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

[torbrowser/master] rename start-vidalia script
by erinn＠torproject.org 21 Dec '13

21 Dec '13

commit eebd740786afec1b39d28a6c7aa2ad049860e2e4 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 20 19:15:45 2013 -0200 rename start-vidalia script --- build-scripts/linux-alpha.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 3c11f32..21a4ca2 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -423,9 +423,9 @@ compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp vidalia-standalone-bundle-localized: mkdir -p vidalia-standalone cp config/vidalia.conf.standalone-linux $(BUNDLE)/Data/Vidalia/vidalia.conf - cp ../src/RelativeLink/vidalia/start-vidalia.sh $(BUNDLE) + cp ../src/RelativeLink/vidalia/start-vidalia.sh $(BUNDLE)/start-vidalia ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) -e - cd $(BUNDLE) && tar -cvzf ../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)$(LANGCODE).tar.gz start-vidalia.sh App/vidalia Data/Vidalia Docs/Qt Docs/Vidalia Lib/libQt* Lib/libpng* + cd $(BUNDLE) && tar -cvzf ../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)$(LANGCODE).tar.gz start-vidalia App/vidalia Data/Vidalia Docs/Qt Docs/Vidalia Lib/libQt* Lib/libpng* copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$*

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 21 Dec '13

21 Dec '13

commit 84049425727a9c8d49e4c63fc8c2a44c6f052cc8 Merge: dd7a02a eebd740 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 20 19:15:56 2013 -0200 Merge branch 'maint-2.4' build-scripts/linux-alpha.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[torbrowser/master] fix dumb LD_LIBRARY_PATH bug. [closes: #10448]
by erinn＠torproject.org 21 Dec '13

21 Dec '13

commit 474f0097fa8f28dbb92ce7fc0453910a2ced13b1 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 20 18:57:04 2013 -0200 fix dumb LD_LIBRARY_PATH bug. [closes: #10448] --- src/RelativeLink/vidalia/start-vidalia.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/RelativeLink/vidalia/start-vidalia.sh b/src/RelativeLink/vidalia/start-vidalia.sh index 3880e76..1613ce4 100755 --- a/src/RelativeLink/vidalia/start-vidalia.sh +++ b/src/RelativeLink/vidalia/start-vidalia.sh @@ -1,4 +1,3 @@ #!/bin/bash -LD_LIBRARY_PATH="./Lib" -./App/vidalia --datadir Data/Vidalia/ -style Cleanlooks +LD_LIBRARY_PATH="./Lib" ./App/vidalia --datadir Data/Vidalia/ -style Cleanlooks

1 0

[torbrowser/maint-2.4] fix dumb LD_LIBRARY_PATH bug. [closes: #10448]
by erinn＠torproject.org 21 Dec '13

21 Dec '13

commit 9be371a01b2f70980a96843a805076aa237e872a Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 20 18:57:04 2013 -0200 fix dumb LD_LIBRARY_PATH bug. [closes: #10448] --- src/RelativeLink/vidalia/start-vidalia.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/RelativeLink/vidalia/start-vidalia.sh b/src/RelativeLink/vidalia/start-vidalia.sh index 3880e76..1613ce4 100755 --- a/src/RelativeLink/vidalia/start-vidalia.sh +++ b/src/RelativeLink/vidalia/start-vidalia.sh @@ -1,4 +1,3 @@ #!/bin/bash -LD_LIBRARY_PATH="./Lib" -./App/vidalia --datadir Data/Vidalia/ -style Cleanlooks +LD_LIBRARY_PATH="./Lib" ./App/vidalia --datadir Data/Vidalia/ -style Cleanlooks

1 0

[torbrowser/maint-2.4] add missing Windows libraries
by erinn＠torproject.org 21 Dec '13

21 Dec '13

commit e39510cfb84297cc576b299f6f09d936a02f3e2a Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 20 18:59:52 2013 -0200 add missing Windows libraries --- build-scripts/windows-alpha.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index a0109b7..1abd9d7 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -429,7 +429,7 @@ vidalia-standalone-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).st cp config/vidalia.conf.standalone $(BUNDLE)/Data/Vidalia/vidalia.conf ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) cp ../src/RelativeLink/StartTorBrowserBundle.exe Start\ Vidalia.exe - cd $(NAME)_$(LANGCODE)/$(NAME); $(SEVENZIP) a -mx9 -sfx7z.sfx ../../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe ../../Start\ Vidalia.exe App/vidalia.exe App/Qt* Data/Vidalia Docs/Vidalia Docs/Qt + cd $(NAME)_$(LANGCODE)/$(NAME); $(SEVENZIP) a -mx9 -sfx7z.sfx ../../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe ../../Start\ Vidalia.exe App/vidalia.exe App/mingwm10.dll App/libgcc_s_dw2-1.dll App/Qt* Data/Vidalia Docs/Vidalia Docs/Qt copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$*

1 0

[torbrowser/master] add missing Windows libraries
by erinn＠torproject.org 21 Dec '13

21 Dec '13

commit dd7a02a6dadee09c14d93a228a60fc477f79a94c Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Dec 20 18:59:52 2013 -0200 add missing Windows libraries --- build-scripts/windows-alpha.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index a0109b7..1abd9d7 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -429,7 +429,7 @@ vidalia-standalone-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).st cp config/vidalia.conf.standalone $(BUNDLE)/Data/Vidalia/vidalia.conf ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf $(LANGCODE) cp ../src/RelativeLink/StartTorBrowserBundle.exe Start\ Vidalia.exe - cd $(NAME)_$(LANGCODE)/$(NAME); $(SEVENZIP) a -mx9 -sfx7z.sfx ../../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe ../../Start\ Vidalia.exe App/vidalia.exe App/Qt* Data/Vidalia Docs/Vidalia Docs/Qt + cd $(NAME)_$(LANGCODE)/$(NAME); $(SEVENZIP) a -mx9 -sfx7z.sfx ../../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe ../../Start\ Vidalia.exe App/vidalia.exe App/mingwm10.dll App/libgcc_s_dw2-1.dll App/Qt* Data/Vidalia Docs/Vidalia Docs/Qt copy-files_%: generic-bundle.stamp rm -fr $(NAME)_$*

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 21 Dec '13

21 Dec '13

commit e32aa119abb6364673c5d16b6e55cf80bc228b5e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 20 19:15:13 2013 +0000 Update translations for vidalia --- ca/vidalia_ca.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index 1166ef0..fd3196f 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-12-20 18:40+0000\n" +"PO-Revision-Date: 2013-12-20 18:50+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 21 Dec '13

21 Dec '13

commit 8aeabcfa7df6fc3f78a9b5bda7ebf1d6a7d97ee2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 20 18:46:26 2013 +0000 Update translations for tor-launcher-network-settings --- ca/network-settings.dtd | 67 ++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd index b6480b6..1bbc84c 100644 --- a/ca/network-settings.dtd +++ b/ca/network-settings.dtd @@ -1,55 +1,56 @@ -<!ENTITY torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "Configuració Xarxa Tor">  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Sí"> <!ENTITY torSettings.no "No"> -<!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.firstQuestion "Quina de les següuens descriula teva situació?"> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> +<!ENTITY torSettings.configurePrompt2 "Necessito configurar la xarxa."> +<!ENTITY torSettings.configure "Configura"> +<!ENTITY torSettings.connectPrompt1 "La conexió a internet d'aquest ordinador està lliure d'obstacles."> +<!ENTITY torSettings.connectPrompt2 "M'agradaria conectar-me directament a la xarxa Tor."> +<!ENTITY torSettings.connect "Conectar"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Necessita aquest ordinador usar un proxy per accedir a internet?">  -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> +<!ENTITY torSettings.enterProxy "Introdueix les opcions del proxy."> +<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> +<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> +<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> +<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">  -<!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restart ""> +<!ENTITY torsettings.startingTor "Esperant a Tor per començar..."> +<!ENTITY torsettings.restart "Reinicia"> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "Opcional +"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> +<!ENTITY torsettings.useProxy.type "Tipus de Proxy:"> <!ENTITY torsettings.useProxy.address "Adreça:"> -<!ENTITY torsettings.useProxy.address.placeholder ""> +<!ENTITY torsettings.useProxy.address.placeholder "Direcció IP o nom del host"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Nom d'usuari:"> <!ENTITY torsettings.useProxy.password "Contrasenya:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox ""> +<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> -<!ENTITY torsettings.useBridges.checkbox ""> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> - -<!ENTITY torsettings.copyLog ""> -<!ENTITY torsettings.bridgeHelpTitle ""> -<!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp2 ""> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.useBridges.checkbox "El meu proveidor d'internet (ISP) bloqueja les conexions a la xarxa Tor"> +<!ENTITY torsettings.useBridges.label "Entra en un o més repetidors (un per linia)."> +<!ENTITY torsettings.useBridges.placeholder "adreça:port O transporta adreça:port"> + +<!ENTITY torsettings.copyLog "Copiar el Log al portapapers"> +<!ENTITY torsettings.bridgeHelpTitle "Ajuda Repetidors"> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges which are hidden relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp2 "Per obtenir algus repetidors, usa un navegador web per visitar la següent pagina: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com."> +<!ENTITY torsettings.bridgeHelp4 "You can also request bridge relays by sending mail to help(a)rt.torproject.org.">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 21 Dec '13

21 Dec '13

commit 84733e9f0643740bc0d3b03182cec99abda4ff24 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 20 18:46:22 2013 +0000 Update translations for tor-launcher-properties_completed --- ca/torlauncher.properties | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/ca/torlauncher.properties b/ca/torlauncher.properties new file mode 100644 index 0000000..4a5c41a --- /dev/null +++ b/ca/torlauncher.properties @@ -0,0 +1,31 @@ +### Copyright (c) 2013, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.error_title=Inicialitzador Tor + +torlauncher.tor_exited=Tor ha sortit inesperadament. +torlauncher.please_restart_app=Si us plau reinicia l'aplicació. +torlauncher.tor_controlconn_failed=Nos'ha pogut conectar al port de control Tor +torlauncher.tor_failed_to_start=Tor ha fallat al iniciar. +torlauncher.tor_bootstrap_failed=Impossible establir una conexió a la xarxa Tor.\n%S + +torlauncher.unable_to_start_tor=Impossible iniciar Tor.\n%S +torlauncher.tor_missing=Falta l'executable de Tor. +torlauncher.torrc_missing=Falta l'arxiu torrc. +torlauncher.datadir_missing=La carpeta de dades de Tor no existeix. +torlauncher.password_hash_missing=Ha fallat l'obtencio de la contrasenya hash. + +torlauncher.failed_to_get_settings=Impossible obtenir la configuració de Tor\n%S +torlauncher.failed_to_save_settings=Impossible guardar la configuració de Tor.\n%S +torlauncher.ensure_tor_is_running=Si us plau assegurat de que Tor esta funcionant. + +torlauncher.error_proxy_addr_missing=Heu d'especificar tant una adreça IP o domini com un número de port per a configurar el Tor per tal que pugui utilitzar un servidor intermediari per a accedir a Internet. +torlauncher.error_proxy_type_missing=Heu de seleccionar el tipus de proxy. +torlauncher.error_bridges_missing=Has d'especificar un o mes repetidors. + +torlauncher.connect=Conectar +torlauncher.quit=Surt +torlauncher.quit_win=Surt +torlauncher.done=Fet + +torlauncher.forAssistance=Per assistència, contacta %S

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 21 Dec '13

21 Dec '13

commit ae132f57ef4ff7079b65bb30a9134a27b43d393c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 20 18:46:20 2013 +0000 Update translations for tor-launcher-properties --- ca/torlauncher.properties | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ca/torlauncher.properties b/ca/torlauncher.properties index 47ef894..4a5c41a 100644 --- a/ca/torlauncher.properties +++ b/ca/torlauncher.properties @@ -1,31 +1,31 @@ ### Copyright (c) 2013, The Tor Project, Inc. ### See LICENSE for licensing information. -# torlauncher.error_title=Tor Launcher +torlauncher.error_title=Inicialitzador Tor -# torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -# torlauncher.tor_failed_to_start=Tor failed to start. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S +torlauncher.tor_exited=Tor ha sortit inesperadament. +torlauncher.please_restart_app=Si us plau reinicia l'aplicació. +torlauncher.tor_controlconn_failed=Nos'ha pogut conectar al port de control Tor +torlauncher.tor_failed_to_start=Tor ha fallat al iniciar. +torlauncher.tor_bootstrap_failed=Impossible establir una conexió a la xarxa Tor.\n%S -# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -# torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. -# torlauncher.datadir_missing=The Tor data directory does not exist. -# torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=Impossible iniciar Tor.\n%S +torlauncher.tor_missing=Falta l'executable de Tor. +torlauncher.torrc_missing=Falta l'arxiu torrc. +torlauncher.datadir_missing=La carpeta de dades de Tor no existeix. +torlauncher.password_hash_missing=Ha fallat l'obtencio de la contrasenya hash. -# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Impossible obtenir la configuració de Tor\n%S +torlauncher.failed_to_save_settings=Impossible guardar la configuració de Tor.\n%S +torlauncher.ensure_tor_is_running=Si us plau assegurat de que Tor esta funcionant. torlauncher.error_proxy_addr_missing=Heu d'especificar tant una adreça IP o domini com un número de port per a configurar el Tor per tal que pugui utilitzar un servidor intermediari per a accedir a Internet. torlauncher.error_proxy_type_missing=Heu de seleccionar el tipus de proxy. -# torlauncher.error_bridges_missing=You must specify one or more bridges. +torlauncher.error_bridges_missing=Has d'especificar un o mes repetidors. -# torlauncher.connect=Connect +torlauncher.connect=Conectar torlauncher.quit=Surt torlauncher.quit_win=Surt -# torlauncher.done=Done +torlauncher.done=Fet -# torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Per assistència, contacta %S

1 0