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

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

18 Jul '13

commit d5d4519f3f098af04bd6f21a22a4bff2a79a76e5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 21:15:11 2013 +0000 Update translations for orbot --- values-es/strings.xml | 10 ++++++++++ values-is/strings.xml | 2 ++ 2 files changed, 12 insertions(+) diff --git a/values-es/strings.xml b/values-es/strings.xml index 7f67587..c5f6653 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -129,13 +129,22 @@ <string name="pref_entrance_node">Nodos de entrada</string> <string name="pref_entrance_node_summary">Reglas de identificación de repetidores de entrada a la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y \ndirecciones (o rangos). No prevalecen sobre las configuraciones de exclusión de nodos, y las configuraciones de bridges.</string> <string name="pref_entrance_node_dialog">Introduzca nodos de entrada</string> + <string name="pref_proxy_title">Proxy de salida a la red (opcional)</string> <string name="pref_proxy_type_title">Tipo de proxy saliente</string> <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, Socks4, Socks5.</string> <string name="pref_proxy_type_dialog">Introduzca tipo de proxy</string> <string name="pref_proxy_host_title">Servidor proxy saliente</string> + <string name="pref_proxy_host_summary">Nombre del servidor proxy </string> <string name="pref_proxy_host_dialog">Introduzca el servidor proxy</string> <string name="pref_proxy_port_title">Puerto del proxy saliente </string> + <string name="pref_proxy_port_summary">Puerto del servidor proxy</string> <string name="pref_proxy_port_dialog">Introduzca el puerto del proxy</string> + <string name="pref_proxy_username_title">Nombre de usuario en el proxy de salida</string> + <string name="pref_proxy_username_summary">Nombre de usuario en el proxy (opcional)</string> + <string name="pref_proxy_username_dialog">Introduzca nombre de usuario en el proxy</string> + <string name="pref_proxy_password_title">Contraseña en el proxy de salida</string> + <string name="pref_proxy_password_summary">Contraseña en el proxy (opcional)</string> + <string name="pref_proxy_password_dialog">Introduzca contraseña en el proxy</string> <string name="status">Estado</string> <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa... </string> <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones... </string> @@ -216,4 +225,5 @@ <string name="wizard_locale_msg">Deje el predeterminado o cambie de idioma</string> <string name="powered_by">impulsado por The Tor Project</string> <string name="btn_save_settings">Guardar configuración</string> + <string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en espera...</string> </resources> diff --git a/values-is/strings.xml b/values-is/strings.xml index 33a061c..b9570d3 100644 --- a/values-is/strings.xml +++ b/values-is/strings.xml @@ -69,6 +69,7 @@ <string name="wizard_tips_otrchat">Gibberbot - Öruggur skilaboðaþjónn fyrir Android</string> <string name="wizard_tips_proxy">Proxy Stillingar - Lærðu hvernig á að stilla smáforrit til að virka með Orbot</string> <string name="wizard_proxy_help_info">Proxy Stillingar</string> + <string name="wizard_proxy_help_msg">Ef að Android smáforritið sem þú notar, styður notkun af HTTP eða SOCKS procy, geturu stillt það til að tengjast Orbot og nota Tor.⏎\n⏎\n⏎\nStillingar þjóns er 127.0.0.1 eða \"localhost\". Fyrir HTTP, port stillingin er 8118. Fyrir SOCKS, proxyinn er 9050. Þá ættir að nota SOCKS4A eða SOCKS5 ef mögulegt.⏎\n⏎\n⏎\n⏎\nÞú getur lært meira um proxýun á Android með FAQ á: http://tinyurl.com/proxyandroid⏎</string> <string name="wizard_final">Orbot er tilbúinn!</string>  <string name="tor_check">Þetta mun opna vef vafrann þinn að https://check.torproject.org til að sjá hvort Orbot sé rétt tengdur og að þú sért tengdur Tor.</string> @@ -80,6 +81,7 @@ <string name="wizard_title_msg">Orbot kemur með Tor til Android!⏎\n⏎\nTor hjálpar þér að verjast gegn síun innihalds, umferðar rýnun og net njósnun sem er hættulegt friðhelgi einkalífsins, trúnaðarupplýsingum og persónulegum samböndum.⏎\n⏎\nÞessi leiðbeinandi hjálpar þér að stilla Orbot og Tor á tækinu þínu.</string>  <string name="wizard_warning_title">Aðvörun</string> + <string name="wizard_warning_msg">Aðeins með að setja upp Orbot mun ekki sjálfkrafa gera netumferð þína nafnlausa.⏎\n⏎\nÞú verður að stilla Orbot rétt, tækið þitt og önnur smáforritið til að nota Tor rétt.</string>  <string name="wizard_permissions_title">Leyfisveitingar</string> <string name="wizard_permissions_root_msg1">Þú getur valfrjálst veitt Orbot \'Ofurnotanda\' aðgang til að virkja stillingar fyrir lengra komna, eins og Gegnsæ Proxýun.</string>

1 0

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

18 Jul '13

commit cb98bef3fd1613c1c6e359961526f3063cf3221b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 20:45:17 2013 +0000 Update translations for orbot --- values-is/strings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/values-is/strings.xml b/values-is/strings.xml index 4d17bcc..33a061c 100644 --- a/values-is/strings.xml +++ b/values-is/strings.xml @@ -77,6 +77,7 @@ <string name="pref_start_boot_summary">Sjálfkrafa virkja Orbot og tengja Tor þegar Android tækið þitt ræsist</string>   + <string name="wizard_title_msg">Orbot kemur með Tor til Android!⏎\n⏎\nTor hjálpar þér að verjast gegn síun innihalds, umferðar rýnun og net njósnun sem er hættulegt friðhelgi einkalífsins, trúnaðarupplýsingum og persónulegum samböndum.⏎\n⏎\nÞessi leiðbeinandi hjálpar þér að stilla Orbot og Tor á tækinu þínu.</string>  <string name="wizard_warning_title">Aðvörun</string>  @@ -133,7 +134,9 @@ <string name="use_only_these_specified_nodes">Nota *aðeins* þessa tilgreindu punkta</string> <string name="bridges">Brýr</string> <string name="use_bridges">Nota Brýr</string> + <string name="bridges_obfuscated">Villandi Brýr</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Kveikja hliðstæðan inngangspunkt inná Tor Netið</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Leyfa ef stilltar brýr eru villandi brýr</string> <string name="ip_address_and_port_of_bridges">IP addressa og brúarport</string> <string name="enter_bridge_addresses">Sláðu Inn Brúar Addressur</string> <string name="relays">Endurvarpar</string> @@ -155,6 +158,7 @@ <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nafnið fyrir falda þjónustu þína (búið til sjálfkrafa)</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">leyfa villuskráningu á verða búin til (verður að nota adb eða aLogCat til að skoða)</string> <string name="project_home">Heimili Verkefnisins:</string> + <string name="project_urls">https://www.torproject.org/docs/android⏎\nhttps://guardianproject.info/apps…</string> <string name="the_tor_license">Tor Leyfið</string> <string name="https_torproject_org">https:torproject.org</string> <string name="third_party_software">Hugbúnaður frá öðrum höfund:</string> @@ -166,5 +170,14 @@ <string name="unable_to_read_hidden_service_name">get ekki lesið nafn földu þjónustunnar</string> <string name="unable_to_start_tor">Get ekki kveikt á Tor:</string> <string name="pref_use_sys_iptables_title">Nota Upprunalegar IPtöflur</string> + <string name="pref_use_sys_iptables_summary">nota innbyggðar iptöflur binary í staðinn fyrir þær sem fylgja með Orbot</string> + <string name="error_installing_binares">Tor binary-in gátu ekki verið uppsettar eða uppfærðar.</string> + <string name="pref_use_persistent_notifications">Alltaf hafa smámynd í glugganum þegar Orbot er tengudr</string> + <string name="pref_use_persistent_notifications_title">Alltaf-Á Upplýsingar</string> + <string name="notification_using_bridges">Brýr kveiktar!</string> <string name="default_bridges"></string> + <string name="set_locale_title">Setja Núverandi</string> + <string name="set_locale_summary">Veldur núverandi og tungumál fyrir Orbot</string> + <string name="wizard_locale_title">Veldu Tungumál</string> + <string name="wizard_locale_msg">Leyfa upprunalega eða skipta núverandi tungumáli</string> </resources>

1 0

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

18 Jul '13

commit 93ffa7369143d1ecffcd311415c573fd8688a080 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 20:15:30 2013 +0000 Update translations for vidalia_alpha --- is/vidalia_is.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/is/vidalia_is.po b/is/vidalia_is.po index 9cf86be..053157d 100644 --- a/is/vidalia_is.po +++ b/is/vidalia_is.po @@ -6,7 +6,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-18 19:40+0000\n" +"PO-Revision-Date: 2013-07-18 20:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/torproject/language/is/)\n" "MIME-Version: 1.0\n" @@ -91,7 +91,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "None" -msgstr "" +msgstr "Engin" msgctxt "AdvancedPage" msgid "Cookie"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 18 Jul '13

18 Jul '13

commit 64ff4653870ade6cb9c1047f702ae975ff19eae2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 20:15:23 2013 +0000 Update translations for vidalia --- is/vidalia_is.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/is/vidalia_is.po b/is/vidalia_is.po index 2d62bb1..c0088df 100755 --- a/is/vidalia_is.po +++ b/is/vidalia_is.po @@ -6,7 +6,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-07-18 19:40+0000\n" +"PO-Revision-Date: 2013-07-18 20:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/torproject/language/is/)\n" "MIME-Version: 1.0\n" @@ -91,7 +91,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "None" -msgstr "" +msgstr "Engin" msgctxt "AdvancedPage" msgid "Cookie"

1 0

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

18 Jul '13

commit 05efa5743d5eac4898112e36d58e593ebf88312b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 20:15:12 2013 +0000 Update translations for orbot --- values-is/strings.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/values-is/strings.xml b/values-is/strings.xml index b50c342..4d17bcc 100644 --- a/values-is/strings.xml +++ b/values-is/strings.xml @@ -97,6 +97,7 @@ <string name="wizard_transproxy_hint">(Hakaðu í þenna reit ef þú hefur enga hugmynd um hvað við erum að tala)</string> <string name="wizard_transproxy_none">Engin</string> <string name="pref_transparent_tethering_title">Tor Netaðgangspunktur</string> + <string name="pref_transparent_tethering_summary">Leyfa Tor Gegnsæja Proxýun fyrir WiFi og USB Tæki með Netaðgengi (þarfnast endurræsingar)</string> <string name="button_grant_superuser">Biðja um Ofurnotandaréttindi</string> <string name="pref_select_apps">Velja Smáforrit</string> <string name="pref_select_apps_summary">Velja Smáforrit til að Beina í gegnum Tor</string> @@ -107,7 +108,63 @@ <string name="pref_entrance_node_dialog">Sláðu Inn Inngangspunkt</string> <string name="pref_proxy_type_summary">Protocol til að nota fyrir proxy þjón: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Sláðu Inn Gerð Proxýs</string> + <string name="pref_proxy_host_dialog">Sláðu Inn Proxy Þjón</string> + <string name="pref_proxy_port_dialog">Sláðu Inn Proxy port</string> <string name="status">Staða</string> + <string name="transparent_proxying_enabled">Gegnsæ proxýun KVEIKT</string> + <string name="transproxy_enabled_for_tethering_">TransProxy kveikt fyrir Netaðgangspunkt!</string> + <string name="warning_error_starting_transparent_proxying_">AÐVÖRUN: villa við að kveikja á gegnsærri proxýun</string> + <string name="transproxy_rules_cleared">TransProxy reglur hreinsaðar</string> + <string name="couldn_t_start_tor_process_">Gat ekki kveikt á Tor þráð:</string> + <string name="privoxy_is_running_on_port_">Privoxy keyrir á porti:</string> + <string name="bridge_error">Brúar Villa</string> + <string name="bridge_requires_ip">Til að nota brúar viðbótina, verðuru að slá inn að minnsta kosti eina IP addressu fyrir brú.</string> + <string name="send_email_for_bridges">Sendu tölvupóst til bridges(a)torproject.org með setningunni \"get bridges\" eitt og sér í innihaldi skeytisins frá gmail aðgangi.</string> <string name="error">Villa</string> + <string name="your_reachableaddresses_settings_caused_an_exception_">Þitt ReachableAddressur stillingar ollu undanþágu!</string> + <string name="your_relay_settings_caused_an_exception_">Endurvarp stillingar þínar ollu undanþágu!</string> + <string name="exit_nodes">Útgangspunktar</string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingraför, uppnefni, lönd og heimilisföng fyrir síðasta hoppið</string> + <string name="enter_exit_nodes">Sláðu Inn Útgangspunkta</string> + <string name="exclude_nodes">Útiloka Punkta</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingraför, uppnefni, lönd og heimilisföng til að útiloka</string> + <string name="enter_exclude_nodes">Sláðu Inn Útiloka Punkta</string> + <string name="strict_nodes">Strangir Punktar</string> + <string name="use_only_these_specified_nodes">Nota *aðeins* þessa tilgreindu punkta</string> + <string name="bridges">Brýr</string> + <string name="use_bridges">Nota Brýr</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Kveikja hliðstæðan inngangspunkt inná Tor Netið</string> + <string name="ip_address_and_port_of_bridges">IP addressa og brúarport</string> + <string name="enter_bridge_addresses">Sláðu Inn Brúar Addressur</string> + <string name="relays">Endurvarpar</string> + <string name="relaying">Endurvörpun</string> + <string name="enable_your_device_to_be_a_non_exit_relay">Leyfa tækinu þínu að vera útgangslaus endurvarpi</string> + <string name="relay_port">Endurvörpunar Port</string> + <string name="listening_port_for_your_tor_relay">Hlustunar port fyrir Tor endurvarpann þinn</string> + <string name="enter_or_port">Sláðu Inn OR port</string> + <string name="relay_nickname">Endurvörpunar viðurnefni</string> + <string name="the_nickname_for_your_tor_relay">Viðurnefni fyrir Tor endurvarpið þitt</string> + <string name="enter_a_custom_relay_nickname">Sláðu Inn sérhannað endurvarp viðurnefni</string> + <string name="reachable_addresses">Nálgunarhæf Heimilisföng</string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Keyra sem notandi bakvið eldvegg með hamlandi skilyrðum</string> + <string name="reachable_ports">Nálgunarhæf port</string> + <string name="ports_reachable_behind_a_restrictive_firewall">Port nálgunarhæf bakvið hamlandi eldvegg</string> + <string name="enter_ports">Sláðu Inn port</string> + <string name="enter_localhost_ports_for_hidden_services">sláðu inn localhost port fyrir faldar þjónustur</string> + <string name="hidden_service_ports">Falin Þjónustu Port</string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nafnið fyrir falda þjónustu þína (búið til sjálfkrafa)</string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">leyfa villuskráningu á verða búin til (verður að nota adb eða aLogCat til að skoða)</string> + <string name="project_home">Heimili Verkefnisins:</string> + <string name="the_tor_license">Tor Leyfið</string> + <string name="https_torproject_org">https:torproject.org</string> + <string name="third_party_software">Hugbúnaður frá öðrum höfund:</string> + <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> + <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="hidden_service_request">Smáforrit vill opna falið port þjóns %S að Tor netinu. Þetta er öruggt ef þú treystir smáforritinu.</string> + <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu skráninguna</string> + <string name="hidden_service_on">falin þjónusta á:</string> + <string name="unable_to_read_hidden_service_name">get ekki lesið nafn földu þjónustunnar</string> + <string name="unable_to_start_tor">Get ekki kveikt á Tor:</string> + <string name="pref_use_sys_iptables_title">Nota Upprunalegar IPtöflur</string> <string name="default_bridges"></string> </resources>

1 0

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

18 Jul '13

commit bf018ffda8166bbaf67b036bd8a6c86f417a3393 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 19:45:31 2013 +0000 Update translations for vidalia_alpha --- is/vidalia_is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/vidalia_is.po b/is/vidalia_is.po index 1c85c9d..9cf86be 100644 --- a/is/vidalia_is.po +++ b/is/vidalia_is.po @@ -6,7 +6,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-18 09:50+0000\n" +"PO-Revision-Date: 2013-07-18 19:40+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/torproject/language/is/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 18 Jul '13

18 Jul '13

commit 39e959b04941658d32ee95a15b6728d9c75be815 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 19:45:24 2013 +0000 Update translations for vidalia --- is/vidalia_is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/vidalia_is.po b/is/vidalia_is.po index ec1c984..2d62bb1 100755 --- a/is/vidalia_is.po +++ b/is/vidalia_is.po @@ -6,7 +6,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-07-18 09:50+0000\n" +"PO-Revision-Date: 2013-07-18 19:40+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/torproject/language/is/)\n" "MIME-Version: 1.0\n"

1 0

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

18 Jul '13

commit bb5c2e0ecdd5165ff169895942d0f26855dd9583 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 18 19:45:13 2013 +0000 Update translations for orbot --- values-is/strings.xml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/values-is/strings.xml b/values-is/strings.xml index 15e56b0..b50c342 100644 --- a/values-is/strings.xml +++ b/values-is/strings.xml @@ -35,6 +35,15 @@ <string name="pref_transparent_all_title">Tor Allt</string> <string name="pref_transparent_all_summary">Beina umferð fyrir öll smáforrit í gegnum Tor</string> <string name="pref_transparent_port_fallback_title">Port Beinir til vara</string> + <string name="pref_transparent_port_fallback_summary">AÐVÖRUN: Fer framhjá algengum portum (80, 443, etc). *NOTA AÐEINS* ef \'Allt\' eða \'Smáforrit\' stilling virkar ekki.</string> + <string name="pref_transparent_port_title">Porta Listi</string> + <string name="pref_transparent_port_summary">Listi yfir port til að proxya. *NOTA AÐEINS* ef \'Allt\' eða \'Smáforrit\' stilling virkar ekki</string> + <string name="pref_transparent_port_dialog">Settu inn port til að proxya</string> + <string name="pref_has_root">Biðja um Rótaraðgang</string> + <string name="pref_has_root_summary">Þarfnast rótaraðgangs fyrir gegnsæja proxýun</string> + <string name="status_install_success">Uppsetning Tor skráa tókst!</string> + <string name="status_install_fail">Tor binary skrár gátu ekki verið settar upp. Vinsamlegast athugaðu Skráninguna og láttu vita til tor-assistants(a)torproject.org</string> + <string name="title_error">Villa í Forriti</string> <string name="wizard_title">Orbot</string> <string name="wizard_btn_tell_me_more">Um Orbot</string> <string name="btn_next">Næsta</string> @@ -44,6 +53,7 @@ <string name="btn_cancel">Hætta við</string>  <string name="wizard_details">Fáein Orbot Smáatriði</string> + <string name="wizard_details_msg">Orbot er open-source forrit sem inniheldur Tor, LibEvent og Privoxy. Það veitir staðbundinn HTTP proxy (8118) og SOCKS proxy (9050) inná Tor netið. Orbot hefur líka eiginleika, á tæki með rótaraðgang, til að senda alla vefumferð í gegnum Tor.</string> <string name="wizard_permissions_root">Aðgangur Heimilaður</string> <string name="wizard_permissions_stock">Orbot Leyfisveiting</string> <string name="wizard_premissions_msg_root">Frábært! Við höfum skynjað að þú hefur rótaraðgang heimilaðan fyrir Orbot. Við munum nota þetta vald skynsamlega.</string> @@ -51,12 +61,14 @@ <string name="wizard_permissions_no_root">Ef þú hefur ekki rótaraðgang eða hefur enga hugmynd um hvað við erum að tala, vertu viss um að nota smáforrit sem gerð eru til að vinna með Orbot.</string> <string name="wizard_permissions_consent">Ég skil og vil halda áfram án réttinda Ofurnotanda</string> <string name="wizard_permission_enable_root">Veita rótaraðgang fyrir Orbot</string> + <string name="wizard_configure">Stilla Torinleika</string> + <string name="wizard_configure_msg">Orbot gefur þér möguleikann á að beina allri umferð smáforrita í gegnum Tor EÐA að velja smáforrit hvert fyrir sig.</string> <string name="wizard_configure_all">Beina umferð fyrir öll smáforrit í gegnum Tor</string> <string name="wizard_configure_select_apps">Velja Einstök Smáforrit fyrir Tor</string> <string name="wizard_tips_tricks">Orbot-virk Smáforrit</string> <string name="wizard_tips_otrchat">Gibberbot - Öruggur skilaboðaþjónn fyrir Android</string> - <string name="wizard_tips_proxy">Beinis Stillingar - Lærðu hvernig á að stilla smáforrit til að virka með Orbot</string> - <string name="wizard_proxy_help_info">Beinis Stillingar</string> + <string name="wizard_tips_proxy">Proxy Stillingar - Lærðu hvernig á að stilla smáforrit til að virka með Orbot</string> + <string name="wizard_proxy_help_info">Proxy Stillingar</string> <string name="wizard_final">Orbot er tilbúinn!</string>  <string name="tor_check">Þetta mun opna vef vafrann þinn að https://check.torproject.org til að sjá hvort Orbot sé rétt tengdur og að þú sért tengdur Tor.</string> @@ -69,17 +81,32 @@ <string name="wizard_warning_title">Aðvörun</string>  <string name="wizard_permissions_title">Leyfisveitingar</string> - <string name="wizard_permissions_root_msg1">Þú getur valfrjálst veitt Orbot \'Ofurnotanda\' aðgang til að virkja stillingar fyrir lengra komna, eins og Gegnsæ Beining.</string> + <string name="wizard_permissions_root_msg1">Þú getur valfrjálst veitt Orbot \'Ofurnotanda\' aðgang til að virkja stillingar fyrir lengra komna, eins og Gegnsæ Proxýun.</string> <string name="wizard_permissions_root_msg2">Ef þú vilt ekki gera þetta, vinsamlegast vertu viss um að nota smáforrit sem gerð eru til að vinna með Orbot</string>  <string name="wizard_tips_title">Orbot-Virk Smáforrit</string> <string name="wizard_tips_gibberbot">Gibberbot: Öruggt spjallforrit með Óupptekna Dulkóðun</string> + <string name="wizard_tips_orweb">Orweb: Næðis-bættur vafri sem virkar í gegnum Tor</string>   - <string name="wizard_transproxy_title">Gegnsætt Proxy</string> + <string name="wizard_transproxy_title">Gegnsæ Proxýun</string> + <string name="wizard_transproxy_msg">Þetta leyfir smáforritunum þínum sjálfkrafa að keyra í gengum Tor netið án nokkurra stillinga.</string> + <string name="wizard_transproxy_hint">(Hakaðu í þenna reit ef þú hefur enga hugmynd um hvað við erum að tala)</string> + <string name="wizard_transproxy_none">Engin</string> + <string name="pref_transparent_tethering_title">Tor Netaðgangspunktur</string> + <string name="button_grant_superuser">Biðja um Ofurnotandaréttindi</string> + <string name="pref_select_apps">Velja Smáforrit</string> + <string name="pref_select_apps_summary">Velja Smáforrit til að Beina í gegnum Tor</string> + <string name="pref_node_configuration">Punkta Stilling</string> + <string name="pref_node_configuration_summary">Þetta eru flóknari stillingar sem geta minnkað nafnleysið þitt</string> + <string name="pref_entrance_node">Inngangs Punktur</string> + <string name="pref_entrance_node_summary">Fingraför, uppnefni, lönd og heimilisföng fyrir fyrsta hoppið</string> + <string name="pref_entrance_node_dialog">Sláðu Inn Inngangspunkt</string> + <string name="pref_proxy_type_summary">Protocol til að nota fyrir proxy þjón: HTTP, HTTPS, Socks4, Socks5</string> + <string name="pref_proxy_type_dialog">Sláðu Inn Gerð Proxýs</string> <string name="status">Staða</string> <string name="error">Villa</string> <string name="default_bridges"></string>

1 0

[tor/master] Start of a unit test for options_validate.
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit f45e1fbd5b25735c75bed8767d9d50e279c4b63a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 14:38:31 2013 -0400 Start of a unit test for options_validate. I added this so I could write a unit test for ServerTransportOptions, but it incidentally exercises the succeed-on-defaults case of options_validate too. --- src/or/config.c | 11 ++- src/or/config.h | 12 ++++ src/or/confparse.h | 2 +- src/test/include.am | 1 + src/test/test.c | 2 + src/test/test_options.c | 169 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 189 insertions(+), 8 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 4ddced8..2218e50 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -9,6 +9,7 @@ * \brief Code to parse and interpret configuration files. **/ +#define CONFIG_PRIVATE #include "or.h" #include "addressmap.h" #include "channel.h" @@ -509,10 +510,6 @@ static const config_var_t testing_tor_network_defaults[] = { #ifdef _WIN32 static char *get_windows_conf_root(void); #endif -static int options_validate(or_options_t *old_options, - or_options_t *options, - or_options_t *default_options, - int from_setconf, char **msg); static int options_act_reversible(const or_options_t *old_options, char **msg); static int options_act(const or_options_t *old_options); static int options_transition_allowed(const or_options_t *old, @@ -556,7 +553,7 @@ static void config_maybe_load_geoip_files_(const or_options_t *options, #define OR_OPTIONS_MAGIC 9090909 /** Configuration format for or_options_t. */ -static config_format_t options_format = { +STATIC config_format_t options_format = { sizeof(or_options_t), OR_OPTIONS_MAGIC, STRUCT_OFFSET(or_options_t, magic_), @@ -712,7 +709,7 @@ get_short_version(void) /** Release additional memory allocated in options */ -static void +STATIC void or_options_free(or_options_t *options) { if (!options) @@ -2349,7 +2346,7 @@ compute_publishserverdescriptor(or_options_t *options) * Log line should stay empty. If it's 0, then give us a default log * if there are no logs defined. */ -static int +STATIC int options_validate(or_options_t *old_options, or_options_t *options, or_options_t *default_options, int from_setconf, char **msg) { diff --git a/src/or/config.h b/src/or/config.h index 9910f18..16a8a35 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -116,5 +116,17 @@ smartlist_t *get_options_from_transport_options_line(const char *line, const char *transport); smartlist_t *get_options_for_server_transport(const char *transport); +#ifdef CONFIG_PRIVATE +#ifdef TOR_UNIT_TESTS +extern struct config_format_t options_format; +#endif + +STATIC void or_options_free(or_options_t *options); +STATIC int options_validate(or_options_t *old_options, + or_options_t *options, + or_options_t *default_options, + int from_setconf, char **msg); +#endif + #endif diff --git a/src/or/confparse.h b/src/or/confparse.h index d82e109..924ee0d 100644 --- a/src/or/confparse.h +++ b/src/or/confparse.h @@ -76,7 +76,7 @@ typedef int (*validate_fn_t)(void*,void*,int,char**); /** Information on the keys, value types, key-to-struct-member mappings, * variable descriptions, validation functions, and abbreviations for a * configuration or storage format. */ -typedef struct { +typedef struct config_format_t { size_t size; /**< Size of the struct that everything gets parsed into. */ uint32_t magic; /**< Required 'magic value' to make sure we have a struct * of the right type. */ diff --git a/src/test/include.am b/src/test/include.am index d616067..6271909 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -27,6 +27,7 @@ src_test_test_SOURCES = \ src/test/test_dir.c \ src/test/test_introduce.c \ src/test/test_microdesc.c \ + src/test/test_options.c \ src/test/test_pt.c \ src/test/test_replay.c \ src/test/test_util.c \ diff --git a/src/test/test.c b/src/test/test.c index d1c5b17..9640169 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -2134,6 +2134,7 @@ extern struct testcase_t replaycache_tests[]; extern struct testcase_t cell_format_tests[]; extern struct testcase_t circuitlist_tests[]; extern struct testcase_t cell_queue_tests[]; +extern struct testcase_t options_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@ -2151,6 +2152,7 @@ static struct testgroup_t testgroups[] = { { "replaycache/", replaycache_tests }, { "introduce/", introduce_tests }, { "circuitlist/", circuitlist_tests }, + { "options/", options_tests }, END_OF_GROUPS }; diff --git a/src/test/test_options.c b/src/test/test_options.c new file mode 100644 index 0000000..6beff25 --- /dev/null +++ b/src/test/test_options.c @@ -0,0 +1,169 @@ +/* Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define CONFIG_PRIVATE +#include "or.h" +#include "confparse.h" +#include "config.h" +#include "test.h" + +typedef struct { + int severity; + uint32_t domain; + char *msg; +} logmsg_t; + +static smartlist_t *messages = NULL; + +static void +log_cback(int severity, uint32_t domain, const char *msg) +{ + logmsg_t *x = tor_malloc(sizeof(*x)); + x->severity = severity; + x->domain = domain; + x->msg = tor_strdup(msg); + if (!messages) + messages = smartlist_new(); + smartlist_add(messages, x); +} + +static void +setup_log_callback(void) +{ + log_severity_list_t lst; + memset(&lst, 0, sizeof(lst)); + lst.masks[LOG_ERR - LOG_ERR] = ~0; + lst.masks[LOG_WARN - LOG_ERR] = ~0; + lst.masks[LOG_NOTICE - LOG_ERR] = ~0; + add_callback_log(&lst, log_cback); +} + +static char * +dump_logs(void) +{ + smartlist_t *msgs; + char *out; + if (! messages) + return tor_strdup(""); + msgs = smartlist_new(); + SMARTLIST_FOREACH_BEGIN(messages, logmsg_t *, x) { + smartlist_add_asprintf(msgs, "[%s] %s", + log_level_to_string(x->severity), x->msg); + } SMARTLIST_FOREACH_END(x); + out = smartlist_join_strings(msgs, "", 0, NULL); + SMARTLIST_FOREACH(msgs, char *, cp, tor_free(cp)); + smartlist_free(msgs); + return out; +} + +static void +clear_log_messages(void) +{ + if (!messages) + return; + SMARTLIST_FOREACH(messages, logmsg_t *, m, + { tor_free(m->msg); tor_free(m); }); + smartlist_free(messages); + messages = NULL; +} + +static void +test_options_validate_impl(const char *configuration, + const char *expect_errmsg, + int expect_log_severity, + const char *expect_log) +{ + or_options_t *opt = options_new(); + or_options_t *dflt; + config_line_t *cl=NULL; + char *msg=NULL; + int r; + opt->command = CMD_RUN_TOR; + options_init(opt); + + dflt = config_dup(&options_format, opt); + clear_log_messages(); + + r = config_get_lines(configuration, &cl, 1); + tt_int_op(r, ==, 0); + + r = config_assign(&options_format, opt, cl, 0, 0, &msg); + tt_int_op(r, ==, 0); + + r = options_validate(NULL, opt, dflt, 0, &msg); + if (expect_errmsg && !msg) { + TT_DIE(("Expected error message <%s> from <%s>, but got none.", + expect_errmsg, configuration)); + } else if (expect_errmsg && !strstr(msg, expect_errmsg)) { + TT_DIE(("Expected error message <%s> from <%s>, but got <%s>.", + expect_errmsg, configuration, msg)); + } else if (!expect_errmsg && msg) { + TT_DIE(("Expected no error message from <%s> but got <%s>.", + configuration, msg)); + } + tt_int_op((r == 0), ==, (msg == NULL)); + + if (expect_log) { + int found = 0; + if (messages) { + SMARTLIST_FOREACH_BEGIN(messages, logmsg_t *, m) { + if (m->severity == expect_log_severity && + strstr(m->msg, expect_log)) { + found = 1; + break; + } + } SMARTLIST_FOREACH_END(m); + } + if (!found) { + tor_free(msg); + msg = dump_logs(); + TT_DIE(("Expected log message [%s] %s from <%s>, but got <%s>.", + log_level_to_string(expect_log_severity), expect_log, + configuration, msg)); + } + } + + done: + config_free_lines(cl); + or_options_free(opt); + or_options_free(dflt); + tor_free(msg); + clear_log_messages(); +} + +#define WANT_ERR(config, msg) \ + test_options_validate_impl((config), (msg), 0, NULL) +#define WANT_LOG(config, severity, msg) \ + test_options_validate_impl((config), NULL, (severity), (msg)) +#define WANT_ERR_LOG(config, msg, severity, logmsg) \ + test_options_validate_impl((config), (msg), (severity), (logmsg)) +#define OK(config) \ + test_options_validate_impl((config), NULL, 0, NULL) + +static void +test_options_validate(void *arg) +{ + (void)arg; + setup_log_callback(); + + WANT_ERR_LOG("ServerTransportOptions trebuchet", + "ServerTransportOptions did not parse", + LOG_WARN, "Too few arguments"); + OK("ServerTransportOptions trebuchet sling=snappy"); + OK("ServerTransportOptions trebuchet sling="); + WANT_ERR_LOG("ServerTransportOptions trebuchet slingsnappy", + "ServerTransportOptions did not parse", + LOG_WARN, "\"slingsnappy\" is not a k=v"); + +// done: + clear_log_messages(); + return; +} + +struct testcase_t options_tests[] = { + { "validate", test_options_validate, TT_FORK, NULL, NULL }, + END_OF_TESTCASES +}; +

1 0

[tor/master] Add a test for n_cells_in_circuit_queues
by nickm＠torproject.org 18 Jul '13

18 Jul '13

commit 1e78100b250a55a925c7e8b510090a8ceee19025 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 11:21:27 2013 -0400 Add a test for n_cells_in_circuit_queues --- src/or/circuitlist.c | 2 +- src/or/circuitlist.h | 1 + src/test/test_cell_queue.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 2a85b7d..85bacce 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1640,7 +1640,7 @@ marked_circuit_free_cells(circuit_t *circ) } /** Return the number of cells used by the circuit <b>c</b>'s cell queues. */ -static size_t +STATIC size_t n_cells_in_circ_queues(const circuit_t *c) { size_t n = c->n_chan_cells.n; diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index a5a5485..4e56f52 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -72,6 +72,7 @@ void channel_note_destroy_not_pending(channel_t *chan, circid_t id); #ifdef CIRCUITLIST_PRIVATE STATIC void circuit_free(circuit_t *circ); +STATIC size_t n_cells_in_circ_queues(const circuit_t *c); #endif #endif diff --git a/src/test/test_cell_queue.c b/src/test/test_cell_queue.c index 8916b06..cf2d11a 100644 --- a/src/test/test_cell_queue.c +++ b/src/test/test_cell_queue.c @@ -97,7 +97,50 @@ test_cq_manip(void *arg) free_cell_pool(); } +static void +test_circuit_n_cells(void *arg) +{ + packed_cell_t *pc1=NULL, *pc2=NULL, *pc3=NULL, *pc4=NULL, *pc5=NULL; + origin_circuit_t *origin_c=NULL; + or_circuit_t *or_c=NULL; + + (void)arg; + + init_cell_pool(); + + pc1 = packed_cell_new(); + pc2 = packed_cell_new(); + pc3 = packed_cell_new(); + pc4 = packed_cell_new(); + pc5 = packed_cell_new(); + tt_assert(pc1 && pc2 && pc3 && pc4 && pc5); + + or_c = or_circuit_new(0, NULL); + origin_c = origin_circuit_new(); + origin_c->base_.purpose = CIRCUIT_PURPOSE_C_GENERAL; + + tt_int_op(n_cells_in_circ_queues(TO_CIRCUIT(or_c)), ==, 0); + cell_queue_append(&or_c->p_chan_cells, pc1); + tt_int_op(n_cells_in_circ_queues(TO_CIRCUIT(or_c)), ==, 1); + cell_queue_append(&or_c->base_.n_chan_cells, pc2); + cell_queue_append(&or_c->base_.n_chan_cells, pc3); + tt_int_op(n_cells_in_circ_queues(TO_CIRCUIT(or_c)), ==, 3); + + tt_int_op(n_cells_in_circ_queues(TO_CIRCUIT(origin_c)), ==, 0); + cell_queue_append(&origin_c->base_.n_chan_cells, pc4); + cell_queue_append(&origin_c->base_.n_chan_cells, pc5); + tt_int_op(n_cells_in_circ_queues(TO_CIRCUIT(origin_c)), ==, 2); + + done: + circuit_free(TO_CIRCUIT(or_c)); + circuit_free(TO_CIRCUIT(origin_c)); + + free_cell_pool(); +} + struct testcase_t cell_queue_tests[] = { { "basic", test_cq_manip, TT_FORK, NULL, NULL, }, + { "circ_n_cells", test_circuit_n_cells, TT_FORK, NULL, NULL }, END_OF_TESTCASES }; +

1 0