[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [orbot/master] update strings



commit a3dba713ecbcb5fd4450b2a5e0ea3dbf4d75b01a
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date:   Tue Nov 13 09:46:32 2018 -0500

    update strings
---
 app/src/main/res/values-ay/poestrings.xml |  24 ++++++
 app/src/main/res/values-ay/strings.xml    | 120 +++++++++++++++++++++++++++++-
 app/src/main/res/values-gu/strings.xml    |   1 +
 description/ay.xlf                        |  16 ++++
 4 files changed, 160 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ay/poestrings.xml b/app/src/main/res/values-ay/poestrings.xml
index 50a75f28..ac3e49d5 100644
--- a/app/src/main/res/values-ay/poestrings.xml
+++ b/app/src/main/res/values-ay/poestrings.xml
@@ -1,13 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="bridges_desc">Jalakipañanakax Tor waljkut pachp luririnakawa, jan jist\'antayasiñan yanapt\'i. Toratix ISP ukan jark\'antatachixa, kunayman jalakipañanak yant\'asma
+Jan jist\'antayasiñatakixa: ajllitatix jan kust\'kchixa, yaqhrak yant\'am.</string>
+
+    <string name="bridges_no">Janiw jalakipañanakax utjkiti: Chiqak Torar waykatam
+</string>
+    <string name="bridges_provided">Jalakipañanak uñtayata:</string>
+    <string name="bridges_custom">Maynipachpatakjam jalakipañanaka</string>
+
+    <string name="bridges_config">Jalakipañanak mayjt\'ayäwi </string>
     <string name="action_done">Tukuyata</string>
 
     <string name="bridges_sometimes">Yaqhippachax Tor apnaqañatakix mä jalakipañaw wakisi</string>
     <string name="action_more">JUK\'AMP YATIYASKAKITA</string>
 
     <string name="vpn_setup">Toran VPN utjirinaktuqüm kawknïr wakichäwinaks qhantayarakismawa</string>
+    <string name="vpn_setup_sub">Akax janiw jan uñjkay tukuykatamti, ukhamarus jark\'antatanak jalakipañanx yanapt\'ätamwa.</string>
     <string name="action_vpn_choose">WAKICHÃ?WINAK CHHIJLLAÃ?A</string>
 
+    <string name="status_connected">¡Waykatata!
+</string>
+
+    <string name="loading_claim_1">¡Torarux kunayman mayacht\'atanakaw ch\'amañchi!</string>
+    <string name="loading_claim_2">Jan khitins uñjayasiñatakix jaqix sapüruw Tor apnaqi.</string>
+    <string name="loading_claim_3">Kunapachatï Facebookarux jan mantañjamäxi, jaqix masinakamp aruskipañatakix Tor apnaqi.</string>
+    <string name="loading_claim_4">Arsusirinakax amuyunakap maynit maynikam twitertuq aruskipañatakix Tor apnaqapxi. </string>
+    <string name="loading_claim_5">Jaqinak p\'arxtayañatakis mayachthapiñatakis blogueronakax Tor apnaqapxi.</string>
+    <string name="loading_claim_6">Yatiyäwinak sumpach yatxatañatakix yatiyirinakax Tor apnaqapxi.</string>
+    <string name="loading_claim_7">Jan katjayasiñatakix alakip jaqinakax Tor apnaqapxi.</string>
+    <string name="loading_claim_8">Irnaqirinakax chiqapar uñjatapxañapatakis jan jaqsuyasipxañapatakis Tor apnaqapxi.</string>
+
+    <string name="status_connecting">Waykatasipksmawa.\" = \"Waykatasipksmawa.</string>
+
     <string name="hello">Kamisaki</string>
     <string name="welcome">Jawsañatak wakt\'ayat Tor ukarux walik mantantaxa.</string>
 
diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml
index 6b810fe1..12256d87 100644
--- a/app/src/main/res/values-ay/strings.xml
+++ b/app/src/main/res/values-ay/strings.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Orbot</string>
+  <string name="app_name">Orbot </string>
+  <string name="app_description">Orbotax proxyn mä wakichawipawa, llikatuq jan lunthatayasiñatakiw yaqha wakichawinakampachar yanapi. Orbotax Toratuqiw uraqpachan luratanak jañ uñjayasiñatak atamirinaktuq jark\'aqi. Torax Software Libre ukhamawa, ukampirus maynin luratanakapa, aruskipatanakapa, amuyunakap jan uñjayasiñatakiw jark\'aqi. </string>
   <string name="internal_web_url">http://orbot/</string>
   <string name="default_web_url">http://check.torproject.org</string>
   <string name="secure_default_web_url">https://check.torproject.org</string>
@@ -42,7 +43,14 @@
   <string name="pref_transparent_all_title">Taqpachaw Tor ukamp apnaqatäxani</string>
   <string name="pref_transparent_all_summary">Jan mayjt\'ayas taqpach apnaqat wakichäwinak Tor ukamp proxyptayam</string>
   <string name="pref_transparent_port_fallback_title">Jan walt\'äwinak utjipanx yaqha proxy ukar saram</string>
+  <string name="pref_transparent_port_fallback_summary">UKATRAKI: jan mantañ apayañ thakhinakarux jan mantamti (80, 443, juk\'ampinaka). Ukhamatix \'taqpacha\' jan ukax \'Wakichâwinaka\' jan aqtayatakchixa \"UKHAK APNAQAM\".</string>
+  <string name="pref_transparent_port_title">Apayañ thakhi utjirinaka</string>
+  <string name="pref_transparent_port_summary">Proxyfikañ apayañ thakh utjirinaka. Kunapachati \'Taqpacha\' \'Wakichawinaka\'  jan aqtayatäki *UKHAK APNAQAM*</string>
+  <string name="pref_transparent_port_dialog">Proxifikañ apayañ thakhinak qillqantam</string>
+  <string name="pref_has_root">Root ukar mantañatak mayim</string>
   <string name="pref_has_root_summary">Qhan apnaqat proxyptayat apnaqañatakix rootamp iyawsayasim</string>
+  <string name="status_install_success">¡Toran binarionakapax khusa uchatawa! </string>
+  <string name="status_install_fail">Toran binarionakapax janiw uchatäkiti. Qillqantayasit uñakipam ukhamarak tor-assistants@xxxxxxxxxxxxxx ukar qillqt\'am</string>
   <string name="title_error">Pantjat wakichäwi</string>
   <string name="wizard_title">Orbot</string>
   <string name="wizard_btn_tell_me_more">Orbotxata</string>
@@ -53,17 +61,35 @@
   <string name="btn_cancel">Janiw saña</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Orbotxat juk\'amp yatiñataki</string>
+  <string name="wizard_details_msg">Orbot wakichawix inakiwa ukatx Tor ukaniwa, Obfs4Proxy, BadVPN Tun2Socks, LibEvent ukhamarak Polipo. Proxy HTTP (8118) ukhamarak mä proxy SOCKS (9050) Tor taypin utjayi. Mä rooteat atamirinx Orbotax Tor tuqiw taqpach llika yatiyäwinak  apayarakispawa.</string>
   <string name="wizard_permissions_root">Iyaw sata</string>
   <string name="wizard_permissions_stock">Orbotar iyaw satanaka</string>
   <string name="wizard_premissions_msg_root">¡Wali kusawa! Rootar iyaw satanak Orbotar churatam katjapxta. Amuyumpiw aka iyaw satanak apnaqapxä.</string>
   <string name="wizard_permissions_msg_stock">Inas jan munaskchiti, ukampirusa Root iyawsatamp dispositivomar mantät ukjaxa, Orbotax juk\'amp ch\'amaniw tukuspa. ¡Orbot juk\'amp ch\'amaniñapatakix aynachtuqir limt\'am!</string>
+  <string name="wizard_permissions_no_root">Root ukarutix jan mantañjamakchixa, jan ukax janich amuykta ukapachax kawkïr wakichäwinakati Orbotatak utjki uk apnaqam.  </string>
   <string name="wizard_permissions_consent">Amuyxtwa, jan iyawsas luraskakiwa</string>
+  <string name="wizard_permission_enable_root">Orbotar iyaw sañ Rootar churam</string>
+  <string name="wizard_configure">Tor tuqin mayxt\'ayaña</string>
+  <string name="wizard_configure_msg">Orbotax Tor tuqiw taqi wakichäwinak apnaqañ yanapt\'tam JAN UKASTI sapa wakichäwinakaman ajlliñ yanapt\'tam.</string>
+  <string name="wizard_configure_all">Tor tuqix taqpach wakichäwinak proxiptayam</string>
+  <string name="wizard_configure_select_apps">Toratak sapa wakichäwinak ajllt\'am</string>
+  <string name="wizard_tips_tricks">Orbotatak aqtayat wakichäwinaka</string>
+  <string name="wizard_tips_msg">Aknïr wakichäwinakax Orbotamp irnaqañatak luratawa. Jichhax apaqañatakix sapa limt\'añar limt\'am, jan ukasti Google Play, GuardianProject.info ukhamarak F-Droid.org tuqins jikxatarakismawa.</string>
+  <string name="wizard_tips_otrchat">ChatSecure -  Android ukatak yatiyawinak apnaqiri</string>
+  <string name="wizard_tips_proxy">Proxinak mayjt\'ayaña - Orbotamp irnaqañ kunjam mayxt\'ayañas wakchäiwinakax uk yatiqam</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo thaqhañ wakichäwi </string>
+  <string name="wizard_tips_twitter">8118 apayañ thakhimp ukhamarak \"localhost\" ukamp proxytuq Twiter mayjt\'ayam</string>
+  <string name="wizard_tips_story_maker">StoryMaker - ¡tuwaqasiñatakix Tor ukar churam jan ukasti luratanak wakicht\'am!</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy mayjt\'ayirinaka</string>
+  <string name="wizard_proxy_help_msg">HTTP jan ukax SOCKS proxy uka apnaqawtix android wakichäw iyawschixa, Orbot ukar waykattañatakix mayjt\'ayasmawa jan ukax Tor uks apnaqarakismawa.\n\n\n Yanapirin mayjt\'ayañax 127.0.0.1 jan ukasti \"localhost\" ukawa. HTTP mayjt\'ayañatakix 8118 ukawa. SOCKS ukan proxypax 9050 ukankiwa.  Wakisisp ukjax SOCKS4A, SOCKS5 ukas apnaqatarakispawa.\n \n\n\n  Androidan proxyfikañ tuqitx FAQ http://tinyurl.com/proxyandroid\n uksanx juk\'amp yatxatarakismawa. </string>
   <string name="wizard_final">¡Orbotax wakt\'ayatawa!</string>
   <string name="wizard_final_msg">Uraqpachanx waranq waranq jaqiw Tor apnaqasipki. \n\n yatiyirinaka, blog apnaqarinaka, jaqir arxatirinaka, taripäw apnaqirinaka, tamanaka, t\'aqhisiyat markachirinaka, aliq jaqinaka... ¡Jichhax jumas apnaqxarakismawa!</string>
   <string name="wizard_exit_at_first_screen_toast">¡Janïr Orbot apnaqkasax mayjt\'ayam, amp suma!</string>
   <!--END Welcome Wizard strings (DJH)-->
   <string name="connect_first_time">Tor wakichäwinkxtawa - ukampirus dispositivomx jan walt\'ayañatak uñsusipkakispawa. Yatiñatakix \'Thaqhiriru\' limt\'am. \n\nJuk\'amp yatiñatakix akawjar mantam: https://guardianproject.info/apps/orbot jan ukax help@xxxxxxxxxxxxxxxxxxxx ukar qillqt\'am.</string>
+  <string name="tor_check">Tor tuqir waykatat uñjañatakix ukhamarak orbot uk mayxt\'ayat amuyañatakix https://check.torproject.org uk thaqhañ llika taypin jist\'aram.</string>
+  <string name="pref_hs_group">Imantat yanapirinaka</string>
   <string name="pref_general_group">Wakiskiri</string>
   <string name="pref_start_boot_title">Orbot qhantaykas qalltaña</string>
   <string name="pref_start_boot_summary">Android aqtaykasax Orbot, Tor justupak aqtayam.</string>
@@ -76,38 +102,82 @@
   <!--Permissions screen-->
   <string name="wizard_permissions_title">Iyawsatanaka</string>
   <string name="wizard_permissions_root_msg1">Qhan apnaqat proxyptayatjam kikpaki, Orbotan juk\'amp lurañapatakix \'Taqpach apnaqiri\' tukuñapatak iyaw sarakismawa. </string>
+  <string name="wizard_permissions_root_msg2">Janitix ak lurañ munkst ukhaxa Orbotamp irnaqir wakichäwinak lurat apnaqam </string>
+  <string name="wizard_permissions_no_root_msg">Dispositivomax janiw rooteyatjamakiti, janiw rootas yäparjamakiti \"Wali apnaqiri\" ukas askjamäkiti.\n\nUkalantix \"Wakichäwinaka\" nayrïn uñstankix ukan amp sum yant\'am.</string>
   <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbotatak aqtayat wakichäwinaka</string>
+  <string name="wizard_tips_gibberbot">ChatSecure:  Off-The-Record (OTR) ukamp qillqattuq aruskipäwinkaña</string>
+  <string name="wizard_tips_orweb">Orfox: Tortuq thaqtañapatak wakichatawa</string>
+  <string name="wizard_tips_play">Google Playtuqin Guardian Project ukan wakichäwinakap jikxatam</string>
+  <string name="wizard_tips_fdroid">F-Drold tuqin Guardian Project ukan taqpach wakichäwinakap katjam</string>
+  <string name="wizard_tips_fdroid_org">https://f-droid.org ukan Guardian Project ukan taqpach wakichäwinakap jikxatäta</string>
   <!--Transparent Proxy screen-->
   <string name="wizard_transproxy_title">Proxyptayatax qhan apnaqatawa</string>
+  <string name="wizard_transproxy_msg">Tortuqin jan mayjt\'ayas justupach wakichäwinakax aqtañapan yanapt\'i</string>
+  <string name="wizard_transproxy_hint">(Janitix kunas amuyaskchixa, ukawjar limt\'am)</string>
   <string name="wizard_transproxy_none">Ni kuna</string>
   <string name="pref_transparent_tethering_title">Tor yaqhanakamp waythapiña</string>
   <string name="pref_transparent_tethering_summary">Wifi, USB waythapit yänakatak Toran qhan aqnaqat proxyptayat qhantayam (mayamp aqtayañawa)</string>
+  <string name="button_grant_superuser">WAli apnaqir ukar mantañatak mayim</string>
   <string name="pref_select_apps">Wakichäwinak ajlliña</string>
+  <string name="pref_select_apps_summary">Tor tuqix uñacht\'ayañatak wakichäwinak ajllt\'am</string>
+  <string name="pref_node_configuration">Puriñawjanak mayjt\'ayaña</string>
+  <string name="pref_node_configuration_summary">Akanakax jan amuykay tukuñaman mayjt\'ayañatakiwa.</string>
+  <string name="pref_entrance_node">Puriñawjan mantañanaka</string>
+  <string name="pref_entrance_node_summary">Nayrïr jalakipañanakan ampar luk\'an chimpunaka, ñanqha sutinaka, markanaka, chiqawjanakapa</string>
+  <string name="pref_entrance_node_dialog">Puriñawjan mantañanak qillqantaña</string>
   <string name="pref_allow_background_starts_title">Wakichäwinak qhiparkipstayaña</string>
   <string name="pref_allow_background_starts_summary">Toramp kikip luratanakamp qalltañapataki, yaqha wakichäwinakamp Orbot apnaqayam</string>
+  <string name="button_proxy_all">Taqpach proxyptayaña</string>
+  <string name="button_proxy_none">Jan kuns proxyptayaña</string>
+  <string name="button_invert_selection">Ajlliñanak jaqukipaña</string>
   <string name="pref_proxy_title">Llikan uñstir proxy (munsta ukaki)</string>
   <string name="pref_proxy_type_title">Uñstir proxy</string>
   <string name="pref_proxy_type_summary">Uñstir yanapiri ajllt\'aña: HTTP, HTTPS, Socks4, Socks5.i</string>
+  <string name="pref_proxy_type_dialog">Mä Proxy ajllt\'am</string>
   <string name="pref_proxy_host_title">Uñstir proxy</string>
   <string name="pref_proxy_host_summary">Proxy suti</string>
+  <string name="pref_proxy_host_dialog">Yanapir proxy qillqantam</string>
   <string name="pref_proxy_port_title">Uñstir proxy apayañ thakhi</string>
   <string name="pref_proxy_port_summary">Proxy apayañ thakhi</string>
+  <string name="pref_proxy_port_dialog">Proxy apayañ thakh qillqantam</string>
   <string name="pref_proxy_username_title">Uñstir proxyn apnaqañ sutima</string>
   <string name="pref_proxy_username_summary">Proxyn apnaqañ suti (munsta ukaki)</string>
+  <string name="pref_proxy_username_dialog">Proxytuqin apnaqirin sutip qillqantam</string>
   <string name="pref_proxy_password_title">Proxy chimpu</string>
   <string name="pref_proxy_password_summary">Proxy chimpu (munsta ukaki)</string>
+  <string name="pref_proxy_password_dialog">Proxytuqin chimpu qillqantam</string>
   <string name="status">Kunjmäskisa</string>
   <string name="setting_up_full_transparent_proxying_">Taqpachatak qhan apnaqat proxyptayatax phuqhachaskiwa...</string>
   <string name="setting_up_app_based_transparent_proxying_">Sapa wakichäwitak qhan apnaqat proxyptayatax phuqhachaskiwa...</string>
   <string name="transparent_proxying_enabled">Qhan apnaqat proxyptayatax QHANTAYATAWA</string>
+  <string name="transproxy_enabled_for_tethering_">TransProzyx Tethering ukatak aqtatawa</string>
   <string name="warning_error_starting_transparent_proxying_">UKATARAKI: ¡Qhan apnaqat proxyptayatax qalltkas pantjatawa!</string>
+  <string name="transproxy_rules_cleared">TransProxyn thakhiñchanakapax pichsutawa</string>
+  <string name="couldn_t_start_tor_process_">Torax janiw qalltkiti:</string>
+  <string name="privoxy_is_running_on_port_">Polipox apayañ thakhin qallantaski:</string>
   <string name="setting_up_port_based_transparent_proxying_">Apayañ thakhirjam qhan apnaqat proxyptayatax phuchaskiwa...</string>
+  <string name="bridge_error">Pantat jalakipañanaka</string>
   <string name="bridge_requires_ip">Jalakipir apnaqañatakixa, mä jalakipir IP ukaks uskuñamapuniwa.</string>
+  <string name="send_email_for_bridges">Gmail.com, yahoo.com jan ukasti yahoo.cn ukan bridges@xxxxxxxxxxxxxx ukatuqir mä imayl apayam, \"get bridges\" ukax qillqatankañapawa.</string>
   <string name="error">Pantjata</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">¡\'Reglas de direcciones accesibles\' ukanakax pantjatawa!</string>
+  <string name="your_relay_settings_caused_an_exception_">¡Katuqir apayirinakax pantjatawa!</string>
+  <string name="exit_nodes">Puriñawjan mistuñanakapa</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Qhipïr jalakipañanakan ampar luk\'an chimpunaka, ñanqha sutinaka, markanaka, chiqawjanakapa</string>
+  <string name="enter_exit_nodes">Puriñawjan mistsuñanakap qillqantam</string>
+  <string name="exclude_nodes">Puriñawjanak uñanukuña</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Ampar luk\'an chimpunaka, ñanqha sutinaka, markanaka, chiqawjanaka, jan Tor llikar mantayañataki</string>
+  <string name="enter_exclude_nodes">Puriñawjanak uñanuqut qillqantam</string>
+  <string name="strict_nodes">Sum uñjat puriñawjanaka</string>
+  <string name="use_only_these_specified_nodes">Aka sutiñchat puriñawjanakak apnaqam</string>
   <string name="bridges">Jalakipañanaka</string>
   <string name="use_bridges">Jalakipañanak apnaqaña</string>
+  <string name="bridges_obfuscated">Chakt\'at jalakipañanaka</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor llika manqhan yaqha mantañanak qhantayaña</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Kunawsatix jalakipañanakax chakt\'atak ukhax mayjt\'ayañ jalakipañanak aqtayam</string>
   <string name="ip_address_and_port_of_bridges">IP ukanakamp jalakipañ apayañ thakhinakampi</string>
+  <string name="enter_bridge_addresses">Jalakipañanakan chiqawjanakap qillqantam</string>
   <string name="relays">Ch\'iqiyirinaka</string>
   <string name="relaying">Apayat ch\'iqiyaña</string>
   <string name="enable_your_device_to_be_a_non_exit_relay">Jan uñstir ch\'iqiyirïñapatak dispositivo aqtayam</string>
@@ -121,15 +191,33 @@
   <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jark\'antat kamachinakampi, apnaqirjam jark\'antat taypin Tor aqtayaña</string>
   <string name="reachable_ports">Mantkañ apayañ thakhinaka</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Jark\'antat taypin mantkañ apayañ thakhinaka</string>
+  <string name="enter_ports">Apayañ thakhinak qillqantam</string>
+  <string name="enable_hidden_services">Yanapir imantatanaka</string>
+  <string name="run_servers_accessible_via_the_tor_network">Tor llikatuqix imantat yanapirinakaruw mantañ yanapt\'i</string>
+  <string name="enter_localhost_ports_for_hidden_services">Imantat yanapirin apayañ thakhinak qillqantam</string>
+  <string name="hidden_service_ports">Imantat yanapir apayañ thakhinaka</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">imantat yanapirinapirinakan, uñtayaw suti</string>
   <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">imatanak ajllirañ qhantayaña (uñjañatakix adb jan ukax aLogCat apnaqañamawa)</string>
+  <string name="project_home">Nayrïr uñsta janja:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Toran Licenciapa</string>
   <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3ar jaljat-Software </string>
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
   <string name="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
   <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Imantat apayañ thakhinak Tor llikar mä wakichäwiw jist\'arañ muni %1$s. Wakichawitix uñt\'atachixa, iyaw sama.</string>
+  <string name="found_existing_tor_process">Utjir Toraw jikxatata...</string>
+  <string name="something_bad_happened">Mä jan walt\'äwiw utji. Qillqantayasit uñakipam</string>
+  <string name="hidden_service_on">Imantat yanapirina:</string>
+  <string name="unable_to_read_hidden_service_name">Janiw imantat yanapirin sutiman ullarañjamakänti</string>
   <string name="unable_to_start_tor">Janiw Torax aqtayañjamäkiti:</string>
+  <string name="unable_to_reset_tor">¡Dispositivom mayamp aqtayam, janiw Torax qalltkiti!</string>
+  <string name="pref_use_sys_iptables_title">Iptables ukx justupach aqtirir ucham</string>
+  <string name="pref_use_sys_iptables_summary">Iptables utjirinakax jawsañamankkis ukäñapawa, janiw Orbotankkis ukäñapakiti</string>
+  <string name="error_installing_binares">Toran binariop jichhakiptayañax janiw uchañjamakänti.</string>
   <string name="pref_use_persistent_notifications">Orbot aqtatäki ukjax chimpup uñstayañapuni</string>
   <string name="pref_use_persistent_notifications_title">Yatiyäwinakax purinipuniniwa</string>
   <string name="pref_use_expanded_notifications">Kawkja markans IP ukamp Toramp  uñstani uka yatiyäw juk\'amp uñacht\'ayaña</string>
@@ -150,17 +238,37 @@
   <string name="pref_disable_network_summary">Llika jan uktjki ukjax Tor suyt\'ayam</string>
   <string name="newnym">¡Jichhax Tor sutimax yaqhäxiwa!</string>
   <string name="menu_verify_browser">Thaqhiri</string>
+  <string name="menu_use_chatsecure"> ChatSecure apnaqam</string>
+  <string name="permission_manage_tor_label">Tor apnaqaña</string>
+  <string name="permission_manage_tor_description">Tor wakichäw apnaqañatak aqtayam</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbotax Orfox thaqhirimpix jasak irnaqi. ¿Jichhpachat apaqäta?</string>
+  <string name="install_apps_">¿Thaqhirt apaqäta?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Janiw llikax utjkiti. Torax suyt\'ayatawa...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Llikax khus uñstaniski. Torax aqtaskiwa...</string>
+  <string name="updating_settings_in_tor_service">Toran wakichäwinakax mayjt\'ayaskiwa</string>
   <string name="pref_socks_title">Toran SOCKS ukapa</string>
   <string name="pref_socks_summary">Toran proxy SOCKS apayañ thakhipa: (nayra utt\'atatakix 9050, jiwt\'ayañatakix 0)</string>
+  <string name="pref_socks_dialog"> SOCKS apayañ thakhinak mayjt\'ayaña</string>
   <string name="pref_transport_title">Toran TransProxy apayañ thakhipa</string>
   <string name="pref_transport_summary">Toran Qhan Apnaqat Proxy apayañ thakh churañ munatapa (Nayra utt\'atatakix 9040, jiwt\'ayañatakix 0)</string>
+  <string name="pref_transport_dialog">TransProxyn apayañ thakhinak mayjt\'ayaña</string>
   <string name="pref_dnsport_title">Tor DNS apayañ thakhi</string>
   <string name="pref_dnsport_summary">Toran DNS apayañ thakhipa: (nayra utt\'atatakix 5400, jiwt\'ayañatakix 0)</string>
+  <string name="pref_dnsport_dialog">DNS apayañ thakhinak mayjt\'ayaña</string>
   <string name="pref_torrc_title">Torrc mayjt\'ayaña</string>
   <string name="pref_torrc_summary">YATIRINAKATAKIKI: torrc apthapitan chiqak mayjt\'ayam</string>
+  <string name="pref_torrc_dialog">Maynipachpatak Torrc kuttayaña</string>
+  <string name="wizard_tips_martus">Jawsañ Martus - Benetech Human Rights Documentation wakichäwi</string>
+  <string name="your_tor_public_ips_"> Toraman taqin uñjkay  IPs:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Orbotatix jan walt\'kchixa, aka  Android-&gt;Settings-&gt;Apps jiwt\'ayam, amps suma:</string>
+  <string name="app_conflict">Wakichäwin jan walt\'atapa</string>
+  <string name="pref_transproxy_refresh_title">Transproxy justupach-jichhaptayaña</string>
+  <string name="pref_transproxy_refresh_summary">Kunawsatix llikax turkakipatakixa transproxyn thakhichanakap mayamp yant\'am</string>
+  <string name="pref_transproxy_flush_title">Transproxy MUNAY JAN MUN PICHSUM</string>
+  <string name="pref_transproxy_flush_summary">Taqpach transproxyn llikan thakhichanakap pichsuñatakix akhar JICHHAX limt\'am</string>
   <string name="transparent_proxy_rules_flushed_">¡Qhan apnaqat proxy kamachinakax pichsutawa!</string>
+  <string name="you_do_not_have_root_access_enabled">Janiw ROOT ukax mantañatak aqtatakiti</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Mayjt\'ayañ mayjt\'añapatakix inas Orbot jiwt\'ayasin mayamp aqtayañamachini.</string>
   <string name="menu_vpn">Wakichäwinaka</string>
   <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
@@ -177,7 +285,10 @@
   <string name="apps_mode">VPN</string>
   <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Orbot VPN apnaqasaxa, wakichäwinakax Tor tuqiw qhantayatäspa.\n\n Ukampix yatiyäwimax uñstaskakiniwa, ukampirus akax jark\'antatanak mäkiptañ yanapt\'ätam</string>
   <string name="send_email">Qillqat apayaña</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Jalakipañan QR waruqasa, jan ukax llikatuqi, imailtuqis jalakipañ utjirinakx jikxatarakismawa. Jalakipañ thakh jikxatañatakix \'Imail\' jan ukax \'llika\' ajllt\'am.\n\n Orbotan majt\'ayañawjapan \"Jalakipañ Thakhi\" limt\'añar apkatam, ukat mayamp qalltam.</string>
   <string name="install_orweb">Orfox apaqaña</string>
+  <string name="standard_browser">Utt\'ayat thaqhiri</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">AMUYASI�ATAKI: Tor utt\'ayat jalakipañanakax dispositivo Intel X86/ATOM ukanak irnaqi</string>
   <string name="vpn_default_world">Uraqpacha (justupaki)</string>
   <string name="hidden_services">Imantat lurañanaka</string>
   <string name="title_activity_hidden_services">Imantat lurañanaka</string>
@@ -213,13 +324,20 @@
   <string name="please_restart_Orbot_to_enable_the_changes">Mayjt\'ayatanak aqtayañatak Orbot mayamp qhant\'ayam, amp suma</string>
   <string name="client_cookies">Apnaqirin Cookiepa</string>
   <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Jan wali Onion ukan chiqawjanakapa</string>
   <string name="cookie_from_QR">QR ukamp ullaraña</string>
+  <string name="backup_cookie">Cookien imat luratanakapa</string>
+  <string name="delete_cookie">Cookie pichsum</string>
+  <string name="confirm_cookie_deletion">Cookie pichsut mayamp uñxatam</string>
+  <string name="hosted_services">Qurpachat lurañanaka</string>
+  <string name="share_as_qr">QRjam ch\'iqiyaña</string>
   <string name="disable">Jiwt\'ayaña</string>
   <string name="enable">Aqtayaña</string>
   <string name="consider_disable_battery_optimizations">Ch\'amanchir pist\'k ukjax jiwt\'añkam aqaskañapatakik amuyt\'am</string>
   <string name="consider_enable_battery_optimizations">Ch\'amanchir pist\'k ukjax jiwt\'añkam jan aqañapatak amuyt\'am</string>
   <string name="pref_isolate_dest">Apayañ chiqanak jark\'aqaña</string>
   <string name="pref_isolate_dest_summary">Sapa apayañ chiqatak kunayman thakhinak apnaqaña</string>
+  <string name="no_transproxy_warning_short">UKATARAKI: Transproxy luräwix janiw mayampis iyaw jisxiti</string>
   <string name="no_transproxy_warning">UKATARAKI: Qhan apnaqat proxyx janiw iyaw satäkiti. Uka lantix Orbot wakichäw VPN apnaqam.</string>
   <string name="pref_connection_padding">Waythapiñ ch\'amachiri</string>
   <string name="pref_connection_padding_summary">Yaqhip apayat uñsusirinakat jark\'aqasiñataki, waythapiñ ch\'amachir aqtayapunim. Utt\'ayata: justupacha</string>
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index cc0bb33e..e1566469 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -24,4 +24,5 @@
   <string name="activate">સ��રિય</string>
   <string name="save">સ���રહ�</string>
   <string name="name">નામ</string>
+  <string name="disable">નિષ���રિય �ર�</string>
 </resources>
diff --git a/description/ay.xlf b/description/ay.xlf
index 4f1eb25d..2530bd89 100644
--- a/description/ay.xlf
+++ b/description/ay.xlf
@@ -11,13 +11,16 @@
       </trans-unit>
       <trans-unit id="shortdescription" maxwidth="80" size-unit="char">
         <source>Protect your privacy with this proxy with Tor</source>
+        <target>Proxymp Toramp jan khitimp uñjayasiñatak jark'aqasim.  </target>
         <note from="developer">This is limited by Google to 80 characters</note>
       </trans-unit>
       <trans-unit id="intro">
         <source>Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</source>
+        <target>Orbotax proxyn mä wakichäwipawa, llikan yaqha wakichatanakaruw jan khitin uñjayasiñatakiw yanapi.  Orbotax Tor ukx llika taypin luratanakaruw jark'i, ukhamipanx uraqpachan walja atamirinaktuqiw imanti. Torax Software Libre uka taypinkiriwa, jan maynipachpan luratanakap, aruskipatanakap ukhamarak arsutanakap jan uñjayasiñatakiw jark'aqi. </target>
       </trans-unit>
       <trans-unit id="intro2">
         <source>Orbot is the only app that creates a truly private internet connection. As the New York Times writes, â??when a communication arrives from Tor, you can never know where or whom itâ??s from.â?? Tor won the 2012 Electronic Frontier Foundation (EFF) Pioneer Award.</source>
+        <target>Orbot wakichäw sapakiw llika taypinx jark'aqiristam tuwaqiristam.  New York Times yatiyäwix akahm siwa: &quot;kunawsatix yatiyäwix Tor tuq purinkix janiw kawkhat purinitapas khitin apayanitapas yatiskiti&quot; Tor ukax 2012 maranx Electronic Frontier Foundation (EFF, fundación para las fronteras electrónicas) ukanx Pioneer Award uka paylläw katuqi. </target>
       </trans-unit>
       <trans-unit id="intro2">
         <source>ACCEPT NO SUBSTITUTES: Orbot is the safest way to use the Internet on Android. Period. Orbot bounces your encrypted traffic several times through computers around the world, instead of connecting you directly like VPNs and proxies. This process takes a little longer, but the strongest privacy and identity protection available is worth the wait.</source>
@@ -38,44 +41,57 @@ ITâ??S OFFICIAL: This is the official version of the Tor onion routing service f
       </trans-unit>
       <trans-unit id="expertrootmode">
         <source>***Expert Root Mode***</source>
+        <target>***Expert Root Mode***</target>
       </trans-unit>
       <trans-unit id="universalmode">
         <source>UNIVERSAL MODE: Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you want to use through Tor.</source>
+        <target>URAQPACHATAKI: Orbotax Tor tuqix taqpach llikan lurawinak proxyptayañatakix mayxt'ayarakismawa. Ukhamarak Tor tuqix uñt'at wakichäwinak ajllirakismawa.</target>
       </trans-unit>
       <trans-unit id="wespeakyourlanguage">
         <source>â?? WE SPEAK YOUR LANGUAGE: Orbot is available for friends who speak:</source>
+        <target>â??ARUMX YATIPXTWA: Orbotax arum arsurinakatakix utjiwa:</target>
       </trans-unit>
       <trans-unit id="languagelist" translate="no">
         <source>اÙ?عربÙ?Ø©, azÉ?rbaycanca, бÑ?лгаÑ?Ñ?ки, català, Ä?eÅ¡tina, dansk, Deutsch, Î?λληνικά, English, español, eesti, euskara, Ù?ارسÛ?, suomi, français, galego, hrvatski, magyar, ×¢×?ר×?ת, íslenska, italiano, æ?¥æ?¬èª?, í??êµ­ì?´, lietuvių, latvieÅ¡u, Ð?акедонÑ?и, Bahasa Melayu, Nederlands, norsk, polski, português, РÑ?Ñ?Ñ?кий, slovenÄ?ina, slovenÅ¡Ä?ina, Ñ?Ñ?пÑ?ки, svenska, Türkçe, Ñ?кÑ?аÑ?нÑ?Ñ?ка, Tagalog, Tiếng Viá»?t, 中æ??(ç®?ä½?), 中æ??(å?°ç?£)</source>
+        <target>اÙ?عربÙ?Ø©, azÉ?rbaycanca aru, бÑ?лгаÑ?Ñ?ки, català aru, Ä?eÅ¡tina aru, dansk aru, Deutsch aru, Î?λληνικά, English aru, español aru, eesti, euskara aru, Ù?ارسÛ?, suomi aru, français aru, galego aru, hrvatski, magyar aru, ×¢×?ר×?ת, íslenska aru, italiano aru, æ?¥æ?¬èª?, í??êµ­ì?´, lietuvių aru, latvieÅ¡u aru, Ð?акедонÑ?и, Bahasa Melayu aru, Nederlands aru, norsk aru, polski aru, português aru, РÑ?Ñ?Ñ?кий, slovenÄ?ina aru, slovenÅ¡Ä?ina aru, Ñ?Ñ?пÑ?ки, svenska aru, Türkçe aru, Ñ?кÑ?аÑ?нÑ?Ñ?ка, Tagalog aru, Tiếng Viá»?t, 中æ??(ç®?ä½?), 中æ??(å?°ç?£)</target>
         <note from="developer">Do not translate the names of the languages, leave them just like this.</note>
       </trans-unit>
       <trans-unit id="helptranslate">
         <source>Donâ??t see your language? Join us and help translate the app:</source>
+        <target>¿Arumat jan utjkï? Aka wakichäw arumar jaqukipañatakix chikañcht'asinismawa:</target>
       </trans-unit>
       <trans-unit id="helptranslateurl" translate="no">
         <source>https://www.transifex.com/projects/p/orbot</source>
+        <target>https://www.transifex.com/projects/p/orbot</target>
         <note from="developer">Do not translate this.</note>
       </trans-unit>
       <trans-unit id="learnmore">
         <source>***Learn More***</source>
+        <target>***Juk'ampi***</target>
       </trans-unit>
       <trans-unit id="aboutus">
         <source>â?? ABOUT US: Guardian Project is a group of developers that make secure mobile apps and open-source code for a better tomorrow</source>
+        <target>JIWASXATA: Guardian Project tamachäwix jawsañanakan jark'aqasiñanak tuwaqasiñanak jist'arat wakichäwinak luriripxiwa.</target>
       </trans-unit>
       <trans-unit id="ourwebsite">
         <source>â?? OUR WEBSITE: https://GuardianProject.info</source>
+        <target>LLIKASA: https://GuardianProject.info</target>
       </trans-unit>
       <trans-unit id="abouttor">
         <source>â?? ABOUT TOR: https://TorProject.org</source>
+        <target>TORXATA: https://TorProject.org</target>
       </trans-unit>
       <trans-unit id="ontwitter">
         <source>â?? ON TWITTER: https://twitter.com/guardianproject</source>
+        <target>TWITTERANA: https://twitter.com/guardianproject</target>
       </trans-unit>
       <trans-unit id="freesoftware">
         <source>â?? FREE SOFTWARE: Orbot is free software. Take a look at our source code, or join the community to make it better:</source>
+        <target>INA SOFTWARE: Orbotatax ina Software ukawa. Lurat chipinak uñxatasmawa, ukhamarak tamachawins chikañchasirakismawa.</target>
       </trans-unit>
       <trans-unit id="gitrepo" translate="no">
         <source>https://gitweb.torproject.org/orbot.git</source>
+        <target>https://gitweb.torproject.org/orbot.git</target>
         <note from="developer">Do not translate this.</note>
       </trans-unit>
       <trans-unit id="messageus">



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits