July 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Update gettext .pot template file with string changes for email providers.
by isis＠torproject.org 26 Jul '14

26 Jul '14

commit 695b58566085588746cbb2051a4d993b29774cc4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 26 02:14:27 2014 +0000 Update gettext .pot template file with string changes for email providers. --- lib/bridgedb/i18n/templates/bridgedb.pot | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/i18n/templates/bridgedb.pot b/lib/bridgedb/i18n/templates/bridgedb.pot index 6d830ef..c1db8e2 100644 --- a/lib/bridgedb/i18n/templates/bridgedb.pot +++ b/lib/bridgedb/i18n/templates/bridgedb.pot @@ -6,12 +6,12 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.2.1-101-g6553596-dirty\n" +"Project-Id-Version: bridgedb 0.2.2-84-ge798a44\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-06-06 21:46+0000\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2014-07-26 02:11+0000\n" "Last-Translator: Isis Lovecruft <isis(a)torproject.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "" msgid "Hello, friend!" msgstr "" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" msgstr "" @@ -145,7 +145,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you " "must\n" "send the email using an address from one of the following email providers:\n" -"%s or %s." +"%s, %s or %s." msgstr "" #: lib/bridgedb/strings.py:90 @@ -261,19 +261,19 @@ msgstr "" msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" msgstr "" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:94 msgid "Source Code" msgstr "" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:97 msgid "Changelog" msgstr "" -#: lib/bridgedb/templates/base.html:98 +#: lib/bridgedb/templates/base.html:99 msgid "Contact" msgstr ""

1 0

[bridgedb/develop] Merge branch 'fix/11139-riseup_r1' into develop
by isis＠torproject.org 26 Jul '14

26 Jul '14

commit fe22faf2bfa74a899622ae371c69136ba2960117 Merge: 45213d8 695b585 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 26 02:22:10 2014 +0000 Merge branch 'fix/11139-riseup_r1' into develop README | 59 ++++++++++++++++++----- bridgedb.conf | 18 +++++-- lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/templates/bridgedb.pot | 18 +++---- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 9 ++-- lib/bridgedb/strings.py | 2 +- lib/bridgedb/templates/base.html | 1 + lib/bridgedb/txrecaptcha.py | 2 +- 32 files changed, 202 insertions(+), 132 deletions(-)

1 0

[bridgedb/develop] Fix an additional unittest broken by Arabic translation changes.
by isis＠torproject.org 26 Jul '14

26 Jul '14

commit 45213d83ea2f8dffe5f289270e4cb8c790248071 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 26 00:53:30 2014 +0000 Fix an additional unittest broken by Arabic translation changes. --- lib/bridgedb/test/test_HTTPServer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index c6b521f..42fbdef 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -617,8 +617,10 @@ class WebResourceBridgesTests(unittest.TestCase): page = self.bridgesResource.render(request) self.assertSubstring("direction: rtl", page) self.assertSubstring( - # "I need an alternative way to get bridges!" - "أحتاج إلى وسيلة بديلة للحصول على bridges", page) + # "How to use the above bridge lines" (since there should be + # bridges in this response, we don't tell them about alternative + # mechanisms for getting bridges) + "چگونگی از پل‌های خود استفاده کنید", page) for bridgeLine in self.parseBridgesFromHTMLPage(page): # Check that each bridge line had the expected number of fields:

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 26 Jul '14

26 Jul '14

commit 81b74f6a2d3f191e302df9e383bda3567e38a998 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 26 00:46:53 2014 +0000 Update translations for tor-launcher-network-settings_completed --- pl/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/network-settings.dtd b/pl/network-settings.dtd index 312be05..b3beb8a 100644 --- a/pl/network-settings.dtd +++ b/pl/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Uruchamianie oprogramowania Tor"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.restartTor "Zrestartuj Tor"> <!ENTITY torsettings.optional "(opcjonalnie)">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 26 Jul '14

26 Jul '14

commit 2504f63dd41c6cfdff0ecee6ea1dd66d924eb579 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 26 00:46:48 2014 +0000 Update translations for tor-launcher-network-settings --- pl/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/network-settings.dtd b/pl/network-settings.dtd index 34ac2c1..b3beb8a 100644 --- a/pl/network-settings.dtd +++ b/pl/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Uruchamianie oprogramowania Tor"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Zrestartuj Tor"> <!ENTITY torsettings.optional "(opcjonalnie)">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 26 Jul '14

26 Jul '14

commit 7c9fbc448955b8449ab7002498d3d3bb697fd053 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 26 00:46:38 2014 +0000 Update translations for tor-launcher-properties_completed --- pl/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pl/torlauncher.properties b/pl/torlauncher.properties index 32feaa8..367c5be 100644 --- a/pl/torlauncher.properties +++ b/pl/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor wyłączył się niespodziewanie. -torlauncher.please_restart_app=Proszę zrestartuj tą aplikację. +torlauncher.tor_connection_lost=Twoje połączenie z siecią Tor zostało utracone. torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora. torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora. torlauncher.tor_control_failed=Nie udało się przejąć kontroli nad Tor'em. @@ -30,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Brak dostępnych mostków, które maj torlauncher.recommended_bridge=(zalecane) torlauncher.connect=Połącz +torlauncher.reconnect=Połącz ponownie torlauncher.quit=Wyjście torlauncher.quit_win=Wyjście torlauncher.done=Gotowe

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 26 Jul '14

26 Jul '14

commit f7557ab63047e69da128825be5e59c7c6294ffd3 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 26 00:46:29 2014 +0000 Update translations for tor-launcher-properties --- pl/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl/torlauncher.properties b/pl/torlauncher.properties index 9d9305e..367c5be 100644 --- a/pl/torlauncher.properties +++ b/pl/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor wyłączył się niespodziewanie. -torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. +torlauncher.tor_connection_lost=Twoje połączenie z siecią Tor zostało utracone. torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora. torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora. torlauncher.tor_control_failed=Nie udało się przejąć kontroli nad Tor'em. @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=Brak dostępnych mostków, które maj torlauncher.recommended_bridge=(zalecane) torlauncher.connect=Połącz -torlauncher.reconnect=Reconnect +torlauncher.reconnect=Połącz ponownie torlauncher.quit=Wyjście torlauncher.quit_win=Wyjście torlauncher.done=Gotowe

1 0

[tor-browser-bundle/master] Relocate recommended-versions file here.
by mikeperry＠torproject.org 26 Jul '14

26 Jul '14

commit a2370de2b0b44a22f3f2591c2960cd6767940b8b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jul 25 17:23:24 2014 -0700 Relocate recommended-versions file here. --- gitian/recommended-release-versions | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gitian/recommended-release-versions b/gitian/recommended-release-versions new file mode 100644 index 0000000..13ba64a --- /dev/null +++ b/gitian/recommended-release-versions @@ -0,0 +1,5 @@ +[ +"3.6.3-Linux", +"3.6.3-MacOS", +"3.6.3-Windows" +]

1 0

[torbrowser/master] Remove 3.6.2 from recommended-versions.
by mikeperry＠torproject.org 26 Jul '14

26 Jul '14

commit bd4899b38d55e04e9cd8defec328af9c03c46d84 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jul 25 17:17:42 2014 -0700 Remove 3.6.2 from recommended-versions. --- build-scripts/recommended-versions | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 6373f36..13ba64a 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,4 @@ [ -"3.6.2-Linux", -"3.6.2-MacOS", -"3.6.2-Windows", "3.6.3-Linux", "3.6.3-MacOS", "3.6.3-Windows"

1 0

[tor-browser-spec/master] Separate the recommended versions update into two steps.
by mikeperry＠torproject.org 26 Jul '14

26 Jul '14

commit 67c6be5cd7aae458bbfc0edd82073d437c523f53 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jul 25 17:16:45 2014 -0700 Separate the recommended versions update into two steps. First add the new one, then remove the old one. --- processes/ReleaseProcess | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index ea1929e..a2a7a44 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -64,6 +64,16 @@ cp -a $TORBROWSER_VERSION /srv/www-master.torproject.org/htdocs/dist/torbrowser/ /home/mirroradm/bin/trigger-mirrors +#. Add $TORBROWSER_VERSION to recommended-versions file in torbrowser.git +# (Don't remove old version yet) + cd torbrowser + git checkout master + torsocks git pull origin + vim ./build-scripts/recommended-versions + git commit build-scripts/recommended-versions + torsocks git push origin master:master + cd .. + #. Update website's torbrowser versions file cd website torsocks svn up . @@ -72,21 +82,19 @@ ./publish cd .. -#. Update recommended-versions file in torbrowser.git +#. Create blog post from changelog +# XXX: Template? +# See https://blog.torproject.org/blog/tor-browser-352-released for now +# Don't forget to link to Mozilla's security advisories if this is a security +# update, or Nadim will yell at you. + +#. Remove old version from recommended-versions file in torbrowser.git cd torbrowser - git checkout maint-2.4 + git checkout master torsocks git pull origin vim ./build-scripts/recommended-versions git commit build-scripts/recommended-versions - git checkout master - torsocks git pull origin - git merge maint-2.4 - torsocks git push origin maint-2.4:maint-2.4 torsocks git push origin master:master cd .. -#. Create blog post from changelog -# XXX: Template? -# See https://blog.torproject.org/blog/tor-browser-352-released for now -# Don't forget to link to Mozilla's security advisories if this is a security -# update, or Nadim will yell at you. +

1 0