ソースを参照

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram 7 年 前
コミット
895678b6b8
共有10 個のファイルを変更した347 個の追加334 個の削除を含む
  1. 2
    0
      Makefile
  2. 15
    15
      src/freedombone-app-searx
  3. 1
    1
      src/freedombone-config
  4. 1
    1
      src/freedombone-dhparam
  5. 108
    104
      src/freedombone-image-customise
  6. 6
    5
      src/freedombone-image-hardware-setup
  7. 195
    195
      src/freedombone-image-mesh
  8. 10
    10
      src/freedombone-powerline
  9. 8
    2
      src/freedombone-tests
  10. 1
    1
      src/freedombone-utils-web

+ 2
- 0
Makefile ファイルの表示

@@ -23,6 +23,7 @@ install:
23 23
 	mkdir -p ${DESTDIR}/usr/share/${APP}/utils
24 24
 	mkdir -p ${DESTDIR}/usr/share/${APP}/avatars
25 25
 	mkdir -p ${DESTDIR}/etc/${APP}
26
+	cp src/${APP} ${DESTDIR}${PREFIX}/bin
26 27
 	rm -f ${DESTDIR}/${PREFIX}/bin/${APP}-*
27 28
 	cp -r image_build/* ${DESTDIR}/etc/${APP}
28 29
 	cp img/backgrounds/${APP}_*.png ${DESTDIR}${PREFIX}/share
@@ -40,6 +41,7 @@ install:
40 41
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-app-* ${DESTDIR}/usr/share/${APP}/apps
41 42
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-utils-* ${DESTDIR}/usr/share/${APP}/utils
42 43
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
44
+	cp man/${APP}.1.gz ${DESTDIR}${PREFIX}/share/man/man1
43 45
 	rm ${DESTDIR}${PREFIX}/share/man/man1/${APP}*.1.gz
44 46
 	cp man/*.1.gz ${DESTDIR}${PREFIX}/share/man/man1
45 47
 	cp man/${APP}-backup-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/backup.1.gz

+ 15
- 15
src/freedombone-app-searx ファイルの表示

@@ -752,29 +752,29 @@ function create_searx_config {
752 752
       echo '';
753 753
       echo 'locales:';
754 754
       echo '    en : English';
755
-      echo '    bg : Български (Bulgarian)';
756
-      echo '    cs : Čeština (Czech)';
755
+      echo '    bg :  (Bulgarian)';
756
+      echo '    cs : etina (Czech)';
757 757
       echo '    de : Deutsch (German)';
758 758
       echo '    de_DE : Deutsch (German_Germany)';
759
-      echo '    el_GR : Ελληνικά (Greek_Greece)';
759
+      echo '    el_GR :  (Greek_Greece)';
760 760
       echo '    eo : Esperanto (Esperanto)';
761
-      echo '    es : Español (Spanish)';
761
+      echo '    es : Espaol (Spanish)';
762 762
       echo '    fi : Suomi (Finnish)';
763
-      echo '    fr : Français (French)';
764
-      echo '    he : עברית (Hebrew)';
763
+      echo '    fr : Franais (French)';
764
+      echo '    he :  (Hebrew)';
765 765
       echo '    hu : Magyar (Hungarian)';
766 766
       echo '    it : Italiano (Italian)';
767
-      echo '    ja : 日本語 (Japanese)';
767
+      echo '    ja :  (Japanese)';
768 768
       echo '    nl : Nederlands (Dutch)';
769
-      echo '    pt : Português (Portuguese)';
770
-      echo '    pt_BR : Português (Portuguese_Brazil)';
771
-      echo '    ro : Română (Romanian)';
772
-      echo '    ru : Русский (Russian)';
773
-      echo '    sk : Slovenčina (Slovak)';
769
+      echo '    pt : Portugus (Portuguese)';
770
+      echo '    pt_BR : Portugus (Portuguese_Brazil)';
771
+      echo '    ro : Romn (Romanian)';
772
+      echo '    ru :  (Russian)';
773
+      echo '    sk : Slovenina (Slovak)';
774 774
       echo '    sv : Svenska (Swedish)';
775
-      echo '    tr : Türkçe (Turkish)';
776
-      echo '    uk : українська мова (Ukrainian)';
777
-      echo '    zh : 中文 (Chinese)';
775
+      echo '    tr : Trke (Turkish)';
776
+      echo '    uk :   (Ukrainian)';
777
+      echo '    zh :  (Chinese)';
778 778
       echo '';
779 779
       echo 'doi_resolvers :';
780 780
       echo "    oadoi.org : 'https://oadoi.org/'";

+ 1
- 1
src/freedombone-config ファイルの表示

@@ -74,7 +74,7 @@ HUBZILLA_DOMAIN_NAME=
74 74
 HUBZILLA_CODE=
75 75
 GNUSOCIAL_DOMAIN_NAME=
76 76
 GNUSOCIAL_CODE=
77
-GNUSOCIAL_WELCOME_MESSAGE=$"<h1>Welcome to \$GNUSOCIAL_DOMAIN_NAME  a federated social network</h1><p>Another $PROJECT_NAME site</p>"
77
+GNUSOCIAL_WELCOME_MESSAGE=$"<h1>Welcome to \$GNUSOCIAL_DOMAIN_NAME  a federated social network</h1><p>Another $PROJECT_NAME site</p>"
78 78
 GNUSOCIAL_BACKGROUND_IMAGE_URL=
79 79
 GIT_DOMAIN_NAME=
80 80
 GIT_CODE=

+ 1
- 1
src/freedombone-dhparam ファイルの表示

@@ -41,7 +41,7 @@ FAST=''
41 41
 # From BetterCrypto:
42 42
 #
43 43
 #   "Where configurable, we recommend using the Diffie Hellman groups
44
-#    defined for IKE, specifically groups 14-18 (20488192bit MODP).
44
+#    defined for IKE, specifically groups 14-18 (20488192bit MODP).
45 45
 #    These groups have been checked by many eyes and can be assumed
46 46
 #    to be secure."
47 47
 

+ 108
- 104
src/freedombone-image-customise ファイルの表示

@@ -376,7 +376,7 @@ EOF
376 376
 
377 377
       # change the password for the admin user
378 378
       echo -n "    echo \"${MY_USERNAME}:";
379
-      echo "\$(printf \"%s\" \"\$(cat ~/login.txt)\")|chpasswd";
379
+      echo "\$(printf \"%s\" \"\$(cat ~/login.txt)\")\"|chpasswd";
380 380
 
381 381
       # update before continuing
382 382
       echo "    cd /root/${PROJECT_NAME}";
@@ -1190,16 +1190,16 @@ if [ \$no_of_users -gt 0 ]; then
1190 1190
     fi
1191 1191
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/Users.desktop
1192 1192
     echo 'Comment=List of users' >> /home/$MY_USERNAME/Desktop/Users.desktop
1193
-    echo 'Comment[el]=Κατάλογος χρηστών' >> /home/$MY_USERNAME/Desktop/Users.desktop
1194
-    echo 'Comment[ar]=قائمة المستخدمين' >> /home/$MY_USERNAME/Desktop/Users.desktop
1193
+    echo 'Comment[el]= ' >> /home/$MY_USERNAME/Desktop/Users.desktop
1194
+    echo 'Comment[ar]= ' >> /home/$MY_USERNAME/Desktop/Users.desktop
1195 1195
     echo "Comment[ca]=Llista d'usuaris" >> /home/$MY_USERNAME/Desktop/Users.desktop
1196
-    echo 'Comment[hi]=उपयोगकर्ताओं की सूची' >> /home/$MY_USERNAME/Desktop/Users.desktop
1196
+    echo 'Comment[hi]=  ' >> /home/$MY_USERNAME/Desktop/Users.desktop
1197 1197
     echo 'Comment[fr]=Liste des utilisateurs' >> /home/$MY_USERNAME/Desktop/Users.desktop
1198 1198
     echo 'Comment[de]=Liste der Benutzer' >> /home/$MY_USERNAME/Desktop/Users.desktop
1199 1199
     echo 'Comment[es]=Lista de usuarios' >> /home/$MY_USERNAME/Desktop/Users.desktop
1200 1200
     echo 'Comment[it]=Elenco degli utenti' >> /home/$MY_USERNAME/Desktop/Users.desktop
1201
-    echo 'Comment[ru]=Список пользователей' >> /home/$MY_USERNAME/Desktop/Users.desktop
1202
-    echo 'Comment[zh]=用户列表' >> /home/$MY_USERNAME/Desktop/Users.desktop
1201
+    echo 'Comment[ru]= ' >> /home/$MY_USERNAME/Desktop/Users.desktop
1202
+    echo 'Comment[zh]=' >> /home/$MY_USERNAME/Desktop/Users.desktop
1203 1203
     echo 'Exec=bash /home/$MY_USERNAME/showusers' >> /home/$MY_USERNAME/Desktop/Users.desktop
1204 1204
     echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_users.png' >> /home/$MY_USERNAME/Desktop/Users.desktop
1205 1205
     echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/Users.desktop
@@ -1212,16 +1212,16 @@ if [ \$no_of_users -gt 0 ]; then
1212 1212
             echo 'Name=CryptPad' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1213 1213
             echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1214 1214
             echo 'Comment=Realtime collaborative editing of documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1215
-            echo 'Comment[el]=Συνεργατική επεξεργασία εγγράφων σε πραγματικό χρόνο' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1216
-            echo 'Comment[ar]=في الوقت الحقيقي التحرير التعاوني للوثائق' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1217
-            echo 'Comment[ca]=Edició col·laborativa en temps real de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1218
-            echo 'Comment[hi]=दस्तावेज़ों का रीयलटाइम सहयोगी संपादन' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1219
-            echo 'Comment[fr]=Edition collaborative en temps réel de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1215
+            echo 'Comment[el]=     ' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1216
+            echo 'Comment[ar]=     ' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1217
+            echo 'Comment[ca]=Edici collaborativa en temps real de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1218
+            echo 'Comment[hi]=    ' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1219
+            echo 'Comment[fr]=Edition collaborative en temps rel de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1220 1220
             echo 'Comment[de]=Kollaboratives Echtzeit-Editing von Dokumenten' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1221
-            echo 'Comment[es]=Edición colaborativa en tiempo real de documentos' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1221
+            echo 'Comment[es]=Edicin colaborativa en tiempo real de documentos' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1222 1222
             echo 'Comment[it]=Editing collaborativo di documenti in tempo reale' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1223
-            echo 'Comment[ru]=Совместное редактирование документов в режиме реального времени' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1224
-            echo 'Comment[zh]=实时协同编辑文件' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1223
+            echo 'Comment[ru]=      ' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1224
+            echo 'Comment[zh]=' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1225 1225
             echo "Exec=$BROWSER $BROWSER_OPTIONS http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1226 1226
             echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
1227 1227
             echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
@@ -1269,28 +1269,28 @@ if [ \$no_of_users -gt 0 ]; then
1269 1269
     if [ ! -f /home/$MY_USERNAME/Desktop/social.desktop ]; then
1270 1270
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
1271 1271
         echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
1272
-        echo 'Name[el]=Κοινωνικός' >> /home/$MY_USERNAME/Desktop/social.desktop
1273
-        echo 'Name[ar]=اجتماعي' >> /home/$MY_USERNAME/Desktop/social.desktop
1272
+        echo 'Name[el]=' >> /home/$MY_USERNAME/Desktop/social.desktop
1273
+        echo 'Name[ar]=' >> /home/$MY_USERNAME/Desktop/social.desktop
1274 1274
         echo 'Name[ca]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
1275
-        echo 'Name[hi]=सामाजिक' >> /home/$MY_USERNAME/Desktop/social.desktop
1275
+        echo 'Name[hi]=' >> /home/$MY_USERNAME/Desktop/social.desktop
1276 1276
         echo 'Name[fr]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
1277 1277
         echo 'Name[de]=Soziale' >> /home/$MY_USERNAME/Desktop/social.desktop
1278 1278
         echo 'Name[es]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
1279 1279
         echo 'Name[it]=Sociale' >> /home/$MY_USERNAME/Desktop/social.desktop
1280
-        echo 'Name[ru]=Социальное' >> /home/$MY_USERNAME/Desktop/social.desktop
1281
-        echo 'Name[zh]=社会' >> /home/$MY_USERNAME/Desktop/social.desktop
1280
+        echo 'Name[ru]=' >> /home/$MY_USERNAME/Desktop/social.desktop
1281
+        echo 'Name[zh]=' >> /home/$MY_USERNAME/Desktop/social.desktop
1282 1282
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
1283 1283
         echo "Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1284
-        echo "Comment[el]=Μια αποκεντρωμένη εφαρμογή ανταλλαγής μηνυμάτων και κοινής χρήσης που είναι ενσωματωμένη στην κορυφή του Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1285
-        echo "Comment[ar]=والرسائل اللامركزية وتبادل التطبيق بنيت على رأس سكوتليبوت الآمنة (سب)" >> /home/$MY_USERNAME/Desktop/social.desktop
1286
-        echo "Comment[ca]=Una aplicació de missatgeria i distribució descentralitzada integrada a Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1287
-        echo "Comment[hi]=सिक्योर स्कूटलबट (एसएसबी) के शीर्ष पर निर्मित एक विकेन्द्रीकृत संदेश और साझाकरण ऐप" >> /home/$MY_USERNAME/Desktop/social.desktop
1288
-        echo "Comment[fr]=Une application de messagerie et de partage décentralisée basée sur Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1284
+        echo "Comment[el]=              Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1285
+        echo "Comment[ar]=         ()" >> /home/$MY_USERNAME/Desktop/social.desktop
1286
+        echo "Comment[ca]=Una aplicaci de missatgeria i distribuci descentralitzada integrada a Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1287
+        echo "Comment[hi]=  ()          " >> /home/$MY_USERNAME/Desktop/social.desktop
1288
+        echo "Comment[fr]=Une application de messagerie et de partage dcentralise base sur Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1289 1289
         echo "Comment[de]=Eine dezentralisierte Messaging- und Sharing-App, die auf Secure Scuttlebutt basiert" >> /home/$MY_USERNAME/Desktop/social.desktop
1290
-        echo "Comment[es]=Una aplicación de mensajería y uso compartido descentralizada construida sobre Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1290
+        echo "Comment[es]=Una aplicacin de mensajera y uso compartido descentralizada construida sobre Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1291 1291
         echo "Comment[it]=Un'applicazione decentralizzata di messaggistica e condivisione costruita sulla base di Secure Shuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1292
-        echo "Comment[ru]=Децентрализованное приложение для обмена сообщениями и совместного использования, построенное на основе Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1293
-        echo "Comment[zh]=安全Scuttlebutt之上构建的分散式消息和共享应用程序" >> /home/$MY_USERNAME/Desktop/social.desktop
1292
+        echo "Comment[ru]=       ,    Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1293
+        echo "Comment[zh]=Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
1294 1294
         echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
1295 1295
         echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop
1296 1296
         echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
@@ -1316,27 +1316,27 @@ if [ \$no_of_users -gt 0 ]; then
1316 1316
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/vpn.desktop
1317 1317
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1318 1318
         echo 'Name=Connect Meshes' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1319
-        echo 'Name[el]=Συνδέστε τα μάτια' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1320
-        echo 'Name[ar]=ربط مشيس' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1319
+        echo 'Name[el]=  ' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1320
+        echo 'Name[ar]= ' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1321 1321
         echo 'Name[ca]=Connecteu malles' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1322
-        echo 'Name[hi]=कनेक्ट मेशेस' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1322
+        echo 'Name[hi]= ' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1323 1323
         echo 'Name[fr]=Connecter les maillages' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1324 1324
         echo 'Name[de]=Netze verbinden' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1325 1325
         echo 'Name[es]=Conectar Mallas' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1326 1326
         echo 'Name[it]=Collegare le maglie' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1327
-        echo 'Name[ru]=Подключить сетки' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1328
-        echo 'Name[zh]=连接网格' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1327
+        echo 'Name[ru]= ' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1328
+        echo 'Name[zh]=' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1329 1329
         echo 'Comment=Connect to another mesh network via the internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1330
-        echo 'Comment[el]=Συνδεθείτε σε άλλο δίκτυο ματιών μέσω του Διαδικτύου' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1331
-        echo 'Comment[ar]=الاتصال بشبكة شبكة أخرى عبر الإنترنت' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1332
-        echo "Comment[ca]=Connecteu-vos a una altra xarxa de malla a través d'Internet" >> /home/$MY_USERNAME/Desktop/vpn.desktop
1333
-        echo 'Comment[hi]=इंटरनेट के माध्यम से किसी अन्य जाल नेटवर्क से कनेक्ट करें' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1334
-        echo 'Comment[fr]=Connectez-vous à un autre réseau maillé via Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1335
-        echo 'Comment[de]=Verbindung mit einem anderen Mesh-Netzwerk über das Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1336
-        echo 'Comment[es]=Conéctese a otra red en malla a través de Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1330
+        echo 'Comment[el]=       ' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1331
+        echo 'Comment[ar]=     ' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1332
+        echo "Comment[ca]=Connecteu-vos a una altra xarxa de malla a travs d'Internet" >> /home/$MY_USERNAME/Desktop/vpn.desktop
1333
+        echo 'Comment[hi]=          ' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1334
+        echo 'Comment[fr]=Connectez-vous  un autre rseau maill via Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1335
+        echo 'Comment[de]=Verbindung mit einem anderen Mesh-Netzwerk ber das Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1336
+        echo 'Comment[es]=Conctese a otra red en malla a travs de Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1337 1337
         echo "Comment[it]=Collegarsi ad un'altra rete di maglie via internet" >> /home/$MY_USERNAME/Desktop/vpn.desktop
1338
-        echo 'Comment[ru]=Подключение к другой сети с сетью через Интернет' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1339
-        echo 'Comment[zh]=通过互联网连接到另一个网状网络' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1338
+        echo 'Comment[ru]=       ' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1339
+        echo 'Comment[zh]=' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1340 1340
         echo 'Exec=/usr/local/bin/${PROJECT_NAME}-mesh-connect' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1341 1341
         echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_connect.png' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1342 1342
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/vpn.desktop
@@ -1348,27 +1348,27 @@ if [ \$no_of_users -gt 0 ]; then
1348 1348
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/routing.desktop
1349 1349
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/routing.desktop
1350 1350
         echo 'Name=Routing Protocol' >> /home/$MY_USERNAME/Desktop/routing.desktop
1351
-        echo 'Name[el]=Πρωτόκολλο δρομολόγησης' >> /home/$MY_USERNAME/Desktop/routing.desktop
1352
-        echo 'Name[ar]=بروتوكول التوجيه' >> /home/$MY_USERNAME/Desktop/routing.desktop
1351
+        echo 'Name[el]= ' >> /home/$MY_USERNAME/Desktop/routing.desktop
1352
+        echo 'Name[ar]= ' >> /home/$MY_USERNAME/Desktop/routing.desktop
1353 1353
         echo "Name[ca]=Protocol d'enrutament" >> /home/$MY_USERNAME/Desktop/routing.desktop
1354
-        echo 'Name[hi]=रूटिंग प्रोटोकॉल' >> /home/$MY_USERNAME/Desktop/routing.desktop
1354
+        echo 'Name[hi]= ' >> /home/$MY_USERNAME/Desktop/routing.desktop
1355 1355
         echo 'Name[fr]=Protocole de routage' >> /home/$MY_USERNAME/Desktop/routing.desktop
1356 1356
         echo 'Name[de]=Routingprotokoll' >> /home/$MY_USERNAME/Desktop/routing.desktop
1357 1357
         echo 'Name[es]=Protocolo de enrutamiento' >> /home/$MY_USERNAME/Desktop/routing.desktop
1358 1358
         echo 'Name[it]=Protocollo di routing' >> /home/$MY_USERNAME/Desktop/routing.desktop
1359
-        echo 'Name[ru]=Протокол маршрутизации' >> /home/$MY_USERNAME/Desktop/routing.desktop
1360
-        echo 'Name[zh]=路由协议' >> /home/$MY_USERNAME/Desktop/routing.desktop
1359
+        echo 'Name[ru]= ' >> /home/$MY_USERNAME/Desktop/routing.desktop
1360
+        echo 'Name[zh]=' >> /home/$MY_USERNAME/Desktop/routing.desktop
1361 1361
         echo 'Comment=Select the mesh routing protocol' >> /home/$MY_USERNAME/Desktop/routing.desktop
1362
-        echo 'Comment[el]=Επιλέξτε το πρωτόκολλο δρομολόγησης πλέγματος' >> /home/$MY_USERNAME/Desktop/routing.desktop
1363
-        echo 'Comment[ar]=حدد بروتوكول توجيه الشبكة' >> /home/$MY_USERNAME/Desktop/routing.desktop
1362
+        echo 'Comment[el]=    ' >> /home/$MY_USERNAME/Desktop/routing.desktop
1363
+        echo 'Comment[ar]=   ' >> /home/$MY_USERNAME/Desktop/routing.desktop
1364 1364
         echo "Comment[ca]=Seleccioneu el protocol d'enrutament de malles" >> /home/$MY_USERNAME/Desktop/routing.desktop
1365
-        echo 'Comment[hi]=जाल रूटिंग प्रोटोकॉल का चयन करें' >> /home/$MY_USERNAME/Desktop/routing.desktop
1366
-        echo 'Comment[fr]=Sélectionnez le protocole de routage de maillage' >> /home/$MY_USERNAME/Desktop/routing.desktop
1367
-        echo 'Comment[de]=Wählen Sie das Mesh-Routing-Protokoll' >> /home/$MY_USERNAME/Desktop/routing.desktop
1365
+        echo 'Comment[hi]=     ' >> /home/$MY_USERNAME/Desktop/routing.desktop
1366
+        echo 'Comment[fr]=Slectionnez le protocole de routage de maillage' >> /home/$MY_USERNAME/Desktop/routing.desktop
1367
+        echo 'Comment[de]=Whlen Sie das Mesh-Routing-Protokoll' >> /home/$MY_USERNAME/Desktop/routing.desktop
1368 1368
         echo 'Comment[es]=Seleccione el protocolo de enrutamiento de malla' >> /home/$MY_USERNAME/Desktop/routing.desktop
1369 1369
         echo "Comment[it]=Seleziona il protocollo di instradamento della mesh" >> /home/$MY_USERNAME/Desktop/routing.desktop
1370
-        echo 'Comment[ru]=Выберите протокол маршрутизации сетки' >> /home/$MY_USERNAME/Desktop/routing.desktop
1371
-        echo 'Comment[zh]=选择网状路由协议' >> /home/$MY_USERNAME/Desktop/routing.desktop
1370
+        echo 'Comment[ru]=   ' >> /home/$MY_USERNAME/Desktop/routing.desktop
1371
+        echo 'Comment[zh]=' >> /home/$MY_USERNAME/Desktop/routing.desktop
1372 1372
         echo "Exec=mate-terminal -e \"/usr/local/bin/${PROJECT_NAME}-mesh-routing\"" >> /home/$MY_USERNAME/Desktop/routing.desktop
1373 1373
         echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_routing.png' >> /home/$MY_USERNAME/Desktop/routing.desktop
1374 1374
         echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/routing.desktop
@@ -1381,27 +1381,27 @@ if [ \$no_of_users -gt 0 ]; then
1381 1381
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop
1382 1382
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/sites.desktop
1383 1383
         echo "Name=Visit a site" >> /home/$MY_USERNAME/Desktop/sites.desktop
1384
-        echo "Name[el]=Επισκεφθείτε έναν ιστότοπο" >> /home/$MY_USERNAME/Desktop/sites.desktop
1385
-        echo "Name[ar]=انتقل إلى موقع" >> /home/$MY_USERNAME/Desktop/sites.desktop
1384
+        echo "Name[el]=  " >> /home/$MY_USERNAME/Desktop/sites.desktop
1385
+        echo "Name[ar]=  " >> /home/$MY_USERNAME/Desktop/sites.desktop
1386 1386
         echo "Name[ca]=Visiteu un lloc" >> /home/$MY_USERNAME/Desktop/sites.desktop
1387
-        echo "Name[hi]=किसी साइट पर जाएं" >> /home/$MY_USERNAME/Desktop/sites.desktop
1387
+        echo "Name[hi]=   " >> /home/$MY_USERNAME/Desktop/sites.desktop
1388 1388
         echo "Name[fr]=Visitez un site" >> /home/$MY_USERNAME/Desktop/sites.desktop
1389 1389
         echo "Name[de]=Besuchen Sie eine Website" >> /home/$MY_USERNAME/Desktop/sites.desktop
1390 1390
         echo "Name[es]=Visita un sitio" >> /home/$MY_USERNAME/Desktop/sites.desktop
1391 1391
         echo "Name[it]=Visita un sito" >> /home/$MY_USERNAME/Desktop/sites.desktop
1392
-        echo "Name[ru]=Посетите сайт" >> /home/$MY_USERNAME/Desktop/sites.desktop
1393
-        echo "Name[zh]=访问网站" >> /home/$MY_USERNAME/Desktop/sites.desktop
1392
+        echo "Name[ru]= " >> /home/$MY_USERNAME/Desktop/sites.desktop
1393
+        echo "Name[zh]=" >> /home/$MY_USERNAME/Desktop/sites.desktop
1394 1394
         echo 'Comment=Visit a site' >> /home/$MY_USERNAME/Desktop/sites.desktop
1395
-        echo "Comment[el]=Επισκεφθείτε έναν ιστότοπο" >> /home/$MY_USERNAME/Desktop/sites.desktop
1396
-        echo "Comment[ar]=انتقل إلى موقع" >> /home/$MY_USERNAME/Desktop/sites.desktop
1395
+        echo "Comment[el]=  " >> /home/$MY_USERNAME/Desktop/sites.desktop
1396
+        echo "Comment[ar]=  " >> /home/$MY_USERNAME/Desktop/sites.desktop
1397 1397
         echo "Commant[ca]=Visiteu un lloc" >> /home/$MY_USERNAME/Desktop/sites.desktop
1398
-        echo "Comment[hi]=किसी साइट पर जाएं" >> /home/$MY_USERNAME/Desktop/sites.desktop
1398
+        echo "Comment[hi]=   " >> /home/$MY_USERNAME/Desktop/sites.desktop
1399 1399
         echo "Comment[fr]=Visitez un site" >> /home/$MY_USERNAME/Desktop/sites.desktop
1400 1400
         echo "Comment[de]=Besuchen Sie eine Website" >> /home/$MY_USERNAME/Desktop/sites.desktop
1401 1401
         echo "Comment[es]=Visita un sitio" >> /home/$MY_USERNAME/Desktop/sites.desktop
1402 1402
         echo "Comment[it]=Visita un sito" >> /home/$MY_USERNAME/Desktop/sites.desktop
1403
-        echo "Comment[ru]=Посетите сайт" >> /home/$MY_USERNAME/Desktop/sites.desktop
1404
-        echo "Comment[zh]=访问网站" >> /home/$MY_USERNAME/Desktop/sites.desktop
1403
+        echo "Comment[ru]= " >> /home/$MY_USERNAME/Desktop/sites.desktop
1404
+        echo "Comment[zh]=" >> /home/$MY_USERNAME/Desktop/sites.desktop
1405 1405
         echo 'Exec=/usr/local/bin/${PROJECT_NAME}-mesh-visit-site' >> /home/$MY_USERNAME/Desktop/sites.desktop
1406 1406
         echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_sites.png' >> /home/$MY_USERNAME/Desktop/sites.desktop
1407 1407
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/sites.desktop
@@ -1412,26 +1412,26 @@ if [ \$no_of_users -gt 0 ]; then
1412 1412
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/blog.desktop
1413 1413
         echo "Name=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1414 1414
         echo "Name[el]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1415
-        echo "Name[ar]=مدونة" >> /home/$MY_USERNAME/Desktop/blog.desktop
1415
+        echo "Name[ar]=" >> /home/$MY_USERNAME/Desktop/blog.desktop
1416 1416
         echo "Name[ca]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1417
-        echo "Name[hi]=ब्लॉग" >> /home/$MY_USERNAME/Desktop/blog.desktop
1417
+        echo "Name[hi]=" >> /home/$MY_USERNAME/Desktop/blog.desktop
1418 1418
         echo "Name[fr]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1419 1419
         echo "Name[de]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1420 1420
         echo "Name[es]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1421 1421
         echo "Name[it]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1422
-        echo "Name[ru]=Блог" >> /home/$MY_USERNAME/Desktop/blog.desktop
1423
-        echo "Name[zh]=博客" >> /home/$MY_USERNAME/Desktop/blog.desktop
1422
+        echo "Name[ru]=" >> /home/$MY_USERNAME/Desktop/blog.desktop
1423
+        echo "Name[zh]=" >> /home/$MY_USERNAME/Desktop/blog.desktop
1424 1424
         echo 'Comment=View or create blog entries' >> /home/$MY_USERNAME/Desktop/blog.desktop
1425
-        echo 'Comment[el]=Προβολή ή δημιουργία καταχωρήσεων ιστολογίου' >> /home/$MY_USERNAME/Desktop/blog.desktop
1426
-        echo 'Comment[ar]=عرض إدخالات المدونة أو إنشائها' >> /home/$MY_USERNAME/Desktop/blog.desktop
1425
+        echo 'Comment[el]=    ' >> /home/$MY_USERNAME/Desktop/blog.desktop
1426
+        echo 'Comment[ar]=    ' >> /home/$MY_USERNAME/Desktop/blog.desktop
1427 1427
         echo 'Comment[ca]=Permet visualitzar o crear entrades de bloc' >> /home/$MY_USERNAME/Desktop/blog.desktop
1428
-        echo 'Comment[hi]=ब्लॉग प्रविष्टियों देखें या बनाएं' >> /home/$MY_USERNAME/Desktop/blog.desktop
1429
-        echo 'Comment[fr]=Afficher ou créer des entrées de blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
1430
-        echo 'Comment[de]=Blog-Einträge anzeigen oder erstellen' >> /home/$MY_USERNAME/Desktop/blog.desktop
1428
+        echo 'Comment[hi]=    ' >> /home/$MY_USERNAME/Desktop/blog.desktop
1429
+        echo 'Comment[fr]=Afficher ou crer des entres de blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
1430
+        echo 'Comment[de]=Blog-Eintrge anzeigen oder erstellen' >> /home/$MY_USERNAME/Desktop/blog.desktop
1431 1431
         echo 'Comment[es]=Ver o crear entradas de blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
1432 1432
         echo 'Comment[it]=Visualizza o crea voci di blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
1433
-        echo 'Comment[ru]=Просмотр или создание записей в блоге' >> /home/$MY_USERNAME/Desktop/blog.desktop
1434
-        echo 'Comment[zh]=查看或创建博客条目' >> /home/$MY_USERNAME/Desktop/blog.desktop
1433
+        echo 'Comment[ru]=     ' >> /home/$MY_USERNAME/Desktop/blog.desktop
1434
+        echo 'Comment[zh]=' >> /home/$MY_USERNAME/Desktop/blog.desktop
1435 1435
         echo 'Exec=/usr/local/bin/${PROJECT_NAME}-mesh-blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
1436 1436
         echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_blog.png' >> /home/$MY_USERNAME/Desktop/blog.desktop
1437 1437
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/blog.desktop
@@ -1452,28 +1452,28 @@ if [ \$no_of_users -gt 0 ]; then
1452 1452
     if [ ! -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then
1453 1453
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/tox.desktop
1454 1454
         echo 'Name=Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
1455
-        echo 'Name[el]=Κουβέντα' >> /home/$MY_USERNAME/Desktop/tox.desktop
1456
-        echo 'Name[ar]=دردشة' >> /home/$MY_USERNAME/Desktop/tox.desktop
1455
+        echo 'Name[el]=' >> /home/$MY_USERNAME/Desktop/tox.desktop
1456
+        echo 'Name[ar]=' >> /home/$MY_USERNAME/Desktop/tox.desktop
1457 1457
         echo 'Name[ca]=Xat' >> /home/$MY_USERNAME/Desktop/tox.desktop
1458
-        echo 'Name[hi]=बातचीत' >> /home/$MY_USERNAME/Desktop/tox.desktop
1458
+        echo 'Name[hi]=' >> /home/$MY_USERNAME/Desktop/tox.desktop
1459 1459
         echo 'Name[fr]=Bavarder' >> /home/$MY_USERNAME/Desktop/tox.desktop
1460 1460
         echo 'Name[de]=Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
1461 1461
         echo 'Name[es]=Charla' >> /home/$MY_USERNAME/Desktop/tox.desktop
1462 1462
         echo 'Name[it]=Chiacchierare' >> /home/$MY_USERNAME/Desktop/tox.desktop
1463
-        echo 'Name[ru]=чат' >> /home/$MY_USERNAME/Desktop/tox.desktop
1464
-        echo 'Name[zh]=' >> /home/$MY_USERNAME/Desktop/tox.desktop
1463
+        echo 'Name[ru]=' >> /home/$MY_USERNAME/Desktop/tox.desktop
1464
+        echo 'Name[zh]=' >> /home/$MY_USERNAME/Desktop/tox.desktop
1465 1465
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop
1466 1466
         echo 'Comment=Chat, Voice and Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
1467
-        echo 'Comment[el]=Συνομιλία, Φωνή και βίντεο' >> /home/$MY_USERNAME/Desktop/tox.desktop
1468
-        echo 'Comment[ar]=دردشة، صوت والفيديو' >> /home/$MY_USERNAME/Desktop/tox.desktop
1469
-        echo 'Comment[ca]=Xat, veu i vídeo' >> /home/$MY_USERNAME/Desktop/tox.desktop
1470
-        echo 'Comment[hi]=चैट, वॉयस और वीडियो' >> /home/$MY_USERNAME/Desktop/tox.desktop
1471
-        echo 'Comment[fr]=Chat, voix et vidéo' >> /home/$MY_USERNAME/Desktop/tox.desktop
1467
+        echo 'Comment[el]=,   ' >> /home/$MY_USERNAME/Desktop/tox.desktop
1468
+        echo 'Comment[ar]=  ' >> /home/$MY_USERNAME/Desktop/tox.desktop
1469
+        echo 'Comment[ca]=Xat, veu i vdeo' >> /home/$MY_USERNAME/Desktop/tox.desktop
1470
+        echo 'Comment[hi]=,   ' >> /home/$MY_USERNAME/Desktop/tox.desktop
1471
+        echo 'Comment[fr]=Chat, voix et vido' >> /home/$MY_USERNAME/Desktop/tox.desktop
1472 1472
         echo 'Comment[de]=Chat, Sprache und Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
1473 1473
         echo 'Comment[es]=Chat, voz y video' >> /home/$MY_USERNAME/Desktop/tox.desktop
1474 1474
         echo 'Comment[it]=Chat, voce e video' >> /home/$MY_USERNAME/Desktop/tox.desktop
1475
-        echo 'Comment[ru]=Чат, голос и видео' >> /home/$MY_USERNAME/Desktop/tox.desktop
1476
-        echo 'Comment[zh]=聊天,语音和视频' >> /home/$MY_USERNAME/Desktop/tox.desktop
1475
+        echo 'Comment[ru]=,   ' >> /home/$MY_USERNAME/Desktop/tox.desktop
1476
+        echo 'Comment[zh]=' >> /home/$MY_USERNAME/Desktop/tox.desktop
1477 1477
         echo 'Exec=bash /home/$MY_USERNAME/runtox' >> /home/$MY_USERNAME/Desktop/tox.desktop
1478 1478
         echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_chat.png" >> /home/$MY_USERNAME/Desktop/tox.desktop
1479 1479
         echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop
@@ -1488,28 +1488,28 @@ if [ \$no_of_users -gt 0 ]; then
1488 1488
             echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop
1489 1489
             echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/invite.desktop
1490 1490
             echo 'Name=Create Invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
1491
-            echo 'Name[el]=Δημιουργία πρόσκλησης' >> /home/$MY_USERNAME/Desktop/invite.desktop
1492
-            echo 'Name[ar]=إنشاء دعوة' >> /home/$MY_USERNAME/Desktop/invite.desktop
1493
-            echo 'Name[ca]=Crea una invitació' >> /home/$MY_USERNAME/Desktop/invite.desktop
1494
-            echo 'Name[hi]=आमंत्रण बनाएं' >> /home/$MY_USERNAME/Desktop/invite.desktop
1495
-            echo 'Name[fr]=Créer une invitation' >> /home/$MY_USERNAME/Desktop/invite.desktop
1491
+            echo 'Name[el]= ' >> /home/$MY_USERNAME/Desktop/invite.desktop
1492
+            echo 'Name[ar]= ' >> /home/$MY_USERNAME/Desktop/invite.desktop
1493
+            echo 'Name[ca]=Crea una invitaci' >> /home/$MY_USERNAME/Desktop/invite.desktop
1494
+            echo 'Name[hi]= ' >> /home/$MY_USERNAME/Desktop/invite.desktop
1495
+            echo 'Name[fr]=Crer une invitation' >> /home/$MY_USERNAME/Desktop/invite.desktop
1496 1496
             echo 'Name[de]=Einladung erstellen' >> /home/$MY_USERNAME/Desktop/invite.desktop
1497
-            echo 'Name[es]=Crear invitación' >> /home/$MY_USERNAME/Desktop/invite.desktop
1497
+            echo 'Name[es]=Crear invitacin' >> /home/$MY_USERNAME/Desktop/invite.desktop
1498 1498
             echo 'Name[it]=Crea Invita' >> /home/$MY_USERNAME/Desktop/invite.desktop
1499
-            echo 'Name[ru]=Создать приглашение' >> /home/$MY_USERNAME/Desktop/invite.desktop
1500
-            echo 'Name[zh]=创建邀请' >> /home/$MY_USERNAME/Desktop/invite.desktop
1499
+            echo 'Name[ru]= ' >> /home/$MY_USERNAME/Desktop/invite.desktop
1500
+            echo 'Name[zh]=' >> /home/$MY_USERNAME/Desktop/invite.desktop
1501 1501
             echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/invite.desktop
1502 1502
             echo 'Comment=Create an invite for Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1503
-            echo 'Comment[el]=Δημιουργήστε μια πρόσκληση για το Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1504
-            echo 'Comment[ar]=إنشاء دعوة ل باتشورك' >> /home/$MY_USERNAME/Desktop/invite.desktop
1505
-            echo 'Comment[ca]=Crea una invitació per Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1506
-            echo 'Comment[hi]=पैचवर्क के लिए एक आमंत्रण बनाएं' >> /home/$MY_USERNAME/Desktop/invite.desktop
1507
-            echo 'Comment[fr]=Créer une invitation pour Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1508
-            echo 'Comment[de]=Erstellen Sie eine Einladung für Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1509
-            echo 'Comment[es]=Crear una invitación para Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1503
+            echo 'Comment[el]=     Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1504
+            echo 'Comment[ar]=   ' >> /home/$MY_USERNAME/Desktop/invite.desktop
1505
+            echo 'Comment[ca]=Crea una invitaci per Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1506
+            echo 'Comment[hi]=     ' >> /home/$MY_USERNAME/Desktop/invite.desktop
1507
+            echo 'Comment[fr]=Crer une invitation pour Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1508
+            echo 'Comment[de]=Erstellen Sie eine Einladung fr Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1509
+            echo 'Comment[es]=Crear una invitacin para Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1510 1510
             echo 'Comment[it]=Crea un invito per patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1511
-            echo 'Comment[ru]=Создать приглашение на лоскутное одеяло' >> /home/$MY_USERNAME/Desktop/invite.desktop
1512
-            echo 'Comment[zh]=为拼拼创建邀请' >> /home/$MY_USERNAME/Desktop/invite.desktop
1511
+            echo 'Comment[ru]=    ' >> /home/$MY_USERNAME/Desktop/invite.desktop
1512
+            echo 'Comment[zh]=' >> /home/$MY_USERNAME/Desktop/invite.desktop
1513 1513
             echo 'Exec=mate-terminal -e freedombone-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
1514 1514
             echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
1515 1515
             echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop
@@ -2002,7 +2002,7 @@ chroot "$rootdir" /usr/bin/env -i \
2002 2002
     PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
2003 2003
 echo "export PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:" >> "$rootdir/root/.bashrc"
2004 2004
 chroot "$rootdir" adduser --gecos "$username" --disabled-password "$username"
2005
-echo "$username":"$password" | chroot "$rootdir" /usr/sbin/chpasswd
2005
+echo "$username:$password" | chroot "$rootdir" /usr/sbin/chpasswd
2006 2006
 chroot "$rootdir" adduser "$username" sudo
2007 2007
 
2008 2008
 if [ ! "$DEBIAN_REPO" ]; then
@@ -2057,6 +2057,10 @@ sed -i "s|use-ipv4=.*|use-ipv4=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2057 2057
 sed -i "s|use-ipv6=.*|use-ipv6=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2058 2058
 sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2059 2059
 sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" "$rootdir/etc/nsswitch.conf"
2060
+sed -i "s|#publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2061
+sed -i "s|publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2062
+sed -i "s|#publish-addresses=.*|publish-addresses=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2063
+sed -i "s|publish-addresses=.*|publish-addresses=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2060 2064
 
2061 2065
 # Add an ssh avahi service
2062 2066
 { echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->';

+ 6
- 5
src/freedombone-image-hardware-setup ファイルの表示

@@ -47,7 +47,7 @@ beaglebone_setup_boot() {
47 47
         fstype=ext4
48 48
     fi
49 49
     # shellcheck disable=SC2012
50
-    kernelVersion=$(ls "/usr/lib/*/am335x-boneblack.dtb" | head -1 | cut -d/ -f4)
50
+    kernelVersion=$(ls /usr/lib/*/am335x-boneblack.dtb | head -1 | cut -d/ -f4)
51 51
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
52 52
     initRd=initrd.img-$version
53 53
     vmlinuz=vmlinuz-$version
@@ -116,7 +116,7 @@ beaglebone_repack_kernel() {
116 116
     bbb_dtb='am335x-boneblack'
117 117
 
118 118
     # shellcheck disable=SC2012
119
-    kernelVersion=$(ls "/usr/lib/*/${bbb_dtb}.dtb" | head -1 | cut -d/ -f4)
119
+    kernelVersion=$(ls /usr/lib/*/${bbb_dtb}.dtb | head -1 | cut -d/ -f4)
120 120
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
121 121
     initRd=initrd.img-$version
122 122
     vmlinuz=vmlinuz-$version
@@ -164,8 +164,8 @@ a20_setup_boot() {
164 164
     else
165 165
         fstype=ext4
166 166
     fi
167
-    # shellcheck disable=SC2012
168
-    kernelVersion=$(ls "/usr/lib/*/$dtb" | head -1 | cut -d/ -f4)
167
+    # shellcheck disable=SC2012,SC2086
168
+    kernelVersion=$(ls /usr/lib/*/$dtb | head -1 | cut -d/ -f4)
169 169
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
170 170
     initRd=initrd.img-$version
171 171
     vmlinuz=vmlinuz-$version
@@ -207,7 +207,8 @@ EOF
207 207
 
208 208
     # Copy all DTBs
209 209
     mkdir -p /boot/dtbs
210
-    cp "/usr/lib/$kernelVersion/"* /boot/dtbs
210
+    # shellcheck disable=SC2086
211
+    cp /usr/lib/$kernelVersion/* /boot/dtbs
211 212
 
212 213
     # extra boot modules
213 214
     echo "rtc_sunxi" >> /etc/initramfs-tools/modules

+ 195
- 195
src/freedombone-image-mesh ファイルの表示

@@ -337,28 +337,28 @@ function show_desktop_icons {
337 337
     { echo '[Desktop Entry]';
338 338
       echo 'Version=1.0';
339 339
       echo 'Name=Help';
340
-      echo "Name[el]=Βοήθεια";
341
-      echo "Name[ar]=مساعدة";
340
+      echo "Name[el]=";
341
+      echo "Name[ar]=";
342 342
       echo "Name[ca]=Ajuda";
343
-      echo "Name[hi]=मदद";
343
+      echo "Name[hi]=";
344 344
       echo "Name[fr]=Aidez-moi";
345 345
       echo "Name[de]=Hilfe";
346 346
       echo "Name[es]=Ayuda";
347 347
       echo "Name[it]=Aiuto";
348
-      echo "Name[ru]=Помогите";
349
-      echo "Name[zh]=帮帮我";
348
+      echo "Name[ru]=";
349
+      echo "Name[zh]=";
350 350
       echo 'Type=Application';
351 351
       echo 'Comment=Show help';
352
-      echo "Comment[el]=Εμφάνιση βοήθειας";
353
-      echo "Comment[ar]=عرض المساعدة";
352
+      echo "Comment[el]= ";
353
+      echo "Comment[ar]= ";
354 354
       echo "Comment[ca]=Mostra ajuda";
355
-      echo "Comment[hi]=मदद दिखायें";
355
+      echo "Comment[hi]= ";
356 356
       echo "Comment[fr]=Afficher l'aide";
357 357
       echo "Comment[de]=Zeig Hilfe";
358 358
       echo "Comment[es]=Mostrar ayuda";
359 359
       echo "Comment[it]=Mostra aiuto";
360
-      echo "Comment[ru]=Показать справку";
361
-      echo "Comment[zh]=显示帮助";
360
+      echo "Comment[ru]= ";
361
+      echo "Comment[zh]=";
362 362
       echo "Exec=bash -c /home/$MY_USERNAME/.showhelp";
363 363
       echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_help.png";
364 364
       echo 'Terminal=false';
@@ -368,27 +368,27 @@ function show_desktop_icons {
368 368
       echo 'Version=1.0';
369 369
       echo 'Name=Wifi';
370 370
       echo "Name[el]=Wifi";
371
-      echo "Name[ar]=واي فاي";
371
+      echo "Name[ar]= ";
372 372
       echo "Name[ca]=Wifi";
373
-      echo "Name[hi]=वाई - फाई";
373
+      echo "Name[hi]= - ";
374 374
       echo "Name[fr]=Wifi";
375 375
       echo "Name[de]=W-lan";
376 376
       echo "Name[es]=Wifi";
377 377
       echo "Name[it]=Wi-Fi";
378
-      echo "Name[ru]=вай-фай";
379
-      echo "Name[zh]=无线上网";
378
+      echo "Name[ru]=-";
379
+      echo "Name[zh]=";
380 380
       echo 'Type=Application';
381 381
       echo 'Comment=Check wifi status';
382
-      echo "Comment[el]=Ελέγξτε την κατάσταση wifi";
383
-      echo "Comment[ar]=التحقق من حالة واي فاي";
382
+      echo "Comment[el]=   wifi";
383
+      echo "Comment[ar]=    ";
384 384
       echo "Comment[ca]=Comprova l'estat de wifi";
385
-      echo "Comment[hi]=वाईफ़ाई स्थिति की जांच करें";
386
-      echo "Comment[fr]=Vérifier l'état du wifi";
387
-      echo "Comment[de]=WLAN-Status überprüfen";
385
+      echo "Comment[hi]=    ";
386
+      echo "Comment[fr]=Vrifier l'tat du wifi";
387
+      echo "Comment[de]=WLAN-Status berprfen";
388 388
       echo "Comment[es]=Verificar el estado del wifi";
389 389
       echo "Comment[it]=Controllare lo stato wifi";
390
-      echo "Comment[ru]=Проверить статус wifi";
391
-      echo "Comment[zh]=检查wifi状态";
390
+      echo "Comment[ru]=  wifi";
391
+      echo "Comment[zh]=wifi";
392 392
       echo 'Exec=mate-terminal --full-screen -e "sudo batman monitor"';
393 393
       echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_wifi.png";
394 394
       echo 'Terminal=false';
@@ -397,28 +397,28 @@ function show_desktop_icons {
397 397
     { echo '[Desktop Entry]';
398 398
       echo 'Version=1.0';
399 399
       echo 'Name=Network Restart';
400
-      echo "Name[el]=Δικτυακή επανεκκίνηση";
401
-      echo "Name[ar]=إعادة تشغيل الشبكة";
400
+      echo "Name[el]= ";
401
+      echo "Name[ar]=  ";
402 402
       echo "Name[ca]=Reinicia la xarxa";
403
-      echo "Name[hi]=नेटवर्क पुनरारंभ करें";
404
-      echo "Name[fr]=Redémarrage du réseau";
403
+      echo "Name[hi]=  ";
404
+      echo "Name[fr]=Redmarrage du rseau";
405 405
       echo "Name[de]=Netzwerk Neustart";
406 406
       echo "Name[es]=Reinicio de red";
407 407
       echo "Name[it]=Riavvia rete";
408
-      echo "Name[ru]=Перезапуск сети";
409
-      echo "Name[zh]=网络重新启动";
408
+      echo "Name[ru]= ";
409
+      echo "Name[zh]=";
410 410
       echo 'Type=Application';
411 411
       echo 'Comment=Restart the mesh network daemon';
412
-      echo "Comment[el]=Κάντε επανεκκίνηση του δαίμονα του δικτύου ματιών";
413
-      echo "Comment[ar]=إعادة تشغيل شبكة شبكة الخفي";
412
+      echo "Comment[el]=      ";
413
+      echo "Comment[ar]=    ";
414 414
       echo "Comment[ca]=Reinicia el dimoni de la xarxa de malla";
415
-      echo "Comment[hi]=जाल नेटवर्क डेमॉन को पुनरारंभ करें";
416
-      echo "Comment[fr]=Redémarrez le démon réseau maillé";
415
+      echo "Comment[hi]=     ";
416
+      echo "Comment[fr]=Redmarrez le dmon rseau maill";
417 417
       echo "Comment[de]=Starten Sie den Mesh-Netzwerk-Daemon neu.";
418 418
       echo "Comment[es]=Reinicie el daemon de red de malla";
419 419
       echo "Comment[it]=Riavviare il daemon della rete mesh";
420
-      echo "Comment[ru]=Перезапустить демон сетчатой сети";
421
-      echo "Comment[zh]=重新启动网状网络守护程序";
420
+      echo "Comment[ru]=   ";
421
+      echo "Comment[zh]=";
422 422
       echo 'Exec=mate-terminal -e "sudo batman restart 2> /dev/null"';
423 423
       echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_restart_network.png";
424 424
       echo 'Terminal=false';
@@ -427,28 +427,28 @@ function show_desktop_icons {
427 427
     { echo '[Desktop Entry]';
428 428
       echo 'Version=1.0';
429 429
       echo 'Name=New Identity';
430
-      echo "Name[el]=Νέα ταυτότητα";
431
-      echo "Name[ar]=هوية جديدة";
430
+      echo "Name[el]= ";
431
+      echo "Name[ar]= ";
432 432
       echo "Name[ca]=Nova identitat";
433
-      echo "Name[hi]=नई पहचान";
434
-      echo "Name[fr]=Nouvelle identité";
435
-      echo "Name[de]=Neue Identität";
433
+      echo "Name[hi]= ";
434
+      echo "Name[fr]=Nouvelle identit";
435
+      echo "Name[de]=Neue Identitt";
436 436
       echo "Name[es]=Nueva identidad";
437
-      echo "Name[it]=Nuova Identità";
438
-      echo "Name[ru]=Новая идентификация";
439
-      echo "Name[zh]=新身份";
437
+      echo "Name[it]=Nuova Identit";
438
+      echo "Name[ru]= ";
439
+      echo "Name[zh]=";
440 440
       echo 'Type=Application';
441 441
       echo 'Comment=Create a new identity';
442
-      echo "Comment[el]=Δημιουργήστε μια νέα ταυτότητα";
443
-      echo "Comment[ar]=إنشاء هوية جديدة";
442
+      echo "Comment[el]=   ";
443
+      echo "Comment[ar]=  ";
444 444
       echo "Comment[ca]=Crea una nova identitat";
445
-      echo "Comment[hi]=एक नई पहचान बनाएँ";
446
-      echo "Comment[fr]=Créer une nouvelle identité";
447
-      echo "Comment[de]=Erstellen Sie eine neue Identität";
445
+      echo "Comment[hi]=   ";
446
+      echo "Comment[fr]=Crer une nouvelle identit";
447
+      echo "Comment[de]=Erstellen Sie eine neue Identitt";
448 448
       echo "Comment[es]=Crea una nueva identidad";
449
-      echo "Comment[it]=Crea una nuova identità";
450
-      echo "Comment[ru]=Создайте новое удостоверение личности";
451
-      echo "Comment[zh]=创建一个新的身份";
449
+      echo "Comment[it]=Crea una nuova identit";
450
+      echo "Comment[ru]=   ";
451
+      echo "Comment[zh]=";
452 452
       echo "Exec=${PROJECT_NAME}-mesh-reset";
453 453
       echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_new_identity.png";
454 454
       echo 'Terminal=false';
@@ -456,28 +456,28 @@ function show_desktop_icons {
456 456
 
457 457
     { echo '[Desktop Entry]';
458 458
       echo 'Name=Social';
459
-      echo 'Name[el]=Κοινωνικός';
460
-      echo 'Name[ar]=اجتماعي';
459
+      echo 'Name[el]=';
460
+      echo 'Name[ar]=';
461 461
       echo 'Name[ca]=Social';
462
-      echo 'Name[hi]=सामाजिक';
462
+      echo 'Name[hi]=';
463 463
       echo 'Name[fr]=Social';
464 464
       echo 'Name[de]=Soziale';
465 465
       echo 'Name[es]=Social';
466 466
       echo 'Name[it]=Sociale';
467
-      echo 'Name[ru]=Социальное';
468
-      echo 'Name[zh]=社会';
467
+      echo 'Name[ru]=';
468
+      echo 'Name[zh]=';
469 469
       echo 'Type=Application';
470 470
       echo "Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt";
471
-      echo "Comment[el]=Μια αποκεντρωμένη εφαρμογή ανταλλαγής μηνυμάτων και κοινής χρήσης που είναι ενσωματωμένη στην κορυφή του Secure Scuttlebutt";
472
-      echo "Comment[ar]=والرسائل اللامركزية وتبادل التطبيق بنيت على رأس سكوتليبوت الآمنة (سب)";
473
-      echo "Comment[ca]=Una aplicació de missatgeria i distribució descentralitzada integrada a Secure Scuttlebutt";
474
-      echo "Comment[hi]=सिक्योर स्कूटलबट (एसएसबी) के शीर्ष पर निर्मित एक विकेन्द्रीकृत संदेश और साझाकरण ऐप";
475
-      echo "Comment[fr]=Une application de messagerie et de partage décentralisée basée sur Secure Scuttlebutt";
471
+      echo "Comment[el]=              Secure Scuttlebutt";
472
+      echo "Comment[ar]=         ()";
473
+      echo "Comment[ca]=Una aplicaci de missatgeria i distribuci descentralitzada integrada a Secure Scuttlebutt";
474
+      echo "Comment[hi]=  ()          ";
475
+      echo "Comment[fr]=Une application de messagerie et de partage dcentralise base sur Secure Scuttlebutt";
476 476
       echo "Comment[de]=Eine dezentralisierte Messaging- und Sharing-App, die auf Secure Scuttlebutt basiert";
477
-      echo "Comment[es]=Una aplicación de mensajería y uso compartido descentralizada construida sobre Secure Scuttlebutt";
477
+      echo "Comment[es]=Una aplicacin de mensajera y uso compartido descentralizada construida sobre Secure Scuttlebutt";
478 478
       echo "Comment[it]=Un'applicazione decentralizzata di messaggistica e condivisione costruita sulla base di Secure Shuttlebutt";
479
-      echo "Comment[ru]=Децентрализованное приложение для обмена сообщениями и совместного использования, построенное на основе Secure Scuttlebutt";
480
-      echo "Comment[zh]=安全Scuttlebutt之上构建的分散式消息和共享应用程序";
479
+      echo "Comment[ru]=       ,    Secure Scuttlebutt";
480
+      echo "Comment[zh]=Scuttlebutt";
481 481
       echo 'Exec=bash /usr/bin/start_patchwork';
482 482
       echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_social.png";
483 483
       echo 'Terminal=false';
@@ -511,7 +511,7 @@ function show_desktop_icons {
511 511
       echo 'Name[km]=Kdenlive';
512 512
       echo 'Name[lt]=Kdenlive';
513 513
       echo 'Name[lv]=Kdenlive';
514
-      echo 'Name[mr]=के-डि-एनलाइव्ह';
514
+      echo 'Name[mr]=--';
515 515
       echo 'Name[nb]=Kdenlive';
516 516
       echo 'Name[nds]=Kdenlive';
517 517
       echo 'Name[nl]=Kdenlive';
@@ -531,85 +531,85 @@ function show_desktop_icons {
531 531
       echo 'Name[zh_CN]=Kdenlive';
532 532
       echo 'Name[zh_TW]=Kdenlive';
533 533
       echo 'GenericName=Video Editor';
534
-      echo 'GenericName[ar]=محرّر فيديوهات';
534
+      echo 'GenericName[ar]= ';
535 535
       echo 'GenericName[ast]=Editor de videu';
536
-      echo 'GenericName[bs]=Video uređivač';
537
-      echo 'GenericName[ca]=Editor de vídeo';
538
-      echo 'GenericName[ca@valencia]=Editor de vídeo';
539
-      echo 'GenericName[cs]=Editor videí';
536
+      echo 'GenericName[bs]=Video ureiva';
537
+      echo 'GenericName[ca]=Editor de vdeo';
538
+      echo 'GenericName[ca@valencia]=Editor de vdeo';
539
+      echo 'GenericName[cs]=Editor vide';
540 540
       echo 'GenericName[da]=Videoredigering';
541 541
       echo 'GenericName[de]=Video-Editor';
542
-      echo 'GenericName[el]=Επεξεργαστής βίντεο';
542
+      echo 'GenericName[el]= ';
543 543
       echo 'GenericName[en_GB]=Video Editor';
544 544
       echo 'GenericName[es]=Editor de video';
545 545
       echo 'GenericName[et]=Videoredaktor';
546 546
       echo 'GenericName[fi]=Videomuokkain';
547
-      echo 'GenericName[fr]=Éditeur vidéo';
548
-      echo 'GenericName[ga]=Eagarthóir Físe';
549
-      echo 'GenericName[gl]=Editor de vídeo';
550
-      echo 'GenericName[hu]=Videoszerkesztő';
547
+      echo 'GenericName[fr]=diteur vido';
548
+      echo 'GenericName[ga]=Eagarthir Fse';
549
+      echo 'GenericName[gl]=Editor de vdeo';
550
+      echo 'GenericName[hu]=Videoszerkeszt';
551 551
       echo 'GenericName[it]=Editor video';
552
-      echo 'GenericName[ja]=ビデオエディタ';
553
-      echo 'GenericName[km]=កម្មវិធី​កែសម្រួល​វីដេអូ';
552
+      echo 'GenericName[ja]=';
553
+      echo 'GenericName[km]=';
554 554
       echo 'GenericName[lt]=Video redaktorius';
555 555
       echo 'GenericName[lv]=Video redaktors';
556
-      echo 'GenericName[mr]=व्हिडीओ संपादक';
556
+      echo 'GenericName[mr]= ';
557 557
       echo 'GenericName[nb]=Videoredigeringsprogram';
558 558
       echo 'GenericName[nl]=Video-bewerker';
559 559
       echo 'GenericName[nn]=Videoredigering';
560 560
       echo 'GenericName[pl]=Edytor wideo';
561
-      echo 'GenericName[pt]=Editor de Víde';
562
-      echo 'GenericName[pt_BR]=Editor de Vídeo';
561
+      echo 'GenericName[pt]=Editor de Vde';
562
+      echo 'GenericName[pt_BR]=Editor de Vdeo';
563 563
       echo 'GenericName[ro]=Redactor de imagini';
564
-      echo 'GenericName[ru]=Видеоредактор';
564
+      echo 'GenericName[ru]=';
565 565
       echo 'GenericName[sk]=Editor videa';
566 566
       echo 'GenericName[sl]=Urejevalnik videa';
567 567
       echo 'GenericName[sv]=Videoeditor';
568
-      echo 'GenericName[tr]=Video Düzenleyici';
569
-      echo 'GenericName[uk]=Відеоредактор';
568
+      echo 'GenericName[tr]=Video Dzenleyici';
569
+      echo 'GenericName[uk]=';
570 570
       echo 'GenericName[x-test]=xxVideo Editorxx';
571
-      echo 'GenericName[zh_CN]=视频编辑器';
572
-      echo 'GenericName[zh_TW]=影像編輯器';
571
+      echo 'GenericName[zh_CN]=';
572
+      echo 'GenericName[zh_TW]=';
573 573
       echo 'Comment=Nonlinear video editor for KDE';
574
-      echo 'Comment[ar]=محرّر فيديوهات غير خطّيّ لكدي';
574
+      echo 'Comment[ar]=    ';
575 575
       echo 'Comment[ast]=Editor de videu non llinial pa KDE';
576
-      echo 'Comment[bs]=Nelinearni video uređivač za KDE';
577
-      echo 'Comment[ca]=Editor de vídeo no lineal per al KDE';
578
-      echo 'Comment[ca@valencia]=Editor de vídeo no lineal per al KDE';
579
-      echo 'Comment[cs]=Nelineární editor videí pro KDE';
580
-      echo 'Comment[da]=Ikke-lineær videoredigering til KDE';
581
-      echo 'Comment[de]=Nichtlinearer Video-Editor für KDE';
582
-      echo 'Comment[el]=Μη γραμμικός επεξεργαστής βίντεο για το KDE';
576
+      echo 'Comment[bs]=Nelinearni video ureiva za KDE';
577
+      echo 'Comment[ca]=Editor de vdeo no lineal per al KDE';
578
+      echo 'Comment[ca@valencia]=Editor de vdeo no lineal per al KDE';
579
+      echo 'Comment[cs]=Nelinern editor vide pro KDE';
580
+      echo 'Comment[da]=Ikke-liner videoredigering til KDE';
581
+      echo 'Comment[de]=Nichtlinearer Video-Editor fr KDE';
582
+      echo 'Comment[el]=      KDE';
583 583
       echo 'Comment[en_GB]=Nonlinear video editor for KDE';
584 584
       echo 'Comment[es]=Editor no lineal de video para KDE';
585 585
       echo 'Comment[et]=KDE mittelineaarne videoredaktor';
586
-      echo 'Comment[fi]=Epälineaarinen videomuokkain KDE:lle';
587
-      echo 'Comment[fr]=Éditeur vidéo non linéaire pour KDE';
588
-      echo 'Comment[gl]=Editor de vídeo non linear para KDE';
589
-      echo 'Comment[hu]=Nemlineáris videoszerkesztő a KDE-hez';
586
+      echo 'Comment[fi]=Eplineaarinen videomuokkain KDE:lle';
587
+      echo 'Comment[fr]=diteur vido non linaire pour KDE';
588
+      echo 'Comment[gl]=Editor de vdeo non linear para KDE';
589
+      echo 'Comment[hu]=Nemlineris videoszerkeszt a KDE-hez';
590 590
       echo 'Comment[it]=Editor di video non lineare per KDE';
591
-      echo 'Comment[ja]=KDE 向けノンリニアビデオエディタ';
592
-      echo 'Comment[km]=កម្មវិធី​កែសម្រួល​វីដេអូ​មិន​លីនេអ៊ែរ​សម្រាប់ KDE';
591
+      echo 'Comment[ja]=KDE ';
592
+      echo 'Comment[km]= KDE';
593 593
       echo 'Comment[lt]=Nelinijinis veido redaktorius skirtas KDE';
594
-      echo 'Comment[lv]=Nelineārais video redaktors KDE videi';
595
-      echo 'Comment[mr]=केडीई करिता अरेषीय व्हिडीओ संपादक';
594
+      echo 'Comment[lv]=Nelinerais video redaktors KDE videi';
595
+      echo 'Comment[mr]=    ';
596 596
       echo 'Comment[nb]=Videoredigeringsprogram for KDE med dataklipping';
597 597
       echo 'Comment[nl]=Niet-lineaire video-bewerker voor KDE';
598
-      echo 'Comment[nn]=Program for ikkje-lineær videoredigering';
598
+      echo 'Comment[nn]=Program for ikkje-liner videoredigering';
599 599
       echo 'Comment[pl]=Nieliniowy edytor wideo dla KDE';
600
-      echo 'Comment[pt]=Editor de vídeo não-linear para o KDE';
601
-      echo 'Comment[pt_BR]=Editor de vídeo não-linear para o KDE';
600
+      echo 'Comment[pt]=Editor de vdeo no-linear para o KDE';
601
+      echo 'Comment[pt_BR]=Editor de vdeo no-linear para o KDE';
602 602
       echo 'Comment[ro]=Redactor de imagini neliniar pentru KDE';
603
-      echo 'Comment[ru]=Нелинейный видеоредактор от KDE';
604
-      echo 'Comment[sk]=Nelineárny editor videa pre KDE';
603
+      echo 'Comment[ru]=   KDE';
604
+      echo 'Comment[sk]=Nelinerny editor videa pre KDE';
605 605
       echo 'Comment[sl]=Ne-linearni urejevalnik videa za KDE';
606
-      echo 'Comment[sv]=Icke-linjär videoeditor för KDE';
607
-      echo 'Comment[tr]=KDE için doğrusal olmayan video düzenleyici';
608
-      echo 'Comment[ug]=KDE ئۈچۈن سىزىقسىز سىن تەھرىرلىگۈچ';
609
-      echo 'Comment[uk]=Нелінійний редактор відео для KDE';
606
+      echo 'Comment[sv]=Icke-linjr videoeditor fr KDE';
607
+      echo 'Comment[tr]=KDE iin dorusal olmayan video dzenleyici';
608
+      echo 'Comment[ug]=KDE    ';
609
+      echo 'Comment[uk]=    KDE';
610 610
       echo 'Comment[x-test]=xxNonlinear video editor for KDExx';
611
-      echo 'Comment[zh_CN]=KDE 的非线性视频编辑器';
612
-      echo 'Comment[zh_TW]=KDE 上的非線性影像編輯器';
611
+      echo 'Comment[zh_CN]=KDE ';
612
+      echo 'Comment[zh_TW]=KDE ';
613 613
       echo 'Type=Application';
614 614
       echo 'Exec=kdenlive %U';
615 615
       echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_kdenlive.png";
@@ -619,28 +619,28 @@ function show_desktop_icons {
619 619
       echo 'MimeType=application/x-kdenlive;';
620 620
       echo 'Categories=Qt;KDE;AudioVideo;AudioVideoEditing;';
621 621
       echo 'Keywords=editing;video;audio;mlt;kde;';
622
-      echo 'Keywords[ca]=edició;vídeo;àudio;mlt;kde;';
623
-      echo 'Keywords[ca@valencia]=edició;vídeo;àudio;mlt;kde;';
622
+      echo 'Keywords[ca]=edici;vdeo;udio;mlt;kde;';
623
+      echo 'Keywords[ca@valencia]=edici;vdeo;udio;mlt;kde;';
624 624
       echo 'Keywords[da]=redigering;video;lyd;mlt;kde;';
625 625
       echo 'Keywords[de]=Editing;Bearbeitung;Schnitt;Videoschnitt;Video;Audio;MLT;';
626 626
       echo 'Keywords[en_GB]=editing;video;audio;mlt;kde;';
627
-      echo 'Keywords[es]=edición;video;audio;mlt;kde;';
627
+      echo 'Keywords[es]=edicin;video;audio;mlt;kde;';
628 628
       echo 'Keywords[et]=redigeerimine;muutmine;video;audio;heli;mlt;kde;';
629
-      echo 'Keywords[fi]=editing;video;audio;mlt;kde;editointi;ääni;';
630
-      echo 'Keywords[fr]=montage;vidéo;audio;mlt;kde;';
631
-      echo 'Keywords[gl]=editing;edición;video;vídeo;audio;son;mlt;kde;';
629
+      echo 'Keywords[fi]=editing;video;audio;mlt;kde;editointi;ni;';
630
+      echo 'Keywords[fr]=montage;vido;audio;mlt;kde;';
631
+      echo 'Keywords[gl]=editing;edicin;video;vdeo;audio;son;mlt;kde;';
632 632
       echo 'Keywords[it]=editing;video;audio;mlt;kde;';
633 633
       echo 'Keywords[nl]=bewerken;video;audio;mlt;kde;';
634 634
       echo 'Keywords[nn]=redigering;video;lyd;mlt;kde;';
635
-      echo 'Keywords[pl]=edytowanie;video;wideo;filmy;audio;dźwięk;mlt;kde;';
636
-      echo 'Keywords[pt]=edição;vídeo;áudio;MLT;kde;';
637
-      echo 'Keywords[pt_BR]=edição;vídeo;áudio;mlt;kde;';
635
+      echo 'Keywords[pl]=edytowanie;video;wideo;filmy;audio;dwik;mlt;kde;';
636
+      echo 'Keywords[pt]=edio;vdeo;udio;MLT;kde;';
637
+      echo 'Keywords[pt_BR]=edio;vdeo;udio;mlt;kde;';
638 638
       echo 'Keywords[sk]=editovanie;video;audio;mlt;kde;';
639 639
       echo 'Keywords[sl]=urejanje;video;zvok;mlt;kde;';
640 640
       echo 'Keywords[sv]=redigering;video;ljud;mlt;kde;';
641
-      echo 'Keywords[uk]=editing;video;audio;mlt;kde;редагування;відео;звук;аудіо;млт;кдє;';
641
+      echo 'Keywords[uk]=editing;video;audio;mlt;kde;;;;;;;';
642 642
       echo 'Keywords[x-test]=xxeditingxx;xxvideoxx;xxaudioxx;xxmltxx;xxkdexx;';
643
-      echo 'Keywords[zh_CN]=editing;video;audio;mlt;kde;编辑;视频;音频;';
643
+      echo 'Keywords[zh_CN]=editing;video;audio;mlt;kde;;;;';
644 644
       echo 'Keywords[zh_TW]=editing;video;audio;mlt;kde;';
645 645
       echo 'X-DBUS-ServiceName=org.kde.kdenlive'; } > "/home/$MY_USERNAME/Desktop/kdenlive.desktop"
646 646
 
@@ -649,7 +649,7 @@ function show_desktop_icons {
649 649
     { echo '#!/usr/bin/env xdg-open';
650 650
       echo '[Desktop Entry]';
651 651
       echo 'Version=1.0';
652
-      echo 'Name[ar]=شُتْ‌وِل';
652
+      echo 'Name[ar]=';
653 653
       echo 'Name[as]=Photos';
654 654
       echo 'Name[bn_IN]=Shotwell';
655 655
       echo 'Name[bs]=Shotwell';
@@ -668,7 +668,7 @@ function show_desktop_icons {
668 668
       echo 'Name[gl]=Shotwell';
669 669
       echo 'Name[gu]=Shotwell';
670 670
       echo 'Name[he]=Shotwell';
671
-      echo 'Name[hi]=शॉटवेल';
671
+      echo 'Name[hi]=';
672 672
       echo 'Name[hr]=Shotwell';
673 673
       echo 'Name[hu]=Shotwell';
674 674
       echo 'Name[id]=Shotwell';
@@ -676,16 +676,16 @@ function show_desktop_icons {
676 676
       echo 'Name[ja]=Shotwell';
677 677
       echo 'Name[kk]=Shotwell';
678 678
       echo 'Name[kn]=Shotwell';
679
-      echo 'Name[ko]=샷웰';
679
+      echo 'Name[ko]=';
680 680
       echo 'Name[lt]=Shotwell';
681 681
       echo 'Name[lv]=Shotwell';
682
-      echo 'Name[ml]=ഷോട്ട്‌‌വെല്‍';
683
-      echo 'Name[mr]=शॉटवेल';
682
+      echo 'Name[ml]=';
683
+      echo 'Name[mr]=';
684 684
       echo 'Name[nb]=Shotwell';
685 685
       echo 'Name[nl]=Shotwell';
686 686
       echo 'Name[oc]=Shotwell';
687 687
       echo 'Name[or]=Shotwell';
688
-      echo 'Name[pa]=ਸ਼ੂਟਵੈੱਲ';
688
+      echo 'Name[pa]=';
689 689
       echo 'Name[pl]=Shotwell';
690 690
       echo 'Name[pt]=Shotwell';
691 691
       echo 'Name[pt_BR]=Shotwell';
@@ -693,11 +693,11 @@ function show_desktop_icons {
693 693
       echo 'Name[ru]=Shotwell';
694 694
       echo 'Name[sk]=Shotwell';
695 695
       echo 'Name[sl]=Shotwell';
696
-      echo 'Name[sr]=Фото-бунар';
696
+      echo 'Name[sr]=-';
697 697
       echo 'Name[sr@latin]=Foto-bunar';
698 698
       echo 'Name[sv]=Shotwell';
699
-      echo 'Name[ta]=ஷாட்வெல்';
700
-      echo 'Name[te]=షాట్‌వెల్';
699
+      echo 'Name[ta]=';
700
+      echo 'Name[te]=';
701 701
       echo 'Name[tr]=Shotwell';
702 702
       echo 'Name[uk]=Shotwell';
703 703
       echo 'Name[vi]=Shotwell';
@@ -706,18 +706,18 @@ function show_desktop_icons {
706 706
       echo 'Name[zh_TW]=Shotwell';
707 707
       echo 'Name=Photos';
708 708
       echo 'GenericName[af]=Foto Organiseerder';
709
-      echo 'GenericName[ar]=مدير الصور';
710
-      echo "GenericName[as]='টো ব্যৱস্থাপক";
709
+      echo 'GenericName[ar]= ';
710
+      echo "GenericName[as]=' ";
711 711
       echo 'GenericName[ast]=Xestor de semeyes';
712
-      echo 'GenericName[bg]=Мениджър на снимки';
713
-      echo 'GenericName[bn]=ফটো ম্যানেজার';
714
-      echo 'GenericName[bn_IN]=ছবি পরিচালন ব্যবস্থা';
712
+      echo 'GenericName[bg]=  ';
713
+      echo 'GenericName[bn]= ';
714
+      echo 'GenericName[bn_IN]=  ';
715 715
       echo 'GenericName[bs]=Organizator Slika';
716
-      echo 'GenericName[ca]=Gestor fotogràfic';
717
-      echo 'GenericName[cs]=Správce fotografií';
718
-      echo 'GenericName[da]=Billedhåndtering';
716
+      echo 'GenericName[ca]=Gestor fotogrfic';
717
+      echo 'GenericName[cs]=Sprvce fotografi';
718
+      echo 'GenericName[da]=Billedhndtering';
719 719
       echo 'GenericName[de]=Fotoverwaltung';
720
-      echo 'GenericName[el]=Διαχειριστής εικόνων';
720
+      echo 'GenericName[el]= ';
721 721
       echo 'GenericName[en_GB]=Photo Manager';
722 722
       echo 'GenericName[es]=Gestor de fotos';
723 723
       echo 'GenericName[et]=Fotohaldur';
@@ -726,72 +726,72 @@ function show_desktop_icons {
726 726
       echo 'GenericName[fr]=Gestionnaire de photos';
727 727
       echo 'GenericName[gd]=Manaidsear dhealbhan';
728 728
       echo 'GenericName[gl]=Xestor de fotos';
729
-      echo 'GenericName[gu]=ફોટો સંચાલક';
730
-      echo 'GenericName[he]=מנהל תמונות';
731
-      echo 'GenericName[hi]=फ़ोटो प्रबंधक';
729
+      echo 'GenericName[gu]= ';
730
+      echo 'GenericName[he]= ';
731
+      echo 'GenericName[hi]= ';
732 732
       echo 'GenericName[hr]=Upravitelj fotografija';
733
-      echo 'GenericName[hu]=Fényképkezelő';
733
+      echo 'GenericName[hu]=Fnykpkezel';
734 734
       echo 'GenericName[ia]=Administrator de photos';
735 735
       echo 'GenericName[id]=Manajer Foto';
736 736
       echo 'GenericName[it]=Gestore di fotografie';
737
-      echo 'GenericName[ja]=Shotwell 写真管理ツール';
738
-      echo 'GenericName[kk]=Фотосуреттерді басқару қолданбасы';
739
-      echo 'GenericName[km]=កម្ម​វិធី​គ្រប់​គ្រង​រូប​ថត';
740
-      echo 'GenericName[kn]=ಫೋಟೊ ವ್ಯವಸ್ಥಾಪಕ';
741
-      echo 'GenericName[ko]=사진 관리자';
742
-      echo 'GenericName[ky]=Фотография менеджери';
743
-      echo 'GenericName[lt]=Nuotraukų tvarkytuvė';
744
-      echo 'GenericName[lv]=Fotogrāfiju pārvaldnieks';
745
-      echo 'GenericName[mk]=Менаџер на фотографии';
746
-      echo 'GenericName[ml]=ചിത്ര പാലകന്‍';
747
-      echo 'GenericName[mr]=छायाचित्र व्यवस्थापक';
737
+      echo 'GenericName[ja]=Shotwell ';
738
+      echo 'GenericName[kk]=  ';
739
+      echo 'GenericName[km]=';
740
+      echo 'GenericName[kn]= ';
741
+      echo 'GenericName[ko]= ';
742
+      echo 'GenericName[ky]= ';
743
+      echo 'GenericName[lt]=Nuotrauk tvarkytuv';
744
+      echo 'GenericName[lv]=Fotogrfiju prvaldnieks';
745
+      echo 'GenericName[mk]=  ';
746
+      echo 'GenericName[ml]= ';
747
+      echo 'GenericName[mr]= ';
748 748
       echo 'GenericName[nb]=Fotobehandler';
749 749
       echo 'GenericName[nl]=Fotobeheerder';
750
-      echo 'GenericName[oc]=Gestionari de fòtos';
751
-      echo 'GenericName[or]=ଫୋଟୋ ପରିଚାଳକ';
752
-      echo 'GenericName[pa]=ਫੋਟੋ ਮੈਨੇਜਰ';
753
-      echo 'GenericName[pl]=Menedżer zdjęć';
750
+      echo 'GenericName[oc]=Gestionari de ftos';
751
+      echo 'GenericName[or]= ';
752
+      echo 'GenericName[pa]= ';
753
+      echo 'GenericName[pl]=Meneder zdj';
754 754
       echo 'GenericName[pt]=Gestor de fotografias';
755 755
       echo 'GenericName[pt_BR]=Organizador de fotos';
756 756
       echo 'GenericName[ro]=Administrator de fotografii';
757
-      echo 'GenericName[ru]=Менеджер фотографий';
758
-      echo 'GenericName[sk]=Správca fotografií';
757
+      echo 'GenericName[ru]= ';
758
+      echo 'GenericName[sk]=Sprvca fotografi';
759 759
       echo 'GenericName[sl]=Upravljalnik fotografij';
760
-      echo 'GenericName[sr]=Управник фотографија';
760
+      echo 'GenericName[sr]= ';
761 761
       echo 'GenericName[sr@latin]=Upravnik fotografija';
762 762
       echo 'GenericName[sv]=Bildhanterare';
763
-      echo 'GenericName[ta]=புகைப்பட அடுக்கு';
764
-      echo 'GenericName[te]=ఫోటో నిర్వాహకం';
765
-      echo 'GenericName[th]=ตัวจัดการภาพถ่าย';
766
-      echo 'GenericName[tr]=Fotoğraf Yöneticisi';
767
-      echo 'GenericName[uk]=Впорядник фотографій';
768
-      echo 'GenericName[vi]=Trình qun lý nh';
769
-      echo 'GenericName[zh_CN]=照片管理器';
770
-      echo 'GenericName[zh_HK]=相片管理員';
771
-      echo 'GenericName[zh_TW]=相片管理員';
763
+      echo 'GenericName[ta]= ';
764
+      echo 'GenericName[te]= ';
765
+      echo 'GenericName[th]=';
766
+      echo 'GenericName[tr]=Fotoraf Yneticisi';
767
+      echo 'GenericName[uk]= ';
768
+      echo 'GenericName[vi]=Trnh qun l nh';
769
+      echo 'GenericName[zh_CN]=';
770
+      echo 'GenericName[zh_HK]=';
771
+      echo 'GenericName[zh_TW]=';
772 772
       echo 'GenericName=Photo Manager';
773
-      echo 'Comment[cs]=Roztřiďte si své fotografie';
774
-      echo 'Comment[da]=Organisér dine billeder';
773
+      echo 'Comment[cs]=Roztite si sv fotografie';
774
+      echo 'Comment[da]=Organisr dine billeder';
775 775
       echo 'Comment[de]=Ihre Fotos organisieren';
776 776
       echo 'Comment[es]=Organice sus fotos';
777 777
       echo 'Comment[fi]=Hallitse kuviasi';
778 778
       echo 'Comment[gd]=Cuir rian air na dealbhan agad';
779
-      echo 'Comment[he]=ארגון התמונות שלך';
779
+      echo 'Comment[he]=  ';
780 780
       echo 'Comment[hr]=Organizirajte svoje fotografije';
781
-      echo 'Comment[hu]=Rendszerezze a fényképeit';
781
+      echo 'Comment[hu]=Rendszerezze a fnykpeit';
782 782
       echo 'Comment[id]=Organisasikan foto Anda';
783
-      echo 'Comment[kk]=Фотосуреттеріңізді реттеңіз';
784
-      echo 'Comment[kn]=ನಿಮ್ಮ ಚಿತ್ರಗಳನ್ನು ವ್ಯವಸ್ಥಿತವಾಗಿ ಜೋಡಿಸಿ';
785
-      echo 'Comment[ko]=사진을 정리합니다.';
786
-      echo 'Comment[lv]=Organizē savas fotogrāfijas';
787
-      echo 'Comment[pl]=Organizowanie zdjęć';
783
+      echo 'Comment[kk]= ';
784
+      echo 'Comment[kn]=   ';
785
+      echo 'Comment[ko]= .';
786
+      echo 'Comment[lv]=Organiz savas fotogrfijas';
787
+      echo 'Comment[pl]=Organizowanie zdj';
788 788
       echo 'Comment[pt]=Organize as suas fotografias';
789 789
       echo 'Comment[pt_BR]=Organize suas fotos';
790
-      echo 'Comment[sk]=Organizuje vaše fotografie';
791
-      echo 'Comment[sr]=Организујте ваше фотографије';
792
-      echo 'Comment[sr@latin]=Organizujte vaše fotografije';
790
+      echo 'Comment[sk]=Organizuje vae fotografie';
791
+      echo 'Comment[sr]=  ';
792
+      echo 'Comment[sr@latin]=Organizujte vae fotografije';
793 793
       echo 'Comment[sv]=Organisera dina bilder';
794
-      echo 'Comment[uk]=Впорядкуйте ваші фотографії';
794
+      echo 'Comment[uk]=  ';
795 795
       echo 'Comment=Organize your photos';
796 796
       echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_photos.png";
797 797
       echo 'Exec=shotwell %U';
@@ -815,27 +815,27 @@ function show_desktop_icons {
815 815
     { echo '[Desktop Entry]';
816 816
       echo 'Type=Application';
817 817
       echo 'Name=Routing Protocol';
818
-      echo 'Name[el]=Πρωτόκολλο δρομολόγησης';
819
-      echo 'Name[ar]=بروتوكول التوجيه';
818
+      echo 'Name[el]= ';
819
+      echo 'Name[ar]= ';
820 820
       echo "Name[ca]=Protocol d'enrutament";
821
-      echo 'Name[hi]=रूटिंग प्रोटोकॉल';
821
+      echo 'Name[hi]= ';
822 822
       echo 'Name[fr]=Protocole de routage';
823 823
       echo 'Name[de]=Routingprotokoll';
824 824
       echo 'Name[es]=Protocolo de enrutamiento';
825 825
       echo 'Name[it]=Protocollo di routing';
826
-      echo 'Name[ru]=Протокол маршрутизации';
827
-      echo 'Name[zh]=路由协议';
826
+      echo 'Name[ru]= ';
827
+      echo 'Name[zh]=';
828 828
       echo 'Comment=Select the mesh routing protocol';
829
-      echo 'Comment[el]=Επιλέξτε το πρωτόκολλο δρομολόγησης πλέγματος';
830
-      echo 'Comment[ar]=حدد بروتوكول توجيه الشبكة';
829
+      echo 'Comment[el]=    ';
830
+      echo 'Comment[ar]=   ';
831 831
       echo "Comment[ca]=Seleccioneu el protocol d'enrutament de malles";
832
-      echo 'Comment[hi]=जाल रूटिंग प्रोटोकॉल का चयन करें';
833
-      echo 'Comment[fr]=Sélectionnez le protocole de routage de maillage';
834
-      echo 'Comment[de]=Wählen Sie das Mesh-Routing-Protokoll';
832
+      echo 'Comment[hi]=     ';
833
+      echo 'Comment[fr]=Slectionnez le protocole de routage de maillage';
834
+      echo 'Comment[de]=Whlen Sie das Mesh-Routing-Protokoll';
835 835
       echo 'Comment[es]=Seleccione el protocolo de enrutamiento de malla';
836 836
       echo "Comment[it]=Seleziona il protocollo di instradamento della mesh";
837
-      echo 'Comment[ru]=Выберите протокол маршрутизации сетки';
838
-      echo 'Comment[zh]=选择网状路由协议';
837
+      echo 'Comment[ru]=   ';
838
+      echo 'Comment[zh]=';
839 839
       echo "Exec=mate-terminal -e \"/usr/local/bin/${PROJECT_NAME}-mesh-routing\"";
840 840
       echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_routing.png";
841 841
       echo 'Terminal=false';

+ 10
- 10
src/freedombone-powerline ファイルの表示

@@ -25,16 +25,16 @@ __powerline() {
25 25
 
26 26
   # Unicode symbols
27 27
   if [ -z "${POWERLINE_FONT+x}" ]; then
28
-    readonly GIT_BRANCH_SYMBOL=''
28
+    readonly GIT_BRANCH_SYMBOL=''
29 29
   else
30
-    readonly GIT_BRANCH_SYMBOL=''
30
+    readonly GIT_BRANCH_SYMBOL=''
31 31
   fi
32
-  readonly GIT_BRANCH_CHANGED_SYMBOL='Δ'
33
-  readonly GIT_NEED_PUSH_SYMBOL=''
34
-  readonly GIT_NEED_PULL_SYMBOL=''
32
+  readonly GIT_BRANCH_CHANGED_SYMBOL=''
33
+  readonly GIT_NEED_PUSH_SYMBOL=''
34
+  readonly GIT_NEED_PULL_SYMBOL=''
35 35
 
36 36
   # Powerline symbols
37
-  readonly BLOCK_START=''
37
+  readonly BLOCK_START=''
38 38
 
39 39
   # ANSI Colours
40 40
   readonly BLACK=0
@@ -160,7 +160,7 @@ __powerline() {
160 160
     # shellcheck disable=SC2181
161 161
     if [ $? != 0 ]; then
162 162
       branch="$($git_eng describe --tags --always 2>/dev/null)"
163
-      ref_symbol=''
163
+      ref_symbol=''
164 164
     else
165 165
       ref_symbol=$GIT_BRANCH_SYMBOL
166 166
     fi
@@ -299,17 +299,17 @@ __powerline() {
299 299
   __status_block() {
300 300
     local text
301 301
     if [ "$exit_code" != 0 ]; then
302
-      __prompt_block $BLACK $RED ''
302
+      __prompt_block $BLACK $RED ''
303 303
       text+=$__block_text
304 304
     fi
305 305
 
306 306
     if [ "$(id -u "$USER")" == 0 ]; then
307
-      __prompt_block $BLACK $YELLOW ''
307
+      __prompt_block $BLACK $YELLOW ''
308 308
       text+=$__block_text
309 309
     fi
310 310
 
311 311
     if [ "$(jobs -l | wc -l)" != 0 ]; then
312
-      __prompt_block $BLACK $CYAN ''
312
+      __prompt_block $BLACK $CYAN ''
313 313
       text+=$__block_text
314 314
     fi
315 315
 

+ 8
- 2
src/freedombone-tests ファイルの表示

@@ -46,7 +46,8 @@ function show_help {
46 46
     echo ''
47 47
     echo $'Runs tests on the system'
48 48
     echo ''
49
-    echo $'     --stig [yes|no|fix]  Run STIG tests'
49
+    echo $'  -s --stig [yes|no|fix]  Run STIG tests'
50
+    echo $'  -a --static             Run static analysis on scripts'
50 51
     echo $'     --help               Show help'
51 52
     echo ''
52 53
     exit 0
@@ -1284,6 +1285,12 @@ do
1284 1285
         -h|--help)
1285 1286
             show_help
1286 1287
             ;;
1288
+        -a|--static)
1289
+            echo $'Running static analysis tests'
1290
+            test_static_analysis
1291
+            echo $'All tests passed'
1292
+            exit 0
1293
+            ;;
1287 1294
         -s|--stig)
1288 1295
             shift
1289 1296
             if [[ "$1" == 'showall' ]]; then
@@ -1303,7 +1310,6 @@ if [ ! "$RUN_STIG" ]; then
1303 1310
 fi
1304 1311
 
1305 1312
 test_app_functions
1306
-test_static_analysis
1307 1313
 test_unique_onion_ports
1308 1314
 remove_management_engine_interface
1309 1315
 freedombone-pass --test yes

+ 1
- 1
src/freedombone-utils-web ファイルの表示

@@ -217,7 +217,7 @@ function check_certificates {
217 217
         fi
218 218
     fi
219 219
     if [ ! -f "/etc/ssl/certs/${1}.dhparam" ]; then
220
-        echo $"DiffieHellman parameters for ${CHECK_HOSTNAME} were not created"
220
+        echo $"DiffieHellman parameters for ${CHECK_HOSTNAME} were not created"
221 221
         exit 5989
222 222
     fi
223 223
 }