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

[tor/master] Merge branch 'bug9288_rebased'
by nickm＠torproject.org 31 Jul '13

31 Jul '13

commit 904a58d10f144b95a689b35c88f6780371243da8 Merge: d5a5a6a 8a0eedb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 31 13:51:15 2013 -0400 Merge branch 'bug9288_rebased' Conflicts: src/test/test_pt.c changes/bug9288 | 4 +++ src/common/util.c | 10 +++--- src/common/util.h | 21 ++++++------ src/or/statefile.c | 4 +-- src/or/statefile.h | 2 +- src/or/transports.c | 28 +++++++++------- src/or/transports.h | 2 ++ src/test/test_pt.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 131 insertions(+), 29 deletions(-) diff --cc src/or/transports.c index 15faa98,0bd024f..62cc1a8 --- a/src/or/transports.c +++ b/src/or/transports.c @@@ -102,9 -102,10 +102,7 @@@ create_managed_proxy_environment(const static INLINE int proxy_configuration_finished(const managed_proxy_t *mp); -static void managed_proxy_destroy(managed_proxy_t *mp, - int also_terminate_process); - static void handle_finished_proxy(managed_proxy_t *mp); - static void configure_proxy(managed_proxy_t *mp); - static void parse_method_error(const char *line, int is_server_method); #define parse_server_method_error(l) parse_method_error(l, 1) #define parse_client_method_error(l) parse_method_error(l, 0) diff --cc src/or/transports.h index 1c6fc41,7f180a6..7b524f2 --- a/src/or/transports.h +++ b/src/or/transports.h @@@ -113,14 -110,9 +113,16 @@@ STATIC int parse_smethod_line(const cha STATIC int parse_version(const char *line, managed_proxy_t *mp); STATIC void parse_env_error(const char *line); STATIC void handle_proxy_line(const char *line, managed_proxy_t *mp); +STATIC char *get_transport_options_for_server_proxy(const managed_proxy_t *mp); + +STATIC void managed_proxy_destroy(managed_proxy_t *mp, + int also_terminate_process); + +STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, + char **proxy_argv, int is_server); + STATIC int configure_proxy(managed_proxy_t *mp); + #endif #endif diff --cc src/test/test_pt.c index ac97cf9,afa4917..f969457 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@@ -5,11 -5,12 +5,14 @@@ #include "orconfig.h" #define PT_PRIVATE + #define UTIL_PRIVATE #include "or.h" +#include "config.h" +#include "confparse.h" #include "transports.h" #include "circuitbuild.h" + #include "util.h" + #include "statefile.h" #include "test.h" static void @@@ -224,61 -156,98 +227,147 @@@ test_pt_protocol(void tor_free(mp); } +static void +test_pt_get_extrainfo_string(void *arg) +{ + managed_proxy_t *mp1 = NULL, *mp2 = NULL; + char **argv1, **argv2; + smartlist_t *t1 = smartlist_new(), *t2 = smartlist_new(); + int r; + char *s = NULL; + (void) arg; + + argv1 = tor_malloc_zero(sizeof(char*)*3); + argv1[0] = tor_strdup("ewige"); + argv1[1] = tor_strdup("Blumenkraft"); + argv1[2] = NULL; + argv2 = tor_malloc_zero(sizeof(char*)*4); + argv2[0] = tor_strdup("und"); + argv2[1] = tor_strdup("ewige"); + argv2[2] = tor_strdup("Schlangenkraft"); + argv2[3] = NULL; + + mp1 = managed_proxy_create(t1, argv1, 1); + mp2 = managed_proxy_create(t2, argv2, 1); + + r = parse_smethod_line("SMETHOD hagbard 127.0.0.1:5555", mp1); + tt_int_op(r, ==, 0); + r = parse_smethod_line("SMETHOD celine 127.0.0.1:1723 ARGS:card=no-enemy", + mp2); + tt_int_op(r, ==, 0); + + /* Force these proxies to look "completed" or they won't generate output. */ + mp1->conf_state = mp2->conf_state = PT_PROTO_COMPLETED; + + s = pt_get_extra_info_descriptor_string(); + tt_assert(s); + tt_str_op(s, ==, + "transport hagbard 127.0.0.1:5555\n" + "transport celine 127.0.0.1:1723 card=no-enemy\n"); + + done: + /* XXXX clean up better */ + smartlist_free(t1); + smartlist_free(t2); + tor_free(s); +} + + #ifdef _WIN32 + #define STDIN_HANDLE HANDLE + #else + #define STDIN_HANDLE FILE + #endif + + static smartlist_t * + tor_get_lines_from_handle_replacement(STDIN_HANDLE *handle, + enum stream_status *stream_status_out) + { + static int times_called = 0; + smartlist_t *retval_sl = smartlist_new(); + + (void) handle; + (void) stream_status_out; + + /* Generate some dummy CMETHOD lines the first 5 times. The 6th + time, send 'CMETHODS DONE' to finish configuring the proxy. */ + if (times_called++ != 5) { + smartlist_add_asprintf(retval_sl, "CMETHOD mock%d socks5 127.0.0.1:555%d", + times_called, times_called); + } else { + smartlist_add(retval_sl, tor_strdup("CMETHODS DONE")); + } + + return retval_sl; + } + + /* NOP mock */ + static void + tor_process_handle_destroy_replacement(process_handle_t *process_handle, + int also_terminate_process) + { + (void) process_handle; + (void) also_terminate_process; + } + + static or_state_t *dummy_state = NULL; + + static or_state_t * + get_or_state_replacement(void) + { + return dummy_state; + } + + /* Test the configure_proxy() function. */ + static void + test_pt_configure_proxy(void *arg) + { + int i; + managed_proxy_t *mp = NULL; + (void) arg; + + dummy_state = tor_malloc_zero(sizeof(or_state_t)); + + MOCK(tor_get_lines_from_handle, + tor_get_lines_from_handle_replacement); + MOCK(tor_process_handle_destroy, + tor_process_handle_destroy_replacement); + MOCK(get_or_state, + get_or_state_replacement); + + mp = tor_malloc(sizeof(managed_proxy_t)); + mp->conf_state = PT_PROTO_ACCEPTING_METHODS; + mp->transports = smartlist_new(); + mp->transports_to_launch = smartlist_new(); + mp->process_handle = tor_malloc_zero(sizeof(process_handle_t)); + mp->argv = tor_malloc_zero(sizeof(char*)*2); + mp->argv[0] = tor_strdup("<testcase>"); + + /* Test the return value of configure_proxy() by calling it some + times while it is uninitialized and then finally finalizing its + configuration. */ + for (i = 0 ; i < 5 ; i++) { + test_assert(configure_proxy(mp) == 0); + } + test_assert(configure_proxy(mp) == 1); + + done: + tor_free(dummy_state); + UNMOCK(tor_get_lines_from_handle); + UNMOCK(tor_process_handle_destroy); + } + #define PT_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_pt_ ## name } struct testcase_t pt_tests[] = { PT_LEGACY(parsing), PT_LEGACY(protocol), + { "get_transport_options", test_pt_get_transport_options, TT_FORK, + NULL, NULL }, + { "get_extrainfo_string", test_pt_get_extrainfo_string, TT_FORK, + NULL, NULL }, + { "configure_proxy",test_pt_configure_proxy, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Fix mixed declaration/statement warning
by nickm＠torproject.org 31 Jul '13

31 Jul '13

commit 8a0eedbbb08199818cd7c2c6998f062c03e33122 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 31 13:36:17 2013 -0400 Fix mixed declaration/statement warning --- src/test/test_pt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 162d9e3..afa4917 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -166,12 +166,12 @@ static smartlist_t * tor_get_lines_from_handle_replacement(STDIN_HANDLE *handle, enum stream_status *stream_status_out) { - (void) handle; - (void) stream_status_out; static int times_called = 0; - smartlist_t *retval_sl = smartlist_new(); + (void) handle; + (void) stream_status_out; + /* Generate some dummy CMETHOD lines the first 5 times. The 6th time, send 'CMETHODS DONE' to finish configuring the proxy. */ if (times_called++ != 5) { @@ -205,9 +205,9 @@ get_or_state_replacement(void) static void test_pt_configure_proxy(void *arg) { - (void) arg; int i; managed_proxy_t *mp = NULL; + (void) arg; dummy_state = tor_malloc_zero(sizeof(or_state_t));

1 0

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

31 Jul '13

commit 65df6c662196176b69d62178cb1d5f0a08da0a05 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 31 16:46:34 2013 +0000 Update translations for tor-launcher-network-settings --- cs/network-settings.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cs/network-settings.dtd b/cs/network-settings.dtd index a706217..6d9685a 100644 --- a/cs/network-settings.dtd +++ b/cs/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "Síťové nastavení TORu">  @@ -10,10 +10,10 @@ <!ENTITY torSettings.firstQuestion ""> <!ENTITY torSettings.configurePrompt1 ""> <!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> +<!ENTITY torSettings.configure "Konfigurovat"> <!ENTITY torSettings.connectPrompt1 ""> <!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.connect "Připojit"> <!ENTITY torSettings.proxyQuestion "">  @@ -26,7 +26,7 @@  -<!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.startingTor "Čekání na start TORu"> <!ENTITY torsettings.optional ""> @@ -44,7 +44,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> <!ENTITY torsettings.useBridges.checkbox ""> <!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> +<!ENTITY torsettings.useBridges.placeholder "adresa:port"> <!ENTITY torsettings.copyLog ""> <!ENTITY torsettings.bridgeHelpTitle "">

1 0

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

31 Jul '13

commit 29f08e93228b284a987f1505a3652bcbd90646a7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 31 16:46:28 2013 +0000 Update translations for tor-launcher-properties --- cs/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/torlauncher.properties b/cs/torlauncher.properties index 5e47590..4f98ecd 100644 --- a/cs/torlauncher.properties +++ b/cs/torlauncher.properties @@ -22,7 +22,7 @@ torlauncher.error_proxy_addr_missing=Pro nastavení Toru pro použití proxy ser torlauncher.error_proxy_type_missing=Musíte vybrat typ proxy # torlauncher.error_bridges_missing=You must specify one or more bridges. -# torlauncher.connect=Connect +torlauncher.connect=Připojit torlauncher.quit=Ukoncit torlauncher.quit_win=Konec torlauncher.done=Hotovo

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 31 Jul '13

31 Jul '13

commit db35a89a764ce5db0d90993d421ce69f1b160da5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 31 16:46:21 2013 +0000 Update translations for mat-gui --- cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs.po b/cs.po index b32d21d..8be1eeb 100644 --- a/cs.po +++ b/cs.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-07-31 16:15+0000\n" +"PO-Revision-Date: 2013-07-31 16:20+0000\n" "Last-Translator: adamse <adamslovacek(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 31 Jul '13

31 Jul '13

commit 9eeb0f2f457de8445a6cebce50c0f41eeae4039b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 31 16:16:23 2013 +0000 Update translations for mat-gui --- cs.po | 55 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/cs.po b/cs.po index 659b046..b32d21d 100644 --- a/cs.po +++ b/cs.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# adamse <adamslovacek(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-07-25 09:22+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-07-31 16:15+0000\n" +"Last-Translator: adamse <adamslovacek(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,27 +20,27 @@ msgstr "" #: mat-gui:65 mat-gui:375 mat-gui:387 msgid "Ready" -msgstr "" +msgstr "Připraveno" #: mat-gui:134 msgid "Choose files" -msgstr "" +msgstr "Vybrat soubory" #: mat-gui:141 msgid "All files" -msgstr "" +msgstr "Všechny soubory" #: mat-gui:148 msgid "Supported files" -msgstr "" +msgstr "Podporované soubory" #: mat-gui:164 msgid "No metadata found" -msgstr "" +msgstr "Nenalezena žádná metadata" #: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 msgid "Clean" -msgstr "" +msgstr "Vyčistit" #: mat-gui:167 mat-gui:372 msgid "Dirty" @@ -52,27 +53,27 @@ msgstr "" #: mat-gui:183 msgid "Trash your meta, keep your data" -msgstr "" +msgstr "Smazat meta, ponechat data" #: mat-gui:188 msgid "Website" -msgstr "" +msgstr "Internetová stránka" #: mat-gui:214 data/mat.ui:107 msgid "Preferences" -msgstr "" +msgstr "Nastavení" #: mat-gui:228 msgid "Reduce PDF quality" -msgstr "" +msgstr "Snížit kvalitu PDF" #: mat-gui:231 msgid "Reduce the produced PDF size and quality" -msgstr "" +msgstr "Snížit velikost PDF a jeho kvalitu" #: mat-gui:234 msgid "Add unsupported file to archives" -msgstr "" +msgstr "Přidat podporovaný soubor do archivů" #: mat-gui:238 msgid "Add non-supported (and so non-anonymised) file to output archive" @@ -84,11 +85,11 @@ msgstr "Neznámý" #: mat-gui:330 msgid "Not-supported" -msgstr "" +msgstr "Nnepodporováno" #: mat-gui:347 msgid "Unknown mimetype" -msgstr "" +msgstr "Neznámý mime typ souboru" #: mat-gui:354 data/mat.ui:291 msgid "Filename" @@ -101,12 +102,12 @@ msgstr "" #: mat-gui:366 #, python-format msgid "Checking %s" -msgstr "" +msgstr "Kontroluji %s" #: mat-gui:381 #, python-format msgid "Cleaning %s" -msgstr "" +msgstr "Čištění %s" #: data/mat.ui:63 msgid "_File" @@ -130,7 +131,7 @@ msgstr "" #: data/mat.ui:214 msgid "Add" -msgstr "" +msgstr "Přidat" #: data/mat.ui:240 msgid "Check" @@ -138,11 +139,11 @@ msgstr "Ověřit" #: data/mat.ui:308 msgid "State" -msgstr "" +msgstr "Stav" #: data/mat.ui:346 data/mat.ui:495 msgid "Metadata" -msgstr "" +msgstr "Meta data" #: data/mat.ui:400 msgid "Name" @@ -150,24 +151,24 @@ msgstr "Jméno" #: data/mat.ui:414 msgid "Content" -msgstr "" +msgstr "Obsah" #: data/mat.ui:448 msgid "Supported formats" -msgstr "" +msgstr "Podporované formáty" #: data/mat.ui:482 msgid "Support" -msgstr "" +msgstr "Podpora" #: data/mat.ui:508 msgid "Method" -msgstr "" +msgstr "Metoda" #: data/mat.ui:521 msgid "Remaining" -msgstr "" +msgstr "Zbývá" #: data/mat.ui:556 msgid "Fileformat" -msgstr "" +msgstr "Formát souboru"

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 31 Jul '13

31 Jul '13

commit e0004bbce58243c035dd835f345f54d70c6e572e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 31 15:45:14 2013 +0000 Update translations for orbot --- values-hr_HR/strings.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/values-hr_HR/strings.xml b/values-hr_HR/strings.xml index 1493089..6e0ee13 100644 --- a/values-hr_HR/strings.xml +++ b/values-hr_HR/strings.xml @@ -7,8 +7,11 @@ <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> <string name="control_permission_label">pokreni i zaustavi Tor</string> <string name="tor_proxy_service_process">torproxyusluga</string> + <string name="status_starting_up">Orbot se pokreće...</string> <string name="status_activated">Spojen na Tor mrežu</string> + <string name="status_disabled">Orbot je deaktiviran</string> <string name="status_shutting_down">Orbot je u procesu gašenja</string> + <string name="tor_process_starting">Pokrećem Tor software</string> <string name="tor_process_complete">gotovo.</string> <string name="tor_process_waiting">čekam.</string> <string name="not_anonymous_yet">UPOZORENJE: Vaš promet još nije anoniman! Molimo konfigurirajte vaše aplikacije da koriste HTTP proxy 127.0.0.1:8118 ili SOCKS4A ili SOCKS5 proxy 127.0.0.1:9050</string> @@ -68,6 +71,9 @@ <string name="wizard_tips_tricks">Orbot-omogućene Aplikacije</string> <string name="wizard_tips_otrchat">Gibberbot - Sigurni klijent za dopisivanje za Android</string> <string name="wizard_tips_proxy">Proxy Postavke - Naučite kako konfigurirati aplikacije za rad s Orbotom</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Postavke Proxya</string> <string name="wizard_final">Orbot je spreman!</string>  @@ -86,7 +92,10 @@  <string name="wizard_tips_title">Orbot-Omogućene Aplikacije</string> <string name="wizard_tips_gibberbot">Gibberbot: Sigurna chat aplikacija sa Povjerljivim Šifriranjem</string> + <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Preglednik poboljšane privatnosti koji radi kroz Tor</string> + <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string> @@ -148,6 +157,15 @@ <string name="reachable_addresses">Dostupne Adrese</string> <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Pokreni kao klijent sa firewallom sa restriktivnim politikama</string> <string name="reachable_ports">Dostupni portovi</string> + <string name="ports_reachable_behind_a_restrictive_firewall">Portovi dostupni iza restriktivnog firewalla</string> + <string name="enter_ports">Unesi portove</string> + <string name="enter_localhost_ports_for_hidden_services">unesi localhost portove za skrivene usluge</string> + <string name="hidden_service_ports">Portovi za skrivene usluge</string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresirano ime za vašu skrivenu uslugu (generirano automatski)</string> + <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string> + <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="default_bridges"></string> + <string name="wizard_locale_title">Odaberi Jezik</string> <string name="btn_save_settings">Spremi postavke</string> </resources>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 31 Jul '13

31 Jul '13

commit 60fc59b67f3223cacc6af42d0ac3cf97fe2e0cac Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 31 15:45:06 2013 +0000 Update translations for gettor --- hr_HR/gettor.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hr_HR/gettor.po b/hr_HR/gettor.po index ae90075..b10b6d3 100644 --- a/hr_HR/gettor.po +++ b/hr_HR/gettor.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# dlb031 <abuljan031(a)gmail.com>, 2013 +# dlb031, 2013 # cisterna, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-07-23 21:55+0000\n" -"Last-Translator: dlb031 <abuljan031(a)gmail.com>\n" +"PO-Revision-Date: 2013-07-31 15:40+0000\n" +"Last-Translator: dlb031\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "" +msgstr "Pozdrav, Ovo je \"DobijTor\" robot." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." @@ -199,7 +199,7 @@ msgstr "6.) To je sve. Gotovi ste. Hvala na korištenju Tora i zabavite se!" msgid "" "SUPPORT\n" "=======" -msgstr "" +msgstr "PODRŠKA\n=======" #: lib/gettor/i18n.py:138 msgid "" @@ -236,7 +236,7 @@ msgstr "" msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" -msgstr "" +msgstr "BLOKIRAN PRISTUP / CENZURA\n===========================" #: lib/gettor/i18n.py:160 msgid "" @@ -315,7 +315,7 @@ msgstr "" msgid "" "UNPACKING THE FILES\n" "===================" -msgstr "" +msgstr "RASPAKIRAVANJE DATOTEKA\n===================" #: lib/gettor/i18n.py:205 msgid "" @@ -433,11 +433,11 @@ msgstr "" msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" -msgstr "" +msgstr "ČESTO POSTAVLJANA PITANJA\n==========================" #: lib/gettor/i18n.py:272 msgid "What is Tor?" -msgstr "" +msgstr "Što je Tor?" #: lib/gettor/i18n.py:274 msgid "The name \"Tor\" can refer to several different components." @@ -469,7 +469,7 @@ msgstr "" #: lib/gettor/i18n.py:292 msgid "What package should I request?" -msgstr "" +msgstr "Koji paket trebam zatražiti?" #: lib/gettor/i18n.py:294 msgid "" @@ -477,19 +477,19 @@ msgid "" "operating system is Microsoft Windows, you should request \"windows\". Here\n" "is a short explanation of all packages to request and what operating \n" "systems there are suitable for:" -msgstr "" +msgstr "Ovisi koji operacijski sustav koristite. Na primjer, ako je vaš operacijski sustav Microsoft Windows, trebate zatražiti \"windows\". Ovdje je kratko objašnjenje svih paketa koji se mogu zatražiti i za koje su operacijske sustave prikladni:" #: lib/gettor/i18n.py:299 msgid "How do I extract the file(s) you sent me?" -msgstr "" +msgstr "Kako da izdvojim datoteku/datoteke koje ste mi poslali?" #: lib/gettor/i18n.py:301 msgid "QUESTION:" -msgstr "" +msgstr "PITANJE:" #: lib/gettor/i18n.py:303 msgid "ANSWER:" -msgstr "" +msgstr "ODGOVOR:" #: lib/gettor/i18n.py:305 #, python-format

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 31 Jul '13

31 Jul '13

commit 112c8a01c6ebeae44c6bd0963523cb15f6ad58f0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 31 15:15:32 2013 +0000 Update translations for vidalia_alpha_completed --- hr_HR/vidalia_hr_HR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/vidalia_hr_HR.po b/hr_HR/vidalia_hr_HR.po index 6507914..5a29f15 100644 --- a/hr_HR/vidalia_hr_HR.po +++ b/hr_HR/vidalia_hr_HR.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:46+0000\n" -"PO-Revision-Date: 2013-07-25 09:21+0000\n" +"PO-Revision-Date: 2013-07-31 15:10+0000\n" "Last-Translator: dlb031 <abuljan031(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 31 Jul '13

31 Jul '13

commit f6e8643c39f29647ff6208b31704fe5d99fb9c8d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 31 15:15:28 2013 +0000 Update translations for vidalia_alpha --- hr_HR/vidalia_hr_HR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/vidalia_hr_HR.po b/hr_HR/vidalia_hr_HR.po index 6507914..5a29f15 100644 --- a/hr_HR/vidalia_hr_HR.po +++ b/hr_HR/vidalia_hr_HR.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:46+0000\n" -"PO-Revision-Date: 2013-07-25 09:21+0000\n" +"PO-Revision-Date: 2013-07-31 15:10+0000\n" "Last-Translator: dlb031 <abuljan031(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0