December 2016 - tor-commits - lists.torproject.org

[flashproxy/master] Remove "facilitator" query string parameter.
by dcf＠torproject.org 21 Dec '16

21 Dec '16

commit a6af0da52a1c534799e563beba047ef02cc0a9e8 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 21 02:06:49 2016 -0800 Remove "facilitator" query string parameter. This could be used to cause browsers to issue requests to a third-party URL. --- proxy/flashproxy.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 24c7a0d..64a2b90 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -1,6 +1,6 @@ /* Query string parameters. These change how the program runs from the outside. * For example: - * http://www.example.com/embed.html?facilitator=http://127.0.0.1:9002&debug=1 + * http://www.example.com/embed.html?debug=1 * * cookierequired=0|1 * If true, the proxy will disable itself if the user has not explicitly opted @@ -27,10 +27,6 @@ * disables the limit. The default is DEFAULT_RATE_LIMIT. There is a * sanity-check minimum of "10K". * - * facilitator=https://host:port/ - * The URL of the facilitator CGI script. By default it is - * DEFAULT_FACILITATOR_URL. - * * debug=0|1 * If true, show verbose terminal-like output instead of the badge. The values * "1", "true", and the empty string "" all enable debug mode. Any other value @@ -62,7 +58,7 @@ * http://autobahn.ws/testsuite/reports/clients/index.html */ -var DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/"; +var FACILITATOR_URL = "https://fp-facilitator.org/"; /* Start two connections because some versions of Tor make two PT connections: https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html @@ -495,7 +491,7 @@ function FlashProxy() { var relay_addr; var rate_limit_bytes; - this.fac_url = get_param_string(query, "facilitator", DEFAULT_FACILITATOR_URL); + this.fac_url = FACILITATOR_URL; this.max_num_clients = get_param_integer(query, "max_clients", DEFAULT_MAX_NUM_CLIENTS); if (this.max_num_clients === null || this.max_num_clients < 0) {

1 0

[flashproxy/master] Remove "client" and "relay" query string parameters.
by dcf＠torproject.org 21 Dec '16

21 Dec '16

commit d518f2615d977475dabaf4a46fbbe83c5a52801c Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 21 02:10:16 2016 -0800 Remove "client" and "relay" query string parameters. These could be used to send unsolicited WebSocket connection attempts. --- proxy/flashproxy.js | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 64a2b90..632620e 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -31,16 +31,6 @@ * If true, show verbose terminal-like output instead of the badge. The values * "1", "true", and the empty string "" all enable debug mode. Any other value * uses the normal badge display. - * - * client=<HOST>:<PORT> - * The address of the client to connect to. The proxy normally receives this - * information from the facilitator. When this option is used, the facilitator - * query is not done. The "relay" parameter must be given as well. - * - * relay=<HOST>:<PORT> - * The address of the relay to connect to. The proxy normally receives this - * information from the facilitator. When this option is used, the facilitator - * query is not done. The "client" parameter must be given as well. */ /* WebSocket links. @@ -528,31 +518,6 @@ function FlashProxy() { this.rate_limit = new BucketRateLimit(rate_limit_bytes * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); } - client_addr = get_param_addr(query, "client"); - if (client_addr === null) { - puts("Error: can't parse \"client\" parameter."); - this.die(); - return; - } - relay_addr = get_param_addr(query, "relay"); - if (relay_addr === null) { - puts("Error: can't parse \"relay\" parameter."); - this.die(); - return; - } - if (client_addr !== undefined && relay_addr !== undefined) { - this.begin_proxy(client_addr, relay_addr); - return; - } else if (client_addr !== undefined) { - puts("Error: the \"client\" parameter requires \"relay\" also.") - this.die(); - return; - } else if (relay_addr !== undefined) { - puts("Error: the \"relay\" parameter requires \"client\" also.") - this.die(); - return; - } - puts("Starting; will contact facilitator in " + this.initial_facilitator_poll_interval + " seconds."); setTimeout(this.proxy_main.bind(this), this.initial_facilitator_poll_interval * 1000); };

1 0

[flashproxy/master] Remove unused get_param_addr.
by dcf＠torproject.org 21 Dec '16

21 Dec '16

commit 574125469e29ea95ae1f959b56cfe53bf21cd233 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 21 02:11:12 2016 -0800 Remove unused get_param_addr. --- proxy/flashproxy-test.js | 27 --------------------------- proxy/flashproxy.js | 12 ------------ 2 files changed, 39 deletions(-) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index fc4fcd2..5ebc5b1 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -273,32 +273,6 @@ function test_parse_addr_spec() { } } -function test_get_param_addr() { - var DEFAULT = { host: "1.1.1.1", port: 2222 }; - var TESTS = [ - { query: { }, - expected: DEFAULT }, - { query: { addr: "3.3.3.3:4444" }, - expected: { host: "3.3.3.3", port: 4444 } }, - { query: { x: "3.3.3.3:4444" }, - expected: DEFAULT }, - { query: { addr: "---" }, - expected: null }, - ]; - - announce("test_get_param_addr"); - for (var i = 0; i < TESTS.length; i++) { - var test = TESTS[i]; - var actual; - - actual = get_param_addr(test.query, "addr", DEFAULT); - if (objects_equal(actual, test.expected)) - pass(test.query); - else - fail(test.query, test.expected, actual); - } -} - function test_lang_keys() { var TESTS = [ { code: "de", expected: ["de"] }, @@ -376,7 +350,6 @@ test_parse_cookie_string(); test_parse_query_string(); test_get_param_boolean(); test_parse_addr_spec(); -test_get_param_addr(); test_lang_keys(); test_have_websocket_binary_frames(); test_is_likely_tor_browser(); diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 632620e..12dd824 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -272,18 +272,6 @@ function get_param_string(query, param, default_val) { return val; } -/* Get an object value and parse it as an address spec. Returns default_val if - param is not a key. Returns null on a parsing error. */ -function get_param_addr(query, param, default_val) { - var val; - - val = query[param]; - if (val === undefined) - return default_val; - else - return parse_addr_spec(val); -} - /* Get an object value and parse it as an integer. Returns default_val if param is not a key. Return null on a parsing error. */ function get_param_integer(query, param, default_val) {

1 0

[flashproxy/master] Remove facilitator poll interval config.
by dcf＠torproject.org 21 Dec '16

21 Dec '16

commit 99958c0fd0113764370ed68064f2d2bda257fa25 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 21 02:19:25 2016 -0800 Remove facilitator poll interval config. --- proxy/flashproxy.js | 43 ++++++++++--------------------------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 12dd824..0194309 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -10,14 +10,6 @@ * lang=<CODE> * Display language of the badge, as an IETF language tag. * - * facilitator_poll_interval=<FLOAT> - * How often to poll the facilitator, in seconds. The default is - * DEFAULT_FACILITATOR_POLL_INTERVAL. There is a sanity-check minimum of 1.0 s. - * - * initial_facilitator_poll_interval=<FLOAT> - * How long to wait before polling the facilitator the first time, in seconds. - * DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL. - * * max_clients=<NUM> * How many clients to serve concurrently. The default is * DEFAULT_MAX_NUM_CLIENTS. @@ -56,8 +48,8 @@ https://trac.torproject.org/projects/tor/ticket/7733 */ var CONNECTIONS_PER_CLIENT = 2 var DEFAULT_MAX_NUM_CLIENTS = 10; -var DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL = 60.0; -var DEFAULT_FACILITATOR_POLL_INTERVAL = 3600.0; +var INITIAL_FACILITATOR_POLL_INTERVAL = 60.0; +var DEFAULT_FACILITATOR_POLL_INTERVAL = 3600.0; // May be overriden by facilitator check-back-in. var MIN_FACILITATOR_POLL_INTERVAL = 10.0; /* Bytes per second. Set to undefined to disable limit. */ @@ -478,19 +470,8 @@ function FlashProxy() { return; } - this.initial_facilitator_poll_interval = get_param_timespec(query, "initial_facilitator_poll_interval", DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL); - if (this.initial_facilitator_poll_interval === null || this.initial_facilitator_poll_interval < 0) { - puts("Error: initial_facilitator_poll_interval must be a nonnegative number."); - this.die(); - return; - } - - this.facilitator_poll_interval = get_param_timespec(query, "facilitator_poll_interval"); - if (this.facilitator_poll_interval !== undefined && (this.facilitator_poll_interval === null || this.facilitator_poll_interval < MIN_FACILITATOR_POLL_INTERVAL)) { - puts("Error: facilitator_poll_interval must be a nonnegative number at least " + MIN_FACILITATOR_POLL_INTERVAL + "."); - this.die(); - return; - } + this.initial_facilitator_poll_interval = INITIAL_FACILITATOR_POLL_INTERVAL; + this.facilitator_poll_interval = DEFAULT_FACILITATOR_POLL_INTERVAL; if (query["ratelimit"] === "off") rate_limit_bytes = undefined; @@ -568,17 +549,13 @@ function FlashProxy() { response = parse_query_string(text); - if (this.facilitator_poll_interval) { - poll_interval = this.facilitator_poll_interval; - } else { - poll_interval = get_param_integer(response, "check-back-in", DEFAULT_FACILITATOR_POLL_INTERVAL); - if (poll_interval === null) { - puts("Error: can't parse polling interval from facilitator, " + repr(poll_interval) + "."); - poll_interval = DEFAULT_FACILITATOR_POLL_INTERVAL; - } - if (poll_interval < MIN_FACILITATOR_POLL_INTERVAL) - poll_interval = MIN_FACILITATOR_POLL_INTERVAL; + poll_interval = get_param_integer(response, "check-back-in", DEFAULT_FACILITATOR_POLL_INTERVAL); + if (poll_interval === null) { + puts("Error: can't parse polling interval from facilitator, " + repr(poll_interval) + "."); + poll_interval = DEFAULT_FACILITATOR_POLL_INTERVAL; } + if (poll_interval < MIN_FACILITATOR_POLL_INTERVAL) + poll_interval = MIN_FACILITATOR_POLL_INTERVAL; puts("Next check in " + repr(poll_interval) + " seconds."); setTimeout(this.proxy_main.bind(this), poll_interval * 1000);

1 0

[flashproxy/master] Remove unused get_param_timespec.
by dcf＠torproject.org 21 Dec '16

21 Dec '16

commit 0c5ea1b04c4725fccc5a98a25bede5c419e07fcd Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 21 02:19:50 2016 -0800 Remove unused get_param_timespec. --- proxy/flashproxy.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 0194309..69275d5 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -302,13 +302,6 @@ function get_param_number(query, param, default_val) { } } -/* Get a floating-point number of seconds from a time specification. The only - time specification format is a decimal number of seconds. Returns null on - error. */ -function get_param_timespec(query, param, default_val) { - return get_param_number(query, param, default_val); -} - /* Parse a count of bytes. A suffix of "k", "m", or "g" (or uppercase) does what you would think. Returns null on error. */ function parse_byte_count(spec) {

1 0

[flashproxy/master] Revert "allow some proxy defaults to be defined from an external script file."
by dcf＠torproject.org 21 Dec '16

21 Dec '16

commit 7c7acc14638a3e9346c99defa6d4dd80b4f437aa Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 21 02:03:17 2016 -0800 Revert "allow some proxy defaults to be defined from an external script file." This reverts commit f0e9b3647c6df72c2b1f71a3cbe180150d1b67a9. Conflicts: proxy/embed.html proxy/flashproxy.js --- proxy/embed.html | 11 ----------- proxy/flashproxy.js | 10 +++++----- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/proxy/embed.html b/proxy/embed.html index 178b80a..53b5bf5 100644 --- a/proxy/embed.html +++ b/proxy/embed.html @@ -3,17 +3,6 @@ <head> <meta charset="utf-8"> <meta http-equiv="refresh" content="86400"> -<script type="text/javascript" > -/* - You can tweak the behaviour of the proxy by giving URL query parameters to - this embedding document. If you wish to override the default values even in - the absence of those parameters, you may set them below. - - See the main code of the proxy for details on which URL query parameters - are available, as well as which defaults you can override. -*/ -//var DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/"; -</script> <style type="text/css"> html { width: 100%; diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 15c6cf3..24c7a0d 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -62,20 +62,20 @@ * http://autobahn.ws/testsuite/reports/clients/index.html */ -var DEFAULT_FACILITATOR_URL = DEFAULT_FACILITATOR_URL || "https://fp-facilitator.org/"; +var DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/"; /* Start two connections because some versions of Tor make two PT connections: https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html https://trac.torproject.org/projects/tor/ticket/7733 */ var CONNECTIONS_PER_CLIENT = 2 -var DEFAULT_MAX_NUM_CLIENTS = DEFAULT_MAX_NUM_CLIENTS || 10; +var DEFAULT_MAX_NUM_CLIENTS = 10; -var DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL = DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL || 60.0; -var DEFAULT_FACILITATOR_POLL_INTERVAL = DEFAULT_FACILITATOR_POLL_INTERVAL || 3600.0; +var DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL = 60.0; +var DEFAULT_FACILITATOR_POLL_INTERVAL = 3600.0; var MIN_FACILITATOR_POLL_INTERVAL = 10.0; /* Bytes per second. Set to undefined to disable limit. */ -var DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined; +var DEFAULT_RATE_LIMIT = undefined; var MIN_RATE_LIMIT = 10 * 1024; var RATE_LIMIT_HISTORY = 5.0;

1 0

[sandboxed-tor-browser/master] Remove the unused `pulseAudioBox` identifier.
by yawning＠torproject.org 21 Dec '16

21 Dec '16

commit 480a7c13406cf12a0cd71910a8b36c9c48a6c0c4 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Dec 21 06:02:51 2016 +0000 Remove the unused `pulseAudioBox` identifier. --- ChangeLog | 1 + data/ui/gtkui.ui | 2 +- src/cmd/sandboxed-tor-browser/internal/ui/gtk/config.go | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d9cb6f..f68edb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ Changes in version 0.0.3 - UNRELEASED: on certain pages. * Bug 20973: Silence Gdk warnings on systems with integrated png loader. * Bug 20806: Try even harder to exclude gstreamer. + * Remove the unused `pulseAudioBox` identifier. * Set the security slider to "High" by default on a fresh install. * Store the version of the sandbox in the config file, and re-Sync() the config, and reinstall the `mozilla.cfg` when things change. diff --git a/data/ui/gtkui.ui b/data/ui/gtkui.ui index 991268a..eb453d3 100644 --- a/data/ui/gtkui.ui +++ b/data/ui/gtkui.ui @@ -519,7 +519,7 @@ <property name="margin_bottom">6</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="pulseAudioBox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">6</property> diff --git a/src/cmd/sandboxed-tor-browser/internal/ui/gtk/config.go b/src/cmd/sandboxed-tor-browser/internal/ui/gtk/config.go index f5519fe..36799e8 100644 --- a/src/cmd/sandboxed-tor-browser/internal/ui/gtk/config.go +++ b/src/cmd/sandboxed-tor-browser/internal/ui/gtk/config.go @@ -60,7 +60,6 @@ type configDialog struct { torSystemIndicator *gtk3.Box // Sandbox config elements. - pulseAudioBox *gtk3.Box pulseAudioSwitch *gtk3.Switch avCodecSwitch *gtk3.Switch circuitDisplaySwitch *gtk3.Switch @@ -109,7 +108,6 @@ func (d *configDialog) loadFromConfig() { d.torConfigBox.SetSensitive(!d.ui.Cfg.UseSystemTor) d.torSystemIndicator.SetVisible(d.ui.Cfg.UseSystemTor) - // XXX: Hide PulseAudio option if not available. forceAdv := false d.pulseAudioSwitch.SetActive(d.ui.Cfg.Sandbox.EnablePulseAudio) d.avCodecSwitch.SetActive(d.ui.Cfg.Sandbox.EnableAVCodec) @@ -375,9 +373,6 @@ func (ui *gtkUI) initConfigDialog(b *gtk3.Builder) error { } // Sandbox config elements. - if d.pulseAudioBox, err = getBox(b, "pulseAudioBox"); err != nil { - return err - } if d.pulseAudioSwitch, err = getSwitch(b, "pulseAudioSwitch"); err != nil { return err }

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit 93652dda022891d6bac0fc69c6a90a3191f8c14d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 05:45:47 2016 +0000 Update translations for tails-greeter_completed --- zh_TW/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index c505a89..4b9a7d4 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-02 14:43+0200\n" -"PO-Revision-Date: 2016-11-27 14:26+0000\n" +"PO-Revision-Date: 2016-12-21 05:27+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit 16b15038e8fdd59ef85d9583e6250eaaebcf8955 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 05:45:43 2016 +0000 Update translations for tails-greeter --- zh_TW/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index c505a89..4b9a7d4 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-02 14:43+0200\n" -"PO-Revision-Date: 2016-11-27 14:26+0000\n" +"PO-Revision-Date: 2016-12-21 05:27+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 21 Dec '16

21 Dec '16

commit d21695bdfbfbc7ee8634a36c204388c62699d743 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 21 05:45:40 2016 +0000 Update translations for tails-persistence-setup_completed --- zh_TW/zh_TW.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 16ce354..90b2e12 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-12-21 03:59+0000\n" +"PO-Revision-Date: 2016-12-21 05:31+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "GnuPG keyrings 和設定" +msgstr "GnuPG 之金鑰鑰匙圈及其設定" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" @@ -54,7 +54,7 @@ msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" -msgstr "Pidgin 設定檔和 OTR keyring" +msgstr "Pidgin 設定檔和 OTR 鑰匙圈" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Icedove" @@ -230,20 +230,20 @@ msgstr "<b>注意！</b>要使用永久性磁碟區的話，請務必先徹底 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "複雜密碼:" +msgstr "通關密語：" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:" -msgstr "確認複雜密碼：" +msgstr "確認通關密語：" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 msgid "Passphrase can't be empty" -msgstr "複雜密碼不能為空" +msgstr "通關密語不能為空" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 msgid "Passphrases do not match" -msgstr "複雜密碼不符" +msgstr "通關密語不相符" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 @@ -253,19 +253,19 @@ msgstr "失敗" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." -msgstr "掛接 Tails 永久性分割區。" +msgstr "掛載 Tails 永久性分割區。" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." -msgstr "Tails 永久性分割區將會被掛接。" +msgstr "Tails 永久性分割區將會被掛載。" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." -msgstr "修正永久性磁碟區的權限。" +msgstr "修正永久性磁碟區的存取權限。" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." -msgstr "永久性磁碟區的權限將被修正。" +msgstr "永久性磁碟區的存取權限將被修正。" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." @@ -289,7 +289,7 @@ msgstr "指定將儲存在永久性磁碟區內的檔案" msgid "" "The selected files will be stored in the encrypted partition %s (%s), on the" " <b>%s %s</b> device." -msgstr "所選檔案將被儲存在已加密的分割區 %s (%s)，在 <b>%s %s</b> 裝置上。" +msgstr "所選擇的檔案將被儲存在<b>%s %s</b> 裝置的加密分割區 %s (%s)中。" #: ../lib/Tails/Persistence/Step/Configure.pm:74 msgid "Save"

1 0