From 54602b4b2e4f20629af1b77ee3204150f2601f02 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Mon, 30 Nov 2015 17:44:36 +0000
Subject: [PATCH] More translation strings
---
src/freedombone | 66 ++++++++++++++++++++++++-------------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/freedombone b/src/freedombone
index bc7645d39..4b3e5d8b6 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -533,9 +533,9 @@ function interactive_configuration_remote_backups {
fi
freedombone-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes
if [ ! "$?" = "0" ]; then
- echo 'Command failed:'
+ echo $'Command failed:'
echo ''
- echo " freedombone-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes"
+ echo $" freedombone-remote -u $MY_USERNAME -l $FRIENDS_SERVERS_LIST -m $MINIMUM_PASSWORD_LENGTH -r yes"
echo ''
exit 65892
fi
@@ -585,9 +585,9 @@ function interactive_configuration {
exit 0
fi
if [ ! "$?" = "0" ]; then
- echo 'Command failed:'
+ echo $'Command failed:'
echo ''
- echo " freedombone-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]"
+ echo $" freedombone-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]"
echo ''
exit 73594
fi
@@ -801,7 +801,7 @@ function parse_args {
fi
if [ ! -d /home/$MY_USERNAME ]; then
- echo "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user."
+ echo $"There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user."
exit 1
fi
if [ ! "$DEFAULT_DOMAIN_NAME" ]; then
@@ -818,11 +818,11 @@ function parse_args {
fi
if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
if [ ! $DDNS_USERNAME ]; then
- echo 'Please provide the username for your dynamic DNS provider with the --ddnsuser option'
+ echo $'Please provide the username for your dynamic DNS provider with the --ddnsuser option'
exit 7823
fi
if [ ! $DDNS_PASSWORD ]; then
- echo 'Please provide the password for your dynamic DNS provider with the --ddnspass option'
+ echo $'Please provide the password for your dynamic DNS provider with the --ddnspass option'
exit 6382
fi
fi
@@ -830,7 +830,7 @@ function parse_args {
SYSTEM_TYPE=$VARIANT_FULL
fi
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
- echo "'$SYSTEM_TYPE' is an unrecognised Freedombone variant."
+ echo $"'$SYSTEM_TYPE' is an unrecognised Freedombone variant."
exit 30
fi
}
@@ -845,7 +845,7 @@ function read_configuration {
if [[ $INSTALLING_FROM_CONFIGURATION_FILE == "yes" ]]; then
if [ ! -f $CONFIGURATION_FILE ]; then
- echo "The configuration file $CONFIGURATION_FILE was not found"
+ echo $"The configuration file $CONFIGURATION_FILE was not found"
exit 8935
fi
fi
@@ -1302,25 +1302,25 @@ function check_certificates {
fi
if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
if [ ! -f /etc/ssl/private/$1.key ]; then
- echo "Private certificate for $CHECK_HOSTNAME was not created"
+ echo $"Private certificate for $CHECK_HOSTNAME was not created"
exit 63959
fi
if [ ! -f /etc/ssl/certs/$1.crt ]; then
- echo "Public certificate for $CHECK_HOSTNAME was not created"
+ echo $"Public certificate for $CHECK_HOSTNAME was not created"
exit 7679
fi
else
if [ ! -f /etc/letsencrypt/live/${1}/privkey.pem ]; then
- echo "Private certificate for $CHECK_HOSTNAME was not created"
+ echo $"Private certificate for $CHECK_HOSTNAME was not created"
exit 6282
fi
if [ ! -f /etc/letsencrypt/live/${1}/fullchain.pem ]; then
- echo "Public certificate for $CHECK_HOSTNAME was not created"
+ echo $"Public certificate for $CHECK_HOSTNAME was not created"
exit 5328
fi
fi
if [ ! -f /etc/ssl/certs/$1.dhparam ]; then
- echo "Diffie–Hellman parameters for $CHECK_HOSTNAME were not created"
+ echo $"Diffie–Hellman parameters for $CHECK_HOSTNAME were not created"
exit 5989
fi
}
@@ -1864,21 +1864,21 @@ function install_zeronet_blog {
ZERONET_BLOG_PRIVATE_KEY=${blog_private_key//[[:blank:]]/}
if [ ${#ZERONET_BLOG_ADDRESS} -lt 20 ]; then
- echo "Address: $ZERONET_BLOG_ADDRESS"
- echo "Public key: $ZERONET_BLOG_PRIVATE_KEY"
- echo 'Unable to create zeronet blog address'
+ echo $"Address: $ZERONET_BLOG_ADDRESS"
+ echo $"Public key: $ZERONET_BLOG_PRIVATE_KEY"
+ echo $'Unable to create zeronet blog address'
exit 7358
fi
if [ ${#ZERONET_BLOG_PRIVATE_KEY} -lt 20 ]; then
- echo "Address: $ZERONET_BLOG_ADDRESS"
- echo "Public key: $ZERONET_BLOG_PRIVATE_KEY"
- echo 'Unable to create zeronet blog private key'
+ echo $"Address: $ZERONET_BLOG_ADDRESS"
+ echo $"Public key: $ZERONET_BLOG_PRIVATE_KEY"
+ echo $'Unable to create zeronet blog private key'
exit 1639
fi
if [ ! -d "/opt/zeronet/data/$ZERONET_BLOG_ADDRESS" ]; then
- echo "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS"
+ echo $"Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS"
exit 7638
fi
@@ -1887,8 +1887,8 @@ function install_zeronet_blog {
echo 'ZeroBlog repo could not be cloned'
exit 6739
fi
- echo "ZeroNet Blog address: $ZERONET_BLOG_ADDRESS"
- echo "ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
+ echo $"ZeroNet Blog address: $ZERONET_BLOG_ADDRESS"
+ echo $"ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
cp -r /opt/zeronet/ZeroBlog/* /opt/zeronet/data/$ZERONET_BLOG_ADDRESS
if [ ! -d /opt/zeronet/data/$ZERONET_BLOG_ADDRESS/data ]; then
@@ -1966,31 +1966,31 @@ function install_zeronet_forum {
ZERONET_FORUM_PRIVATE_KEY=${forum_private_key//[[:blank:]]/}
if [ ${#ZERONET_FORUM_ADDRESS} -lt 20 ]; then
- echo "Address: $ZERONET_FORUM_ADDRESS"
- echo "Public key: $ZERONET_FORUM_PRIVATE_KEY"
- echo 'Unable to create zeronet forum address'
+ echo $"Address: $ZERONET_FORUM_ADDRESS"
+ echo $"Public key: $ZERONET_FORUM_PRIVATE_KEY"
+ echo $'Unable to create zeronet forum address'
exit 76352
fi
if [ ${#ZERONET_FORUM_PRIVATE_KEY} -lt 20 ]; then
- echo "Address: $ZERONET_FORUM_ADDRESS"
- echo "Public key: $ZERONET_FORUM_PRIVATE_KEY"
- echo 'Unable to create zeronet forum private key'
+ echo $"Address: $ZERONET_FORUM_ADDRESS"
+ echo $"Public key: $ZERONET_FORUM_PRIVATE_KEY"
+ echo $'Unable to create zeronet forum private key'
exit 87356
fi
if [ ! -d "/opt/zeronet/data/$ZERONET_FORUM_ADDRESS" ]; then
- echo "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS"
+ echo $"Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS"
exit 7638
fi
git clone $ZERONET_FORUM_REPO ZeroTalk
if [ ! -d /opt/zeronet/ZeroTalk ]; then
- echo 'ZeroTalk repo could not be cloned'
+ echo $'ZeroTalk repo could not be cloned'
exit 6739
fi
- echo "Forum address: $ZERONET_FORUM_ADDRESS"
- echo "Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
+ echo $"Forum address: $ZERONET_FORUM_ADDRESS"
+ echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
cp -r /opt/zeronet/ZeroTalk/* /opt/zeronet/data/$ZERONET_FORUM_ADDRESS
sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" /opt/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
sed -i "s/ZeroTalk/$ZERONET_DEFAULT_FORUM_TITLE/g" /opt/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html
--
GitLab