April 2015 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Apr '15

20 Apr '15

commit d7f675dd5b70df01cf275c5f94769c022a37fb6b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 18:15:03 2015 +0000 Update translations for bridgedb --- ca/LC_MESSAGES/bridgedb.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po index 2b9376b..36f8c24 100644 --- a/ca/LC_MESSAGES/bridgedb.po +++ b/ca/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-20 17:44+0000\n" +"PO-Revision-Date: 2015-04-20 18:02+0000\n" "Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" @@ -126,7 +126,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "A més, BridgeDB té molts ponts %s estàndard sense \nPluggable Transports %s, que potser no són tan interessants, però que també\npoden ajudar a esquivar la censura d'internet, en molts casos.\n" +msgstr "A més a més, BridgeDB té molts ponts %s estàndard sense \nPluggable Transports %s, que potser no són tan interessants, però que també\npoden ajudar a esquivar la censura d'internet en molts casos.\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -135,11 +135,11 @@ msgstr "Què són els ponts?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Ponts %s són mecanismes Tor que ajuden a esquivar la censura." +msgstr "%s Ponts %s són repetidors Tor que ajuden a esquivar la censura." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "Necessito una manera alternativa d'obtenir ponts" +msgstr "Em cal una manera alternativa d'obtenir ponts." #: lib/bridgedb/strings.py:83 #, python-format @@ -157,7 +157,7 @@ msgstr "No em funcionen els ponts! Ajuda!" #: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Si el teu Tor no funciona, hauries d'enviar un correu a %s." +msgstr "Si Tor no us funciona, hauríeu d'enviar un correu a %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -175,32 +175,32 @@ msgstr "Les vostres línies de ponts:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "Descarrega ponts!" +msgstr "Descarregueu ponts!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "Si us plau, sel·leccioni les opcions pel tipus de pont:" +msgstr "Seleccioneu les opcions pel tipus de pont:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "Necessites adreces IPv6?" +msgstr "Necessiteu adreces IPv6?" #: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" -msgstr "Necessites un %s?" +msgstr "Necessiteu un %s?" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "El seu navegador no està mostrant les imatges correctament." +msgstr "El navegador no està mostrant les imatges correctament." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "Introdueixi els caràcters de la imatge superior..." +msgstr "Introduïu els caràcters de la imatge superior..." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" -msgstr "Per començar a utilitzar els ponts" +msgstr "Com començar a utilitzar els ponts" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: lib/bridgedb/strings.py:121 @@ -209,7 +209,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Per introduir ponts al Navegador Tor, primer cal anar a %s de la pàgina de descàrrega\n%s i després seguir les instruccions per descarregar i iniciar\nel Navegador Tor. " +msgstr "Per introduir ponts al Tor Browser, primer cal anar a %s de la pàgina de descàrrega\n%s i després seguir les instruccions per descarregar i iniciar\nel Tor Browser. " #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126 @@ -232,7 +232,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Seleccioneu 'Sí' i després cliqueu 'Següent'. Per configurar els vostres ponts nous, copieu i\nenganxeu les línies del pont al següent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botó \nd''Ajuda' a l'auxiliar de 'Configuració Xarxa Tor' per més assistència." +msgstr "Seleccioneu 'Sí' i després cliqueu 'Següent'. Per configurar els ponts nous, copieu i\nenganxeu les línies del pont al següent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botó \nd''Ajuda' a l'auxiliar de 'Configuració Xarxa Tor' per més assistència." #: lib/bridgedb/strings.py:142 msgid "Displays this message."

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 20 Apr '15

20 Apr '15

commit 8248c19c602cdd009a7320944c0c63c135f58591 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 17:45:08 2015 +0000 Update translations for bridgedb_completed --- ca/LC_MESSAGES/bridgedb.po | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po index ebf752f..2b9376b 100644 --- a/ca/LC_MESSAGES/bridgedb.po +++ b/ca/LC_MESSAGES/bridgedb.po @@ -8,15 +8,14 @@ # Eloi García i Fargas, 2014 # Humbert <humbert.costas(a)gmail.com>, 2014 # isis <isis(a)torproject.org>, 2015 -# laia_ <laiaadorio(a)gmail.com>, 2014-2015 +# laia_, 2014-2015 # Toni Hermoso Pulido <toniher(a)softcatala.cat>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-03-21 22:22+0000\n" -"Last-Translator: isis <isis(a)torproject.org>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-04-20 17:44+0000\n" +"Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,13 +35,13 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." -msgstr "Perdoni! Quelcom ha anat malament amb la seva petició." +msgstr "Quelcom ha anat malament amb la petició." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" -msgstr "[Aquest es un missatge automàtic; si us plau, no respongui.]" +msgstr "[Aquest és un missatge automàtic, no el respongui.]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" @@ -53,7 +52,7 @@ msgstr "Els vostres ponts: " msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Has superat el límit. Siusplau baixa el ritme! El mínim de temps entre\nels correus és de %s hores. La resta de correus durant aquest període de temps seran ignorats." +msgstr "Heu superat el límit. El mínim de temps entre\nels correus és de %s hores. La resta de correus durant aquest període de temps seran ignorats." #: lib/bridgedb/strings.py:25 msgid "" @@ -73,7 +72,7 @@ msgstr "Actualment suportant transport TYPEs:" #: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "Ei, %s!" +msgstr "Hola, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" @@ -91,7 +90,7 @@ msgstr "Claus Públiques" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martí i espurnes\nper %s a %s en %s." +msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martí i espurnes\nper a %s el %s a les %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -105,7 +104,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque pot provocar ofuscacions a la teva connexió a Tor Network, fent-ho més difícil per a qualsevol veient el teu tràfic de connexió a internet de determinar que estàs\nusant Tor.\n" +msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexió a Tor Network, fent més difícil determinar que esteu usant Tor a qualsevol que vegi el vostre tràfic de connexió a\ninternet \n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -113,7 +112,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "També hi ha alguns ponts amb adreces IPv6, tot i que alguns Pluggable\nTransports no són compatibles amb IPv6.\n\n" +msgstr "També hi ha ponts disponibles amb adreces IPv6, tot i que alguns Pluggable\nTransports no són compatibles amb IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -207,26 +206,27 @@ msgstr "Per començar a utilitzar els ponts" #: lib/bridgedb/strings.py:121 #, python-format msgid "" -"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" -"Browser download page %s to start Tor Browser." -msgstr "Per introduir ponts al Tor Browser, seguiu les instruccions de la pàgina\nde baixada %s del %s Tor Browser per iniciar el Tor Browser." +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "Per introduir ponts al Navegador Tor, primer cal anar a %s de la pàgina de descàrrega\n%s i després seguir les instruccions per descarregar i iniciar\nel Navegador Tor. " #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Quan aparegui el diàleg 'Configuració Xarxa Tor', clica 'Configura' i segueix\nl'auxiliar fins que pregunti:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "El vostre Proveïdor d'Internet (ISP) bloqueja o censura les connexions\namb la xarxa Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -234,29 +234,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Seleccioneu 'Sí' i després cliqueu 'Següent'. Per configurar els vostres ponts nous, copieu i\nenganxeu les línies del pont al següent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botó \nd''Ajuda' a l'auxiliar de 'Configuració Xarxa Tor' per més assistència." -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "Mostra aquest missatge." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:145 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." msgstr "Demanar ponts estàndard." -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "Demanar ponts IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." msgstr "Demanar un Pluggable Transport per TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Fer una còpia de la clau pública GnuPG del BridgeDB."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Apr '15

20 Apr '15

commit 31b392655b0c372db2ab4f6b49c91e6c0710772b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 17:45:03 2015 +0000 Update translations for bridgedb --- ca/LC_MESSAGES/bridgedb.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po index 483f4a1..2b9376b 100644 --- a/ca/LC_MESSAGES/bridgedb.po +++ b/ca/LC_MESSAGES/bridgedb.po @@ -8,14 +8,14 @@ # Eloi García i Fargas, 2014 # Humbert <humbert.costas(a)gmail.com>, 2014 # isis <isis(a)torproject.org>, 2015 -# laia_ <laiaadorio(a)gmail.com>, 2014-2015 +# laia_, 2014-2015 # Toni Hermoso Pulido <toniher(a)softcatala.cat>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-04-20 17:44+0000\n" +"Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,11 +37,11 @@ msgstr "" #. "Tor Browser" #: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." -msgstr "Perdoni! Quelcom ha anat malament amb la seva petició." +msgstr "Quelcom ha anat malament amb la petició." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" -msgstr "[Aquest es un missatge automàtic; si us plau, no respongui.]" +msgstr "[Aquest és un missatge automàtic, no el respongui.]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" @@ -52,7 +52,7 @@ msgstr "Els vostres ponts: " msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Has superat el límit. Siusplau baixa el ritme! El mínim de temps entre\nels correus és de %s hores. La resta de correus durant aquest període de temps seran ignorats." +msgstr "Heu superat el límit. El mínim de temps entre\nels correus és de %s hores. La resta de correus durant aquest període de temps seran ignorats." #: lib/bridgedb/strings.py:25 msgid "" @@ -72,7 +72,7 @@ msgstr "Actualment suportant transport TYPEs:" #: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "Ei, %s!" +msgstr "Hola, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" @@ -90,7 +90,7 @@ msgstr "Claus Públiques" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martí i espurnes\nper %s a %s en %s." +msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martí i espurnes\nper a %s el %s a les %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -104,7 +104,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque pot provocar ofuscacions a la teva connexió a Tor Network, fent-ho més difícil per a qualsevol veient el teu tràfic de connexió a internet de determinar que estàs\nusant Tor.\n" +msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexió a Tor Network, fent més difícil determinar que esteu usant Tor a qualsevol que vegi el vostre tràfic de connexió a\ninternet \n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -112,7 +112,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "També hi ha alguns ponts amb adreces IPv6, tot i que alguns Pluggable\nTransports no són compatibles amb IPv6.\n\n" +msgstr "També hi ha ponts disponibles amb adreces IPv6, tot i que alguns Pluggable\nTransports no són compatibles amb IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -209,7 +209,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "" +msgstr "Per introduir ponts al Navegador Tor, primer cal anar a %s de la pàgina de descàrrega\n%s i després seguir les instruccions per descarregar i iniciar\nel Navegador Tor. " #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126

1 0

[tor-messenger-build/master] Change directory before applying patches
by sukhbir＠torproject.org 20 Apr '15

20 Apr '15

commit 7962e189f632a7eb478888bb9c63980d1afd558a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Apr 20 12:00:57 2015 -0400 Change directory before applying patches --- projects/instantbird/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index a999f32..c4bd842 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -36,13 +36,13 @@ cd ../[% project %]-[% c('version') %] mkdir im/branding/messenger cp -R im/branding/nightly/* im/branding/messenger/ -cd mozilla for patch in $(ls -1 ../*.patch | sort) do patch -p1 < $patch done cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt cp ../cert_override.txt im/app/profile +cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then for patch in $(ls -1 $rootdir/*.mozpatch | sort)

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 20 Apr '15

20 Apr '15

commit afca4e0fb52ecabca7bc585df53ec03ed35c3f1a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 14:45:10 2015 +0000 Update translations for bridgedb_completed --- zh_CN/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index c0500cb..7b387cd 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 13:22+0000\n" -"Last-Translator: YF <yfdyh000(a)gmail.com>\n" +"PO-Revision-Date: 2015-04-20 14:43+0000\n" +"Last-Translator: khi\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Apr '15

20 Apr '15

commit aa34b8742c63dc21434ae8105a2a701fc33940da Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 14:45:05 2015 +0000 Update translations for bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index c0500cb..7b387cd 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 13:22+0000\n" -"Last-Translator: YF <yfdyh000(a)gmail.com>\n" +"PO-Revision-Date: 2015-04-20 14:43+0000\n" +"Last-Translator: khi\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor-messenger-build/master] Update the Tor Messenger logo for Tor Launcher
by sukhbir＠torproject.org 20 Apr '15

20 Apr '15

commit 6216393a2f09dff6a74ae9eae2b2e9496cbd0e21 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Apr 20 10:33:55 2015 -0400 Update the Tor Messenger logo for Tor Launcher --- projects/tor-launcher/build | 5 ++++- projects/tor-launcher/config | 3 ++- projects/tor-launcher/logo.patch | 13 +++++++++++++ projects/tor-launcher/messenger.png | Bin 0 -> 7749 bytes projects/tor-launcher/torbirdy-logo.patch | 13 ------------- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index a3c5f48..66909f9 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -8,7 +8,10 @@ patch -p1 < ../controlport.patch [% END -%] [% IF c("var/tor-mail") -%] cp ../torbirdy.png src/chrome/skin/tbb-logo.png -patch -p1 < ../torbirdy-logo.patch [% END -%] +[% IF c("var/tor-messenger") -%] +cp ../messenger.png src/chrome/skin/tbb-logo.png +[% END -%] +patch -p1 < ../logo.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index baceb0d..3e8c704 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -7,7 +7,8 @@ tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - filename: torbirdy.png - - filename: torbirdy-logo.patch + - filename: messenger.png + - filename: logo.patch - filename: topdir.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' diff --git a/projects/tor-launcher/logo.patch b/projects/tor-launcher/logo.patch new file mode 100644 index 0000000..0e5daa1 --- /dev/null +++ b/projects/tor-launcher/logo.patch @@ -0,0 +1,13 @@ +diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css +index 331ae42..3331854 100644 +--- a/src/chrome/skin/network-settings.css ++++ b/src/chrome/skin/network-settings.css +@@ -90,7 +90,7 @@ button.firstAnswer { + .tbb-logo { + list-style-image: url("chrome://torlauncher/skin/tbb-logo.png"); + width: 115px; +- height: 80px; ++ height: 94px; + margin-right: 20px; + } + diff --git a/projects/tor-launcher/messenger.png b/projects/tor-launcher/messenger.png new file mode 100644 index 0000000..0b4d39c Binary files /dev/null and b/projects/tor-launcher/messenger.png differ diff --git a/projects/tor-launcher/torbirdy-logo.patch b/projects/tor-launcher/torbirdy-logo.patch deleted file mode 100644 index 0e5daa1..0000000 --- a/projects/tor-launcher/torbirdy-logo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css -index 331ae42..3331854 100644 ---- a/src/chrome/skin/network-settings.css -+++ b/src/chrome/skin/network-settings.css -@@ -90,7 +90,7 @@ button.firstAnswer { - .tbb-logo { - list-style-image: url("chrome://torlauncher/skin/tbb-logo.png"); - width: 115px; -- height: 80px; -+ height: 94px; - margin-right: 20px; - } -

1 0

[tor-browser-bundle/master] Bug #15672: Provide desktop app registration+unregistration for Linux
by gk＠torproject.org 20 Apr '15

20 Apr '15

commit c9266daa8ce6501e6f24446dc0da05caf7fa955d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 13 11:27:29 2015 -0700 Bug #15672: Provide desktop app registration+unregistration for Linux --- RelativeLink/start-tor-browser | 55 ++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index aac5a6e..098f506 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -100,11 +100,18 @@ fi debug=0 show_usage=0 +register_desktop_app=0 # !!! We may have more than one argument, changed -eq to -ge in if & elif clauses below if [ "$#" -ge 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then debug=1 shift # pop the debug argument printf "\nDebug enabled.\n\n" +elif [ "$#" -ge 1 -a $ "x$1" = "x--register-app" -o "x$1" = "x-register-app" $ ]; then + register_desktop_app=1 + shift # pop the register arg +elif [ "$#" -ge 1 -a $ "x$1" = "x--unregister-app" -o "x$1" = "x-unregister-app" $ ]; then + register_desktop_app=-1 + shift # pop the register arg elif [ "$#" -ge 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then show_usage=1 else @@ -160,6 +167,13 @@ fi mydir="`dirname "$myname"`" test -d "$mydir" && cd "$mydir" +# If ${PWD} results in a zero length string, we can try something else... +if [ ! "${PWD}" ]; then + # "hacking around some braindamage" + PWD="`pwd`" + surveysays="This system has a messed up shell.\n" +fi + # This is a fix for an ibus issue on some Linux systems. See #9353 for more # details. The symlink needs to be created before we change HOME. if [ ! -d ".config/ibus" ]; then @@ -167,23 +181,34 @@ if [ ! -d ".config/ibus" ]; then ln -nsf ~/.config/ibus/bus .config/ibus fi -# If ${PWD} results in a zero length HOME, we can try something else... -if [ ! "${PWD}" ]; then - # "hacking around some braindamage" - HOME="`pwd`" - export HOME - surveysays="This system has a messed up shell.\n" -else - HOME="${PWD}" - export HOME -fi - # Fix up .desktop Icon and Exec Paths, and update the .desktop file from the # canonical version if it was changed by the updater. cp start-tor-browser.desktop ../ sed -i -e "s,^Name=.*,Name=Tor Browser,g" ../start-tor-browser.desktop -sed -i -e "s,^Icon=.*,Icon=$HOME/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop -sed -i -e "s,^Exec=.*,Exec=sh -c '\"$HOME/start-tor-browser\" || ([ ! -x \"$HOME/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser)' dummy %k,g" ../start-tor-browser.desktop +sed -i -e "s,^Icon=.*,Icon=$PWD/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop +sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-browser\" || ([ ! -x \"$PWD/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser)' dummy %k,g" ../start-tor-browser.desktop + +if [ "$register_desktop_app" -eq 1 ]; then + mkdir -p "$HOME/.local/share/applications/" + cp ../start-tor-browser.desktop "$HOME/.local/share/applications/" + update-desktop-database "$HOME/.local/share/applications/" + printf "Tor Browser has been registered as a desktop app for this user in ~/.local/share/applications/\n" + exit 0 +fi + +if [ "$register_desktop_app" -eq -1 ]; then + if [ -e "$HOME/.local/share/applications/start-tor-browser.desktop" ]; then + rm -f "$HOME/.local/share/applications/start-tor-browser.desktop" + update-desktop-database "$HOME/.local/share/applications/" + printf "Tor Browser has been removed as a user desktop app (from ~/.local/share/applications/)\n" + else + printf "Tor Browser does not appear to be a desktop app (not present in ~/.local/share/applications/)\n" + fi + exit 0 +fi + +HOME="${PWD}" +export HOME SYSARCHITECTURE=$(getconf LONG_BIT) TORARCHITECTURE=$(expr "$(file TorBrowser/Tor/tor)" : '.*ELF $[[:digit:]]*$') @@ -279,7 +304,9 @@ if [ "$show_usage" -eq 1 ]; then TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ -profile TorBrowser/Data/Browser/profile.default "${@}" 2>/dev/null printf "\nTor Browser Script Options\n" - printf " --debug Display Tor and Firefox output and record in tor-browser-debug.log\n" + printf " --debug Display Tor and Firefox output and record in tor-browser-debug.log\n" + printf " --register-app Register Tor Browser as a desktop app for this user\n" + printf " --unregister-app Unregister Tor Browser as a desktop app for this user\n" elif [ "$debug" -ne 1 ] ; then TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ -profile TorBrowser/Data/Browser/profile.default "${@}" > /dev/null 2>&1 </dev/null &

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'mikeperry/bug15672'
by gk＠torproject.org 20 Apr '15

20 Apr '15

commit 44e59e8d6e91bab002d93a978b8a4e36fbb5b9fb Merge: 33f867c c9266da Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 20 08:41:44 2015 +0000 Merge remote-tracking branch 'mikeperry/bug15672' RelativeLink/start-tor-browser | 55 ++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 14 deletions(-)

1 0

[tor-browser-bundle/master] Revert "Bug 15670: add support for the no_update_for option in config.yml"
by gk＠torproject.org 20 Apr '15

20 Apr '15

commit 6fddec33ed9d3baf343f3848bc3d85553de6b03b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 20 08:42:39 2015 +0000 Revert "Bug 15670: add support for the no_update_for option in config.yml" This reverts commit 7d7faa30b4443f0cc76474738a36fd3f45e875f4. --- tools/update-responses/update_responses | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 6c497ef..07efc7c 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -283,10 +283,6 @@ sub write_htaccess { my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; - my $noup_for = $config->{no_update_for}{$channel}; - for my $noup_ver (ref $noup_for eq 'ARRAY' ? @$noup_for : ()) { - $htaccess .= "RewriteRule ^[^\/]+/$noup_ver/ no-update.xml $flags\n"; - } foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); foreach my $lang (sort keys %{$files->{$os}}) {

1 0