diff --git a/doc/EN/mesh_images.org b/doc/EN/mesh_images.org index 1527a332..5f7b3aa2 100644 --- a/doc/EN/mesh_images.org +++ b/doc/EN/mesh_images.org @@ -45,7 +45,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.x wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig gpg --verify freedombone-meshclient-i386.img.xz.sig sha256sum freedombone-meshclient-i386.img.xz -61e474afae14774d7aa479b6727fd5e77bdc1854e547b3c5b630bf10542a9581 +6dcf7418d6bd7dbe79f5fcf96f83b48eb59f6c11a50b67c5e2c013195751989e unxz freedombone-meshclient-i386.img.xz sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync @@ -61,7 +61,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig sha256sum freedombone-meshclient-insecure-i386.img.xz -fec843303d7d280859f75f7a8edccd70512915a34d4cc0787b5de7d8fbde5c81 +4e9ee5fc5aa11fa58bcceae7f04f017c005a4a2595c0d64ac49de39f88b6590d unxz freedombone-meshclient-insecure-i386.img.xz sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync @@ -102,7 +102,7 @@ wget https://freedombone.net/downloads/current/freedombone.tar.gz wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig gpg --verify freedombone.tar.gz.sig sha256sum freedombone.tar.gz -e2715e27b142a21fa257eab15778ddc96f86fda70f8d91d47c4c9aa19f22e272 +024aedd3a264e963d791daaada347aba1295bc5caebba34ad9b19dc117a8cac9 tar -xzvf freedombone.tar.gz cd freedombone git checkout stretch diff --git a/img/avatars/icons_chat.png b/img/avatars/icon_chat.png similarity index 100% rename from img/avatars/icons_chat.png rename to img/avatars/icon_chat.png diff --git a/img/avatars/icons_invite.png b/img/avatars/icon_invite.png similarity index 100% rename from img/avatars/icons_invite.png rename to img/avatars/icon_invite.png diff --git a/img/avatars/icon_sites.png b/img/avatars/icon_sites.png index 1480983e..a0907c71 100644 Binary files a/img/avatars/icon_sites.png and b/img/avatars/icon_sites.png differ diff --git a/img/icon_chat.png b/img/icon_chat.png index 92ac4c1b..ba813a72 100644 Binary files a/img/icon_chat.png and b/img/icon_chat.png differ diff --git a/img/icons_invite.png b/img/icon_invite.png similarity index 100% rename from img/icons_invite.png rename to img/icon_invite.png diff --git a/img/icon_sites.png b/img/icon_sites.png index 1480983e..a0907c71 100644 Binary files a/img/icon_sites.png and b/img/icon_sites.png differ diff --git a/img/icons_chat.png b/img/icons_chat.png deleted file mode 100644 index ba813a72..00000000 Binary files a/img/icons_chat.png and /dev/null differ diff --git a/img/mesh_choose_avatar.jpg b/img/mesh_choose_avatar.jpg index e99a7141..b9e628ec 100644 Binary files a/img/mesh_choose_avatar.jpg and b/img/mesh_choose_avatar.jpg differ diff --git a/img/mesh_connect.jpg b/img/mesh_connect.jpg index 2db3f497..3874dd85 100644 Binary files a/img/mesh_connect.jpg and b/img/mesh_connect.jpg differ diff --git a/img/mesh_cryptpad1.jpg b/img/mesh_cryptpad1.jpg index 5c6984c4..dc2bcc32 100644 Binary files a/img/mesh_cryptpad1.jpg and b/img/mesh_cryptpad1.jpg differ diff --git a/img/mesh_cryptpad2.jpg b/img/mesh_cryptpad2.jpg index 5a4ed7bc..299fe514 100644 Binary files a/img/mesh_cryptpad2.jpg and b/img/mesh_cryptpad2.jpg differ diff --git a/img/mesh_friend_request.jpg b/img/mesh_friend_request.jpg index ec150d4b..ba7e0c7e 100644 Binary files a/img/mesh_friend_request.jpg and b/img/mesh_friend_request.jpg differ diff --git a/img/mesh_netbook.jpg b/img/mesh_netbook.jpg index b9138771..94b5ede2 100644 Binary files a/img/mesh_netbook.jpg and b/img/mesh_netbook.jpg differ diff --git a/img/mesh_new_blog.jpg b/img/mesh_new_blog.jpg index 0c7530ad..41fac00b 100644 Binary files a/img/mesh_new_blog.jpg and b/img/mesh_new_blog.jpg differ diff --git a/img/mesh_new_blog2.jpg b/img/mesh_new_blog2.jpg index 8b19b92b..1e3e342b 100644 Binary files a/img/mesh_new_blog2.jpg and b/img/mesh_new_blog2.jpg differ diff --git a/img/mesh_share_files.jpg b/img/mesh_share_files.jpg index 3cfcf0ea..b28e81bf 100644 Binary files a/img/mesh_share_files.jpg and b/img/mesh_share_files.jpg differ diff --git a/img/mesh_signal.jpg b/img/mesh_signal.jpg index f26580dd..1fb655f7 100644 Binary files a/img/mesh_signal.jpg and b/img/mesh_signal.jpg differ diff --git a/img/mesh_text_chat.jpg b/img/mesh_text_chat.jpg index 0ff67ad4..a390c098 100644 Binary files a/img/mesh_text_chat.jpg and b/img/mesh_text_chat.jpg differ diff --git a/img/mesh_view_blog.jpg b/img/mesh_view_blog.jpg index 352de6e9..a4e8e063 100644 Binary files a/img/mesh_view_blog.jpg and b/img/mesh_view_blog.jpg differ diff --git a/img/mesh_visit_site.jpg b/img/mesh_visit_site.jpg index 795d87eb..d933ebd5 100644 Binary files a/img/mesh_visit_site.jpg and b/img/mesh_visit_site.jpg differ diff --git a/img/patchwork_public.jpg b/img/patchwork_public.jpg index fd9fac01..6658a69c 100644 Binary files a/img/patchwork_public.jpg and b/img/patchwork_public.jpg differ diff --git a/img/patchwork_setup.jpg b/img/patchwork_setup.jpg index 042534d1..22f80bfd 100644 Binary files a/img/patchwork_setup.jpg and b/img/patchwork_setup.jpg differ diff --git a/src/freedombone-app-cryptpad b/src/freedombone-app-cryptpad index 5f648627..0dd8a90b 100755 --- a/src/freedombone-app-cryptpad +++ b/src/freedombone-app-cryptpad @@ -234,10 +234,6 @@ function mesh_install_cryptpad { exit 783251 fi - if [ -f $rootdir/root/$PROJECT_NAME/img/icon_cryptpad.png ]; then - cp $rootdir/root/$PROJECT_NAME/img/icon_cryptpad.png $rootdir$CRYPTPAD_DIR/icon_cryptpad.png - fi - # an unprivileged user to run as chroot "$rootdir" useradd -d $CRYPTPAD_DIR/ cryptpad diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot index a64fed34..85e58e60 100755 --- a/src/freedombone-app-scuttlebot +++ b/src/freedombone-app-scuttlebot @@ -197,10 +197,6 @@ function remove_scuttlebot { } function mesh_install_scuttlebot { - if [[ $VARIANT == "mesh" ]]; then - return - fi - cat < $rootdir/usr/bin/install_scuttlebot #!/bin/bash npm install -g scuttlebot@${SCUTTLEBOT_VERSION} diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index bbaab7df..bf926927 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -773,7 +773,9 @@ function mesh_client_startup_applications { echo '' >> $START_DESKTOP echo '' >> $START_DESKTOP echo "if [ ! -f $FIRST_BOOT ]; then" >> $START_DESKTOP - echo " $TAHOE_COMMAND start" >> $START_DESKTOP + echo ' if [ -d /var/lib/tahoelafs ]; then' >> $START_DESKTOP + echo " $TAHOE_COMMAND start" >> $START_DESKTOP + echo ' fi' >> $START_DESKTOP echo ' exit 0' >> $START_DESKTOP echo 'fi' >> $START_DESKTOP echo '' >> $START_DESKTOP @@ -806,18 +808,6 @@ function mesh_client_startup_applications { echo "Exec=bash -c '~/mesh-desktop.sh'" >> $START_DESKTOP2 echo 'X-GNOME-Autostart-enabled=true' >> $START_DESKTOP2 chmod +x $START_DESKTOP2 - - START_DESKTOP3=$rootdir/home/$MY_USERNAME/.config/autostart/set_username.desktop - echo '[Desktop Entry]' > $START_DESKTOP3 - echo 'Version=1.0' >> $START_DESKTOP3 - echo 'Name=Set Username' >> $START_DESKTOP3 - echo 'Type=Application' >> $START_DESKTOP3 - echo 'Comment=Set username' >> $START_DESKTOP3 - echo "Exec=mate-terminal -e \"bash -c /home/${MY_USERNAME}/mesh-desktop.sh\"" >> $START_DESKTOP3 - echo 'Icon=user-away' >> $START_DESKTOP3 - echo 'Terminal=false' >> $START_DESKTOP3 - echo 'Categories=Application;' >> $START_DESKTOP3 - chmod +x $START_DESKTOP3 } function mesh_desktop_icons { @@ -918,6 +908,16 @@ if [ \$no_of_users -gt 0 ]; then fi echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/Users.desktop echo 'Comment=List of users' >> /home/$MY_USERNAME/Desktop/Users.desktop + echo 'Comment[el]=Κατάλογος χρηστών' >> /home/$MY_USERNAME/Desktop/Users.desktop + echo 'Comment[ar]=قائمة المستخدمين' >> /home/$MY_USERNAME/Desktop/Users.desktop + echo "Comment[ca]=Llista d'usuaris" >> /home/$MY_USERNAME/Desktop/Users.desktop + echo 'Comment[hi]=उपयोगकर्ताओं की सूची' >> /home/$MY_USERNAME/Desktop/Users.desktop + echo 'Comment[fr]=Liste des utilisateurs' >> /home/$MY_USERNAME/Desktop/Users.desktop + echo 'Comment[de]=Liste der Benutzer' >> /home/$MY_USERNAME/Desktop/Users.desktop + echo 'Comment[es]=Lista de usuarios' >> /home/$MY_USERNAME/Desktop/Users.desktop + echo 'Comment[it]=Elenco degli utenti' >> /home/$MY_USERNAME/Desktop/Users.desktop + echo 'Comment[ru]=Список пользователей' >> /home/$MY_USERNAME/Desktop/Users.desktop + echo 'Comment[zh]=用户列表' >> /home/$MY_USERNAME/Desktop/Users.desktop echo 'Exec=bash /home/$MY_USERNAME/showusers' >> /home/$MY_USERNAME/Desktop/Users.desktop echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_users.png' >> /home/$MY_USERNAME/Desktop/Users.desktop echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/Users.desktop @@ -929,6 +929,16 @@ if [ \$no_of_users -gt 0 ]; then echo 'Name=CryptPad' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop echo 'Comment=Realtime collaborative editing of documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop + echo 'Comment[el]=Συνεργατική επεξεργασία εγγράφων σε πραγματικό χρόνο' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop + echo 'Comment[ar]=في الوقت الحقيقي التحرير التعاوني للوثائق' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop + echo 'Comment[ca]=Edició col·laborativa en temps real de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop + echo 'Comment[hi]=दस्तावेज़ों का रीयलटाइम सहयोगी संपादन' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop + echo 'Comment[fr]=Edition collaborative en temps réel de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop + echo 'Comment[de]=Kollaboratives Echtzeit-Editing von Dokumenten' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop + echo 'Comment[es]=Edición colaborativa en tiempo real de documentos' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop + echo 'Comment[it]=Editing collaborativo di documenti in tempo reale' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop + echo 'Comment[ru]=Совместное редактирование документов в режиме реального времени' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop + echo 'Comment[zh]=实时协同编辑文件' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop echo "Exec=$BROWSER http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop @@ -939,26 +949,39 @@ if [ \$no_of_users -gt 0 ]; then if ! grep -q "\${HOSTNAME}.local" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then sed -i "s|Exec=.*|Exec=$BROWSER http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop fi - if grep -q "Offline" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then - sed -i 's|Name=.*|Name=CryptPad|g' /home/$MY_USERNAME/Desktop/cryptpad.desktop - fi fi if [ ! -f /home/$MY_USERNAME/Desktop/social.desktop ]; then echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[el]=Κοινωνικός' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[ar]=اجتماعي' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[ca]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[hi]=सामाजिक' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[fr]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[de]=Soziale' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[es]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[it]=Sociale' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[ru]=Социальное' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[zh]=社会' >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop - echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[el]=Μια αποκεντρωμένη εφαρμογή ανταλλαγής μηνυμάτων και κοινής χρήσης που είναι ενσωματωμένη στην κορυφή του Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[ar]=والرسائل اللامركزية وتبادل التطبيق بنيت على رأس سكوتليبوت الآمنة (سب)" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[ca]=Una aplicació de missatgeria i distribució descentralitzada integrada a Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[hi]=सिक्योर स्कूटलबट (एसएसबी) के शीर्ष पर निर्मित एक विकेन्द्रीकृत संदेश और साझाकरण ऐप" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[fr]=Une application de messagerie et de partage décentralisée basée sur Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[de]=Eine dezentralisierte Messaging- und Sharing-App, die auf Secure Scuttlebutt basiert" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[es]=Una aplicación de mensajería y uso compartido descentralizada construida sobre Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[it]=Un'applicazione decentralizzata di messaggistica e condivisione costruita sulla base di Secure Shuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[ru]=Децентрализованное приложение для обмена сообщениями и совместного использования, построенное на основе Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[zh]=安全Scuttlebutt之上构建的分散式消息和共享应用程序" >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop chmod +x /home/$MY_USERNAME/Desktop/social.desktop chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop - else - if grep -q "Offline" /home/$MY_USERNAME/Desktop/social.desktop; then - sed -i 's|Name=.*|Name=Social|g' /home/$MY_USERNAME/Desktop/social.desktop - fi fi #if [ ! -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then @@ -972,18 +995,34 @@ if [ \$no_of_users -gt 0 ]; then # echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop # chmod +x /home/$MY_USERNAME/Desktop/audio.desktop # chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop - #else - # if grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then - # sed -i 's|Name=.*|Name=Audio/Music|g' /home/$MY_USERNAME/Desktop/audio.desktop - # fi #fi if [ ! -f /home/$MY_USERNAME/Desktop/vpn.desktop ]; then echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/vpn.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/vpn.desktop echo 'Name=Connect Meshes' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Name[el]=Συνδέστε τα μάτια' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Name[ar]=ربط مشيس' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Name[ca]=Connecteu malles' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Name[hi]=कनेक्ट मेशेस' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Name[fr]=Connecter les maillages' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Name[de]=Netze verbinden' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Name[es]=Conectar Mallas' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Name[it]=Collegare le maglie' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Name[ru]=Подключить сетки' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Name[zh]=连接网格' >> /home/$MY_USERNAME/Desktop/vpn.desktop echo 'Comment=Connect to another mesh network via the internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop - echo 'Exec=mate-terminal -e /usr/local/bin/${PROJECT_NAME}-mesh-connect' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Comment[el]=Συνδεθείτε σε άλλο δίκτυο ματιών μέσω του Διαδικτύου' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Comment[ar]=الاتصال بشبكة شبكة أخرى عبر الإنترنت' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo "Comment[ca]=Connecteu-vos a una altra xarxa de malla a través d'Internet" >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Comment[hi]=इंटरनेट के माध्यम से किसी अन्य जाल नेटवर्क से कनेक्ट करें' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Comment[fr]=Connectez-vous à un autre réseau maillé via Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Comment[de]=Verbindung mit einem anderen Mesh-Netzwerk über das Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Comment[es]=Conéctese a otra red en malla a través de Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo "Comment[it]=Collegarsi ad un'altra rete di maglie via internet" >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Comment[ru]=Подключение к другой сети с сетью через Интернет' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Comment[zh]=通过互联网连接到另一个网状网络' >> /home/$MY_USERNAME/Desktop/vpn.desktop + echo 'Exec=mate-terminal --full-screen -e /usr/local/bin/${PROJECT_NAME}-mesh-connect' >> /home/$MY_USERNAME/Desktop/vpn.desktop echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_connect.png' >> /home/$MY_USERNAME/Desktop/vpn.desktop echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/vpn.desktop chmod +x /home/$MY_USERNAME/Desktop/vpn.desktop @@ -994,8 +1033,28 @@ if [ \$no_of_users -gt 0 ]; then echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/sites.desktop echo "Name=Visit a site" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Name[el]=Επισκεφθείτε έναν ιστότοπο" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Name[ar]=انتقل إلى موقع" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Name[ca]=Visiteu un lloc" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Name[hi]=किसी साइट पर जाएं" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Name[fr]=Visitez un site" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Name[de]=Besuchen Sie eine Website" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Name[es]=Visita un sitio" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Name[it]=Visita un sito" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Name[ru]=Посетите сайт" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Name[zh]=访问网站" >> /home/$MY_USERNAME/Desktop/sites.desktop echo 'Comment=Visit a site' >> /home/$MY_USERNAME/Desktop/sites.desktop - echo 'Exec=mate-terminal -e /usr/local/bin/${PROJECT_NAME}-mesh-visit-site' >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Comment[el]=Επισκεφθείτε έναν ιστότοπο" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Comment[ar]=انتقل إلى موقع" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Commant[ca]=Visiteu un lloc" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Comment[hi]=किसी साइट पर जाएं" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Comment[fr]=Visitez un site" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Comment[de]=Besuchen Sie eine Website" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Comment[es]=Visita un sitio" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Comment[it]=Visita un sito" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Comment[ru]=Посетите сайт" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo "Comment[zh]=访问网站" >> /home/$MY_USERNAME/Desktop/sites.desktop + echo 'Exec=mate-terminal --full-screen -e /usr/local/bin/${PROJECT_NAME}-mesh-visit-site' >> /home/$MY_USERNAME/Desktop/sites.desktop echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_sites.png' >> /home/$MY_USERNAME/Desktop/sites.desktop echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/sites.desktop chmod +x /home/$MY_USERNAME/Desktop/sites.desktop @@ -1004,8 +1063,28 @@ if [ \$no_of_users -gt 0 ]; then echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/blog.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/blog.desktop echo "Name=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop + echo "Name[el]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop + echo "Name[ar]=مدونة" >> /home/$MY_USERNAME/Desktop/blog.desktop + echo "Name[ca]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop + echo "Name[hi]=ब्लॉग" >> /home/$MY_USERNAME/Desktop/blog.desktop + echo "Name[fr]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop + echo "Name[de]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop + echo "Name[es]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop + echo "Name[it]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop + echo "Name[ru]=Блог" >> /home/$MY_USERNAME/Desktop/blog.desktop + echo "Name[zh]=博客" >> /home/$MY_USERNAME/Desktop/blog.desktop echo 'Comment=View or create blog entries' >> /home/$MY_USERNAME/Desktop/blog.desktop - echo 'Exec=mate-terminal -e /usr/local/bin/${PROJECT_NAME}-mesh-blog' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Comment[el]=Προβολή ή δημιουργία καταχωρήσεων ιστολογίου' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Comment[ar]=عرض إدخالات المدونة أو إنشائها' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Comment[ca]=Permet visualitzar o crear entrades de bloc' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Comment[hi]=ब्लॉग प्रविष्टियों देखें या बनाएं' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Comment[fr]=Afficher ou créer des entrées de blog' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Comment[de]=Blog-Einträge anzeigen oder erstellen' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Comment[es]=Ver o crear entradas de blog' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Comment[it]=Visualizza o crea voci di blog' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Comment[ru]=Просмотр или создание записей в блоге' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Comment[zh]=查看或创建博客条目' >> /home/$MY_USERNAME/Desktop/blog.desktop + echo 'Exec=mate-terminal --full-screen -e /usr/local/bin/${PROJECT_NAME}-mesh-blog' >> /home/$MY_USERNAME/Desktop/blog.desktop echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_blog.png' >> /home/$MY_USERNAME/Desktop/blog.desktop echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/blog.desktop chmod +x /home/$MY_USERNAME/Desktop/blog.desktop @@ -1025,8 +1104,28 @@ if [ \$no_of_users -gt 0 ]; then if [ ! -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/tox.desktop echo 'Name=Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Name[el]=Κουβέντα' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Name[ar]=دردشة' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Name[ca]=Xat' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Name[hi]=बातचीत' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Name[fr]=Bavarder' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Name[de]=Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Name[es]=Charla' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Name[it]=Chiacchierare' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Name[ru]=чат' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Name[zh]=聊' >> /home/$MY_USERNAME/Desktop/tox.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop echo 'Comment=Chat, Voice and Video' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Comment[el]=Συνομιλία, Φωνή και βίντεο' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Comment[ar]=دردشة، صوت والفيديو' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Comment[ca]=Xat, veu i vídeo' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Comment[hi]=चैट, वॉयस और वीडियो' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Comment[fr]=Chat, voix et vidéo' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Comment[de]=Chat, Sprache und Video' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Comment[es]=Chat, voz y video' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Comment[it]=Chat, voce e video' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Comment[ru]=Чат, голос и видео' >> /home/$MY_USERNAME/Desktop/tox.desktop + echo 'Comment[zh]=聊天，语音和视频' >> /home/$MY_USERNAME/Desktop/tox.desktop echo 'Exec=bash /home/$MY_USERNAME/runtox' >> /home/$MY_USERNAME/Desktop/tox.desktop echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_chat.png" >> /home/$MY_USERNAME/Desktop/tox.desktop echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop @@ -1041,8 +1140,28 @@ if [ \$no_of_users -gt 0 ]; then echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/invite.desktop echo 'Name=Create Invite' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Name[el]=Δημιουργία πρόσκλησης' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Name[ar]=إنشاء دعوة' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Name[ca]=Crea una invitació' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Name[hi]=आमंत्रण बनाएं' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Name[fr]=Créer une invitation' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Name[de]=Einladung erstellen' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Name[es]=Crear invitación' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Name[it]=Crea Invita' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Name[ru]=Создать приглашение' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Name[zh]=创建邀请' >> /home/$MY_USERNAME/Desktop/invite.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/invite.desktop - echo 'Comment=Create an invite for Patchwork or Ferment' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment=Create an invite for Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment[el]=Δημιουργήστε μια πρόσκληση για το Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment[ar]=إنشاء دعوة ل باتشورك' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment[ca]=Crea una invitació per Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment[hi]=पैचवर्क के लिए एक आमंत्रण बनाएं' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment[fr]=Créer une invitation pour Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment[de]=Erstellen Sie eine Einladung für Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment[es]=Crear una invitación para Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment[it]=Crea un invito per patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment[ru]=Создать приглашение на лоскутное одеяло' >> /home/$MY_USERNAME/Desktop/invite.desktop + echo 'Comment[zh]=为拼拼创建邀请' >> /home/$MY_USERNAME/Desktop/invite.desktop echo 'Exec=mate-terminal -e freedombone-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop @@ -1070,16 +1189,6 @@ else if [ -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then rm /home/$MY_USERNAME/Desktop/tox.desktop fi - if [ -f /home/$MY_USERNAME/Desktop/social.desktop ]; then - if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/social.desktop; then - sed -i 's|Name=.*|Name=Social (Offline)|g' /home/$MY_USERNAME/Desktop/social.desktop - fi - fi - #if [ -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then - # if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then - # sed -i 's|Name=.*|Name=Audio/Music (Offline)|g' /home/$MY_USERNAME/Desktop/audio.desktop - # fi - #fi pkill qtox fi diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh index 362983fe..cb3a6183 100755 --- a/src/freedombone-image-mesh +++ b/src/freedombone-image-mesh @@ -279,8 +279,28 @@ function show_desktop_icons { echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/help.desktop echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/help.desktop echo 'Name=Help' >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Name[el]=Βοήθεια" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Name[ar]=مساعدة" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Name[ca]=Ajuda" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Name[hi]=मदद" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Name[fr]=Aidez-moi" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Name[de]=Hilfe" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Name[es]=Ayuda" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Name[it]=Aiuto" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Name[ru]=Помогите" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Name[zh]=帮帮我" >> /home/$MY_USERNAME/Desktop/help.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/help.desktop echo 'Comment=Show help' >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Comment[el]=Εμφάνιση βοήθειας" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Comment[ar]=عرض المساعدة" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Comment[ca]=Mostra ajuda" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Comment[hi]=मदद दिखायें" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Comment[fr]=Afficher l'aide" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Comment[de]=Zeig Hilfe" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Comment[es]=Mostrar ayuda" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Comment[it]=Mostra aiuto" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Comment[ru]=Показать справку" >> /home/$MY_USERNAME/Desktop/help.desktop + echo "Comment[zh]=显示帮助" >> /home/$MY_USERNAME/Desktop/help.desktop echo "Exec=bash -c /home/$MY_USERNAME/.showhelp" >> /home/$MY_USERNAME/Desktop/help.desktop echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_help.png" >> /home/$MY_USERNAME/Desktop/help.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/help.desktop @@ -289,9 +309,29 @@ function show_desktop_icons { echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/wifi.desktop echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/wifi.desktop echo 'Name=Wifi' >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Name[el]=Wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Name[ar]=واي فاي" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Name[ca]=Wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Name[hi]=वाई - फाई" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Name[fr]=Wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Name[de]=W-lan" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Name[es]=Wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Name[it]=Wi-Fi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Name[ru]=вай-фай" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Name[zh]=无线上网" >> /home/$MY_USERNAME/Desktop/wifi.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/wifi.desktop echo 'Comment=Check wifi status' >> /home/$MY_USERNAME/Desktop/wifi.desktop - echo 'Exec=mate-terminal -e "sudo batman monitor"' >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Comment[el]=Ελέγξτε την κατάσταση wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Comment[ar]=التحقق من حالة واي فاي" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Comment[ca]=Comprova l'estat de wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Comment[hi]=वाईफ़ाई स्थिति की जांच करें" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Comment[fr]=Vérifier l'état du wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Comment[de]=WLAN-Status überprüfen" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Comment[es]=Verificar el estado del wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Comment[it]=Controllare lo stato wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Comment[ru]=Проверить статус wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo "Comment[zh]=检查wifi状态" >> /home/$MY_USERNAME/Desktop/wifi.desktop + echo 'Exec=mate-terminal --full-screen -e "sudo batman monitor"' >> /home/$MY_USERNAME/Desktop/wifi.desktop echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_wifi.png" >> /home/$MY_USERNAME/Desktop/wifi.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/wifi.desktop echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/wifi.desktop @@ -299,8 +339,28 @@ function show_desktop_icons { echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/restart.desktop echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/restart.desktop echo 'Name=Network Restart' >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Name[el]=Δικτυακή επανεκκίνηση" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Name[ar]=إعادة تشغيل الشبكة" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Name[ca]=Reinicia la xarxa" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Name[hi]=नेटवर्क पुनरारंभ करें" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Name[fr]=Redémarrage du réseau" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Name[de]=Netzwerk Neustart" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Name[es]=Reinicio de red" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Name[it]=Riavvia rete" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Name[ru]=Перезапуск сети" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Name[zh]=网络重新启动" >> /home/$MY_USERNAME/Desktop/restart.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/restart.desktop - echo 'Comment=Restart batman' >> /home/$MY_USERNAME/Desktop/restart.desktop + echo 'Comment=Restart the mesh network daemon' >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Comment[el]=Κάντε επανεκκίνηση του δαίμονα του δικτύου ματιών" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Comment[ar]=إعادة تشغيل شبكة شبكة الخفي" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Comment[ca]=Reinicia el dimoni de la xarxa de malla" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Comment[hi]=जाल नेटवर्क डेमॉन को पुनरारंभ करें" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Comment[fr]=Redémarrez le démon réseau maillé" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Comment[de]=Starten Sie den Mesh-Netzwerk-Daemon neu." >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Comment[es]=Reinicie el daemon de red de malla" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Comment[it]=Riavviare il daemon della rete mesh" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Comment[ru]=Перезапустить демон сетчатой сети" >> /home/$MY_USERNAME/Desktop/restart.desktop + echo "Comment[zh]=重新启动网状网络守护程序" >> /home/$MY_USERNAME/Desktop/restart.desktop echo 'Exec=mate-terminal -e "sudo batman restart 2> /dev/null"' >> /home/$MY_USERNAME/Desktop/restart.desktop echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_restart_network.png" >> /home/$MY_USERNAME/Desktop/restart.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/restart.desktop @@ -309,24 +369,64 @@ function show_desktop_icons { echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/new_identity.desktop echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/new_identity.desktop echo 'Name=New Identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Name[el]=Νέα ταυτότητα" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Name[ar]=هوية جديدة" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Name[ca]=Nova identitat" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Name[hi]=नई पहचान" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Name[fr]=Nouvelle identité" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Name[de]=Neue Identität" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Name[es]=Nueva identidad" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Name[it]=Nuova Identità" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Name[ru]=Новая идентификация" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Name[zh]=新身份" >> /home/$MY_USERNAME/Desktop/new_identity.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/new_identity.desktop echo 'Comment=Create a new identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop - echo "Exec=mate-terminal -e ${PROJECT_NAME}-mesh-reset" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Comment[el]=Δημιουργήστε μια νέα ταυτότητα" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Comment[ar]=إنشاء هوية جديدة" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Comment[ca]=Crea una nova identitat" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Comment[hi]=एक नई पहचान बनाएँ" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Comment[fr]=Créer une nouvelle identité" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Comment[de]=Erstellen Sie eine neue Identität" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Comment[es]=Crea una nueva identidad" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Comment[it]=Crea una nuova identità" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Comment[ru]=Создайте новое удостоверение личности" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Comment[zh]=创建一个新的身份" >> /home/$MY_USERNAME/Desktop/new_identity.desktop + echo "Exec=mate-terminal --full-screen -e ${PROJECT_NAME}-mesh-reset" >> /home/$MY_USERNAME/Desktop/new_identity.desktop echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_new_identity.png" >> /home/$MY_USERNAME/Desktop/new_identity.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/new_identity.desktop echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop - echo 'Name=Social (Offline)' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[el]=Κοινωνικός' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[ar]=اجتماعي' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[ca]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[hi]=सामाजिक' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[fr]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[de]=Soziale' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[es]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[it]=Sociale' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[ru]=Социальное' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[zh]=社会' >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop - echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[el]=Μια αποκεντρωμένη εφαρμογή ανταλλαγής μηνυμάτων και κοινής χρήσης που είναι ενσωματωμένη στην κορυφή του Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[ar]=والرسائل اللامركزية وتبادل التطبيق بنيت على رأس سكوتليبوت الآمنة (سب)" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[ca]=Una aplicació de missatgeria i distribució descentralitzada integrada a Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[hi]=सिक्योर स्कूटलबट (एसएसबी) के शीर्ष पर निर्मित एक विकेन्द्रीकृत संदेश और साझाकरण ऐप" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[fr]=Une application de messagerie et de partage décentralisée basée sur Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[de]=Eine dezentralisierte Messaging- und Sharing-App, die auf Secure Scuttlebutt basiert" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[es]=Una aplicación de mensajería y uso compartido descentralizada construida sobre Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[it]=Un'applicazione decentralizzata di messaggistica e condivisione costruita sulla base di Secure Shuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[ru]=Децентрализованное приложение для обмена сообщениями и совместного использования, построенное на основе Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[zh]=安全Scuttlebutt之上构建的分散式消息和共享应用程序" >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop - #echo 'Name=Audio/Music (Offline)' >> /home/$MY_USERNAME/Desktop/audio.desktop + #echo 'Name=Audio/Music' >> /home/$MY_USERNAME/Desktop/audio.desktop #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop #echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop #echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop @@ -885,11 +985,27 @@ if [ -f $MESH_INSTALL_SETUP ]; then rm -rf /home/$MY_USERNAME/.ssb fi - # Remove vpn keys + # Remove vpn host keys if [ -d /etc/openvpn/easy-rsa/keys ]; then rm -rf /etc/openvpn/easy-rsa/keys/* fi + # Remove any existing vpn client keys + if [ -f /home/$MY_USERNAME/vpn.tar.gz ]; then + rm /home/$MY_USERNAME/vpn.tar.gz + fi + if [ -f /home/$USERNAME/stunnel.pem ]; then + rm /home/$USERNAME/stunnel.pem + fi + if [ -f /home/$USERNAME/stunnel.p12 ]; then + rm /home/$USERNAME/stunnel.p12 + fi + + # Remove cryptpad datastore + if [ -d $CRYPTPAD_DIR/datastore ]; then + rm -rf $CRYPTPAD_DIR/datastore + fi + echo $'Beginning mesh node setup' >> $INSTALL_LOG if [ -d /home/$MY_USERNAME/.config ]; then diff --git a/src/freedombone-mesh-batman b/src/freedombone-mesh-batman index 7c6e0cc7..aa2b8e12 100755 --- a/src/freedombone-mesh-batman +++ b/src/freedombone-mesh-batman @@ -425,6 +425,11 @@ function monitor { exit 723657 fi + clear + echo '' + echo $'*** Stopping network ***' + echo '' + stop echo "info: monitoring mesh network $WIFI_SSID on $IFACE" @@ -432,8 +437,18 @@ function monitor { systemctl stop network-manager sleep 5 + clear + echo '' + echo $'*** Setting firewall rate limit ***' + echo '' + global_rate_limit + clear + echo '' + echo $'*** Enabling wifi adaptor in monitor mode ***' + echo '' + # Might have to re-enable wifi rfkill unblock $(rfkill list|awk -F: "/phy/ {print $1}") || true @@ -448,7 +463,14 @@ function monitor { modprobe batman-adv batctl if add $IFACE ifconfig $IFACE up + horst -i $IFACE + + clear + echo '' + echo $'*** Restarting the network daemon. This may take a while. ***' + echo '' + start } @@ -463,8 +485,16 @@ case "$1" in $1 ;; restart) + clear + echo '' + echo $'*** Stopping mesh network connection ***' + echo '' stop sleep 10 + clear + echo '' + echo $'*** Starting mesh network connection ***' + echo '' start ;; ping) diff --git a/src/freedombone-mesh-reset b/src/freedombone-mesh-reset index 7d0855d9..43b3df09 100755 --- a/src/freedombone-mesh-reset +++ b/src/freedombone-mesh-reset @@ -33,28 +33,21 @@ export TEXTDOMAINDIR="/usr/share/locale" MESH_INSTALL_COMPLETED=/root/.mesh_setup_completed -dialog --title $"New Identity" \ - --backtitle $"Freedombone Mesh" \ - --defaultno \ - --yesno $"\nDo you want to reset your identity? This will reset ALL data for this peer, and you will not be able to recover it." 8 60 -sel=$? -case $sel in - 0) sudo batman stop - sudo pkill qtox - sudo pkill firefox - sudo pkill iceweasel - sudo pkill midori - sudo pkill patchwork - sudo rm -f $MESH_INSTALL_COMPLETED - sudo ${PROJECT_NAME}-image-mesh $USER new - sudo batman start - if [ -f $HOME/mesh-desktop.sh ]; then - $HOME/mesh-desktop.sh - else - dialog --title $"New Identity" \ - --msgbox $"You now have a new identity" 6 40 - fi - ;; -esac +if ! zenity --question --title='New Identity' --text="Do you want to reset your identity? This will reset ALL data for this peer, and you will not be able to recover it." --ok-label=No --cancel-label=Yes --width=300; then + sudo batman stop + sudo pkill qtox + sudo pkill firefox + sudo pkill iceweasel + sudo pkill midori + sudo pkill patchwork + sudo rm -f $MESH_INSTALL_COMPLETED + sudo ${PROJECT_NAME}-image-mesh $USER new + sudo batman start + if [ -f $HOME/mesh-desktop.sh ]; then + $HOME/mesh-desktop.sh + else + zenity --info --title=$"New Identity" --text=$"You now have a new identity" --width=200 + fi +fi exit 0 diff --git a/website/EN/mesh_images.html b/website/EN/mesh_images.html index 7b4f32d3..56911a0b 100644 --- a/website/EN/mesh_images.html +++ b/website/EN/mesh_images.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -246,13 +246,13 @@ for the JavaScript code in this tag.

Mesh Network: Images

-
-

Pre-built Disk Images

-
+
+

Pre-built Disk Images

+
-
-

Writing many images quickly

-
+
+

Writing many images quickly

+

There may be situations where you need to write the same disk image to multiple drives at the same time in order to maximize rate of deployment. In the instructions given below the dd command is used for writing to the target drive, but to write to multiple drives you can use a tool such as GNOME MultiWriter.

@@ -280,9 +280,9 @@ The MultiWriter tool is also available within mesh client images, so that you ca

-
-

Client images

-
+
+

Client images

+
@@ -301,7 +301,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.x wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig gpg --verify freedombone-meshclient-i386.img.xz.sig sha256sum freedombone-meshclient-i386.img.xz -61e474afae14774d7aa479b6727fd5e77bdc1854e547b3c5b630bf10542a9581 +6dcf7418d6bd7dbe79f5fcf96f83b48eb59f6c11a50b67c5e2c013195751989e unxz freedombone-meshclient-i386.img.xz sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync @@ -322,7 +322,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig sha256sum freedombone-meshclient-insecure-i386.img.xz -fec843303d7d280859f75f7a8edccd70512915a34d4cc0787b5de7d8fbde5c81 +4e9ee5fc5aa11fa58bcceae7f04f017c005a4a2595c0d64ac49de39f88b6590d unxz freedombone-meshclient-insecure-i386.img.xz sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync @@ -331,16 +331,16 @@ sudo dd bs=1M -

Router images

-
+
+

Router images

+

Routers are intended to build network coverage for an area using small and low cost hardware. You can bolt them to walls or leave them on window ledges. They don't have any user interface and their only job is to haul network traffic across the mesh and to enable peers to find each other via running bootstrap nodes for Tox and IPFS. Copy the image to a microSD card and insert it into the router, plug in an Atheros wifi dongle and power on. That should be all you need to do.

-
-

Beaglebone Black

-
+
+

Beaglebone Black

+
@@ -377,9 +377,9 @@ There is still a software freedom issue with the Beaglebone Black, but it doesn'
-
-

Building Disk Images

-
+
+

Building Disk Images

+

It's better not to trust images downloaded from random places on the interwebs. Chances are that unless you are in the web of trust of the above GPG signatures then they don't mean very much to you. If you actually want something trustworthy then build the images from scratch. It will take some time. Here's how to do it.

@@ -394,7 +394,7 @@ wget https://freedombone.net/downloads/current/freedombone.tar.gz wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig gpg --verify freedombone.tar.gz.sig sha256sum freedombone.tar.gz -e2715e27b142a21fa257eab15778ddc96f86fda70f8d91d47c4c9aa19f22e272 +024aedd3a264e963d791daaada347aba1295bc5caebba34ad9b19dc117a8cac9 tar -xzvf freedombone.tar.gz cd freedombone git checkout stretch