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

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit 84dff6b7b6eea3dec99ce874e467cde19bec623d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 07:17:57 2017 +0000 Update translations for tails-openpgp-applet --- my/openpgp-applet.pot | 78 +++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/my/openpgp-applet.pot b/my/openpgp-applet.pot index 906fe1f08..4c05d9af9 100644 --- a/my/openpgp-applet.pot +++ b/my/openpgp-applet.pot @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Tails developers -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the OpenPGP_Applet package. # # Translators: msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" -"POT-Creation-Date: 2015-08-10 15:55+0200\n" +"POT-Creation-Date: 2017-08-05 15:07-0400\n" "PO-Revision-Date: 2015-11-23 02:23+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n" @@ -17,158 +17,158 @@ msgstr "" "Language: my\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bin/openpgp-applet:163 +#: bin/openpgp-applet:160 msgid "You are about to exit OpenPGP Applet. Are you sure?" msgstr "" -#: bin/openpgp-applet:175 +#: bin/openpgp-applet:172 msgid "OpenPGP encryption applet" msgstr "" -#: bin/openpgp-applet:178 +#: bin/openpgp-applet:175 msgid "Exit" msgstr "ထွက်ရန်" -#: bin/openpgp-applet:180 +#: bin/openpgp-applet:177 msgid "About" msgstr "အကြောင်း" -#: bin/openpgp-applet:235 +#: bin/openpgp-applet:232 msgid "Encrypt Clipboard with _Passphrase" msgstr "" -#: bin/openpgp-applet:238 +#: bin/openpgp-applet:235 msgid "Sign/Encrypt Clipboard with Public _Keys" msgstr "" -#: bin/openpgp-applet:243 +#: bin/openpgp-applet:240 msgid "_Decrypt/Verify Clipboard" msgstr "" -#: bin/openpgp-applet:247 +#: bin/openpgp-applet:244 msgid "_Manage Keys" msgstr "" -#: bin/openpgp-applet:251 +#: bin/openpgp-applet:248 msgid "_Open Text Editor" msgstr "" -#: bin/openpgp-applet:295 +#: bin/openpgp-applet:292 msgid "The clipboard does not contain valid input data." msgstr "" -#: bin/openpgp-applet:347 bin/openpgp-applet:349 bin/openpgp-applet:351 +#: bin/openpgp-applet:337 bin/openpgp-applet:339 bin/openpgp-applet:341 msgid "Unknown Trust" msgstr "" -#: bin/openpgp-applet:353 +#: bin/openpgp-applet:343 msgid "Marginal Trust" msgstr "" -#: bin/openpgp-applet:355 +#: bin/openpgp-applet:345 msgid "Full Trust" msgstr "" -#: bin/openpgp-applet:357 +#: bin/openpgp-applet:347 msgid "Ultimate Trust" msgstr "" -#: bin/openpgp-applet:410 +#: bin/openpgp-applet:400 msgid "Name" msgstr "အမည်" -#: bin/openpgp-applet:411 +#: bin/openpgp-applet:401 msgid "Key ID" msgstr "" -#: bin/openpgp-applet:412 +#: bin/openpgp-applet:402 msgid "Status" msgstr "အနေအထား" -#: bin/openpgp-applet:444 +#: bin/openpgp-applet:433 msgid "Fingerprint:" msgstr "" -#: bin/openpgp-applet:447 +#: bin/openpgp-applet:436 msgid "User ID:" msgid_plural "User IDs:" msgstr[0] "" -#: bin/openpgp-applet:476 +#: bin/openpgp-applet:465 msgid "None (Don't sign)" msgstr "" -#: bin/openpgp-applet:539 +#: bin/openpgp-applet:528 msgid "Select recipients:" msgstr "" -#: bin/openpgp-applet:547 +#: bin/openpgp-applet:536 msgid "Hide recipients" msgstr "" -#: bin/openpgp-applet:550 +#: bin/openpgp-applet:539 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." msgstr "" -#: bin/openpgp-applet:556 +#: bin/openpgp-applet:545 msgid "Sign message as:" msgstr "" -#: bin/openpgp-applet:560 +#: bin/openpgp-applet:549 msgid "Choose keys" msgstr "" -#: bin/openpgp-applet:600 +#: bin/openpgp-applet:589 msgid "Do you trust these keys?" msgstr "" -#: bin/openpgp-applet:603 +#: bin/openpgp-applet:592 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" msgstr[0] "" -#: bin/openpgp-applet:621 +#: bin/openpgp-applet:610 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" msgstr[0] "" -#: bin/openpgp-applet:634 +#: bin/openpgp-applet:623 msgid "No keys selected" msgstr "" -#: bin/openpgp-applet:636 +#: bin/openpgp-applet:625 msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." msgstr "" -#: bin/openpgp-applet:664 +#: bin/openpgp-applet:653 msgid "No keys available" msgstr "" -#: bin/openpgp-applet:666 +#: bin/openpgp-applet:655 msgid "" "You need a private key to sign messages or a public key to encrypt messages." msgstr "" -#: bin/openpgp-applet:794 +#: bin/openpgp-applet:783 msgid "GnuPG error" msgstr "" -#: bin/openpgp-applet:815 +#: bin/openpgp-applet:804 msgid "Therefore the operation cannot be performed." msgstr "" -#: bin/openpgp-applet:865 +#: bin/openpgp-applet:854 msgid "GnuPG results" msgstr "" -#: bin/openpgp-applet:871 +#: bin/openpgp-applet:860 msgid "Output of GnuPG:" msgstr "" -#: bin/openpgp-applet:896 +#: bin/openpgp-applet:885 msgid "Other messages provided by GnuPG:" msgstr ""

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit d1d07183ae4f32fd7086c167b5ed3d9c48e03236 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 07:16:08 2017 +0000 Update translations for mat-gui --- my.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/my.po b/my.po index 56503a347..cf5c1edf3 100644 --- a/my.po +++ b/my.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-03-21 16:34+0000\n" +"PO-Revision-Date: 2017-09-08 07:09+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ msgstr "" #: mat-gui:219 msgid "Preferences" -msgstr "" +msgstr "ဦးစားပေးချက်များ" #: mat-gui:232 msgid "Reduce PDF quality"

1 0

[tor-browser-build/master] Bug 23425: fix build when there is no terminal
by gk＠torproject.org 08 Sep '17

08 Sep '17

commit e21581e108a44915c0bd0f2acd346b02288a52a0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 7 16:58:01 2017 +0200 Bug 23425: fix build when there is no terminal Set process.terminal to false when building, but keep it to true when we open a debugging shell. https://github.com/opencontainers/runtime-spec/blob/master/config.md#process To do that we update the runc config.json in runc/remote_exec rather than only once in runc/remote_start. We also redirect runc stderr to /dev/null to avoid some messages saying "stdin: is not a tty" during the build. --- projects/common/runc-config.json | 2 +- rbm.conf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index 3da6c24..02be3b0 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -9,7 +9,7 @@ [% END -%] }, "process": { - "terminal": true, + "terminal": [% IF c("interactive") %]true[% ELSE %]false[% END %], "user": { "uid": 0, "gid": 0 diff --git a/rbm.conf b/rbm.conf index a93df7f..d574f7a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -308,9 +308,6 @@ runc: fi mkdir -p '[% c("var/container/dir") %]'/rootfs/rbm sudo tar -C '[% c("var/container/dir") %]'/rootfs -xf $(ls -1 '[% c("remote_srcdir", { error_if_undef => 1 }) %]/container-image_'*) - cat > '[% c("var/container/dir") %]'/config.json << EOF - [% INCLUDE 'runc-config.json' %] - EOF [% SET user = c("var/container/user") -%] [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'id ' _ user _ ' >/dev/null 2>&1 || adduser -m ' _ user _ ' || useradd -m ' _ user }) %] @@ -329,7 +326,10 @@ runc: echo 'su - [% user %] -c /rbm/cmd' >> '[% c("var/container/dir") %]'/rootfs/rbm/run chmod +x '[% c("var/container/dir") %]'/rootfs/rbm/cmd chmod +x '[% c("var/container/dir") %]'/rootfs/rbm/run - sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] + cat > '[% c("var/container/dir") %]'/config.json << EOF + [% INCLUDE 'runc-config.json' %] + EOF + sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF ! c("interactive") %]2>/dev/null[% END %] remote_put: | #!/bin/sh

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit 7d9ecf3a7057fd5067df7b003e93eed0ffbe8c44 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 03:19:31 2017 +0000 Update translations for tor-browser-manual_completed --- zh_CN/zh_CN.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index cef7cd5f4..535f8b7e0 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -1,5 +1,6 @@ # Translators: # Mingye Wang <arthur200126(a)gmail.com>, 2016 +# Meng San <jiong3meng(a)gmail.com>, 2017 # YF <yfdyh000(a)gmail.com>, 2017 # Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>, 2017 msgid "" @@ -300,8 +301,8 @@ msgid "" " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-" "azure, meek-amazon." msgstr "" -"如果这是您首次尝试规避网络连接的屏蔽机制，您应该要试着使用不同的可插拔传输层：obfs3、obfs4、ScrambleSuit、FTE、meek-" -"azure、meek-amazon。" +"因连接封锁首次使用规避方式时，请尝试自带的各种传输方式：obfs3、obfs4、ScrambleSuit、FTE、meek-azure 或 meek-" +"amazon。" #: circumvention.page:72 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 08 Sep '17

08 Sep '17

commit d26902e4f1cc30e689bb3c0deac4085d71be4dd9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 8 03:19:26 2017 +0000 Update translations for tor-browser-manual --- zh_CN/zh_CN.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index cef7cd5f4..535f8b7e0 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -1,5 +1,6 @@ # Translators: # Mingye Wang <arthur200126(a)gmail.com>, 2016 +# Meng San <jiong3meng(a)gmail.com>, 2017 # YF <yfdyh000(a)gmail.com>, 2017 # Chi-Hsun Tsai <chihsun.tsai(a)gmail.com>, 2017 msgid "" @@ -300,8 +301,8 @@ msgid "" " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-" "azure, meek-amazon." msgstr "" -"如果这是您首次尝试规避网络连接的屏蔽机制，您应该要试着使用不同的可插拔传输层：obfs3、obfs4、ScrambleSuit、FTE、meek-" -"azure、meek-amazon。" +"因连接封锁首次使用规避方式时，请尝试自带的各种传输方式：obfs3、obfs4、ScrambleSuit、FTE、meek-azure 或 meek-" +"amazon。" #: circumvention.page:72 msgid ""

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket23427_032_01'
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit e5e2df36f3cad69a63b46ed589f250afb31ab476 Merge: 36104e55e 2080a986e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 7 15:20:01 2017 -0400 Merge remote-tracking branch 'dgoulet/ticket23427_032_01' doc/HACKING/ReleasingTor.md | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/master] doc: Add our Ubuntu packager to ReleasingTor.md
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 2080a986ed2abfed1528a659544615462bbea9ca Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 7 12:35:31 2017 -0400 doc: Add our Ubuntu packager to ReleasingTor.md His full name is: Simon Deziel. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/HACKING/ReleasingTor.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 298712161..4eae44bcf 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -152,6 +152,7 @@ new Tor release: - {Nathan} at freitas dot net - {mike} at tig dot as - {tails-rm} at boum dot org + - {simon} at sdeziel.info 4. Add the version number to Trac. To do this, go to Trac, log in, select "Admin" near the top of the screen, then select "Versions" from

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 5c2a3854d329cc411e05880169d6880c549a1e91 Merge: 9914f906e 08592c95f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 7 15:18:00 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-september2017 | 4 + src/config/geoip | 10802 ++++++++++++++++++++++++------------------ src/config/geoip6 | 941 +++- 3 files changed, 6828 insertions(+), 4919 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit bcf2b413c32a86f68bac1894245fc753c0c388ef Merge: 93b28972c 09618ffe3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 7 15:18:00 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-september2017 | 4 + src/config/geoip | 10802 ++++++++++++++++++++++++------------------ src/config/geoip6 | 941 +++- 3 files changed, 6828 insertions(+), 4919 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 08 Sep '17

08 Sep '17

commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb Merge: 969602159 bcf2b413c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 7 15:18:00 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-september2017 | 4 + src/config/geoip | 10802 ++++++++++++++++++++++++------------------ src/config/geoip6 | 941 +++- 3 files changed, 6828 insertions(+), 4919 deletions(-)

1 0