Browse Source

More translation strings

Bob Mottram 9 years ago
parent
commit
54602b4b2e
1 changed files with 33 additions and 33 deletions
  1. 33
    33
      src/freedombone

+ 33
- 33
src/freedombone View File

@@ -533,9 +533,9 @@ function interactive_configuration_remote_backups {
533 533
   fi
534 534
   freedombone-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes
535 535
   if [ ! "$?" = "0" ]; then
536
-      echo 'Command failed:'
536
+      echo $'Command failed:'
537 537
       echo ''
538
-      echo "  freedombone-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes"
538
+      echo $"  freedombone-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes"
539 539
       echo ''
540 540
       exit 65892
541 541
   fi
@@ -585,9 +585,9 @@ function interactive_configuration {
585 585
       exit 0
586 586
   fi
587 587
   if [ ! "$?" = "0" ]; then
588
-      echo 'Command failed:'
588
+      echo $'Command failed:'
589 589
       echo ''
590
-      echo "  freedombone-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]"
590
+      echo $"  freedombone-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]"
591 591
       echo ''
592 592
       exit 73594
593 593
   fi
@@ -801,7 +801,7 @@ function parse_args {
801 801
   fi
802 802
 
803 803
   if [ ! -d /home/$MY_USERNAME ]; then
804
-      echo "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user."
804
+      echo $"There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user."
805 805
       exit 1
806 806
   fi
807 807
   if [ ! "$DEFAULT_DOMAIN_NAME" ]; then
@@ -818,11 +818,11 @@ function parse_args {
818 818
   fi
819 819
   if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
820 820
       if [ ! $DDNS_USERNAME ]; then
821
-          echo 'Please provide the username for your dynamic DNS provider with the --ddnsuser option'
821
+          echo $'Please provide the username for your dynamic DNS provider with the --ddnsuser option'
822 822
           exit 7823
823 823
       fi
824 824
       if [ ! $DDNS_PASSWORD ]; then
825
-          echo 'Please provide the password for your dynamic DNS provider with the --ddnspass option'
825
+          echo $'Please provide the password for your dynamic DNS provider with the --ddnspass option'
826 826
           exit 6382
827 827
       fi
828 828
   fi
@@ -830,7 +830,7 @@ function parse_args {
830 830
       SYSTEM_TYPE=$VARIANT_FULL
831 831
   fi
832 832
   if [[ $SYSTEM_TYPE != $VARIANT_WRITER && $SYSTEM_TYPE != $VARIANT_CLOUD && $SYSTEM_TYPE != $VARIANT_CHAT && $SYSTEM_TYPE != $VARIANT_MAILBOX && $SYSTEM_TYPE != $VARIANT_NONMAILBOX && $SYSTEM_TYPE != $VARIANT_SOCIAL && $SYSTEM_TYPE != $VARIANT_MEDIA && $SYSTEM_TYPE != $VARIANT_DEVELOPER && $SYSTEM_TYPE != $VARIANT_MESH && $SYSTEM_TYPE != $VARIANT_FULL ]]; then
833
-      echo "'$SYSTEM_TYPE' is an unrecognised Freedombone variant."
833
+      echo $"'$SYSTEM_TYPE' is an unrecognised Freedombone variant."
834 834
       exit 30
835 835
   fi
836 836
 }
@@ -845,7 +845,7 @@ function read_configuration {
845 845
 
846 846
   if [[ $INSTALLING_FROM_CONFIGURATION_FILE == "yes"  ]]; then
847 847
       if [ ! -f $CONFIGURATION_FILE ]; then
848
-          echo "The configuration file $CONFIGURATION_FILE was not found"
848
+          echo $"The configuration file $CONFIGURATION_FILE was not found"
849 849
           exit 8935
850 850
       fi
851 851
   fi
@@ -1302,25 +1302,25 @@ function check_certificates {
1302 1302
   fi
1303 1303
   if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
1304 1304
       if [ ! -f /etc/ssl/private/$1.key ]; then
1305
-          echo "Private certificate for $CHECK_HOSTNAME was not created"
1305
+          echo $"Private certificate for $CHECK_HOSTNAME was not created"
1306 1306
           exit 63959
1307 1307
       fi
1308 1308
       if [ ! -f /etc/ssl/certs/$1.crt ]; then
1309
-          echo "Public certificate for $CHECK_HOSTNAME was not created"
1309
+          echo $"Public certificate for $CHECK_HOSTNAME was not created"
1310 1310
           exit 7679
1311 1311
       fi
1312 1312
   else
1313 1313
       if [ ! -f /etc/letsencrypt/live/${1}/privkey.pem ]; then
1314
-          echo "Private certificate for $CHECK_HOSTNAME was not created"
1314
+          echo $"Private certificate for $CHECK_HOSTNAME was not created"
1315 1315
           exit 6282
1316 1316
       fi
1317 1317
       if [ ! -f /etc/letsencrypt/live/${1}/fullchain.pem ]; then
1318
-          echo "Public certificate for $CHECK_HOSTNAME was not created"
1318
+          echo $"Public certificate for $CHECK_HOSTNAME was not created"
1319 1319
           exit 5328
1320 1320
       fi
1321 1321
   fi
1322 1322
   if [ ! -f /etc/ssl/certs/$1.dhparam ]; then
1323
-      echo "Diffie–Hellman parameters for $CHECK_HOSTNAME were not created"
1323
+      echo $"Diffie–Hellman parameters for $CHECK_HOSTNAME were not created"
1324 1324
       exit 5989
1325 1325
   fi
1326 1326
 }
@@ -1864,21 +1864,21 @@ function install_zeronet_blog {
1864 1864
   ZERONET_BLOG_PRIVATE_KEY=${blog_private_key//[[:blank:]]/}
1865 1865
 
1866 1866
   if [ ${#ZERONET_BLOG_ADDRESS} -lt 20 ]; then
1867
-      echo "Address:    $ZERONET_BLOG_ADDRESS"
1868
-      echo "Public key: $ZERONET_BLOG_PRIVATE_KEY"
1869
-      echo 'Unable to create zeronet blog address'
1867
+      echo $"Address:    $ZERONET_BLOG_ADDRESS"
1868
+      echo $"Public key: $ZERONET_BLOG_PRIVATE_KEY"
1869
+      echo $'Unable to create zeronet blog address'
1870 1870
       exit 7358
1871 1871
   fi
1872 1872
 
1873 1873
   if [ ${#ZERONET_BLOG_PRIVATE_KEY} -lt 20 ]; then
1874
-      echo "Address:    $ZERONET_BLOG_ADDRESS"
1875
-      echo "Public key: $ZERONET_BLOG_PRIVATE_KEY"
1876
-      echo 'Unable to create zeronet blog private key'
1874
+      echo $"Address:    $ZERONET_BLOG_ADDRESS"
1875
+      echo $"Public key: $ZERONET_BLOG_PRIVATE_KEY"
1876
+      echo $'Unable to create zeronet blog private key'
1877 1877
       exit 1639
1878 1878
   fi
1879 1879
 
1880 1880
   if [ ! -d "/opt/zeronet/data/$ZERONET_BLOG_ADDRESS" ]; then
1881
-      echo "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS"
1881
+      echo $"Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS"
1882 1882
       exit 7638
1883 1883
   fi
1884 1884
 
@@ -1887,8 +1887,8 @@ function install_zeronet_blog {
1887 1887
       echo 'ZeroBlog repo could not be cloned'
1888 1888
       exit 6739
1889 1889
   fi
1890
-  echo "ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS"
1891
-  echo "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
1890
+  echo $"ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS"
1891
+  echo $"ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
1892 1892
   cp -r /opt/zeronet/ZeroBlog/* /opt/zeronet/data/$ZERONET_BLOG_ADDRESS
1893 1893
 
1894 1894
   if [ ! -d /opt/zeronet/data/$ZERONET_BLOG_ADDRESS/data ]; then
@@ -1966,31 +1966,31 @@ function install_zeronet_forum {
1966 1966
   ZERONET_FORUM_PRIVATE_KEY=${forum_private_key//[[:blank:]]/}
1967 1967
 
1968 1968
   if [ ${#ZERONET_FORUM_ADDRESS} -lt 20 ]; then
1969
-      echo "Address:    $ZERONET_FORUM_ADDRESS"
1970
-      echo "Public key: $ZERONET_FORUM_PRIVATE_KEY"
1971
-      echo 'Unable to create zeronet forum address'
1969
+      echo $"Address:    $ZERONET_FORUM_ADDRESS"
1970
+      echo $"Public key: $ZERONET_FORUM_PRIVATE_KEY"
1971
+      echo $'Unable to create zeronet forum address'
1972 1972
       exit 76352
1973 1973
   fi
1974 1974
 
1975 1975
   if [ ${#ZERONET_FORUM_PRIVATE_KEY} -lt 20 ]; then
1976
-      echo "Address:    $ZERONET_FORUM_ADDRESS"
1977
-      echo "Public key: $ZERONET_FORUM_PRIVATE_KEY"
1978
-      echo 'Unable to create zeronet forum private key'
1976
+      echo $"Address:    $ZERONET_FORUM_ADDRESS"
1977
+      echo $"Public key: $ZERONET_FORUM_PRIVATE_KEY"
1978
+      echo $'Unable to create zeronet forum private key'
1979 1979
       exit 87356
1980 1980
   fi
1981 1981
 
1982 1982
   if [ ! -d "/opt/zeronet/data/$ZERONET_FORUM_ADDRESS" ]; then
1983
-      echo "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS"
1983
+      echo $"Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS"
1984 1984
       exit 7638
1985 1985
   fi
1986 1986
 
1987 1987
   git clone $ZERONET_FORUM_REPO ZeroTalk
1988 1988
   if [ ! -d /opt/zeronet/ZeroTalk ]; then
1989
-      echo 'ZeroTalk repo could not be cloned'
1989
+      echo $'ZeroTalk repo could not be cloned'
1990 1990
       exit 6739
1991 1991
   fi
1992
-  echo "Forum address:     $ZERONET_FORUM_ADDRESS"
1993
-  echo "Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
1992
+  echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
1993
+  echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
1994 1994
   cp -r /opt/zeronet/ZeroTalk/* /opt/zeronet/data/$ZERONET_FORUM_ADDRESS
1995 1995
   sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" /opt/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
1996 1996
   sed -i "s/ZeroTalk/$ZERONET_DEFAULT_FORUM_TITLE/g" /opt/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html