March 2017 - tor-commits - lists.torproject.org

[tor/master] Switch ed-command parsing to use tor_parse_long.
by nickm＠torproject.org 16 Mar '17

16 Mar '17

commit 643c9078c98cb81d51334cf03fdac76166e57f9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 16 11:21:52 2017 -0400 Switch ed-command parsing to use tor_parse_long. --- src/or/consdiff.c | 68 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/src/or/consdiff.c b/src/or/consdiff.c index 510ebd9..13b267f 100644 --- a/src/or/consdiff.c +++ b/src/or/consdiff.c @@ -748,6 +748,23 @@ gen_ed_diff(const smartlist_t *cons1, const smartlist_t *cons2, return NULL; } +/* Helper: Read a base-10 number between 0 and INT32_MAX from s and + * store it in num_out. Advance s to the characer immediately + * after the number. Return 0 on success, -1 on failure. */ +static int +get_linenum(const char **s, int *num_out) +{ + int ok; + char *next; + *num_out = (int) tor_parse_long(*s, 10, 0, INT32_MAX, &ok, &next); + if (ok && next) { + *s = next; + return 0; + } else { + return -1; + } +} + /** Apply the ed diff, starting at diff_starting_line, to the consensus * and return a new consensus, also as a line-based smartlist. Will return * NULL if the ed diff is not properly formatted. @@ -766,42 +783,39 @@ apply_ed_diff(const smartlist_t *cons1, const smartlist_t *diff, for (int i=diff_starting_line; i<diff_len; ++i) { const cdline_t *diff_cdline = smartlist_get(diff, i); char diff_line[128]; - char *endptr1, *endptr2; if (diff_cdline->len > sizeof(diff_line) - 1) { log_warn(LD_CONSDIFF, "Could not apply consensus diff because " "an ed command was far too long"); goto error_cleanup; } + /* Copy the line to make it nul-terminated. */ memcpy(diff_line, diff_cdline->s, diff_cdline->len); diff_line[diff_cdline->len] = 0; - int start = (int)strtol(diff_line, &endptr1, 10); - int end; - if (endptr1 == diff_line) { + const char *ptr = diff_line; + int start = 0, end = 0; + if (get_linenum(&ptr, &start) < 0) { log_warn(LD_CONSDIFF, "Could not apply consensus diff because " - "an ed command was missing a line number."); + "an ed command was missing a line number."); goto error_cleanup; } - - /* Two-item range */ - if (*endptr1 == ',') { - end = (int)strtol(endptr1+1, &endptr2, 10); - if (endptr2 == endptr1+1) { - log_warn(LD_CONSDIFF, "Could not apply consensus diff because " - "an ed command was missing a range end line number."); - goto error_cleanup; - } - /* Incoherent range. */ - if (end <= start) { - log_warn(LD_CONSDIFF, "Could not apply consensus diff because " - "an invalid range was found in an ed command."); - goto error_cleanup; - } - - /* We'll take <n1> as <n1>,<n1> for simplicity. */ + if (*ptr == ',') { + /* Two-item range */ + ++ptr; + if (get_linenum(&ptr, &end) < 0) { + log_warn(LD_CONSDIFF, "Could not apply consensus diff because " + "an ed command was missing a range end line number."); + goto error_cleanup; + } + /* Incoherent range. */ + if (end <= start) { + log_warn(LD_CONSDIFF, "Could not apply consensus diff because " + "an invalid range was found in an ed command."); + goto error_cleanup; + } } else { - endptr2 = endptr1; - end = start; + /* We'll take <n1> as <n1>,<n1> for simplicity. */ + end = start; } if (end > j) { @@ -810,19 +824,19 @@ apply_ed_diff(const smartlist_t *cons1, const smartlist_t *diff, goto error_cleanup; } - if (*endptr2 == '\0') { + if (*ptr == '\0') { log_warn(LD_CONSDIFF, "Could not apply consensus diff because " "a line with no ed command was found"); goto error_cleanup; } - if (*(endptr2+1) != '\0') { + if (*(ptr+1) != '\0') { log_warn(LD_CONSDIFF, "Could not apply consensus diff because " "an ed command longer than one char was found."); goto error_cleanup; } - char action = *endptr2; + char action = *ptr; switch (action) { case 'a':

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 16 Mar '17

16 Mar '17

commit 407f12dd0626de102586177921ee228195c20d3c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 16 12:16:18 2017 +0000 Update translations for tails-misc_completed --- lv.po | 50 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/lv.po b/lv.po index c11132d..879f8bd 100644 --- a/lv.po +++ b/lv.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ojars Balcers <ojars.balcers(a)gmail.com>, 2016 +# Ojars Balcers <ojars.balcers(a)gmail.com>, 2016-2017 # Ojars Balcers <ojars.balcers(a)gmail.com>, 2013-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-02 16:02+0200\n" -"PO-Revision-Date: 2016-09-03 08:57+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-03-06 12:07+0100\n" +"PO-Revision-Date: 2017-03-16 12:14+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -97,6 +97,20 @@ msgstr "Pārstartēt" msgid "Power Off" msgstr "Izslēgt" +#: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:59 +msgid "Warning: Tails 3.0 won't work on this computer!" +msgstr "Brīdinājums: Šajā datorā Tails 3.0 neadrbosies!" + +#: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:60 +msgid "Tails 3.0 will require a 64-bit processor." +msgstr "Tails 3.0 būs nepieciešams 64 bitu procesors." + +#: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:63 +#: config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user:59 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:83 +msgid "Learn more" +msgstr "Uzzināt vairāk" + #: config/chroot_local-includes/usr/local/bin/tails-about:22 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 msgid "Tails" @@ -154,11 +168,15 @@ msgstr "Lai strādātu pareizi Tor'am nepieciešams akurāts laiks. Īpaši svar msgid "Failed to synchronize the clock!" msgstr "Pulksteņa sinhronizācija bija nesekmīga!" -#: config/chroot_local-includes/usr/local/bin/tails-security-check:146 +#: config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user:57 +msgid "Warning: I2P will be removed in Tails 2.12" +msgstr "Brīdinājums: Tails 2.12 versijai tiks noņemts I2P." + +#: config/chroot_local-includes/usr/local/bin/tails-security-check:124 msgid "This version of Tails has known security issues:" msgstr "Šai Tails versijai ir apzinātas šādas drošības problēmas:" -#: config/chroot_local-includes/usr/local/bin/tails-security-check:156 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:134 msgid "Known security issues" msgstr "Drošības zināmās problēmas" @@ -208,21 +226,21 @@ msgid "" "See https://tails.boum.org/doc/first_steps/upgrade#manual" msgstr "Nav pieejams pietiekami liels atmiņas daudzums, lai pārbaudītu jauninājumu pieejamību.\n\nPārbaudiet vai šī sistēma nodrošina Tails izpildes prasības.\nSkatiet datni:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nMeģiniet pārstratēt Tails, lai vēlreiz pārbaudītu jauninājumu pieejamību.\n\nVai veiciet manuālu jaunināšanu.\nSkatiet https://tails.boum.org/doc/first_steps/upgrade#manual" -#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:67 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71 msgid "Warning: virtual machine detected!" msgstr "Brīdinājums: konstatēta virtuāla mašīna!" -#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:69 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:73 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." msgstr "Gan viesotāja operētājsistēma, gan virtualizācijas programmatūra spēj monitorēt to, ko Jūs darāt Tails." -#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:76 msgid "Warning: non-free virtual machine detected!" msgstr "Brīdinājums: konstatēta virtuāla mašīna, kas nav brīva!" -#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:78 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails. Only free software can be considered " @@ -230,23 +248,19 @@ msgid "" "software." msgstr "Gan viesotāja operētājsistēma, gan virtualizācijas programmatūra spēj monitorēt to, ko Jūs darāt Tails. Par uzticamu var uzskatīt vienīgi bezmaksas programmatūru - gan viesotāja operētājsistēmai, gan virtualizācijas programmatūrai." -#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79 -msgid "Learn more" -msgstr "Uzzināt vairāk" - -#: config/chroot_local-includes/usr/local/bin/tor-browser:40 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Tor is not ready" msgstr "Tor nav sagatavots." -#: config/chroot_local-includes/usr/local/bin/tor-browser:41 +#: config/chroot_local-includes/usr/local/bin/tor-browser:44 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor nav sagatavots. Vai, neskatoties uz to, startēt Pārlūku Tor?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:42 +#: config/chroot_local-includes/usr/local/bin/tor-browser:45 msgid "Start Tor Browser" msgstr "Startēt Pārlūku Tor" -#: config/chroot_local-includes/usr/local/bin/tor-browser:43 +#: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" msgstr "Atcelt"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 16 Mar '17

16 Mar '17

commit af1a8e86e19309558a16b71743cf49b0c558082e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 16 12:16:13 2017 +0000 Update translations for tails-misc --- lv.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lv.po b/lv.po index 995fcee..879f8bd 100644 --- a/lv.po +++ b/lv.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ojars Balcers <ojars.balcers(a)gmail.com>, 2016 +# Ojars Balcers <ojars.balcers(a)gmail.com>, 2016-2017 # Ojars Balcers <ojars.balcers(a)gmail.com>, 2013-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-06 12:07+0100\n" -"PO-Revision-Date: 2017-03-07 09:32+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-03-16 12:14+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,11 +99,11 @@ msgstr "Izslēgt" #: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:59 msgid "Warning: Tails 3.0 won't work on this computer!" -msgstr "" +msgstr "Brīdinājums: Šajā datorā Tails 3.0 neadrbosies!" #: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:60 msgid "Tails 3.0 will require a 64-bit processor." -msgstr "" +msgstr "Tails 3.0 būs nepieciešams 64 bitu procesors." #: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:63 #: config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user:59 @@ -170,7 +170,7 @@ msgstr "Pulksteņa sinhronizācija bija nesekmīga!" #: config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user:57 msgid "Warning: I2P will be removed in Tails 2.12" -msgstr "" +msgstr "Brīdinājums: Tails 2.12 versijai tiks noņemts I2P." #: config/chroot_local-includes/usr/local/bin/tails-security-check:124 msgid "This version of Tails has known security issues:"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 16 Mar '17

16 Mar '17

commit b993ec94fa57cc0893e640be2f27c04c233adedb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 16 07:46:19 2017 +0000 Update translations for tails-misc_completed --- nb.po | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/nb.po b/nb.po index 663e361..259acb0 100644 --- a/nb.po +++ b/nb.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-12 19:30+0100\n" -"PO-Revision-Date: 2017-01-20 13:56+0000\n" +"POT-Creation-Date: 2017-03-06 12:07+0100\n" +"PO-Revision-Date: 2017-03-16 07:26+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -105,6 +105,20 @@ msgstr "Start på nytt" msgid "Power Off" msgstr "Slå av" +#: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:59 +msgid "Warning: Tails 3.0 won't work on this computer!" +msgstr "Advarsel: Tails 3.0 vil ikke fungere på denne datamaskinen!" + +#: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:60 +msgid "Tails 3.0 will require a 64-bit processor." +msgstr "Tails 3.0 krever en 64-bits prosessor." + +#: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:63 +#: config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user:59 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:83 +msgid "Learn more" +msgstr "Lær mer" + #: config/chroot_local-includes/usr/local/bin/tails-about:22 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 msgid "Tails" @@ -162,6 +176,10 @@ msgstr "Tor trenger en nøyaktig klokke for å fungere optimalt, spesielt for sk msgid "Failed to synchronize the clock!" msgstr "Synkronisering av klokken feilet!" +#: config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user:57 +msgid "Warning: I2P will be removed in Tails 2.12" +msgstr "Advarsel: I2P vil bli fjernet i Tails 2.12" + #: config/chroot_local-includes/usr/local/bin/tails-security-check:124 msgid "This version of Tails has known security issues:" msgstr "Denne versjonen av Tails har kjente sikkerhetsproblem:" @@ -216,21 +234,21 @@ msgid "" "See https://tails.boum.org/doc/first_steps/upgrade#manual" msgstr "Ikke nok minne til å se etter tilgjengelige oppgraderinger.\n\nForsikre deg om at systemet tilfredstiller kravene for å kjøre Tails.\nSe file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPrøv å starte Tails på nytt for å se etter oppgraderinger igjen.\n\nEller utfør en manuell oppgradering.\nSe https://tails.boum.org/doc/first_steps/upgrade#manual" -#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:67 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71 msgid "Warning: virtual machine detected!" msgstr "Advarsel: Virtuell maskin oppdaget!" -#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:69 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:73 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." msgstr "Både vertssystemet og virtualiseringsprogramvaren kan overvåke alt du gjør i Tails." -#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:76 msgid "Warning: non-free virtual machine detected!" msgstr "Advarsel: ufri virtuell maskin oppdaget!" -#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:78 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails. Only free software can be considered " @@ -238,23 +256,19 @@ msgid "" "software." msgstr "Både vertssystemet og virtualiseringsprogramvaren er i stand til å overvåke alt du gjør i Tails. Kun fri programvare kan anses som pålitelig, både hva gjelder vertssystemet og virtualiseringsprogramvaren." -#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79 -msgid "Learn more" -msgstr "Lær mer" - -#: config/chroot_local-includes/usr/local/bin/tor-browser:40 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Tor is not ready" msgstr "Tor er ikke klar" -#: config/chroot_local-includes/usr/local/bin/tor-browser:41 +#: config/chroot_local-includes/usr/local/bin/tor-browser:44 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor er ikke klar. Start Tor-nettleseren uansett?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:42 +#: config/chroot_local-includes/usr/local/bin/tor-browser:45 msgid "Start Tor Browser" msgstr "Start Tor-nettleseren" -#: config/chroot_local-includes/usr/local/bin/tor-browser:43 +#: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" msgstr "Avbryt"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 16 Mar '17

16 Mar '17

commit 928a41b5e08f87c5d601db116e31ccce54c88c8a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 16 07:46:13 2017 +0000 Update translations for tails-misc --- nb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nb.po b/nb.po index b09512e..259acb0 100644 --- a/nb.po +++ b/nb.po @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-06 12:07+0100\n" -"PO-Revision-Date: 2017-03-07 09:32+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-03-16 07:26+0000\n" +"Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -107,11 +107,11 @@ msgstr "Slå av" #: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:59 msgid "Warning: Tails 3.0 won't work on this computer!" -msgstr "" +msgstr "Advarsel: Tails 3.0 vil ikke fungere på denne datamaskinen!" #: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:60 msgid "Tails 3.0 will require a 64-bit processor." -msgstr "" +msgstr "Tails 3.0 krever en 64-bits prosessor." #: config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user:63 #: config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user:59 @@ -178,7 +178,7 @@ msgstr "Synkronisering av klokken feilet!" #: config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user:57 msgid "Warning: I2P will be removed in Tails 2.12" -msgstr "" +msgstr "Advarsel: I2P vil bli fjernet i Tails 2.12" #: config/chroot_local-includes/usr/local/bin/tails-security-check:124 msgid "This version of Tails has known security issues:"

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 16 Mar '17

16 Mar '17

commit a3f7416a4ee1b88ebfffaed0806a8f81dc325096 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 16 06:18:15 2017 +0000 Update translations for tails-greeter-2_completed --- zh_CN/zh_CN.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 373f031..5f2b4a9 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-01-31 10:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: khi <tsaizb(a)gmail.com>, 2016\n" +"Last-Translator: Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>, 2016\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -257,7 +257,7 @@ msgstr "启动 Tails" #: ../tailsgreeter/language.py:119 msgid "default:LTR" -msgstr "default:LTR" +msgstr "默认:LTR" #: ../tailsgreeter/persistence.py:89 #, python-brace-format @@ -265,7 +265,7 @@ msgid "" "live-persist failed with return code {returncode}:\n" "{stderr}" msgstr "" -"live-persist 失败，返回代码 {returncode}:\n" +"启动持久存储失败，返回代码 {returncode}:\n" "{stderr}" #: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137 @@ -286,7 +286,7 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" -"live-persist 失败，返回代码 {returncode}：\n" +"启动持久存储失败，返回代码 {returncode}：\n" "{stdout}\n" "{stderr}" @@ -297,6 +297,6 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" -"umount 失败，返回代码 {returncode}:\n" +"挂载失败，返回代码 {returncode}:\n" "{stdout}\n" "{stderr}"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 16 Mar '17

16 Mar '17

commit 7e66dc9ffca2457496f8cddb458e2b2fdb7097a2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 16 06:18:10 2017 +0000 Update translations for tails-greeter-2 --- zh_CN/zh_CN.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 373f031..5f2b4a9 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-01-31 10:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: khi <tsaizb(a)gmail.com>, 2016\n" +"Last-Translator: Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>, 2016\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -257,7 +257,7 @@ msgstr "启动 Tails" #: ../tailsgreeter/language.py:119 msgid "default:LTR" -msgstr "default:LTR" +msgstr "默认:LTR" #: ../tailsgreeter/persistence.py:89 #, python-brace-format @@ -265,7 +265,7 @@ msgid "" "live-persist failed with return code {returncode}:\n" "{stderr}" msgstr "" -"live-persist 失败，返回代码 {returncode}:\n" +"启动持久存储失败，返回代码 {returncode}:\n" "{stderr}" #: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137 @@ -286,7 +286,7 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" -"live-persist 失败，返回代码 {returncode}：\n" +"启动持久存储失败，返回代码 {returncode}：\n" "{stdout}\n" "{stderr}" @@ -297,6 +297,6 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" -"umount 失败，返回代码 {returncode}:\n" +"挂载失败，返回代码 {returncode}:\n" "{stdout}\n" "{stderr}"

1 0

[translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed
by translation＠torproject.org 16 Mar '17

16 Mar '17

commit 403f13354073a9addd4c3192e77767ea8c3f8990 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 16 04:47:53 2017 +0000 Update translations for tor-messenger-prefsdtd_completed --- zh_CN/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/prefs.dtd b/zh_CN/prefs.dtd index 5f591c5..ec63ed5 100644 --- a/zh_CN/prefs.dtd +++ b/zh_CN/prefs.dtd @@ -18,5 +18,5 @@ <!ENTITY prefs.coniksServerPort "端口"> <!ENTITY prefs.coniksAccountPolicy "账户政策"> <!ENTITY prefs.coniksPoliciesForAccount "账号条款"> -<!ENTITY prefs.coniksPrivateLookups "隐私查询"> +<!ENTITY prefs.coniksPrivateLookups "私密查询"> <!ENTITY prefs.coniksSignedKeyChange "已签名密钥变更"> \ No newline at end of file

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 16 Mar '17

16 Mar '17

commit 986785cc9e2792decf6bee56fc1c3349f6576651 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 16 04:47:46 2017 +0000 Update translations for tor-messenger-prefsdtd --- zh_CN/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/prefs.dtd b/zh_CN/prefs.dtd index 5f591c5..ec63ed5 100644 --- a/zh_CN/prefs.dtd +++ b/zh_CN/prefs.dtd @@ -18,5 +18,5 @@ <!ENTITY prefs.coniksServerPort "端口"> <!ENTITY prefs.coniksAccountPolicy "账户政策"> <!ENTITY prefs.coniksPoliciesForAccount "账号条款"> -<!ENTITY prefs.coniksPrivateLookups "隐私查询"> +<!ENTITY prefs.coniksPrivateLookups "私密查询"> <!ENTITY prefs.coniksSignedKeyChange "已签名密钥变更"> \ No newline at end of file

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 16 Mar '17

16 Mar '17

commit 4d55fb6bb75dc307b8b1cf48d79aebb525c60bea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 16 02:47:29 2017 +0000 Update translations for torbutton-aboutdialogdtd_completed --- zh_CN/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/aboutdialog.dtd b/zh_CN/aboutdialog.dtd index ae2b90c..9f37d3d 100644 --- a/zh_CN/aboutdialog.dtd +++ b/zh_CN/aboutdialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "&brandShortName; 的开发者为">  <!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end "，一个捍卫您的隐私和自由上网权的非营利组织。"> +<!ENTITY project.end "，一个捍卫您的隐私和自由上网权利的非营利组织。"> <!ENTITY help.start "需要得到帮助？">

1 0