Browse Source

More translations

Bob Mottram 9 years ago
parent
commit
92493126a3
4 changed files with 374 additions and 210 deletions
  1. 55
    0
      locale/de/freedombone.json
  2. 55
    0
      locale/es/freedombone.json
  3. 55
    0
      locale/fr/freedombone.json
  4. 209
    210
      src/freedombone

+ 55
- 0
locale/de/freedombone.json View File

@@ -30,11 +30,66 @@
30 30
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
31 31
     "Forum address:     $ZERONET_FORUM_ADDRESS": "",
32 32
     "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
33
+    "OneRNG package could not be downloaded": "",
34
+    "OneRNG package: $ONERNG_PACKAGE": "",
35
+    "Hash does not match. This could indicate that the package has been tampered with.": "",
36
+    "OneRNG expected package hash: $ONERNG_PACKAGE_HASH": "",
37
+    "OneRNG actual hash: $hash": "",
38
+    "OneRNG Device": "",
39
+    "Please plug in the OneRNG device": "",
33 40
     "Public key:  $MY_GPG_PUBLIC_KEY": "",
34 41
     "Private key: $MY_GPG_PRIVATE_KEY": "",
35 42
     "GPG public key file $MY_GPG_PUBLIC_KEY was not found": "",
36 43
     "GPG private key file $MY_GPG_PRIVATE_KEY was not found": "",
37 44
     "The GPG key for $MY_EMAIL_ADDRESS could not be imported": "",
38 45
     "A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
46
+    "If you have imported legacy email which is not encrypted": "",
47
+    "Your MariaDB password is: $MARIADB_PASSWORD": "",
48
+    "Music player in Owncloud": "",
49
+    " *** Freedombone $SYSTEM_TYPE is now installed ***": "",
50
+    "Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
51
+    "Owncloud install did not recognise the system type $SYSTEM_TYPE": "",
52
+    "Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD": "",
53
+    "the Users dropdown menu entry. The username should be '$MY_USERNAME'.": "",
54
+    "the URL https://$OWNCLOUD_DOMAIN_NAME/remote.php/caldav/principals/$MY_USERNAME": "",
55
+    "Gogs admin user password": "",
56
+    "Database password: $MARIADB_PASSWORD": "",
57
+    "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
58
+    "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
59
+    "Note that there's a usability/security trade-off made here.": "",
60
+    "In order to allow git clone via http we don't redirect everything": "",
61
+    "should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https.": "",
62
+    "File not found /usr/local/bin/tox-bootstrapd": "",
63
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
64
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": "",
65
+    "Your Tox node public key is: $TOX_PUBLIC_KEY": "",
66
+    "Your XMPP password is: $XMPP_PASSWORD": "",
67
+    "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
68
+    "Wiki password": "",
69
+    "Wiki username: $MY_USERNAME": "",
70
+    "Wiki password: $WIKI_ADMIN_PASSWORD": "",
71
+    "Your blog username: $MY_USERNAME": "",
72
+    "Your blog password is: $FULLBLOG_ADMIN_PASSWORD": "",
73
+    "Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login": "",
74
+    "Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD": "",
75
+    "To set up your microblog go to": "",
76
+    "https://$MICROBLOG_DOMAIN_NAME/install.php": "",
77
+    " - DB Password; $MARIADB_PASSWORD": "",
78
+    " - Administrator nickname: $MY_USERNAME": "",
79
+    " - Administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
80
+    "https://$MICROBLOG_DOMAIN_NAME and you can then ": "",
81
+    "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
82
+    "To set up your Hubzilla site go to": "",
83
+    "to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt": "",
84
+    "and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key.": "",
85
+    "Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt": "",
86
+    "within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME": "",
87
+    "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
88
+    "VoIP Server": "",
89
+    "VoIP server password: $VOIP_SERVER_PASSWORD": "",
90
+    "SIP Server": "",
91
+    "SIP server username: $MY_USERNAME": "",
92
+    "SIP server extension: 201": "",
93
+    "SIP server password: $SIP_SERVER_PASSWORD": "",
39 94
     "See /home/$MY_USERNAME/README for post-installation instructions.": ""
40 95
 }

+ 55
- 0
locale/es/freedombone.json View File

@@ -30,11 +30,66 @@
30 30
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
31 31
     "Forum address:     $ZERONET_FORUM_ADDRESS": "",
32 32
     "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
33
+    "OneRNG package could not be downloaded": "",
34
+    "OneRNG package: $ONERNG_PACKAGE": "",
35
+    "Hash does not match. This could indicate that the package has been tampered with.": "",
36
+    "OneRNG expected package hash: $ONERNG_PACKAGE_HASH": "",
37
+    "OneRNG actual hash: $hash": "",
38
+    "OneRNG Device": "",
39
+    "Please plug in the OneRNG device": "",
33 40
     "Public key:  $MY_GPG_PUBLIC_KEY": "",
34 41
     "Private key: $MY_GPG_PRIVATE_KEY": "",
35 42
     "GPG public key file $MY_GPG_PUBLIC_KEY was not found": "",
36 43
     "GPG private key file $MY_GPG_PRIVATE_KEY was not found": "",
37 44
     "The GPG key for $MY_EMAIL_ADDRESS could not be imported": "",
38 45
     "A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
46
+    "If you have imported legacy email which is not encrypted": "",
47
+    "Your MariaDB password is: $MARIADB_PASSWORD": "",
48
+    "Music player in Owncloud": "",
49
+    " *** Freedombone $SYSTEM_TYPE is now installed ***": "",
50
+    "Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
51
+    "Owncloud install did not recognise the system type $SYSTEM_TYPE": "",
52
+    "Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD": "",
53
+    "the Users dropdown menu entry. The username should be '$MY_USERNAME'.": "",
54
+    "the URL https://$OWNCLOUD_DOMAIN_NAME/remote.php/caldav/principals/$MY_USERNAME": "",
55
+    "Gogs admin user password": "",
56
+    "Database password: $MARIADB_PASSWORD": "",
57
+    "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
58
+    "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
59
+    "Note that there's a usability/security trade-off made here.": "",
60
+    "In order to allow git clone via http we don't redirect everything": "",
61
+    "should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https.": "",
62
+    "File not found /usr/local/bin/tox-bootstrapd": "",
63
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
64
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": "",
65
+    "Your Tox node public key is: $TOX_PUBLIC_KEY": "",
66
+    "Your XMPP password is: $XMPP_PASSWORD": "",
67
+    "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
68
+    "Wiki password": "",
69
+    "Wiki username: $MY_USERNAME": "",
70
+    "Wiki password: $WIKI_ADMIN_PASSWORD": "",
71
+    "Your blog username: $MY_USERNAME": "",
72
+    "Your blog password is: $FULLBLOG_ADMIN_PASSWORD": "",
73
+    "Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login": "",
74
+    "Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD": "",
75
+    "To set up your microblog go to": "",
76
+    "https://$MICROBLOG_DOMAIN_NAME/install.php": "",
77
+    " - DB Password; $MARIADB_PASSWORD": "",
78
+    " - Administrator nickname: $MY_USERNAME": "",
79
+    " - Administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
80
+    "https://$MICROBLOG_DOMAIN_NAME and you can then ": "",
81
+    "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
82
+    "To set up your Hubzilla site go to": "",
83
+    "to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt": "",
84
+    "and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key.": "",
85
+    "Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt": "",
86
+    "within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME": "",
87
+    "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
88
+    "VoIP Server": "",
89
+    "VoIP server password: $VOIP_SERVER_PASSWORD": "",
90
+    "SIP Server": "",
91
+    "SIP server username: $MY_USERNAME": "",
92
+    "SIP server extension: 201": "",
93
+    "SIP server password: $SIP_SERVER_PASSWORD": "",
39 94
     "See /home/$MY_USERNAME/README for post-installation instructions.": ""
40 95
 }

+ 55
- 0
locale/fr/freedombone.json View File

@@ -30,11 +30,66 @@
30 30
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
31 31
     "Forum address:     $ZERONET_FORUM_ADDRESS": "",
32 32
     "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
33
+    "OneRNG package could not be downloaded": "",
34
+    "OneRNG package: $ONERNG_PACKAGE": "",
35
+    "Hash does not match. This could indicate that the package has been tampered with.": "",
36
+    "OneRNG expected package hash: $ONERNG_PACKAGE_HASH": "",
37
+    "OneRNG actual hash: $hash": "",
38
+    "OneRNG Device": "",
39
+    "Please plug in the OneRNG device": "",
33 40
     "Public key:  $MY_GPG_PUBLIC_KEY": "",
34 41
     "Private key: $MY_GPG_PRIVATE_KEY": "",
35 42
     "GPG public key file $MY_GPG_PUBLIC_KEY was not found": "",
36 43
     "GPG private key file $MY_GPG_PRIVATE_KEY was not found": "",
37 44
     "The GPG key for $MY_EMAIL_ADDRESS could not be imported": "",
38 45
     "A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
46
+    "If you have imported legacy email which is not encrypted": "",
47
+    "Your MariaDB password is: $MARIADB_PASSWORD": "",
48
+    "Music player in Owncloud": "",
49
+    " *** Freedombone $SYSTEM_TYPE is now installed ***": "",
50
+    "Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
51
+    "Owncloud install did not recognise the system type $SYSTEM_TYPE": "",
52
+    "Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD": "",
53
+    "the Users dropdown menu entry. The username should be '$MY_USERNAME'.": "",
54
+    "the URL https://$OWNCLOUD_DOMAIN_NAME/remote.php/caldav/principals/$MY_USERNAME": "",
55
+    "Gogs admin user password": "",
56
+    "Database password: $MARIADB_PASSWORD": "",
57
+    "Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
58
+    "Gogs admin user email: $MY_EMAIL_ADDRESS": "",
59
+    "Note that there's a usability/security trade-off made here.": "",
60
+    "In order to allow git clone via http we don't redirect everything": "",
61
+    "should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https.": "",
62
+    "File not found /usr/local/bin/tox-bootstrapd": "",
63
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
64
+    "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": "",
65
+    "Your Tox node public key is: $TOX_PUBLIC_KEY": "",
66
+    "Your XMPP password is: $XMPP_PASSWORD": "",
67
+    "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
68
+    "Wiki password": "",
69
+    "Wiki username: $MY_USERNAME": "",
70
+    "Wiki password: $WIKI_ADMIN_PASSWORD": "",
71
+    "Your blog username: $MY_USERNAME": "",
72
+    "Your blog password is: $FULLBLOG_ADMIN_PASSWORD": "",
73
+    "Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login": "",
74
+    "Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD": "",
75
+    "To set up your microblog go to": "",
76
+    "https://$MICROBLOG_DOMAIN_NAME/install.php": "",
77
+    " - DB Password; $MARIADB_PASSWORD": "",
78
+    " - Administrator nickname: $MY_USERNAME": "",
79
+    " - Administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
80
+    "https://$MICROBLOG_DOMAIN_NAME and you can then ": "",
81
+    "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
82
+    "To set up your Hubzilla site go to": "",
83
+    "to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt": "",
84
+    "and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key.": "",
85
+    "Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt": "",
86
+    "within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME": "",
87
+    "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
88
+    "VoIP Server": "",
89
+    "VoIP server password: $VOIP_SERVER_PASSWORD": "",
90
+    "SIP Server": "",
91
+    "SIP server username: $MY_USERNAME": "",
92
+    "SIP server extension: 201": "",
93
+    "SIP server password: $SIP_SERVER_PASSWORD": "",
39 94
     "See /home/$MY_USERNAME/README for post-installation instructions.": ""
40 95
 }

+ 209
- 210
src/freedombone View File

@@ -1222,19 +1222,19 @@ function check_domains {
1222 1222
       test_domain_name "$WIKI_DOMAIN_NAME"
1223 1223
 
1224 1224
       if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
1225
-          echo 'Wiki domain name is the same as Owncloud domain name. They must be different'
1225
+          echo $'Wiki domain name is the same as Owncloud domain name. They must be different'
1226 1226
           exit 73863
1227 1227
       fi
1228 1228
       if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then
1229
-          echo 'Wiki domain name is the same as blog domain name. They must be different'
1229
+          echo $'Wiki domain name is the same as blog domain name. They must be different'
1230 1230
           exit 97326
1231 1231
       fi
1232 1232
       if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then
1233
-          echo 'Wiki domain name is the same as microblog domain name. They must be different'
1233
+          echo $'Wiki domain name is the same as microblog domain name. They must be different'
1234 1234
           exit 36827
1235 1235
       fi
1236 1236
       if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then
1237
-          echo 'Wiki domain name is the same as hubzilla domain name. They must be different'
1237
+          echo $'Wiki domain name is the same as hubzilla domain name. They must be different'
1238 1238
           exit 65848
1239 1239
       fi
1240 1240
   fi
@@ -1243,19 +1243,19 @@ function check_domains {
1243 1243
       test_domain_name "$OWNCLOUD_DOMAIN_NAME"
1244 1244
 
1245 1245
       if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1246
-          echo 'Owncloud domain name is the same as wiki domain name. They must be different'
1246
+          echo $'Owncloud domain name is the same as wiki domain name. They must be different'
1247 1247
           exit 37994
1248 1248
       fi
1249 1249
       if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then
1250
-          echo 'Owncloud domain name is the same as blog domain name. They must be different'
1250
+          echo $'Owncloud domain name is the same as blog domain name. They must be different'
1251 1251
           exit 37936
1252 1252
       fi
1253 1253
       if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then
1254
-          echo 'Owncloud domain name is the same as microblog domain name. They must be different'
1254
+          echo $'Owncloud domain name is the same as microblog domain name. They must be different'
1255 1255
           exit 36896
1256 1256
       fi
1257 1257
       if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then
1258
-          echo 'Owncloud domain name is the same as hubzilla domain name. They must be different'
1258
+          echo $'Owncloud domain name is the same as hubzilla domain name. They must be different'
1259 1259
           exit 68365
1260 1260
       fi
1261 1261
   fi
@@ -1264,19 +1264,19 @@ function check_domains {
1264 1264
       test_domain_name "$FULLBLOG_DOMAIN_NAME"
1265 1265
 
1266 1266
       if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1267
-          echo 'Blog domain name is the same as wiki domain name. They must be different'
1267
+          echo $'Blog domain name is the same as wiki domain name. They must be different'
1268 1268
           exit 62348
1269 1269
       fi
1270 1270
       if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
1271
-          echo 'Blog domain name is the same as Owncloud domain name. They must be different'
1271
+          echo $'Blog domain name is the same as Owncloud domain name. They must be different'
1272 1272
           exit 84682
1273 1273
       fi
1274 1274
       if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then
1275
-          echo 'Blog domain name is the same as microblog domain name. They must be different'
1275
+          echo $'Blog domain name is the same as microblog domain name. They must be different'
1276 1276
           exit 38236
1277 1277
       fi
1278 1278
       if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then
1279
-          echo 'Blog domain name is the same as hubzilla domain name. They must be different'
1279
+          echo $'Blog domain name is the same as hubzilla domain name. They must be different'
1280 1280
           exit 35483
1281 1281
       fi
1282 1282
   fi
@@ -1285,19 +1285,19 @@ function check_domains {
1285 1285
       test_domain_name "$MICROBLOG_DOMAIN_NAME"
1286 1286
 
1287 1287
       if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1288
-          echo 'Microblog domain name is the same as wiki domain name. They must be different'
1288
+          echo $'Microblog domain name is the same as wiki domain name. They must be different'
1289 1289
           exit 73924
1290 1290
       fi
1291 1291
       if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
1292
-          echo 'Microblog domain name is the same as Owncloud domain name. They must be different'
1292
+          echo $'Microblog domain name is the same as Owncloud domain name. They must be different'
1293 1293
           exit 73683
1294 1294
       fi
1295 1295
       if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then
1296
-          echo 'Microblog domain name is the same as blog domain name. They must be different'
1296
+          echo $'Microblog domain name is the same as blog domain name. They must be different'
1297 1297
           exit 26832
1298 1298
       fi
1299 1299
       if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then
1300
-          echo 'Microblog domain name is the same as hubzilla domain name. They must be different'
1300
+          echo $'Microblog domain name is the same as hubzilla domain name. They must be different'
1301 1301
           exit 678382
1302 1302
       fi
1303 1303
   fi
@@ -1306,19 +1306,19 @@ function check_domains {
1306 1306
       test_domain_name "$HUBZILLA_DOMAIN_NAME"
1307 1307
 
1308 1308
       if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1309
-          echo 'Hubzilla domain name is the same as wiki domain name. They must be different'
1309
+          echo $'Hubzilla domain name is the same as wiki domain name. They must be different'
1310 1310
           exit 83682
1311 1311
       fi
1312 1312
       if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
1313
-          echo 'Hubzilla domain name is the same as Owncloud domain name. They must be different'
1313
+          echo $'Hubzilla domain name is the same as Owncloud domain name. They must be different'
1314 1314
           exit 65192
1315 1315
       fi
1316 1316
       if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then
1317
-          echo 'Hubzilla domain name is the same as blog domain name. They must be different'
1317
+          echo $'Hubzilla domain name is the same as blog domain name. They must be different'
1318 1318
           exit 74817
1319 1319
       fi
1320 1320
       if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then
1321
-          echo 'Hubzilla domain name is the same as microblog domain name. They must be different'
1321
+          echo $'Hubzilla domain name is the same as microblog domain name. They must be different'
1322 1322
           exit 83683
1323 1323
       fi
1324 1324
   fi
@@ -2818,8 +2818,8 @@ function check_hwrng {
2818 2818
       # suffer from low entropy and might be insecure
2819 2819
       if [ ! -e /dev/hwrng ]; then
2820 2820
           ls /dev/hw*
2821
-          echo 'The hardware random number generator is enabled but could not be detected on'
2822
-          echo '/dev/hwrng.  There may be a problem with the installation or the Beaglebone hardware.'
2821
+          echo $'The hardware random number generator is enabled but could not be detected on'
2822
+          echo $'/dev/hwrng.  There may be a problem with the installation or the Beaglebone hardware.'
2823 2823
           exit 75
2824 2824
       fi
2825 2825
   fi
@@ -3001,38 +3001,38 @@ function change_login_message {
3001 3001
   echo "'    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'" >> /etc/motd
3002 3002
 
3003 3003
   if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" ]]; then
3004
-      echo '               M A I L B O X   E D I T I O N' >> /etc/motd
3004
+      echo $'               M A I L B O X   E D I T I O N' >> /etc/motd
3005 3005
   fi
3006 3006
 
3007 3007
   if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then
3008
-      echo '                 S O C I A L   E D I T I O N' >> /etc/motd
3008
+      echo $'                 S O C I A L   E D I T I O N' >> /etc/motd
3009 3009
   fi
3010 3010
 
3011 3011
   if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
3012
-      echo '                  C H A T   E D I T I O N' >> /etc/motd
3012
+      echo $'                  C H A T   E D I T I O N' >> /etc/motd
3013 3013
   fi
3014 3014
 
3015 3015
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
3016
-      echo '                  C L O U D   E D I T I O N' >> /etc/motd
3016
+      echo $'                  C L O U D   E D I T I O N' >> /etc/motd
3017 3017
   fi
3018 3018
 
3019 3019
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" ]]; then
3020
-      echo '                 W R I T E R   E D I T I O N ' >> /etc/motd
3020
+      echo $'                 W R I T E R   E D I T I O N ' >> /etc/motd
3021 3021
   fi
3022 3022
 
3023 3023
   if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then
3024
-      echo '                  M E D I A   E D I T I O N' >> /etc/motd
3024
+      echo $'                  M E D I A   E D I T I O N' >> /etc/motd
3025 3025
   fi
3026 3026
 
3027 3027
   if [[ $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
3028
-      echo '             D E V E L O P E R   E D I T I O N' >> /etc/motd
3028
+      echo $'             D E V E L O P E R   E D I T I O N' >> /etc/motd
3029 3029
   fi
3030 3030
 
3031 3031
   echo '' >> /etc/motd
3032 3032
   if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
3033
-      echo '                  Freedom in the Cloud' >> /etc/motd
3033
+      echo $'                  Freedom in the Cloud' >> /etc/motd
3034 3034
   else
3035
-      echo '                   Freedom in the Mesh' >> /etc/motd
3035
+      echo $'                   Freedom in the Mesh' >> /etc/motd
3036 3036
   fi
3037 3037
   echo '' >> /etc/motd
3038 3038
   echo 'change_login_message' >> $COMPLETION_FILE
@@ -3191,7 +3191,7 @@ function install_editor {
3191 3191
   #echo -n "(add-to-list 'load-path " > /home/$MY_USERNAME/.emacs
3192 3192
   #echo '"~/.emacs.d/")' >> /home/$MY_USERNAME/.emacs
3193 3193
   #echo '' >> /home/$MY_USERNAME/.emacs
3194
-  echo ';; ===== Remove trailing whitepace ======================================' >> /home/$MY_USERNAME/.emacs
3194
+  echo $';; ===== Remove trailing whitepace ======================================' >> /home/$MY_USERNAME/.emacs
3195 3195
   echo '' >> /home/$MY_USERNAME/.emacs
3196 3196
   echo ";;(add-hook 'before-save-hook 'delete-trailing-whitespace)" >> /home/$MY_USERNAME/.emacs
3197 3197
   echo '' >> /home/$MY_USERNAME/.emacs
@@ -3199,50 +3199,50 @@ function install_editor {
3199 3199
   echo -n '(global-set-key "\C-l" ' >> /home/$MY_USERNAME/.emacs
3200 3200
   echo "'goto-line)" >> /home/$MY_USERNAME/.emacs
3201 3201
   echo '' >> /home/$MY_USERNAME/.emacs
3202
-  echo ';; ===== Show line numbers ==============================================' >> /home/$MY_USERNAME/.emacs
3202
+  echo $';; ===== Show line numbers ==============================================' >> /home/$MY_USERNAME/.emacs
3203 3203
   echo '' >> /home/$MY_USERNAME/.emacs
3204 3204
   echo "(add-hook 'find-file-hook (lambda () (linum-mode 1)))" >> /home/$MY_USERNAME/.emacs
3205 3205
   echo '' >> /home/$MY_USERNAME/.emacs
3206
-  echo ';; ===== Enable line wrapping in org-mode ===============================' >> /home/$MY_USERNAME/.emacs
3206
+  echo $';; ===== Enable line wrapping in org-mode ===============================' >> /home/$MY_USERNAME/.emacs
3207 3207
   echo '' >> /home/$MY_USERNAME/.emacs
3208 3208
   echo " (add-hook 'org-mode-hook" >> /home/$MY_USERNAME/.emacs
3209 3209
   echo "           '(lambda ()" >> /home/$MY_USERNAME/.emacs
3210 3210
   echo "              (visual-line-mode 1)))" >> /home/$MY_USERNAME/.emacs
3211 3211
   echo '' >> /home/$MY_USERNAME/.emacs
3212
-  echo ';; ===== Enable shift select in org mode ================================' >> /home/$MY_USERNAME/.emacs
3212
+  echo $';; ===== Enable shift select in org mode ================================' >> /home/$MY_USERNAME/.emacs
3213 3213
   echo '' >> /home/$MY_USERNAME/.emacs
3214 3214
   echo '(setq org-support-shift-select t)' >> /home/$MY_USERNAME/.emacs
3215 3215
   echo '' >> /home/$MY_USERNAME/.emacs
3216
-  echo ';; ===== Set standard indent to 4 rather that 4 =========================' >> /home/$MY_USERNAME/.emacs
3216
+  echo $';; ===== Set standard indent to 4 rather that 4 =========================' >> /home/$MY_USERNAME/.emacs
3217 3217
   echo '' >> /home/$MY_USERNAME/.emacs
3218 3218
   echo '(setq standard-indent 4)' >> /home/$MY_USERNAME/.emacs
3219 3219
   echo '(setq-default tab-width 4)' >> /home/$MY_USERNAME/.emacs
3220 3220
   echo '(setq c-basic-offset 4)' >> /home/$MY_USERNAME/.emacs
3221 3221
   echo '' >> /home/$MY_USERNAME/.emacs
3222
-  echo ';; ===== Support Wheel Mouse Scrolling ==================================' >> /home/$MY_USERNAME/.emacs
3222
+  echo $';; ===== Support Wheel Mouse Scrolling ==================================' >> /home/$MY_USERNAME/.emacs
3223 3223
   echo '' >> /home/$MY_USERNAME/.emacs
3224 3224
   echo '(mouse-wheel-mode t)' >> /home/$MY_USERNAME/.emacs
3225 3225
   echo '' >> /home/$MY_USERNAME/.emacs
3226
-  echo ';; ===== Place Backup Files in Specific Directory =======================' >> /home/$MY_USERNAME/.emacs
3226
+  echo $';; ===== Place Backup Files in Specific Directory =======================' >> /home/$MY_USERNAME/.emacs
3227 3227
   echo '' >> /home/$MY_USERNAME/.emacs
3228 3228
   echo '(setq make-backup-files t)' >> /home/$MY_USERNAME/.emacs
3229 3229
   echo '(setq version-control t)' >> /home/$MY_USERNAME/.emacs
3230 3230
   echo '(setq backup-directory-alist (quote ((".*" . "~/.emacs_backups/"))))' >> /home/$MY_USERNAME/.emacs
3231 3231
   echo '' >> /home/$MY_USERNAME/.emacs
3232
-  echo ';; ===== Make Text mode the default mode for new buffers ================' >> /home/$MY_USERNAME/.emacs
3232
+  echo $';; ===== Make Text mode the default mode for new buffers ================' >> /home/$MY_USERNAME/.emacs
3233 3233
   echo '' >> /home/$MY_USERNAME/.emacs
3234 3234
   echo "(setq default-major-mode 'text-mode)" >> /home/$MY_USERNAME/.emacs
3235 3235
   echo '' >> /home/$MY_USERNAME/.emacs
3236
-  echo ';; ===== Line length ====================================================' >> /home/$MY_USERNAME/.emacs
3236
+  echo $';; ===== Line length ====================================================' >> /home/$MY_USERNAME/.emacs
3237 3237
   echo '' >> /home/$MY_USERNAME/.emacs
3238 3238
   echo '(setq-default fill-column 72)' >> /home/$MY_USERNAME/.emacs
3239 3239
   echo '' >> /home/$MY_USERNAME/.emacs
3240
-  echo ';; ===== Enable Line and Column Numbering ===============================' >> /home/$MY_USERNAME/.emacs
3240
+  echo $';; ===== Enable Line and Column Numbering ===============================' >> /home/$MY_USERNAME/.emacs
3241 3241
   echo '' >> /home/$MY_USERNAME/.emacs
3242 3242
   echo '(line-number-mode 1)' >> /home/$MY_USERNAME/.emacs
3243 3243
   echo '(column-number-mode 1)' >> /home/$MY_USERNAME/.emacs
3244 3244
   echo '' >> /home/$MY_USERNAME/.emacs
3245
-  echo ';; ===== Turn on Auto Fill mode automatically in all modes ==============' >> /home/$MY_USERNAME/.emacs
3245
+  echo $';; ===== Turn on Auto Fill mode automatically in all modes ==============' >> /home/$MY_USERNAME/.emacs
3246 3246
   echo '' >> /home/$MY_USERNAME/.emacs
3247 3247
   echo ';; Auto-fill-mode the the automatic wrapping of lines and insertion of' >> /home/$MY_USERNAME/.emacs
3248 3248
   echo ';; newlines when the cursor goes over the column limit.' >> /home/$MY_USERNAME/.emacs
@@ -3253,7 +3253,7 @@ function install_editor {
3253 3253
   echo '' >> /home/$MY_USERNAME/.emacs
3254 3254
   echo '(setq auto-fill-mode 1)' >> /home/$MY_USERNAME/.emacs
3255 3255
   echo '' >> /home/$MY_USERNAME/.emacs
3256
-  echo ';; ===== Enable GPG encryption =========================================' >> /home/$MY_USERNAME/.emacs
3256
+  echo $';; ===== Enable GPG encryption =========================================' >> /home/$MY_USERNAME/.emacs
3257 3257
   echo '' >> /home/$MY_USERNAME/.emacs
3258 3258
   echo "(require 'epa)" >> /home/$MY_USERNAME/.emacs
3259 3259
   echo '(epa-file-enable)' >> /home/$MY_USERNAME/.emacs
@@ -3295,17 +3295,17 @@ function check_onerng_verification {
3295 3295
   if [[ $HWRNG_TYPE != "onerng" ]]; then
3296 3296
       return
3297 3297
   fi
3298
-  echo 'Checking OneRNG firmware verification'
3298
+  echo $'Checking OneRNG firmware verification'
3299 3299
   last_onerng_validation=$(cat /var/log/syslog.1 | grep "OneRNG: firmware verification" | awk '/./{line=$0} END{print line}')
3300 3300
   if [[ $last_onerng_validation != *"passed OK"* ]]; then
3301 3301
       last_onerng_validation=$(cat /var/log/syslog | grep "OneRNG: firmware verification" | awk '/./{line=$0} END{print line}')
3302 3302
       if [[ $last_onerng_validation != *"passed OK"* ]]; then
3303 3303
           echo $last_onerng_validation
3304
-          echo 'OneRNG firmware verification failed'
3304
+          echo $'OneRNG firmware verification failed'
3305 3305
           exit 735026
3306 3306
       fi
3307 3307
   fi
3308
-  echo 'OneRNG firmware verification passed'
3308
+  echo $'OneRNG firmware verification passed'
3309 3309
   # if haveged was previously installed then remove it
3310 3310
   apt-get -y remove haveged
3311 3311
   echo 'check_onerng_verification' >> $COMPLETION_FILE
@@ -3326,17 +3326,17 @@ function install_onerng {
3326 3326
       mv "$ONERNG_PACKAGE?raw=true" $ONERNG_PACKAGE
3327 3327
   fi
3328 3328
   if [ ! -f $ONERNG_PACKAGE ]; then
3329
-      echo "OneRNG package could not be downloaded"
3329
+      echo $"OneRNG package could not be downloaded"
3330 3330
       exit 59249
3331 3331
   fi
3332 3332
 
3333 3333
   # Check the hash
3334 3334
   hash=$(sha256sum $ONERNG_PACKAGE | awk -F ' ' '{print $1}')
3335 3335
   if [[ $hash != $ONERNG_PACKAGE_HASH ]]; then
3336
-      echo "OneRNG package: $ONERNG_PACKAGE"
3337
-      echo "Hash does not match. This could indicate that the package has been tampered with."
3338
-      echo "OneRNG expected package hash: $ONERNG_PACKAGE_HASH"
3339
-      echo "OneRNG actual hash: $hash"
3336
+      echo $"OneRNG package: $ONERNG_PACKAGE"
3337
+      echo $"Hash does not match. This could indicate that the package has been tampered with."
3338
+      echo $"OneRNG expected package hash: $ONERNG_PACKAGE_HASH"
3339
+      echo $"OneRNG actual hash: $hash"
3340 3340
       exit 25934
3341 3341
   fi
3342 3342
 
@@ -3345,12 +3345,12 @@ function install_onerng {
3345 3345
 
3346 3346
   # Check that the install worked
3347 3347
   if [ ! -f /etc/onerng.conf ]; then
3348
-      echo 'OneRNG configuration file not found. The package may not have installed successfully.'
3348
+      echo $'OneRNG configuration file not found. The package may not have installed successfully.'
3349 3349
       exit 42904
3350 3350
   fi
3351 3351
 
3352
-  dialog --title "OneRNG Device" \
3353
-         --msgbox "Please plug in the OneRNG device" 6 40
3352
+  dialog --title $"OneRNG Device" \
3353
+         --msgbox $"Please plug in the OneRNG device" 6 40
3354 3354
 
3355 3355
   # check rng-tools configuration
3356 3356
   if ! grep -q "/dev/$ONERNG_DEVICE" /etc/default/rng-tools; then
@@ -4155,24 +4155,24 @@ function spam_filtering {
4155 4155
   # user preferences
4156 4156
   if [ ! -d /home/$MY_USERNAME/.spamassassin ]; then
4157 4157
       mkdir /home/$MY_USERNAME/.spamassassin
4158
-      echo '# How many points before a mail is considered spam.' > /home/$MY_USERNAME/.spamassassin/user_prefs
4158
+      echo $'# How many points before a mail is considered spam.' > /home/$MY_USERNAME/.spamassassin/user_prefs
4159 4159
       echo '# required_score        5' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4160 4160
       echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4161
-      echo '# Whitelist and blacklist addresses are now file-glob-style patterns, so' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4162
-      echo '# "friend@somewhere.com", "*@isp.com", or "*.domain.net" will all work.' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4161
+      echo $'# Whitelist and blacklist addresses are now file-glob-style patterns, so' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4162
+      echo $'# "friend@somewhere.com", "*@isp.com", or "*.domain.net" will all work.' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4163 4163
       echo '# whitelist_from    someone@somewhere.com' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4164 4164
       echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4165
-      echo '# Add your own customised scores for some tests below.  The default scores are' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4166
-      echo '# read from the installed spamassassin rules files, but you can override them' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4167
-      echo '# here.  To see the list of tests and their default scores, go to' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4165
+      echo $'# Add your own customised scores for some tests below.  The default scores are' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4166
+      echo $'# read from the installed spamassassin rules files, but you can override them' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4167
+      echo $'# here.  To see the list of tests and their default scores, go to' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4168 4168
       echo '# http://spamassassin.apache.org/tests.html .' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4169 4169
       echo '#' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4170 4170
       echo '# score SYMBOLIC_TEST_NAME n.nn' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4171 4171
       echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4172
-      echo '# Speakers of Asian languages, like Chinese, Japanese and Korean, will almost' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4173
-      echo '# definitely want to uncomment the following lines.  They will switch off some' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4174
-      echo '# rules that detect 8-bit characters, which commonly trigger on mails using CJK' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4175
-      echo '# character sets, or that assume a western-style charset is in use. ' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4172
+      echo $'# Speakers of Asian languages, like Chinese, Japanese and Korean, will almost' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4173
+      echo $'# definitely want to uncomment the following lines.  They will switch off some' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4174
+      echo $'# rules that detect 8-bit characters, which commonly trigger on mails using CJK' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4175
+      echo $'# character sets, or that assume a western-style charset is in use. ' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4176 4176
       echo '# ' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4177 4177
       echo '# score HTML_COMMENT_8BITS  0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4178 4178
       echo '# score UPPERCASE_25_50     0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
@@ -4180,10 +4180,10 @@ function spam_filtering {
4180 4180
       echo '# score UPPERCASE_75_100    0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4181 4181
       echo '# score OBSCURED_EMAIL      0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4182 4182
       echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4183
-      echo '# Speakers of any language that uses non-English, accented characters may wish' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4184
-      echo '# to uncomment the following lines.   They turn off rules that fire on' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4185
-      echo '# misformatted messages generated by common mail apps in contravention of the' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4186
-      echo '# email RFCs.' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4183
+      echo $'# Speakers of any language that uses non-English, accented characters may wish' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4184
+      echo $'# to uncomment the following lines.   They turn off rules that fire on' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4185
+      echo $'# misformatted messages generated by common mail apps in contravention of the' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4186
+      echo $'# email RFCs.' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4187 4187
       echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4188 4188
       echo '# score SUBJ_ILLEGAL_CHARS      0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
4189 4189
   fi
@@ -4718,7 +4718,7 @@ function encrypt_outgoing_email {
4718 4718
 
4719 4719
   if ! grep -q "pgp_encrypt_only_command" /home/$MY_USERNAME/.muttrc; then
4720 4720
       echo '' >> /home/$MY_USERNAME/.muttrc
4721
-      echo '# Encrypt items in the Sent folder' >> /home/$MY_USERNAME/.muttrc
4721
+      echo $'# Encrypt items in the Sent folder' >> /home/$MY_USERNAME/.muttrc
4722 4722
       echo "set pgp_encrypt_only_command=\"/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x$MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"" >> /home/$MY_USERNAME/.muttrc
4723 4723
   else
4724 4724
       sed -i "s|set pgp_encrypt_only_command.*|set pgp_encrypt_only_command=\"/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x$MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"|g" /home/$MY_USERNAME/.muttrc
@@ -4755,19 +4755,19 @@ function encrypt_all_email {
4755 4755
   if [ ! /home/$MY_USERNAME/README ]; then
4756 4756
       touch /home/$MY_USERNAME/README
4757 4757
   fi
4758
-  if ! grep -q "If you have imported legacy email" /home/$MY_USERNAME/README; then
4758
+  if ! grep -q $"If you have imported legacy email which is not encrypted" /home/$MY_USERNAME/README; then
4759 4759
       echo '' >> /home/$MY_USERNAME/README
4760 4760
       echo '' >> /home/$MY_USERNAME/README
4761
-      echo 'Encrypting legacy email' >> /home/$MY_USERNAME/README
4761
+      echo $'Encrypting legacy email' >> /home/$MY_USERNAME/README
4762 4762
       echo '=======================' >> /home/$MY_USERNAME/README
4763
-      echo 'If you have imported legacy email which is not encrypted' >> /home/$MY_USERNAME/README
4764
-      echo 'then it can be encrypted with the command:' >> /home/$MY_USERNAME/README
4763
+      echo $'If you have imported legacy email which is not encrypted' >> /home/$MY_USERNAME/README
4764
+      echo $'then it can be encrypted with the command:' >> /home/$MY_USERNAME/README
4765 4765
       echo '' >> /home/$MY_USERNAME/README
4766 4766
       echo '  encmaildir' >> /home/$MY_USERNAME/README
4767 4767
       echo '' >> /home/$MY_USERNAME/README
4768
-      echo 'But be warned that depending upon how much email you have' >> /home/$MY_USERNAME/README
4769
-      echo 'this could take a seriously LONG time on the Beaglebone' >> /home/$MY_USERNAME/README
4770
-      echo 'and may be better done on a faster machine.' >> /home/$MY_USERNAME/README
4768
+      echo $'But be warned that depending upon how much email you have' >> /home/$MY_USERNAME/README
4769
+      echo $'this could take a seriously LONG time on the Beaglebone' >> /home/$MY_USERNAME/README
4770
+      echo $'and may be better done on a faster machine.' >> /home/$MY_USERNAME/README
4771 4771
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
4772 4772
       chmod 600 /home/$MY_USERNAME/README
4773 4773
   fi
@@ -5112,14 +5112,13 @@ function create_private_mailing_list {
5112 5112
       return
5113 5113
   fi
5114 5114
   if [[ $PRIVATE_MAILING_LIST == $MY_USERNAME ]]; then
5115
-      echo 'The name of the private mailing list should not be the'
5116
-      echo 'same as your username'
5115
+      echo $'The name of the private mailing list should not be the same as your username'
5117 5116
       exit 10
5118 5117
   fi
5119 5118
   if [ ! $MY_GPG_PUBLIC_KEY ]; then
5120
-      echo 'To create a private mailing list you need to specify a file'
5121
-      echo 'containing your exported GPG key within MY_GPG_PUBLIC_KEY at'
5122
-      echo 'the top of the script'
5119
+      echo $'To create a private mailing list you need to specify a file'
5120
+      echo $'containing your exported GPG key within MY_GPG_PUBLIC_KEY at'
5121
+      echo $'the top of the script'
5123 5122
       exit 11
5124 5123
   fi
5125 5124
   apt-get -y install ruby ruby-dev ruby-gpgme libgpgme11-dev libmagic-dev
@@ -5222,7 +5221,7 @@ function import_email {
5222 5221
       if [ -d $USB_MOUNT ]; then
5223 5222
           umount $USB_MOUNT
5224 5223
           rm -rf $USB_MOUNT
5225
-          echo '            You can now remove the USB drive'
5224
+          echo $'            You can now remove the USB drive'
5226 5225
       fi
5227 5226
       exit 0
5228 5227
   fi
@@ -5406,7 +5405,7 @@ function install_mariadb {
5406 5405
       echo '' >> /home/$MY_USERNAME/README
5407 5406
       echo 'MariaDB / MySql' >> /home/$MY_USERNAME/README
5408 5407
       echo '===============' >> /home/$MY_USERNAME/README
5409
-      echo "Your MariaDB password is: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
5408
+      echo $"Your MariaDB password is: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
5410 5409
       echo '' >> /home/$MY_USERNAME/README
5411 5410
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
5412 5411
       chmod 600 /home/$MY_USERNAME/README
@@ -5498,7 +5497,7 @@ function install_owncloud_music_app {
5498 5497
   fi
5499 5498
 
5500 5499
   if ! grep -Fxq "install_owncloud" $COMPLETION_FILE; then
5501
-      echo 'Tried to install the Owncloud music app, but Owncloud installation was not found'
5500
+      echo $'Tried to install the Owncloud music app, but Owncloud installation was not found'
5502 5501
       exit 9823
5503 5502
   fi
5504 5503
 
@@ -5533,16 +5532,16 @@ function install_owncloud_music_app {
5533 5532
       sed -i "s/Owncloud music app commit.*/Owncloud music app commit:$OWNCLOUD_MUSIC_APP_COMMIT/g" $COMPLETION_FILE
5534 5533
   fi
5535 5534
 
5536
-  if grep -q "Music player in Owncloud" /home/$MY_USERNAME/README; then
5535
+  if grep -q $"Music player in Owncloud" /home/$MY_USERNAME/README; then
5537 5536
       echo '' >> /home/$MY_USERNAME/README
5538 5537
       echo '' >> /home/$MY_USERNAME/README
5539
-      echo 'Music player in Owncloud' >> /home/$MY_USERNAME/README
5538
+      echo $'Music player in Owncloud' >> /home/$MY_USERNAME/README
5540 5539
       echo '========================' >> /home/$MY_USERNAME/README
5541
-      echo 'To enable the music app within ouwncloud log in to the Owncloud' >> /home/$MY_USERNAME/README
5542
-      echo 'administrator account then go to Apps on the left hand dropdown' >> /home/$MY_USERNAME/README
5543
-      echo 'menu and enable the music app.  You can then log out and log back' >> /home/$MY_USERNAME/README
5544
-      echo 'in as your Owncloud user and select music from the left hand' >> /home/$MY_USERNAME/README
5545
-      echo 'dropdown menu.' >> /home/$MY_USERNAME/README
5540
+      echo $'To enable the music app within ouwncloud log in to the Owncloud' >> /home/$MY_USERNAME/README
5541
+      echo $'administrator account then go to Apps on the left hand dropdown' >> /home/$MY_USERNAME/README
5542
+      echo $'menu and enable the music app.  You can then log out and log back' >> /home/$MY_USERNAME/README
5543
+      echo $'in as your Owncloud user and select music from the left hand' >> /home/$MY_USERNAME/README
5544
+      echo $'dropdown menu.' >> /home/$MY_USERNAME/README
5546 5545
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
5547 5546
       chmod 600 /home/$MY_USERNAME/README
5548 5547
   fi
@@ -5587,8 +5586,8 @@ function install_owncloud {
5587 5586
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
5588 5587
       return
5589 5588
   fi
5590
-  OWNCLOUD_COMPLETION_MSG1=" *** Freedombone $SYSTEM_TYPE is now installed ***"
5591
-  OWNCLOUD_COMPLETION_MSG2="Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup"
5589
+  OWNCLOUD_COMPLETION_MSG1=$" *** Freedombone $SYSTEM_TYPE is now installed ***"
5590
+  OWNCLOUD_COMPLETION_MSG2=$"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup"
5592 5591
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
5593 5592
       if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
5594 5593
           install_owncloud_music_app
@@ -5610,17 +5609,17 @@ function install_owncloud {
5610 5609
   # if this is exclusively a cloud setup
5611 5610
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
5612 5611
       if [ ! $DEFAULT_DOMAIN_NAME ]; then
5613
-          echo 'No default domain name when installing cloud variant'
5612
+          echo $'No default domain name when installing cloud variant'
5614 5613
           exit 5380
5615 5614
       fi
5616 5615
   fi
5617 5616
   if [ ! $OWNCLOUD_DOMAIN_NAME ]; then
5618
-      echo 'No Owncloud domain name was specified'
5617
+      echo $'No Owncloud domain name was specified'
5619 5618
       exit 3095
5620 5619
   fi
5621 5620
   if [[ $SYSTEM_TYPE != "$VARIANT_CLOUD" ]]; then
5622 5621
       if [[ $SYSTEM_TYPE != "$VARIANT_FULL" ]]; then
5623
-          echo "Owncloud install did not recognise the system type $SYSTEM_TYPE"
5622
+          echo $"Owncloud install did not recognise the system type $SYSTEM_TYPE"
5624 5623
           exit 6746
5625 5624
       fi
5626 5625
   fi
@@ -5628,7 +5627,7 @@ function install_owncloud {
5628 5627
   apt-get -y remove --purge apache*
5629 5628
   if [ -d /etc/apache2 ]; then
5630 5629
       rm -rf /etc/apache2
5631
-      echo 'Removed Apache installation after Owncloud install'
5630
+      echo $'Removed Apache installation after Owncloud install'
5632 5631
   fi
5633 5632
   install_mariadb
5634 5633
   get_mariadb_password
@@ -5647,19 +5646,19 @@ function install_owncloud {
5647 5646
       echo '' >> /home/$MY_USERNAME/README
5648 5647
       echo 'Owncloud' >> /home/$MY_USERNAME/README
5649 5648
       echo '========' >> /home/$MY_USERNAME/README
5650
-      echo 'Owncloud database user: owncloudadmin' >> /home/$MY_USERNAME/README
5651
-      echo "Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
5652
-      echo 'Owncloud database name: owncloud' >> /home/$MY_USERNAME/README
5649
+      echo $'Owncloud database user: owncloudadmin' >> /home/$MY_USERNAME/README
5650
+      echo $"Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
5651
+      echo $'Owncloud database name: owncloud' >> /home/$MY_USERNAME/README
5653 5652
       echo '' >> /home/$MY_USERNAME/README
5654
-      echo 'After creating an administrator account then create a user account via' >> /home/$MY_USERNAME/README
5655
-      echo "the Users dropdown menu entry. The username should be '$MY_USERNAME'." >> /home/$MY_USERNAME/README
5653
+      echo $'After creating an administrator account then create a user account via' >> /home/$MY_USERNAME/README
5654
+      echo $"the Users dropdown menu entry. The username should be '$MY_USERNAME'." >> /home/$MY_USERNAME/README
5656 5655
       echo '' >> /home/$MY_USERNAME/README
5657
-      echo 'On mobile devices you can download the Owncloud client via F-Droid.' >> /home/$MY_USERNAME/README
5656
+      echo $'On mobile devices you can download the Owncloud client via F-Droid.' >> /home/$MY_USERNAME/README
5658 5657
       echo '' >> /home/$MY_USERNAME/README
5659
-      echo 'To synchronise calendar entries with Android "install CalDAV Sync Adapter"' >> /home/$MY_USERNAME/README
5660
-      echo 'using F-Droid then go to settings/accounts and add a CalDav account with' >> /home/$MY_USERNAME/README
5661
-      echo "the URL https://$OWNCLOUD_DOMAIN_NAME/remote.php/caldav/principals/$MY_USERNAME" >> /home/$MY_USERNAME/README
5662
-      echo 'and the username and password shown above.' >> /home/$MY_USERNAME/README
5658
+      echo $'To synchronise calendar entries with Android "install CalDAV Sync Adapter"' >> /home/$MY_USERNAME/README
5659
+      echo $'using F-Droid then go to settings/accounts and add a CalDav account with' >> /home/$MY_USERNAME/README
5660
+      echo $"the URL https://$OWNCLOUD_DOMAIN_NAME/remote.php/caldav/principals/$MY_USERNAME" >> /home/$MY_USERNAME/README
5661
+      echo $'and the username and password shown above.' >> /home/$MY_USERNAME/README
5663 5662
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
5664 5663
       chmod 600 /home/$MY_USERNAME/README
5665 5664
   fi
@@ -5788,7 +5787,7 @@ quit" > $INSTALL_DIR/batch.sql
5788 5787
   # backups are not being used
5789 5788
   backup_databases_script_header
5790 5789
   echo '' >> /usr/bin/backupdatabases
5791
-  echo '# Backup Owncloud database' >> /usr/bin/backupdatabases
5790
+  echo $'# Backup Owncloud database' >> /usr/bin/backupdatabases
5792 5791
   echo 'TEMPFILE=/root/owncloud.sql' >> /usr/bin/backupdatabases
5793 5792
   echo 'DAILYFILE=/var/backups/owncloud_daily.sql' >> /usr/bin/backupdatabases
5794 5793
   echo 'mysqldump --password="$MYSQL_PASSWORD" owncloud > $TEMPFILE' >> /usr/bin/backupdatabases
@@ -5938,45 +5937,45 @@ function install_gogs {
5938 5937
       fi
5939 5938
   fi
5940 5939
 
5941
-  if ! grep -q "Gogs admin user password" /home/$MY_USERNAME/README; then
5940
+  if ! grep -q $"Gogs admin user password" /home/$MY_USERNAME/README; then
5942 5941
       echo '' >> /home/$MY_USERNAME/README
5943 5942
       echo '' >> /home/$MY_USERNAME/README
5944 5943
       echo 'Gogs' >> /home/$MY_USERNAME/README
5945 5944
       echo '====' >> /home/$MY_USERNAME/README
5946
-      echo 'Database type: MySql' >> /home/$MY_USERNAME/README
5947
-      echo 'Database host: 127.0.0.1:3306' >> /home/$MY_USERNAME/README
5948
-      echo 'Database user: root' >> /home/$MY_USERNAME/README
5949
-      echo "Database password: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
5950
-      echo 'Database name: gogs' >> /home/$MY_USERNAME/README
5951
-      echo 'Gogs admin user: gogsadmin' >> /home/$MY_USERNAME/README
5952
-      echo "Gogs admin user password: $GIT_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
5953
-      echo "Gogs admin user email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README
5945
+      echo $'Database type: MySql' >> /home/$MY_USERNAME/README
5946
+      echo $'Database host: 127.0.0.1:3306' >> /home/$MY_USERNAME/README
5947
+      echo $'Database user: root' >> /home/$MY_USERNAME/README
5948
+      echo $"Database password: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
5949
+      echo $'Database name: gogs' >> /home/$MY_USERNAME/README
5950
+      echo $'Gogs admin user: gogsadmin' >> /home/$MY_USERNAME/README
5951
+      echo $"Gogs admin user password: $GIT_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
5952
+      echo $"Gogs admin user email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README
5954 5953
       echo '' >> /home/$MY_USERNAME/README
5955
-      echo 'Install Steps For First-time Run:' >> /home/$MY_USERNAME/README
5956
-      echo 'Leave email service settings empty' >> /home/$MY_USERNAME/README
5957
-      echo 'Check "Enable Register Confirmation"' >> /home/$MY_USERNAME/README
5958
-      echo 'Check "Enable Mail Notification"' >> /home/$MY_USERNAME/README
5954
+      echo $'Install Steps For First-time Run:' >> /home/$MY_USERNAME/README
5955
+      echo $'Leave email service settings empty' >> /home/$MY_USERNAME/README
5956
+      echo $'Check "Enable Register Confirmation"' >> /home/$MY_USERNAME/README
5957
+      echo $'Check "Enable Mail Notification"' >> /home/$MY_USERNAME/README
5959 5958
       echo '' >> /home/$MY_USERNAME/README
5960
-      echo 'After the initial install edit /home/git/go/src/github.com/gogits/gogs/custom/conf/app.ini' >> /home/$MY_USERNAME/README
5961
-      echo 'and within the [server] section set:' >> /home/$MY_USERNAME/README
5959
+      echo $'After the initial install edit /home/git/go/src/github.com/gogits/gogs/custom/conf/app.ini' >> /home/$MY_USERNAME/README
5960
+      echo $'and within the [server] section set:' >> /home/$MY_USERNAME/README
5962 5961
       echo "  DOMAIN = $GIT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
5963 5962
       echo "  ROOT_URL = http://$GIT_DOMAIN_NAME/" >> /home/$MY_USERNAME/README
5964 5963
       echo "  SSH_PORT = $SSH_PORT" >> /home/$MY_USERNAME/README
5965
-      echo 'If you want to disable new account registrations then append the following:' >> /home/$MY_USERNAME/README
5964
+      echo $'If you want to disable new account registrations then append the following:' >> /home/$MY_USERNAME/README
5966 5965
       echo '  [service]' >> /home/$MY_USERNAME/README
5967 5966
       echo '  DISABLE_REGISTRATION = true' >> /home/$MY_USERNAME/README
5968
-      echo 'Then restart with:' >> /home/$MY_USERNAME/README
5967
+      echo $'Then restart with:' >> /home/$MY_USERNAME/README
5969 5968
       echo '  systemctl restart gogs' >> /home/$MY_USERNAME/README
5970 5969
       echo '' >> /home/$MY_USERNAME/README
5971
-      echo "Note that there's a usability/security trade-off made here." >> /home/$MY_USERNAME/README
5972
-      echo "In order to allow git clone via http we don't redirect everything" >> /home/$MY_USERNAME/README
5973
-      echo 'over https. Instead only critical things such as user login,' >> /home/$MY_USERNAME/README
5974
-      echo 'settings and admin are encrypted.' >> /home/$MY_USERNAME/README
5975
-      echo 'There are also potential security issues with cloning/pulling/pushing' >> /home/$MY_USERNAME/README
5976
-      echo 'code over http, since a determined adversary could inject malware' >> /home/$MY_USERNAME/README
5977
-      echo 'into the stream as it passes, so beware.' >> /home/$MY_USERNAME/README
5978
-      echo 'If you have a bought domain and a non-self signed cert then you' >> /home/$MY_USERNAME/README
5979
-      echo "should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https." >> /home/$MY_USERNAME/README
5970
+      echo $"Note that there's a usability/security trade-off made here." >> /home/$MY_USERNAME/README
5971
+      echo $"In order to allow git clone via http we don't redirect everything" >> /home/$MY_USERNAME/README
5972
+      echo $'over https. Instead only critical things such as user login,' >> /home/$MY_USERNAME/README
5973
+      echo $'settings and admin are encrypted.' >> /home/$MY_USERNAME/README
5974
+      echo $'There are also potential security issues with cloning/pulling/pushing' >> /home/$MY_USERNAME/README
5975
+      echo $'code over http, since a determined adversary could inject malware' >> /home/$MY_USERNAME/README
5976
+      echo $'into the stream as it passes, so beware.' >> /home/$MY_USERNAME/README
5977
+      echo $'If you have a bought domain and a non-self signed cert then you' >> /home/$MY_USERNAME/README
5978
+      echo $"should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https." >> /home/$MY_USERNAME/README
5980 5979
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
5981 5980
       chmod 600 /home/$MY_USERNAME/README
5982 5981
   fi
@@ -6189,14 +6188,14 @@ function install_tox_node {
6189 6188
   cp /usr/local/lib/libtoxcore* /usr/lib/
6190 6189
 
6191 6190
   if [ ! -f /usr/local/bin/tox-bootstrapd ]; then
6192
-      echo "File not found /usr/local/bin/tox-bootstrapd"
6191
+      echo $"File not found /usr/local/bin/tox-bootstrapd"
6193 6192
       exit 73862
6194 6193
   fi
6195 6194
 
6196 6195
   useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment "Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
6197 6196
   chmod 700 /var/lib/tox-bootstrapd
6198 6197
   if [ ! -f $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf ]; then
6199
-      echo "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf"
6198
+      echo $"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf"
6200 6199
       exit 476835
6201 6200
   fi
6202 6201
   # remove Maildir
@@ -6245,7 +6244,7 @@ function install_tox_node {
6245 6244
   fi
6246 6245
 
6247 6246
   if [ ! -f $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service ]; then
6248
-      echo "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service"
6247
+      echo $"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service"
6249 6248
       exit 7359
6250 6249
   fi
6251 6250
   cp $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service /etc/systemd/system/
@@ -6263,7 +6262,7 @@ function install_tox_node {
6263 6262
   systemctl restart tox-bootstrapd.service
6264 6263
   TOX_PUBLIC_KEY=$(cat /var/log/syslog | grep tox | grep "Public Key" | awk -F ' ' '{print $8}' | tail -1)
6265 6264
   if [ ${#TOX_PUBLIC_KEY} -lt 30 ]; then
6266
-      echo 'Could not obtain the tox node public key'
6265
+      echo $'Could not obtain the tox node public key'
6267 6266
       exit 6529
6268 6267
   fi
6269 6268
 
@@ -6277,8 +6276,8 @@ function install_tox_node {
6277 6276
       echo '' >> /home/$MY_USERNAME/README
6278 6277
       echo 'Tox' >> /home/$MY_USERNAME/README
6279 6278
       echo '===' >> /home/$MY_USERNAME/README
6280
-      echo "Your Tox node public key is: $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README
6281
-      echo 'In the Toxic client you can connect to it with:' >> /home/$MY_USERNAME/README
6279
+      echo $"Your Tox node public key is: $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README
6280
+      echo $'In the Toxic client you can connect to it with:' >> /home/$MY_USERNAME/README
6282 6281
       echo "  /connect $DEFAULT_DOMAIN_NAME.local $TOX_PORT $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README
6283 6282
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
6284 6283
       chmod 600 /home/$MY_USERNAME/README
@@ -6443,8 +6442,8 @@ function install_xmpp {
6443 6442
       echo '' >> /home/$MY_USERNAME/README
6444 6443
       echo 'XMPP' >> /home/$MY_USERNAME/README
6445 6444
       echo '====' >> /home/$MY_USERNAME/README
6446
-      echo "Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README
6447
-      echo 'You can change it with: ' >> /home/$MY_USERNAME/README
6445
+      echo $"Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README
6446
+      echo $'You can change it with: ' >> /home/$MY_USERNAME/README
6448 6447
       echo '' >> /home/$MY_USERNAME/README
6449 6448
       echo "    prosodyctl passwd $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README
6450 6449
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
@@ -6485,7 +6484,7 @@ function install_irc_server {
6485 6484
   fi
6486 6485
 
6487 6486
   if [ ! -d /etc/ngircd ]; then
6488
-      echo "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE"
6487
+      echo $"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE"
6489 6488
       exit 53
6490 6489
   fi
6491 6490
 
@@ -6500,9 +6499,9 @@ function install_irc_server {
6500 6499
   fi
6501 6500
 
6502 6501
   echo '**************************************************' > /etc/ngircd/motd
6503
-  echo '*           F R E E D O M B O N E   I R C        *' >> /etc/ngircd/motd
6502
+  echo $'*           F R E E D O M B O N E   I R C        *' >> /etc/ngircd/motd
6504 6503
   echo '*                                                *' >> /etc/ngircd/motd
6505
-  echo '*               Freedom in the Cloud             *' >> /etc/ngircd/motd
6504
+  echo $'*               Freedom in the Cloud             *' >> /etc/ngircd/motd
6506 6505
   echo '**************************************************' >> /etc/ngircd/motd
6507 6506
   sed -i 's|MotdFile = /etc/ngircd/ngircd.motd|MotdFile = /etc/ngircd/motd|g' /etc/ngircd/ngircd.conf
6508 6507
   sed -i "s/irc@irc.example.com/$MY_EMAIL_ADDRESS/g" /etc/ngircd/ngircd.conf
@@ -6849,15 +6848,15 @@ function install_wiki {
6849 6848
   add_ddns_domain
6850 6849
 
6851 6850
   # add some post-install instructions
6852
-  if ! grep -q "Wiki password" /home/$MY_USERNAME/README; then
6851
+  if ! grep -q $"Wiki password" /home/$MY_USERNAME/README; then
6853 6852
       echo '' >> /home/$MY_USERNAME/README
6854 6853
       echo '' >> /home/$MY_USERNAME/README
6855
-      echo 'Wiki' >> /home/$MY_USERNAME/README
6854
+      echo $'Wiki' >> /home/$MY_USERNAME/README
6856 6855
       echo '====' >> /home/$MY_USERNAME/README
6857
-      echo "Wiki username: $MY_USERNAME" >> /home/$MY_USERNAME/README
6858
-      echo "Wiki password: $WIKI_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
6856
+      echo $"Wiki username: $MY_USERNAME" >> /home/$MY_USERNAME/README
6857
+      echo $"Wiki password: $WIKI_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
6859 6858
       echo '' >> /home/$MY_USERNAME/README
6860
-      echo 'Once you have set up the wiki then remove the install file:' >> /home/$MY_USERNAME/README
6859
+      echo $'Once you have set up the wiki then remove the install file:' >> /home/$MY_USERNAME/README
6861 6860
       echo '' >> /home/$MY_USERNAME/README
6862 6861
       echo "  rm /var/www/$WIKI_DOMAIN_NAME/htdocs/install.php" >> /home/$MY_USERNAME/README
6863 6862
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
@@ -6881,7 +6880,7 @@ function install_blog {
6881 6880
       return
6882 6881
   fi
6883 6882
   if [ ! $FULLBLOG_DOMAIN_NAME ]; then
6884
-      echo 'The blog domain name was not specified'
6883
+      echo $'The blog domain name was not specified'
6885 6884
       exit 5062
6886 6885
   fi
6887 6886
 
@@ -7126,12 +7125,12 @@ function install_blog {
7126 7125
       fi
7127 7126
       echo '' >> /home/$MY_USERNAME/README
7128 7127
       echo '' >> /home/$MY_USERNAME/README
7129
-      echo 'HTMLy Blog' >> /home/$MY_USERNAME/README
7128
+      echo $'HTMLy Blog' >> /home/$MY_USERNAME/README
7130 7129
       echo '==========' >> /home/$MY_USERNAME/README
7131
-      echo "Your blog username: $MY_USERNAME" >> /home/$MY_USERNAME/README
7132
-      echo "Your blog password is: $FULLBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
7133
-      echo "Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login" >> /home/$MY_USERNAME/README
7134
-      echo 'Edit your blog title and time zone at:' >> /home/$MY_USERNAME/README
7130
+      echo $"Your blog username: $MY_USERNAME" >> /home/$MY_USERNAME/README
7131
+      echo $"Your blog password is: $FULLBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
7132
+      echo $"Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login" >> /home/$MY_USERNAME/README
7133
+      echo $'Edit your blog title and time zone at:' >> /home/$MY_USERNAME/README
7135 7134
       echo "  /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini" >> /home/$MY_USERNAME/README
7136 7135
       echo '' >> /home/$MY_USERNAME/README
7137 7136
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
@@ -7161,7 +7160,7 @@ function install_gnu_social {
7161 7160
       return
7162 7161
   fi
7163 7162
   if [ ! $MICROBLOG_DOMAIN_NAME ]; then
7164
-      echo 'No domain name was given for the microblog'
7163
+      echo $'No domain name was given for the microblog'
7165 7164
       exit 7359
7166 7165
   fi
7167 7166
 
@@ -7231,9 +7230,9 @@ function install_gnu_social {
7231 7230
       fi
7232 7231
       echo '' >> /home/$MY_USERNAME/README
7233 7232
       echo '' >> /home/$MY_USERNAME/README
7234
-      echo 'GNU Social' >> /home/$MY_USERNAME/README
7233
+      echo $'GNU Social' >> /home/$MY_USERNAME/README
7235 7234
       echo '==========' >> /home/$MY_USERNAME/README
7236
-      echo "Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
7235
+      echo $"Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
7237 7236
       echo '' >> /home/$MY_USERNAME/README
7238 7237
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
7239 7238
       chmod 600 /home/$MY_USERNAME/README
@@ -7340,7 +7339,7 @@ quit" > $INSTALL_DIR/batch.sql
7340 7339
   # backups are not being used
7341 7340
   backup_databases_script_header
7342 7341
   echo '' >> /usr/bin/backupdatabases
7343
-  echo '# Backup the GNU Social database' >> /usr/bin/backupdatabases
7342
+  echo $'# Backup the GNU Social database' >> /usr/bin/backupdatabases
7344 7343
   echo 'TEMPFILE=/root/gnusocial.sql' >> /usr/bin/backupdatabases
7345 7344
   echo 'DAILYFILE=/var/backups/gnusocial_daily.sql' >> /usr/bin/backupdatabases
7346 7345
   echo 'mysqldump --password="$MYSQL_PASSWORD" gnusocial > $TEMPFILE' >> /usr/bin/backupdatabases
@@ -7367,7 +7366,7 @@ quit" > $INSTALL_DIR/batch.sql
7367 7366
   echo 'fi' >> /usr/bin/backupdatabases
7368 7367
 
7369 7368
   echo '' >> /etc/cron.weekly/backupdatabasesweekly
7370
-  echo '# GNU Social' >> /etc/cron.weekly/backupdatabasesweekly
7369
+  echo $'# GNU Social' >> /etc/cron.weekly/backupdatabasesweekly
7371 7370
   echo 'if [ -f /var/backups/gnusocial_weekly.sql ]; then' >> /etc/cron.weekly/backupdatabasesweekly
7372 7371
   echo '  cp -f /var/backups/gnusocial_weekly.sql /var/backups/gnusocial_2weekly.sql' >> /etc/cron.weekly/backupdatabasesweekly
7373 7372
   echo 'fi' >> /etc/cron.weekly/backupdatabasesweekly
@@ -7376,7 +7375,7 @@ quit" > $INSTALL_DIR/batch.sql
7376 7375
   echo 'fi' >> /etc/cron.weekly/backupdatabasesweekly
7377 7376
 
7378 7377
   echo '' >> /etc/cron.monthly/backupdatabasesmonthly
7379
-  echo '# GNU Social' >> /etc/cron.monthly/backupdatabasesmonthly
7378
+  echo $'# GNU Social' >> /etc/cron.monthly/backupdatabasesmonthly
7380 7379
   echo 'if [ -f /var/backups/gnusocial_monthly.sql ]; then' >> /etc/cron.monthly/backupdatabasesmonthly
7381 7380
   echo '  cp -f /var/backups/gnusocial_monthly.sql /var/backups/gnusocial_2monthly.sql' >> /etc/cron.monthly/backupdatabasesmonthly
7382 7381
   echo 'fi' >> /etc/cron.monthly/backupdatabasesmonthly
@@ -7392,40 +7391,40 @@ quit" > $INSTALL_DIR/batch.sql
7392 7391
   service nginx restart
7393 7392
 
7394 7393
   # some post-install instructions for the user
7395
-  if ! grep -q "To set up your microblog" /home/$MY_USERNAME/README; then
7394
+  if ! grep -q $"To set up your microblog go to" /home/$MY_USERNAME/README; then
7396 7395
       echo '' >> /home/$MY_USERNAME/README
7397 7396
       echo '' >> /home/$MY_USERNAME/README
7398
-      echo 'Microblog' >> /home/$MY_USERNAME/README
7397
+      echo $'Microblog' >> /home/$MY_USERNAME/README
7399 7398
       echo '=========' >> /home/$MY_USERNAME/README
7400
-      echo "To set up your microblog go to" >> /home/$MY_USERNAME/README
7401
-      echo "https://$MICROBLOG_DOMAIN_NAME/install.php" >> /home/$MY_USERNAME/README
7402
-      echo 'and enter the following settings:' >> /home/$MY_USERNAME/README
7403
-      echo ' - Set a name for the site' >> /home/$MY_USERNAME/README
7404
-      echo ' - Server SSL: enable' >> /home/$MY_USERNAME/README
7405
-      echo ' - Hostname: localhost' >> /home/$MY_USERNAME/README
7406
-      echo ' - Type: MySql/MariaDB' >> /home/$MY_USERNAME/README
7407
-      echo ' - Name: gnusocial' >> /home/$MY_USERNAME/README
7408
-      echo ' - DB username: root' >> /home/$MY_USERNAME/README
7409
-      echo " - DB Password; $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
7410
-      echo " - Administrator nickname: $MY_USERNAME" >> /home/$MY_USERNAME/README
7411
-      echo " - Administrator password: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
7412
-      echo ' - Subscribe to announcements: ticked' >> /home/$MY_USERNAME/README
7413
-      echo ' - Site profile: Community' >> /home/$MY_USERNAME/README
7399
+      echo $"To set up your microblog go to" >> /home/$MY_USERNAME/README
7400
+      echo $"https://$MICROBLOG_DOMAIN_NAME/install.php" >> /home/$MY_USERNAME/README
7401
+      echo $'and enter the following settings:' >> /home/$MY_USERNAME/README
7402
+      echo $' - Set a name for the site' >> /home/$MY_USERNAME/README
7403
+      echo $' - Server SSL: enable' >> /home/$MY_USERNAME/README
7404
+      echo $' - Hostname: localhost' >> /home/$MY_USERNAME/README
7405
+      echo $' - Type: MySql/MariaDB' >> /home/$MY_USERNAME/README
7406
+      echo $' - Name: gnusocial' >> /home/$MY_USERNAME/README
7407
+      echo $' - DB username: root' >> /home/$MY_USERNAME/README
7408
+      echo $" - DB Password; $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
7409
+      echo $" - Administrator nickname: $MY_USERNAME" >> /home/$MY_USERNAME/README
7410
+      echo $" - Administrator password: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
7411
+      echo $' - Subscribe to announcements: ticked' >> /home/$MY_USERNAME/README
7412
+      echo $' - Site profile: Community' >> /home/$MY_USERNAME/README
7414 7413
       echo '' >> /home/$MY_USERNAME/README
7415
-      echo 'When the install is complete you will see a lot of warnings' >> /home/$MY_USERNAME/README
7416
-      echo 'but just ignore those and navigate to ' >> /home/$MY_USERNAME/README
7417
-      echo "https://$MICROBLOG_DOMAIN_NAME and you can then " >> /home/$MY_USERNAME/README
7418
-      echo 'complete the configuration via the *Admin* section on the header' >> /home/$MY_USERNAME/README
7419
-      echo 'bar.  Some recommended admin settings are:' >> /home/$MY_USERNAME/README
7414
+      echo $'When the install is complete you will see a lot of warnings' >> /home/$MY_USERNAME/README
7415
+      echo $'but just ignore those and navigate to ' >> /home/$MY_USERNAME/README
7416
+      echo $"https://$MICROBLOG_DOMAIN_NAME and you can then " >> /home/$MY_USERNAME/README
7417
+      echo $'complete the configuration via the *Admin* section on the header' >> /home/$MY_USERNAME/README
7418
+      echo $'bar.  Some recommended admin settings are:' >> /home/$MY_USERNAME/README
7420 7419
       echo '' >> /home/$MY_USERNAME/README
7421
-      echo 'Under the *Site* settings:' >> /home/$MY_USERNAME/README
7420
+      echo $'Under the *Site* settings:' >> /home/$MY_USERNAME/README
7422 7421
       echo '    Text limit: 140' >> /home/$MY_USERNAME/README
7423 7422
       echo '    Dupe Limit: 60000' >> /home/$MY_USERNAME/README
7424 7423
       echo '' >> /home/$MY_USERNAME/README
7425
-      echo 'Under the *User* settings:' >> /home/$MY_USERNAME/README
7424
+      echo $'Under the *User* settings:' >> /home/$MY_USERNAME/README
7426 7425
       echo '    Bio limit: 1000' >> /home/$MY_USERNAME/README
7427 7426
       echo '' >> /home/$MY_USERNAME/README
7428
-      echo 'Under the *Access* settings:' >> /home/$MY_USERNAME/README
7427
+      echo $'Under the *Access* settings:' >> /home/$MY_USERNAME/README
7429 7428
       echo '    /Invite only/ ticked' >> /home/$MY_USERNAME/README
7430 7429
       echo '' >> /home/$MY_USERNAME/README
7431 7430
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
@@ -7510,7 +7509,7 @@ function install_hubzilla {
7510 7509
       echo '' >> /home/$MY_USERNAME/README
7511 7510
       echo 'Hubzilla' >> /home/$MY_USERNAME/README
7512 7511
       echo '==========' >> /home/$MY_USERNAME/README
7513
-      echo "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
7512
+      echo $"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
7514 7513
       echo '' >> /home/$MY_USERNAME/README
7515 7514
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
7516 7515
       chmod 600 /home/$MY_USERNAME/README
@@ -7659,7 +7658,7 @@ quit" > $INSTALL_DIR/batch.sql
7659 7658
   # backups are not being used
7660 7659
   backup_databases_script_header
7661 7660
   echo '' >> /usr/bin/backupdatabases
7662
-  echo '# Backup the Hubzilla database' >> /usr/bin/backupdatabases
7661
+  echo $'# Backup the Hubzilla database' >> /usr/bin/backupdatabases
7663 7662
   echo 'TEMPFILE=/root/hubzilla.sql' >> /usr/bin/backupdatabases
7664 7663
   echo 'DAILYFILE=/var/backups/hubzilla_daily.sql' >> /usr/bin/backupdatabases
7665 7664
   echo 'mysqldump --password="$MYSQL_PASSWORD" hubzilla > $TEMPFILE' >> /usr/bin/backupdatabases
@@ -7717,20 +7716,20 @@ quit" > $INSTALL_DIR/batch.sql
7717 7716
   service cron restart
7718 7717
 
7719 7718
   # some post-install instructions for the user
7720
-  if ! grep -q "To set up your Hubzilla" /home/$MY_USERNAME/README; then
7719
+  if ! grep -q $"To set up your Hubzilla site go to" /home/$MY_USERNAME/README; then
7721 7720
       echo '' >> /home/$MY_USERNAME/README
7722
-      echo "To set up your Hubzilla site go to" >> /home/$MY_USERNAME/README
7721
+      echo $"To set up your Hubzilla site go to" >> /home/$MY_USERNAME/README
7723 7722
       echo "https://$HUBZILLA_DOMAIN_NAME" >> /home/$MY_USERNAME/README
7724
-      echo 'You will need to have a non self-signed SSL certificate in order' >> /home/$MY_USERNAME/README
7725
-      echo "to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt" >> /home/$MY_USERNAME/README
7726
-      echo "and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key." >> /home/$MY_USERNAME/README
7727
-      echo 'If there is an intermediate certificate needed (such as with StartSSL) then' >> /home/$MY_USERNAME/README
7728
-      echo 'this will need to be concatenated onto the end of the crt file, like this:' >> /home/$MY_USERNAME/README
7723
+      echo $'You will need to have a non self-signed SSL certificate in order' >> /home/$MY_USERNAME/README
7724
+      echo $"to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt" >> /home/$MY_USERNAME/README
7725
+      echo $"and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key." >> /home/$MY_USERNAME/README
7726
+      echo $'If there is an intermediate certificate needed (such as with StartSSL) then' >> /home/$MY_USERNAME/README
7727
+      echo $'this will need to be concatenated onto the end of the crt file, like this:' >> /home/$MY_USERNAME/README
7729 7728
       echo '' >> /home/$MY_USERNAME/README
7730 7729
       echo "  cat /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem > /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README
7731 7730
       echo '' >> /home/$MY_USERNAME/README
7732
-      echo "Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README
7733
-      echo "within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME" >> /home/$MY_USERNAME/README
7731
+      echo $"Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README
7732
+      echo $"within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME" >> /home/$MY_USERNAME/README
7734 7733
       echo '' >> /home/$MY_USERNAME/README
7735 7734
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
7736 7735
       chmod 600 /home/$MY_USERNAME/README
@@ -7789,7 +7788,7 @@ function install_dlna_server {
7789 7788
   apt-get -y install minidlna
7790 7789
 
7791 7790
   if [ ! -f /etc/minidlna.conf ]; then
7792
-      echo "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE"
7791
+      echo $"ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE"
7793 7792
       exit 55
7794 7793
   fi
7795 7794
 
@@ -8496,11 +8495,11 @@ function install_voip {
8496 8495
 
8497 8496
   # Check that the cert was created
8498 8497
   if [ ! -f /etc/ssl/certs/mumble.crt ]; then
8499
-      echo 'VoIP server certificate not created'
8498
+      echo $'VoIP server certificate not created'
8500 8499
       exit 57892
8501 8500
   fi
8502 8501
   if [ ! -f /etc/ssl/private/mumble.key ]; then
8503
-      echo 'VoIP server key not created'
8502
+      echo $'VoIP server key not created'
8504 8503
       exit 57893
8505 8504
   fi
8506 8505
   if [ ! -d /var/lib/mumble-server ]; then
@@ -8539,17 +8538,17 @@ function install_voip {
8539 8538
 
8540 8539
   systemctl restart mumble-server
8541 8540
 
8542
-  if ! grep -q "VoIP Server" /home/$MY_USERNAME/README; then
8541
+  if ! grep -q $"VoIP Server" /home/$MY_USERNAME/README; then
8543 8542
       echo '' >> /home/$MY_USERNAME/README
8544 8543
       echo '' >> /home/$MY_USERNAME/README
8545
-      echo 'VoIP Server' >> /home/$MY_USERNAME/README
8544
+      echo $'VoIP Server' >> /home/$MY_USERNAME/README
8546 8545
       echo '===========' >> /home/$MY_USERNAME/README
8547
-      echo 'VoIP server username: mumble-server' >> /home/$MY_USERNAME/README
8546
+      echo $'VoIP server username: mumble-server' >> /home/$MY_USERNAME/README
8548 8547
       if [[ $SYSTEM_TYPE != "VARIANT_MESH" ]]; then
8549
-          echo "VoIP server password: $VOIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README
8548
+          echo $"VoIP server password: $VOIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README
8550 8549
       fi
8551 8550
       echo '' >> /home/$MY_USERNAME/README
8552
-      echo 'To connect to the VoIP server use your username and the server password shown above.' >> /home/$MY_USERNAME/README
8551
+      echo $'To connect to the VoIP server use your username and the server password shown above.' >> /home/$MY_USERNAME/README
8553 8552
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
8554 8553
       chmod 600 /home/$MY_USERNAME/README
8555 8554
   fi
@@ -8624,14 +8623,14 @@ function install_sip {
8624 8623
 
8625 8624
   service sipwitch start
8626 8625
 
8627
-  if ! grep -q "SIP Server" /home/$MY_USERNAME/README; then
8626
+  if ! grep -q $"SIP Server" /home/$MY_USERNAME/README; then
8628 8627
       echo '' >> /home/$MY_USERNAME/README
8629 8628
       echo '' >> /home/$MY_USERNAME/README
8630
-      echo 'SIP Server' >> /home/$MY_USERNAME/README
8629
+      echo $'SIP Server' >> /home/$MY_USERNAME/README
8631 8630
       echo '==========' >> /home/$MY_USERNAME/README
8632
-      echo "SIP server username: $MY_USERNAME" >> /home/$MY_USERNAME/README
8633
-      echo "SIP server extension: 201" >> /home/$MY_USERNAME/README
8634
-      echo "SIP server password: $SIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README
8631
+      echo $"SIP server username: $MY_USERNAME" >> /home/$MY_USERNAME/README
8632
+      echo $"SIP server extension: 201" >> /home/$MY_USERNAME/README
8633
+      echo $"SIP server password: $SIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README
8635 8634
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
8636 8635
       chmod 600 /home/$MY_USERNAME/README
8637 8636
   fi