From 60a9924298728e17d77d93a8b506ba8ba52a0178 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 9 Dec 2015 15:49:07 +0000 Subject: [PATCH] More translations --- locale/de/freedombone-backup-local.json | 1 + locale/de/freedombone-backup-remote.json | 1 + locale/de/freedombone-controlpanel.json | 10 ++++++- locale/de/freedombone-recoverkey.json | 6 ++++ locale/de/freedombone-restore-local.json | 12 +++++--- locale/de/freedombone-restore-remote.json | 2 ++ locale/es/freedombone-backup-local.json | 1 + locale/es/freedombone-backup-remote.json | 1 + locale/es/freedombone-controlpanel.json | 10 ++++++- locale/es/freedombone-recoverkey.json | 6 ++++ locale/es/freedombone-restore-local.json | 12 +++++--- locale/es/freedombone-restore-remote.json | 2 ++ locale/fr/freedombone-backup-local.json | 1 + locale/fr/freedombone-backup-remote.json | 1 + locale/fr/freedombone-controlpanel.json | 10 ++++++- locale/fr/freedombone-recoverkey.json | 6 ++++ locale/fr/freedombone-restore-local.json | 12 +++++--- locale/fr/freedombone-restore-remote.json | 2 ++ src/freedombone-recoverkey | 34 +++++++++++------------ 19 files changed, 98 insertions(+), 32 deletions(-) diff --git a/locale/de/freedombone-backup-local.json b/locale/de/freedombone-backup-local.json index 61c1d084..e769829e 100644 --- a/locale/de/freedombone-backup-local.json +++ b/locale/de/freedombone-backup-local.json @@ -21,6 +21,7 @@ "Backing up spamassassin settings for $USERNAME": "", "Backing up procmail settings for $USERNAME": "", "Backing up $source_directory to $dest_directory": "", + "Backing up ${PROJECT_NAME} configuration files": "", "Backing up README": "", "Backing up VoIP settings": "", "Unable to backup mysql settings": "" diff --git a/locale/de/freedombone-backup-remote.json b/locale/de/freedombone-backup-remote.json index c83f3baf..c4aac010 100644 --- a/locale/de/freedombone-backup-remote.json +++ b/locale/de/freedombone-backup-remote.json @@ -5,6 +5,7 @@ "${1} database could not be saved": "", "Unable to export ${1} database": "", "${PROJECT_NAME} backup to friends": "", + "Backing up ${PROJECT_NAME} configuration files": "", "Backing up personal settings for $USERNAME": "", "Backing up gpg keys for $USERNAME": "", "Backing up ssh keys for $USERNAME": "", diff --git a/locale/de/freedombone-controlpanel.json b/locale/de/freedombone-controlpanel.json index 9f854128..200006b1 100644 --- a/locale/de/freedombone-controlpanel.json +++ b/locale/de/freedombone-controlpanel.json @@ -21,6 +21,9 @@ "Username not found": "", "Home directory not found": "", "Change password for": "", + "IRC Password": "", + "Password for all IRC users": "", + "The IRC password was changed": "", "Change ssh public key": "", "\\nThis is the administrator user.\\n\\nAre you sure you want to change the ssh public key for the administrator?": "", "Change ssh public key for $SELECTED_USERNAME": "", @@ -86,6 +89,8 @@ "Back to Backup and Restore menu": "", "Format USB drive": "", "\\nPlease confirm that you wish to format drive\\n\\n ${drive}\\n\\nAll current data on the drive will be lost, and you will be prompted to give a password used to encrypt the drive.\\n\\nDANGER: If you screw up here and format the wrong drive it's your own fault!": "", + "Remove backups from a USB drive": "", + "\\nPlease confirm that you wish to remove backups from this drive\\n\\n ${drive}\\n\\nYou will not be able to recover them afterwards.": "", "Power off the system": "", "\\nPlease confirm that you wish to power off the system.\\n\\nWARNING: to power on again you will need to have physical access to the hardware.": "", "Restart the system": "", @@ -129,10 +134,13 @@ "Attach a drive containing playable media": "", "Remove a drive containing playable media": "", "Exit": "", + "IRC Menu": "", + "Set a password for all IRC users": "", "Control Panel": "", "Show SIP Phone Extensions": "", "Reset Tripwire": "", "Logging on/off": "", "Security Settings": "", - "Media menu": "" + "Media menu": "", + "IRC menu": "" } \ No newline at end of file diff --git a/locale/de/freedombone-recoverkey.json b/locale/de/freedombone-recoverkey.json index 4db7eed5..c48d4852 100644 --- a/locale/de/freedombone-recoverkey.json +++ b/locale/de/freedombone-recoverkey.json @@ -1,5 +1,11 @@ { "${PROJECT_NAME}-recoverkey -u [username] -d [drive]": "", "User $MY_USERNAME does not exist on the system": "", + "Encryption keys": "", + "There was a problem mounting the USB drive to $GPG_USB_MOUNT": "", + "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found": "", + "GPG Keyring loaded to $HOME_DIR": "", + "ssh keys imported": "", + "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "", "Starting key retrieval from $REMOTE_SERVER...": "" } \ No newline at end of file diff --git a/locale/de/freedombone-restore-local.json b/locale/de/freedombone-restore-local.json index c626dd3a..c11e85c9 100644 --- a/locale/de/freedombone-restore-local.json +++ b/locale/de/freedombone-restore-local.json @@ -1,12 +1,18 @@ { "Please attach a USB drive": "", + "There was a problem mounting the USB drive to $USB_MOUNT": "", + "Unable to unmount the drive. This means that the backup did not work": "", + "Setting permissions": "", + "Unmount encrypted USB": "", "No backup directory found on the USB drive.": "", "Checking that admin user exists": "", "Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username.": "", - "Copying GPG keys to root": "", + "Copying GPG keys from admin user to root": "", "Restoring ${1} database": "", "Unable to restore ${1} database": "", "Restoring ${1} installation": "", + "Restoring configuration files": "", + "The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME": "", "Restoring mysql settings": "", "Get the MariaDB password from the backup": "", "MariaDB password file not found": "", @@ -39,7 +45,5 @@ "Restoring DLNA cache": "", "Restoring VoIP settings": "", "Restoring Tox node settings": "", - "Setting permissions": "", - "Unmount encrypted USB": "", - "Restore from USB drive is complete. You can now remove it.": "" + "Restore from USB drive is complete. You can now unplug it.": "" } \ No newline at end of file diff --git a/locale/de/freedombone-restore-remote.json b/locale/de/freedombone-restore-remote.json index 4245ed70..d64462f5 100644 --- a/locale/de/freedombone-restore-remote.json +++ b/locale/de/freedombone-restore-remote.json @@ -1,9 +1,11 @@ { "No friends list found at /home/${ADMIN_USERNAME}/backup.list": "", "Server not found within the friends list": "", + "Copying GPG keys from admin user to root": "", "Restoring ${1} database": "", "Unable to restore ${1} database": "", "Restoring ${1} installation": "", + "Restoring configuration files": "", "Restoring MariaDB settings": "", "Get the MariaDB password from the backup": "", "MariaDB password file not found": "", diff --git a/locale/es/freedombone-backup-local.json b/locale/es/freedombone-backup-local.json index 61c1d084..e769829e 100644 --- a/locale/es/freedombone-backup-local.json +++ b/locale/es/freedombone-backup-local.json @@ -21,6 +21,7 @@ "Backing up spamassassin settings for $USERNAME": "", "Backing up procmail settings for $USERNAME": "", "Backing up $source_directory to $dest_directory": "", + "Backing up ${PROJECT_NAME} configuration files": "", "Backing up README": "", "Backing up VoIP settings": "", "Unable to backup mysql settings": "" diff --git a/locale/es/freedombone-backup-remote.json b/locale/es/freedombone-backup-remote.json index c83f3baf..c4aac010 100644 --- a/locale/es/freedombone-backup-remote.json +++ b/locale/es/freedombone-backup-remote.json @@ -5,6 +5,7 @@ "${1} database could not be saved": "", "Unable to export ${1} database": "", "${PROJECT_NAME} backup to friends": "", + "Backing up ${PROJECT_NAME} configuration files": "", "Backing up personal settings for $USERNAME": "", "Backing up gpg keys for $USERNAME": "", "Backing up ssh keys for $USERNAME": "", diff --git a/locale/es/freedombone-controlpanel.json b/locale/es/freedombone-controlpanel.json index 9f854128..200006b1 100644 --- a/locale/es/freedombone-controlpanel.json +++ b/locale/es/freedombone-controlpanel.json @@ -21,6 +21,9 @@ "Username not found": "", "Home directory not found": "", "Change password for": "", + "IRC Password": "", + "Password for all IRC users": "", + "The IRC password was changed": "", "Change ssh public key": "", "\\nThis is the administrator user.\\n\\nAre you sure you want to change the ssh public key for the administrator?": "", "Change ssh public key for $SELECTED_USERNAME": "", @@ -86,6 +89,8 @@ "Back to Backup and Restore menu": "", "Format USB drive": "", "\\nPlease confirm that you wish to format drive\\n\\n ${drive}\\n\\nAll current data on the drive will be lost, and you will be prompted to give a password used to encrypt the drive.\\n\\nDANGER: If you screw up here and format the wrong drive it's your own fault!": "", + "Remove backups from a USB drive": "", + "\\nPlease confirm that you wish to remove backups from this drive\\n\\n ${drive}\\n\\nYou will not be able to recover them afterwards.": "", "Power off the system": "", "\\nPlease confirm that you wish to power off the system.\\n\\nWARNING: to power on again you will need to have physical access to the hardware.": "", "Restart the system": "", @@ -129,10 +134,13 @@ "Attach a drive containing playable media": "", "Remove a drive containing playable media": "", "Exit": "", + "IRC Menu": "", + "Set a password for all IRC users": "", "Control Panel": "", "Show SIP Phone Extensions": "", "Reset Tripwire": "", "Logging on/off": "", "Security Settings": "", - "Media menu": "" + "Media menu": "", + "IRC menu": "" } \ No newline at end of file diff --git a/locale/es/freedombone-recoverkey.json b/locale/es/freedombone-recoverkey.json index 4db7eed5..c48d4852 100644 --- a/locale/es/freedombone-recoverkey.json +++ b/locale/es/freedombone-recoverkey.json @@ -1,5 +1,11 @@ { "${PROJECT_NAME}-recoverkey -u [username] -d [drive]": "", "User $MY_USERNAME does not exist on the system": "", + "Encryption keys": "", + "There was a problem mounting the USB drive to $GPG_USB_MOUNT": "", + "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found": "", + "GPG Keyring loaded to $HOME_DIR": "", + "ssh keys imported": "", + "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "", "Starting key retrieval from $REMOTE_SERVER...": "" } \ No newline at end of file diff --git a/locale/es/freedombone-restore-local.json b/locale/es/freedombone-restore-local.json index c626dd3a..c11e85c9 100644 --- a/locale/es/freedombone-restore-local.json +++ b/locale/es/freedombone-restore-local.json @@ -1,12 +1,18 @@ { "Please attach a USB drive": "", + "There was a problem mounting the USB drive to $USB_MOUNT": "", + "Unable to unmount the drive. This means that the backup did not work": "", + "Setting permissions": "", + "Unmount encrypted USB": "", "No backup directory found on the USB drive.": "", "Checking that admin user exists": "", "Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username.": "", - "Copying GPG keys to root": "", + "Copying GPG keys from admin user to root": "", "Restoring ${1} database": "", "Unable to restore ${1} database": "", "Restoring ${1} installation": "", + "Restoring configuration files": "", + "The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME": "", "Restoring mysql settings": "", "Get the MariaDB password from the backup": "", "MariaDB password file not found": "", @@ -39,7 +45,5 @@ "Restoring DLNA cache": "", "Restoring VoIP settings": "", "Restoring Tox node settings": "", - "Setting permissions": "", - "Unmount encrypted USB": "", - "Restore from USB drive is complete. You can now remove it.": "" + "Restore from USB drive is complete. You can now unplug it.": "" } \ No newline at end of file diff --git a/locale/es/freedombone-restore-remote.json b/locale/es/freedombone-restore-remote.json index 4245ed70..d64462f5 100644 --- a/locale/es/freedombone-restore-remote.json +++ b/locale/es/freedombone-restore-remote.json @@ -1,9 +1,11 @@ { "No friends list found at /home/${ADMIN_USERNAME}/backup.list": "", "Server not found within the friends list": "", + "Copying GPG keys from admin user to root": "", "Restoring ${1} database": "", "Unable to restore ${1} database": "", "Restoring ${1} installation": "", + "Restoring configuration files": "", "Restoring MariaDB settings": "", "Get the MariaDB password from the backup": "", "MariaDB password file not found": "", diff --git a/locale/fr/freedombone-backup-local.json b/locale/fr/freedombone-backup-local.json index 61c1d084..e769829e 100644 --- a/locale/fr/freedombone-backup-local.json +++ b/locale/fr/freedombone-backup-local.json @@ -21,6 +21,7 @@ "Backing up spamassassin settings for $USERNAME": "", "Backing up procmail settings for $USERNAME": "", "Backing up $source_directory to $dest_directory": "", + "Backing up ${PROJECT_NAME} configuration files": "", "Backing up README": "", "Backing up VoIP settings": "", "Unable to backup mysql settings": "" diff --git a/locale/fr/freedombone-backup-remote.json b/locale/fr/freedombone-backup-remote.json index c83f3baf..c4aac010 100644 --- a/locale/fr/freedombone-backup-remote.json +++ b/locale/fr/freedombone-backup-remote.json @@ -5,6 +5,7 @@ "${1} database could not be saved": "", "Unable to export ${1} database": "", "${PROJECT_NAME} backup to friends": "", + "Backing up ${PROJECT_NAME} configuration files": "", "Backing up personal settings for $USERNAME": "", "Backing up gpg keys for $USERNAME": "", "Backing up ssh keys for $USERNAME": "", diff --git a/locale/fr/freedombone-controlpanel.json b/locale/fr/freedombone-controlpanel.json index 9f854128..200006b1 100644 --- a/locale/fr/freedombone-controlpanel.json +++ b/locale/fr/freedombone-controlpanel.json @@ -21,6 +21,9 @@ "Username not found": "", "Home directory not found": "", "Change password for": "", + "IRC Password": "", + "Password for all IRC users": "", + "The IRC password was changed": "", "Change ssh public key": "", "\\nThis is the administrator user.\\n\\nAre you sure you want to change the ssh public key for the administrator?": "", "Change ssh public key for $SELECTED_USERNAME": "", @@ -86,6 +89,8 @@ "Back to Backup and Restore menu": "", "Format USB drive": "", "\\nPlease confirm that you wish to format drive\\n\\n ${drive}\\n\\nAll current data on the drive will be lost, and you will be prompted to give a password used to encrypt the drive.\\n\\nDANGER: If you screw up here and format the wrong drive it's your own fault!": "", + "Remove backups from a USB drive": "", + "\\nPlease confirm that you wish to remove backups from this drive\\n\\n ${drive}\\n\\nYou will not be able to recover them afterwards.": "", "Power off the system": "", "\\nPlease confirm that you wish to power off the system.\\n\\nWARNING: to power on again you will need to have physical access to the hardware.": "", "Restart the system": "", @@ -129,10 +134,13 @@ "Attach a drive containing playable media": "", "Remove a drive containing playable media": "", "Exit": "", + "IRC Menu": "", + "Set a password for all IRC users": "", "Control Panel": "", "Show SIP Phone Extensions": "", "Reset Tripwire": "", "Logging on/off": "", "Security Settings": "", - "Media menu": "" + "Media menu": "", + "IRC menu": "" } \ No newline at end of file diff --git a/locale/fr/freedombone-recoverkey.json b/locale/fr/freedombone-recoverkey.json index 4db7eed5..c48d4852 100644 --- a/locale/fr/freedombone-recoverkey.json +++ b/locale/fr/freedombone-recoverkey.json @@ -1,5 +1,11 @@ { "${PROJECT_NAME}-recoverkey -u [username] -d [drive]": "", "User $MY_USERNAME does not exist on the system": "", + "Encryption keys": "", + "There was a problem mounting the USB drive to $GPG_USB_MOUNT": "", + "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found": "", + "GPG Keyring loaded to $HOME_DIR": "", + "ssh keys imported": "", + "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish": "", "Starting key retrieval from $REMOTE_SERVER...": "" } \ No newline at end of file diff --git a/locale/fr/freedombone-restore-local.json b/locale/fr/freedombone-restore-local.json index c626dd3a..c11e85c9 100644 --- a/locale/fr/freedombone-restore-local.json +++ b/locale/fr/freedombone-restore-local.json @@ -1,12 +1,18 @@ { "Please attach a USB drive": "", + "There was a problem mounting the USB drive to $USB_MOUNT": "", + "Unable to unmount the drive. This means that the backup did not work": "", + "Setting permissions": "", + "Unmount encrypted USB": "", "No backup directory found on the USB drive.": "", "Checking that admin user exists": "", "Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username.": "", - "Copying GPG keys to root": "", + "Copying GPG keys from admin user to root": "", "Restoring ${1} database": "", "Unable to restore ${1} database": "", "Restoring ${1} installation": "", + "Restoring configuration files": "", + "The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME": "", "Restoring mysql settings": "", "Get the MariaDB password from the backup": "", "MariaDB password file not found": "", @@ -39,7 +45,5 @@ "Restoring DLNA cache": "", "Restoring VoIP settings": "", "Restoring Tox node settings": "", - "Setting permissions": "", - "Unmount encrypted USB": "", - "Restore from USB drive is complete. You can now remove it.": "" + "Restore from USB drive is complete. You can now unplug it.": "" } \ No newline at end of file diff --git a/locale/fr/freedombone-restore-remote.json b/locale/fr/freedombone-restore-remote.json index 4245ed70..d64462f5 100644 --- a/locale/fr/freedombone-restore-remote.json +++ b/locale/fr/freedombone-restore-remote.json @@ -1,9 +1,11 @@ { "No friends list found at /home/${ADMIN_USERNAME}/backup.list": "", "Server not found within the friends list": "", + "Copying GPG keys from admin user to root": "", "Restoring ${1} database": "", "Unable to restore ${1} database": "", "Restoring ${1} installation": "", + "Restoring configuration files": "", "Restoring MariaDB settings": "", "Get the MariaDB password from the backup": "", "MariaDB password file not found": "", diff --git a/src/freedombone-recoverkey b/src/freedombone-recoverkey index 90288d07..bf6336f2 100755 --- a/src/freedombone-recoverkey +++ b/src/freedombone-recoverkey @@ -100,19 +100,19 @@ function reconstruct_key { cd /home/$MY_USERNAME/.gnupg_fragments no_of_shares=$(ls -afq keyshare.asc.* | wc -l) if (( no_of_shares < 4 )); then - dialog --title "Encryption keys" --msgbox 'Not enough fragments to reconstruct the key' 6 70 + dialog --title $"Encryption keys" --msgbox $'Not enough fragments to reconstruct the key' 6 70 exit 7348 fi apt-get -y install libgfshare-bin gnupg gfcombine /home/$MY_USERNAME/.gnupg_fragments/keyshare* if [ ! "$?" = "0" ]; then - dialog --title "Encryption keys" --msgbox 'Unable to reconstruct the key' 6 70 + dialog --title $"Encryption keys" --msgbox $'Unable to reconstruct the key' 6 70 exit 7348 fi KEYS_FILE=/home/$MY_USERNAME/.gnupg_fragments/keyshare.asc if [ ! -f $KEYS_FILE ]; then - dialog --title "Encryption keys" --msgbox 'Unable to reconstruct the key' 6 70 + dialog --title $"Encryption keys" --msgbox $'Unable to reconstruct the key' 6 70 fi su -c "gpg --allow-secret-key-import --import $KEYS_FILE" - $MY_USERNAME @@ -124,12 +124,12 @@ function reconstruct_key { fi shred -zu $KEYS_FILE - dialog --title "Encryption keys" --msgbox 'Key has been reconstructed' 6 70 + dialog --title $"Encryption keys" --msgbox $'Key has been reconstructed' 6 70 } function interactive_gpg_from_usb { - dialog --title "Encryption keys" \ - --msgbox 'Plug in a USB drive containing a copy of your full key or key fragment' 6 70 + dialog --title $"Encryption keys" \ + --msgbox $'Plug in a USB drive containing a copy of your full key or key fragment' 6 70 HOME_DIR=/home/$MY_USERNAME GPG_LOADING="yes" @@ -146,7 +146,7 @@ function interactive_gpg_from_usb { reconstruct_key return 0 fi - dialog --title "Encryption keys" --msgbox 'No USB drive found' 6 30 + dialog --title $"Encryption keys" --msgbox $'No USB drive found' 6 30 exit 27852 fi fi @@ -173,8 +173,8 @@ function interactive_gpg_from_usb { reconstruct_key return 0 fi - dialog --title "Encryption keys" \ - --msgbox "There was a problem mounting the USB drive to $GPG_USB_MOUNT" 6 70 + dialog --title $"Encryption keys" \ + --msgbox $"There was a problem mounting the USB drive to $GPG_USB_MOUNT" 6 70 rm -rf $GPG_USB_MOUNT exit 74393 fi @@ -187,8 +187,8 @@ function interactive_gpg_from_usb { reconstruct_key return 0 fi - dialog --title "Encryption keys" \ - --msgbox "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found" 6 70 + dialog --title $"Encryption keys" \ + --msgbox $"The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found" 6 70 umount -f $GPG_USB_MOUNT rm -rf $GPG_USB_MOUNT exit 723814 @@ -201,8 +201,8 @@ function interactive_gpg_from_usb { fi cp -r $GPG_USB_MOUNT/.gnupg/* $HOME_DIR/.gnupg GPG_LOADING="no" - dialog --title "Encryption keys" \ - --msgbox "GPG Keyring loaded to $HOME_DIR" 6 70 + dialog --title $"Encryption keys" \ + --msgbox $"GPG Keyring loaded to $HOME_DIR" 6 70 else if [ ! -d $HOME_DIR/.gnupg_fragments ]; then mkdir $HOME_DIR/.gnupg_fragments @@ -216,8 +216,8 @@ function interactive_gpg_from_usb { mkdir $HOME_DIR/.ssh fi cp $GPG_USB_MOUNT/.ssh/* $HOME_DIR/.ssh - dialog --title "Encryption keys" \ - --msgbox "ssh keys imported" 6 70 + dialog --title $"Encryption keys" \ + --msgbox $"ssh keys imported" 6 70 SSH_IMPORTED="yes" fi fi @@ -225,8 +225,8 @@ function interactive_gpg_from_usb { umount -f $GPG_USB_MOUNT rm -rf $GPG_USB_MOUNT if [[ $GPG_LOADING == "yes" ]]; then - dialog --title "Encryption keys" \ - --msgbox "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish" 6 70 + dialog --title $"Encryption keys" \ + --msgbox $"Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish" 6 70 fi GPG_CTR=$((GPG_CTR + 1)) done