Merge remote-tracking branch 'emmapeel/translation-fixes'

1 files changed, 83 insertions, 54 deletions

diff --git a/po/zh_HK.po b/po/zh_HK.po
index a4dd9dc..140f6a9 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-04 11:37+0200\n"
+"POT-Creation-Date: 2018-10-07 21:24+0200\n"
 "PO-Revision-Date: 2017-05-26 14:47+0000\n"
 "Last-Translator: carolyn <carolyn@anhalt.org>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/"
@@ -72,7 +72,7 @@ msgid ""
 msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132
-#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:169
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:172
 msgid ""
 "To add more, install some software using <a href=\"synaptic.desktop"
 "\">Synaptic Package Manager</a> or <a href=\"org.gnome.Terminal.desktop"
@@ -189,109 +189,113 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:216
+#. Translators: Don't translate {beginning} or {last}, they are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:217
 #, python-brace-format
 msgid "{beginning} and {last}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:217
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:218
 msgid ", "
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:281
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:309
+#. Translators: Don't translate {packages}, it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:283
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:311
 #, fuzzy, python-brace-format
 msgid "Add {packages} to your additional software?"
 msgstr "其他軟件"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:283
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:285
 msgid ""
 "To install it automatically from your persistent storage when starting Tails."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:285
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:287
 msgid "Install Every Time"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:286
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:315
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:288
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:317
 msgid "Install Only Once"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:320
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:355
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:359
 msgid "The configuration of your additional software failed."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:311
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:313
 msgid ""
 "To install it automatically when starting Tails, you can create a persistent "
 "storage and activate the <b>Additional Software</b> feature."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:314
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:316
 msgid "Create Persistent Storage"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324
 msgid "Creating your persistent storage failed."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:329
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:331
 #, python-brace-format
 msgid "You could install {packages} automatically when starting Tails"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:332
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:334
 msgid ""
 "To do so, you need to run Tails from a USB stick installed using <i>Tails "
 "Installer</i>."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345
+#. Translators: Don't translate {packages}, it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:348
 #, fuzzy, python-brace-format
 msgid "Remove {packages} from your additional software?"
 msgstr "其他軟件"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:347
+#. Translators: Don't translate {packages}, it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:351
 #, python-brace-format
 msgid "This will stop installing {packages} automatically."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:349
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:353
 msgid "Remove"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:350
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:354
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "取消"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:524
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:528
 msgid "Installing your additional software from persistent storage..."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:526
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:530
 msgid "This can take several minutes."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:538
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:542
 #, fuzzy
 msgid "The installation of your additional software failed"
 msgstr "其他軟件"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:553
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:557
 msgid "Additional software installed successfully"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:573
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:577
 msgid "The check for upgrades of your additional software failed"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:575
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:583
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:579
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:587
 #, fuzzy
 msgid ""
 "Please check your network connection, restart Tails, or read the system log "
@@ -300,7 +304,7 @@ msgstr ""
 "升級失敗。可能由於網絡問題。請檢查網絡連線、嘗試將Tails重新啟動，或者讀取系統"
 "記錄，以便進一步澄清問題。"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:582
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:586
 #, fuzzy
 msgid "The upgrade of your additional software failed"
 msgstr "其他軟件"
@@ -310,56 +314,59 @@ msgstr "其他軟件"
 msgid "Documentation"
 msgstr "Tails文件"
 
-#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:95
+#. Translators: Don't translate {package}, it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:96
 #, python-brace-format
 msgid ""
 "Remove {package} from your additional software? This will stop installing "
 "the package automatically."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:105
+#. Translators: Don't translate {pkg}, it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:107
 #, python-brace-format
 msgid "Failed to remove {pkg}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:122
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:124
 #, fuzzy
 msgid "Failed to read additional software configuration"
 msgstr "其他軟件"
 
-#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:151
+#. Translators: Don't translate {package}, it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154
 #, python-brace-format
 msgid "Stop installing {package} automatically"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:176
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:179
 msgid ""
 "To do so, install some software using <a href=\"synaptic.desktop\">Synaptic "
 "Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the "
 "command line</a>."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:185
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:188
 msgid ""
 "To do so, unlock your persistent storage when starting Tails and install "
 "some software using <a href=\"synaptic.desktop\">Synaptic Package Manager</"
 "a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command line</a>."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:195
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:198
 msgid ""
 "To do so, create a persistent storage and install some software using <a "
 "href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a href=\"org."
 "gnome.Terminal.desktop\">APT on the command line</a>."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:203
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:206
 msgid ""
 "To do so, install Tails on a USB stick using <a href=\"tails-installer."
 "desktop\">Tails Installer</a> and create a persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:250
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:253
 #, fuzzy
 msgid "[package not available]"
 msgstr "唔可以揀"
@@ -581,31 +588,37 @@ msgstr "未由DHCP或NetworkManager嘅手動設定取得DNS伺服器。"
 msgid "Failed to run browser."
 msgstr "無法開啟瀏覽器。"
 
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:56
+#. Translators: Don't translate {volume_label} or {volume_size},
+#. it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:59
+#. Translators: Don't translate {partition_name} or {partition_size},
+#. it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:62
+#. Translators: Don't translate {volume_size}, it's a placeholder
+#. and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:101
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:109
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -613,14 +626,14 @@ msgstr ""
 #. Translators: Don't translate {volume_name} and {path_to_file_container},
 #. they are placeholders and will be replaced. You should only have to translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:116
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
 #, python-brace-format
 msgid "{volume_name} – {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -628,11 +641,26 @@ msgstr ""
 #. Translators: Don't translate {volume_name} and {drive_name},
 #. they are placeholders and will be replaced. You should only have to translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:129
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
 #, python-brace-format
 msgid "{volume_name} – {drive_name}"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+msgid "Wrong passphrase or parameters"
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+msgid "Error unlocking volume"
+msgstr ""
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:226
+#, python-brace-format
+msgid ""
+"Couldn't unlock volume {volume_name}:\n"
+"{error_message}"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
 msgstr ""
@@ -654,7 +682,8 @@ msgstr ""
 msgid "Container opened read-only"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:132
+#. Translators: Don't translate {path}, it's a placeholder  and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:133
 #, python-brace-format
 msgid ""
 "The file container {path} could not be opened with write access. It was "
@@ -663,32 +692,32 @@ msgid ""
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:137
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:138
 msgid "Error opening file"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:159
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160
 msgid "Not a VeraCrypt container"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:161
 #, python-format
 msgid "The file %s does not seem to be a VeraCrypt container."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:162
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163
 #, fuzzy
 msgid "Failed to add container"
 msgstr "無法設定瀏覽器。"
 
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
 #, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.Please "
 "try using the <i>Disks</i> application instead."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:208
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
 msgstr ""