From 545afe7f6db13836ee4d9e3f05151f2fe28d9b21 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 3 Jun 2015 17:27:52 -0400 Subject: [PATCH] Promo Apps: use Play or FDroid links, fallback to https://f-droid.org This automatically detects whether Google Play or FDroid is installed, if so, clicking the promo app button will take the user straight to the install page. If neither is installed, then the user is taken to the page for that app on https://f-droid.org --- res/values-ar/strings.xml | 4 +- res/values-az/strings.xml | 8 +- res/values-bg/strings.xml | 8 +- res/values-bn-rBD/strings.xml | 2 +- res/values-bs/strings.xml | 2 +- res/values-ca/strings.xml | 8 +- res/values-cs-rCZ/strings.xml | 8 +- res/values-cs/strings.xml | 4 +- res/values-cy/strings.xml | 2 +- res/values-da/strings.xml | 4 +- res/values-de-rAT/strings.xml | 2 +- res/values-de/strings.xml | 12 +- res/values-el/strings.xml | 8 +- res/values-en-rGB/strings.xml | 2 +- res/values-eo/strings.xml | 8 +- res/values-es-rAR/strings.xml | 2 +- res/values-es/strings.xml | 12 +- res/values-et/strings.xml | 8 +- res/values-eu/strings.xml | 8 +- res/values-fa/strings.xml | 12 +- res/values-fi/strings.xml | 8 +- res/values-fr-rFR/strings.xml | 12 +- res/values-fr/strings.xml | 8 +- res/values-gl/strings.xml | 8 +- res/values-gu-rIN/strings.xml | 2 +- res/values-gu/strings.xml | 2 +- res/values-he/strings.xml | 4 +- res/values-hi/strings.xml | 2 +- res/values-hr-rHR/strings.xml | 2 +- res/values-hr/strings.xml | 8 +- res/values-hu/strings.xml | 12 +- res/values-hy-rAM/strings.xml | 2 +- res/values-ia/strings.xml | 2 +- res/values-id-rID/strings.xml | 8 +- res/values-id/strings.xml | 2 +- res/values-is/strings.xml | 8 +- res/values-it/strings.xml | 8 +- res/values-ja/strings.xml | 8 +- res/values-ka/strings.xml | 2 +- res/values-kn-rIN/strings.xml | 2 +- res/values-kn/strings.xml | 2 +- res/values-ko/strings.xml | 8 +- res/values-ku/strings.xml | 2 +- res/values-ky/strings.xml | 2 +- res/values-lt/strings.xml | 2 +- res/values-lv/strings.xml | 8 +- res/values-mk/strings.xml | 8 +- res/values-ml/strings.xml | 2 +- res/values-mn-rMN/strings.xml | 2 +- res/values-ms-rMY/strings.xml | 4 +- res/values-ms/strings.xml | 6 +- res/values-my/strings.xml | 2 +- res/values-nb/strings.xml | 8 +- res/values-nl/strings.xml | 8 +- res/values-pa/strings.xml | 2 +- res/values-pl/strings.xml | 12 +- res/values-pt-rBR/strings.xml | 8 +- res/values-pt/strings.xml | 8 +- res/values-ro-rRO/strings.xml | 2 +- res/values-ro/strings.xml | 8 +- res/values-rs-rAR/strings.xml | 2 +- res/values-ru/strings.xml | 8 +- res/values-si-rLK/strings.xml | 4 +- res/values-si/strings.xml | 2 +- res/values-sk-rSK/strings.xml | 2 +- res/values-sk/strings.xml | 2 +- res/values-sl/strings.xml | 2 +- res/values-sn/strings.xml | 2 +- res/values-sq-rAL/strings.xml | 2 +- res/values-sq/strings.xml | 2 +- res/values-sr/strings.xml | 4 +- res/values-sv/strings.xml | 8 +- res/values-ta/strings.xml | 2 +- res/values-te-rIN/strings.xml | 2 +- res/values-th/strings.xml | 2 +- res/values-tl/strings.xml | 8 +- res/values-tr/strings.xml | 10 +- res/values-uk/strings.xml | 8 +- res/values-ur/strings.xml | 2 +- res/values-uz/strings.xml | 4 +- res/values-vi/strings.xml | 8 +- res/values-zh-rTW/strings.xml | 8 +- res/values-zh/strings.xml | 12 +- res/values/strings.xml | 5 - .../android/ui/wizard/PromoAppsActivity.java | 125 ++++++++++++------ 85 files changed, 304 insertions(+), 270 deletions(-) diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index c8ef74d3..8ace8ba7 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -73,7 +73,7 @@ التطبيقات التالية تم تطويرها حتي تعمل مع اوربوت. اضغط علي ما تريد تثبيتة علي جهازك الأن, أو يمكنك ان تجدهم لاحقاً علي جوجل بلاي, أو علي موقعنا GuardianProject.info أو من خلال F-Droid.org. إعدادات البروكسي - تعلم كيفية تكوين التطبيقات لتعمل مع اوربوت تطبيق محرك البحث DuckDuckGo - https://duckduckgo.com/android/latest.apk + اضبط البروكسي الخاص بتويتر إلي مستضيف \"localhost\" و المنفذ إلي 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ إعدادات البروكسي @@ -100,7 +100,7 @@ بروكسي ضمني diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 9c19bed7..b7c5ae3f 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Android üçün təhlükəsiz mesajlaşma müştərisi Proksi Seçimləri - Aplikasiyaların Orbotla necə işləyəcəyini öyrən DuckDuckGO Axtarış Qurğu aplikasiyası - https://duckduckgo.com/android/latest.apk + \"Yerlihost\" və 8118 portuna sahiblik üçün Twitter proksini quraşdır https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proksi qurğuları @@ -96,14 +96,14 @@ Orbot-a Açıq Aplikasiyalar ChatSecure: Çat aplikasiyasını Qeydsiz Şifrləmə ilə təhlükəsizləşdir - https://guardianproject.info/releases/chatsecure-latest.apk + Orveb: Tor vasitəsilə işləyən təhlükəsizliyi gücləndirilmiş brauzer - https://guardianproject.info/releases/orweb-latest.apk + Google Play-də bütün Guardian Layihə aplikasiyaları tap https://play.google.com/store/search?q=guardianproject Şəffaf Proksiləmə diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index e5a79cb4..06585401 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -77,7 +77,7 @@ ChatSecure - Криптиран чат програма за Андроид Proxy Settings - Научете как да конфигурирате приложения да работят през Орбот DuckDuckGo Търсачка - https://duckduckgo.com/android/latest.apk + Нагласете проксито на Twitter на \"localhost\" и порт 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Прокси настройки @@ -99,14 +99,14 @@ Приложения през Орбот ChatSecure: Криптирана чат програма с подръжка на Off-the-Record енкрипция. - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Браузър с повишена анонимност, който работи през Тор - https://guardianproject.info/releases/orweb-latest.apk + Намери всики Guardin Project програми в Google Play https://play.google.com/store/search?q=guardianproject Прозрачно прокси diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index d8d04672..cccea539 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -9,7 +9,7 @@ diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index a55a212a..b2f8861a 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -15,7 +15,7 @@ Aplicacions dissenyades per a l\'Orbot ChatSecure: Aplicació de xat segur amb encriptació confidencial. - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Navegador amb privacitat millorada que funciona a través de Tor - https://guardianproject.info/releases/orweb-latest.apk + Trobareu totes les aplicacions de Guardian Project a Google Play Store https://play.google.com/store/search?q=guardianproject Servidor intermediari transparent diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml index d8e52f52..6189e318 100644 --- a/res/values-cs-rCZ/strings.xml +++ b/res/values-cs-rCZ/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Bezpečný instant messaging klient pro Android Proxy Nastavení - Naučte se, jak nastavit aplikace, aby pracovaly s Orbotem Aplikace DuckDuckGo pro vyhledávací engine - https://duckduckgo.com/android/latest.apk + Nastavit Twitter proxy na host \"localhost\" a port 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Nastavení Proxy @@ -96,14 +96,14 @@ Orbot-povolené aplikace ChatSecure: Bezpečná chatovací aplikace s technologií Off-the-Record Encryption - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: webový prohlížeč s rozšířeným soukromím pracující přes Tor - https://guardianproject.info/releases/orweb-latest.apk + Najděte všechny aplikace Guardian Projektu na Obchodu Play https://play.google.com/store/search?q=guardianproject Transparentní proxy diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 2a1604df..700e7a2c 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -64,10 +64,10 @@ Varování - https://market.android.com/details?id=info.guardianproject.browser + Transparentní proxy diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml index 285b3a78..cf63874d 100644 --- a/res/values-cy/strings.xml +++ b/res/values-cy/strings.xml @@ -62,7 +62,7 @@ Dirprwyo\'n dryloyw diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 7ec6481f..5bc69ff9 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -73,7 +73,7 @@ De nedenstående programmer er udviklet for at fungere med Orbot. Klik hver knap for at installere nu. Ellers kan de senere findes på Google play, på hjemmesiden GuardianProject.info eller via F-Droid.org. Proxy indstillinger - Lær hvordan du konfigurerer apps til at fungere med Orbot DuckDuckGo søgemaskine-programmet - https://duckduckgo.com/android/latest.apk + Indstil Twitter proxyen til værten \"localhost\" og port 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy-indstillinger @@ -99,7 +99,7 @@ https://play.google.com/store/search?q=guardianproject Transperant Proxying diff --git a/res/values-de-rAT/strings.xml b/res/values-de-rAT/strings.xml index d8d04672..cccea539 100644 --- a/res/values-de-rAT/strings.xml +++ b/res/values-de-rAT/strings.xml @@ -9,7 +9,7 @@ diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 85259d75..c497bf08 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -74,11 +74,11 @@ ChatSecure - Ein sicheres Sofortnachrichtenprogramm für Android Vermittlungseinstellungen - Lernen, wie Sie Anwendungen so konfigurieren, dass sie mit Orbot zusammenarbeiten. Duckduckgo-Suchmaschinen-App - https://duckduckgo.com/android/latest.apk + Proxy Mobile Add-on für Firefox (https://guardianproject.info/apps/firefoxprivacy) https://guardianproject.info/apps/firefoxprivacy Twitter-Proxy auf den Rechner »localhost« und Port 8118 einstellen - https://play.google.com/store/apps/details?id=info.guardianproject.mrapp + https://guardianproject.info/2012/05/02/orbot-your-twitter/ Vermittlungseinstellungen Orbot ist bereit! @@ -100,14 +100,14 @@ Orbot aktivierte Anwendungen ChatSecure: Sichere Unterhaltungsanwendung mit vertraulicher Verschlüsselung - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Ein im Datenschutz erweiterter Browser, der durch Tor arbeitet - https://guardianproject.info/releases/orweb-latest.apk + Alle Guardian Project-Anwendungen im Google Play Store finden https://play.google.com/store/search?q=guardianproject Transparente Vermittlung @@ -249,7 +249,7 @@ NUR FÜR EXPERTEN: torrc-Konfigurationszeilen direkt eingeben Benutzerdefinierte Torrc Mobile Martus - Benetech-Anwendung zur Menschenrechtsdokumentierung - https://play.google.com/store/apps/details?id=org.martus.android + Ihre öffentlichen IPs für Tor: Anwendungskonflikt Automatische Transproxy-Aktualisierung diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index eb436d1c..19dc0322 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Εφαρμογή ασφαλούς ανταλλαγής άμεσων μηνυμάτων για Android Ρυθμίσεις proxy: Μάθετε πώς θα ρυθμίσετε τις εφαρμογές ώστε να λειτουργούν με το Orbot Εφαρμογή Μηχανής Αναζήτησης Duckduckgo - https://duckduckgo.com/android/latest.apk + Το Twitter υποστηρίζει http proxy localhost:8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Ρυθμίσεις proxy @@ -96,14 +96,14 @@ Εφαρμογές συμβατές με Orbot ChatSecure: Ασφαλές chat app με Off-the-Record κρυπτογράφηση - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb - Περιηγητής ιστού με ενισχυμένη ασφάλεια που είναι συμβατό με Tor - https://guardianproject.info/releases/orweb-latest.apk + Βρες όλες τις εφαρμογές Guardian Project στο Google Play https://play.google.com/store/search?q=guardianproject Διαφανής μεσολάβηση διακομιστή diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 24b11a87..48851ee4 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -10,7 +10,7 @@ Aplikaĵoj permesitaj por Orbot - https://guardianproject.info/releases/chatsecure-latest.apk - https://guardianproject.info/releases/orweb-latest.apk + + Trovu ĉiujn aplikaĵojn de Guardian Project ĉe Google Play https://play.google.com/store/search?q=guardianproject (Marku ĉi tiun butonon se vi ne scias pri kio ni parolas) diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml index e20e7fab..67c66b79 100644 --- a/res/values-es-rAR/strings.xml +++ b/res/values-es-rAR/strings.xml @@ -58,7 +58,7 @@ Proxying Transparente diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c902488b..e18abb67 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -78,12 +78,12 @@ ChatSecure - Cliente de mensajería instantánea segura para Android Preferencias para proxy - aprenda cómo configurar aplicaciones para que trabajen con Orbot Aplicación del motor de búsqueda DuckDuckGo - https://duckduckgo.com/android/latest.apk + Complemento Proxy Mobile para Firefox (https://guardianproject.info/apps/firefoxprivacy) https://guardianproject.info/apps/firefoxprivacy Configure por proxy la aplicación de Twitter en localhost:8118 StoryMaker - ¡Elabore una historia y déjesela a Tor por seguridad! - https://play.google.com/store/apps/details?id=info.guardianproject.mrapp&hl=es + https://guardianproject.info/2012/05/02/orbot-your-twitter/ Preferencias para proxy Si la aplicación Android que está utilizando puede soportar el uso de un proxy (interpuesto) HTTP o SOCKS, entonces puede configurarla para que conecte a Orbot y use Tor.\n\n\nLa configuración del servidor es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy está en el 9050. Debe utilizar la configuración para SOCKS4A o SOCKS5 si es posible.\n\n\n\nPuede aprender más acerca de proxyficación en Android a través de las preguntas frecuentes (FAQ) en: http://tinyurl.com/proxyandroid\n @@ -111,14 +111,14 @@ Aplicaciones habilitadas para Orbot ChatSecure: Aplicación de chat segura con cifrado Off-The-Record (OTR) - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb - navegador de privacidad-mejorada que funciona a través de Tor - https://guardianproject.info/releases/orweb-latest.apk + Descubre todas las aplicaciones de Guardian Project en Google Play https://play.google.com/store/search?q=guardianproject Proxyficación transparente @@ -266,7 +266,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de SÓLO EXPERTOS: Introduzca directamente las líneas de configuración en el fichero torrc torrc personalizado Martus Móvil - Aplicación de documentación de derechos humanos de Benetech - https://play.google.com/store/apps/details?id=org.martus.android&hl=es + Las IPs públicas de su Tor: Por favor, deshabilite esta aplicación en Android->Configuración->Aplicaciones si está teniendo problemas con Orbot: Conflicto de la aplicación diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 12212cb8..eab2c48c 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Turvaline kiirsõnumiklient Androidile Proxy seaded - Õpi kuidas seadistada rakendusi töötama koos Orbot\'iga DuckDuckGo otsingumootori rakendus - https://duckduckgo.com/android/latest.apk + Seadistage Twitteri proxy server \"localhost\" ja port 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxyseaded @@ -96,14 +96,14 @@ Orbot\'ile mõeldud rakendused ChatSecure: Turvaline vestlusrakendus Off-the-Record krüptoga - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Kõrgendatud privaatsusega veebisirvik mis töötab läbi Tor\'i - https://guardianproject.info/releases/orweb-latest.apk + Kõik Guardian Project rakendused on leitavad ka Google Play kaudu https://play.google.com/store/search?q=guardianproject Läbipaistev Proxy diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 5b4005aa..345cac3e 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Andriodentzako berehalako mezulari bezero ziurra Proxy Ezarpenak - Ikasi zure aplikazioak Orbotekin funtziona dezaten nola konfiguratu DuckDuckGo Bilaketa Motorraren appa - https://duckduckgo.com/android/latest.apk + Twittereko proxyaren ostalarian \"localhost\" jarri eta portuan 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy Ezarpenak @@ -96,14 +96,14 @@ Orbot-Gaitutako Aplikazioak ChatSecure: Txat aplikazio segurua Off-the-Record enkriptazioarekin. - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb - Tor bidez lan egiten duen pribatutasun-hobetua duen nabigatzailea - https://guardianproject.info/releases/orweb-latest.apk + Google Play-n Guardiak Proiektuko aplikazio guztiak bilatu https://play.google.com/store/search?q=guardianproject Proxyatze Gardena diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 580265e0..150bb58b 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -76,12 +76,12 @@ ChatSecure - برنامه امن ارسال پیغام فوری برای اندروئید تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با ربات پیازی اپلیکیشن موتور جستجوی داک داک گو - https://duckduckgo.com/android/latest.apk + افزوده پروکسی موبایل برای فایرفاکس (https://guardianproject.info/apps/firefoxprivacy) https://guardianproject.info/apps/firefoxprivacy توییتر از \"http proxy \"localhost:8118 پشتیبانی می کند StoryMaker - ساختن یک داستان و ترک آن به Tor برای امنیت! - https://play.google.com/store/apps/details?id=info.guardianproject.mrapp + https://guardianproject.info/2012/05/02/orbot-your-twitter/ تنظیمات پروکسی ربات پیازی آماده استفاده میباشد! @@ -103,14 +103,14 @@ اپلیکیشنهایی که ربات پیازی روی آنها فعال است ChatSecure:برنامه امن گفتگوی محرمانه با قابلیت رمزگزاری - https://guardianproject.info/releases/chatsecure-latest.apk + مرورگر پیازی: مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز ربات پیازی - https://guardianproject.info/releases/orweb-latest.apk + تمامي برنامه هاي Guardian Project را در Google Play پيدا كنيد. https://play.google.com/store/search?q=guardianproject پروکسی کردن شفاف @@ -253,7 +253,7 @@ پیکربندی پورت DNS پیکربندی سفارشی Torrc سفارشی Torrc - https://play.google.com/store/apps/details?id=org.martus.android + IP های عمومی Tor شما: تعارض برنامه خودکار تازه کردن Transproxy diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 3413f91e..3c40ffef 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Turvallinen pikaviestisovellus Androidille Välityspalvelinasetukset - Opi konfiguroimaan sovellukset toimimaan Orbotin kanssa DuckDuckGo-hakukonesovellus - https://duckduckgo.com/android/latest.apk + Aseta Twitter-välityspalvelinisännäksi \"localhost\" ja portiksi 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Välityspalvelinasetukset @@ -96,14 +96,14 @@ Orbotia käyttävät sovellukset ChatSecure: Turvallinen chattailusovellus Off-the-Record -salauksella - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Tietosuojaa parantava selain, joka toimii Torin läpi - https://guardianproject.info/releases/orweb-latest.apk + Löydä kaikki Guardian-projektin sovellukset Googlen Play-kaupasta https://play.google.com/store/search?q=guardianproject Läpinäkyvä tiedonvälitys diff --git a/res/values-fr-rFR/strings.xml b/res/values-fr-rFR/strings.xml index 760614e7..5d267049 100644 --- a/res/values-fr-rFR/strings.xml +++ b/res/values-fr-rFR/strings.xml @@ -78,12 +78,12 @@ ChatSecure - Client sécurisé de messagerie instantanée pour Android Paramètres du relais - Apprendre à configurer des applis pour qu\'elles fonctionnent avec Orbot Appli du moteur de recherche DuckDuckgo - https://duckduckgo.com/android/latest.apk + Module *Mandataire mobile* pour Firefox (https://guardianproject.info/apps/firefoxprivacy) https://guardianproject.info/apps/firefoxprivacy Configurer le mandataire Twitter sur l\'hôte « localhost:8118 » et le port 8118 Faiseur d\'histoires - Rédigez une histoire et laissez Tor s\'occuper de la sécurité ! - https://play.google.com/store/apps/details?id=info.guardianproject.mrapp + https://guardianproject.info/2012/05/02/orbot-your-twitter/ Paramètres du mandataire Si l\'appli Android que vous utilisez peut prendre en charge un mandataire HTTP ou SOCKS, vous pouvez alors la configurer pour se connecter à Orbot et utiliser Tor.\n\n\n Le paramètre de l\'hôte est 127.0.0.1 or « localhost ». Pour HTTP, le paramètre de port est 8118. Pour SOCKS, le mandataire est 9050. Vous devriez utiliser SOCKS4A ou SOCKS5 si possible.\n \n\n\n Vous pouvez en apprendre davantage sur l\'utilisation d\'un serveur mandataire sur Android dans la FAQ sur : http://tinyurl.com/proxyandroid\n @@ -111,14 +111,14 @@ Applis conçues pour Orbot Chatsecure : appli sécurisée de clavardage avec chiffrement confidentiel - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb : navigateur à confidentialité améliorée qui fonctionne avec Tor - https://guardianproject.info/releases/orweb-latest.apk + Trouver toutes les applis du Projet Guardian sur Google Play https://play.google.com/store/search?q=guardianproject Relayage transparent @@ -265,7 +265,7 @@ EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct Personnaliser Torrc Martus mobile - Appli de documentation pour les droits humains de Benetech - https://play.google.com/store/apps/details?id=org.martus.android + Vos IP publiques Tor : Veuillez désactiver cette appli dans Android->Paramètres->Applications si vous éprouvez des problèmes avec Orbot : Conflit d\'applis diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 6b6dde65..9b004040 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -75,7 +75,7 @@ Gibberbot - Client de messagerie instantanée pour Android Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot Application DuckDuckgo Search Engine - https://duckduckgo.com/android/latest.apk + Firefox avec le plugin Proxy Mobile (installation complémentaire) https://guardianproject.info/releases/proxymob-latest.xpi Twitter supporte le proxy http \"localhost:8118\" @@ -105,14 +105,14 @@ Applications Orbot Gibberbot: application de clavardage sécurisé avec chiffrement Off-the-Record - https://market.android.com/details?id=info.guardianproject.otr.app.im + ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée & pour Orbot - https://market.android.com/details?id=info.guardianproject.browser + Trouver toutes les applications de Guardian Project sur Google Play https://play.google.com/store/search?q=guardianproject Proxy transparent diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 3bb3f499..5627e07e 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Cliente de mensaxería instantánea segura para Android Axustes do Proxy - Aprenda cómo configurar aplicativos para que funcionen con Orbot Aplicativo do Motor de Búsquedas DuckDuckGo - https://duckduckgo.com/android/latest.apk + Axustar o host para proxy de Twitter a \"localhost\" e porto 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Axustes do proxy @@ -96,14 +96,14 @@ Aplicativos Habilitados para Orbot CahtSecure: Aplicativo de chat seguro con Off-the-Record Encryption (OTR) - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Navegador con privacidade mellorada que traballa a través de Tor - https://guardianproject.info/releases/orweb-latest.apk + Atope todos os aplicativos de Guardian Project apps en Google Play https://play.google.com/store/search?q=guardianproject Proxy Transparente diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 95492e57..47becf2c 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -11,7 +11,7 @@ פרוקסי שקוף diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 730f4084..2bf7df6d 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -18,7 +18,7 @@ कोई नहीं diff --git a/res/values-hr-rHR/strings.xml b/res/values-hr-rHR/strings.xml index 74971dbe..a9925799 100644 --- a/res/values-hr-rHR/strings.xml +++ b/res/values-hr-rHR/strings.xml @@ -23,7 +23,7 @@ Nepoznato diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 6fc58d74..6e3ddd8d 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Sigurni klijent instant poruka za Adnroid Proxy Postavke - Naučite kako konfigurirati aplikacije za rad s Orbot-om DuckDuckGo aplikacija za pretraživanje - https://duckduckgo.com/android/latest.apk + Namjesti Twitter proxy na host \"localhost\" i port 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Postavke Proxy-a @@ -96,14 +96,14 @@ Orbot-Omogućene Aplikacije ChatSecure: Sigurna aplikacija za čavrljanje s Povjerljivom Enkripcijom - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Preglednik poboljšane privatnosti koji radi kroz Tor - https://guardianproject.info/releases/orweb-latest.apk + Pronađi sve Guardian Projekt aplikacije na Google Play https://play.google.com/store/search?q=guardianproject Transparentni Proxy diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 37d32a02..0f019588 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -74,12 +74,12 @@ ChatSecure - Biztonságos üzenetküldő Androidra Proxy beállítások - Tanulja meg, hogyan állíthatja be alkalmazásait, hogy együttműködjenek az Orbot-tal Duckduckgo keresőgép alkalmazás - https://duckduckgo.com/android/latest.apk + Proxy Mobile bővítmény Firefox-hoz (https://guardianproject.info/apps/firefoxprivacy) https://guardianproject.info/apps/firefoxprivacy A Twitter támogatja a \"localhost:8118\" http proxyt StoryMaker - Készítsen egy sztorit, és hagyja a Tor-ra a biztonságért! - https://play.google.com/store/apps/details?id=info.guardianproject.mrapp + https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy beállítások Az Orbot kész! @@ -100,14 +100,14 @@ Orbot-engedélyezett Alkalmazások ChatSecure: Biztonságos üzenetküldő app OTR titkosítással - https://guardianproject.info/releases/chatsecure-latest.apk + ORWEB (csak Android 1.x) - Böngésző, kifejezetten adatvédelemre és az Orbot-hoz - https://guardianproject.info/releases/orweb-latest.apk + Az összes Guardian Project alkalmazás keresése a Google Play-en https://play.google.com/store/search?q=guardianproject Átlátszó proxyzás @@ -254,7 +254,7 @@ CSAK SZAKÉRTŐKNEK: torrc konfigurációs sorok közvetlen beírása Egyedi Torrc Mobile Martus - Benetech meberi jog dokumentáló alkalmazás - https://play.google.com/store/apps/details?id=org.martus.android + A Tor publikus IP-je: Kérjk tiltsa le az alkalmazést az Android->Beállítások->Alkalmazások alatt, ha az Orbot-tal problémái vannak: App ütközés diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index d8d04672..cccea539 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -9,7 +9,7 @@ diff --git a/res/values-ia/strings.xml b/res/values-ia/strings.xml index f0dc49c9..bcf631fb 100644 --- a/res/values-ia/strings.xml +++ b/res/values-ia/strings.xml @@ -23,7 +23,7 @@ Nulle diff --git a/res/values-id-rID/strings.xml b/res/values-id-rID/strings.xml index fa11b325..8af87c79 100644 --- a/res/values-id-rID/strings.xml +++ b/res/values-id-rID/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Client instant messaging aman untuk Android Pengaturan Proxy - Pelajari bagaimana mengkonfigurasikan aplikasi untuk bekerja dengan Orbot Aplikasi Mesin Pencari DuckDuckGo - https://duckduckgo.com/android/latest.apk + Setel proxy Twitter ke host \"localhost\" dan port 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Pengaturan Proxy @@ -96,14 +96,14 @@ Orbot-Aplikasi Teraktifkan ChatSecure: Aplikasi obrolan aman dengan Enkripsi Off-the-Record - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Peramban dengan Peningkatan-privasi yang bekerja melalui Tor - https://guardianproject.info/releases/orweb-latest.apk + Temukan semua aplikasi Guardian Project di Google Play https://play.google.com/store/search?q=guardianproject Transparan Proxying diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml index d320e49b..17cf3971 100644 --- a/res/values-id/strings.xml +++ b/res/values-id/strings.xml @@ -41,7 +41,7 @@ Tidak ada diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index dbc36ace..20687d7d 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Öruggur spjall þjónn fyrir Android Proxy Stillingar - Lærðu hvernig á að stilla smáforrit til að virka með Orbot DuckDuckGo Leitarvél smáforrit - https://duckduckgo.com/android/latest.apk + Setja Twitter proxy hýsir til \"localhost\" and port 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy Stillingar @@ -96,14 +96,14 @@ Orbot-Virk Smáforrit ChatSecure: Öruggt spjall smáforrit með Utanvegar Dulkóðun - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Næðis-bættur vafri sem virkar í gegnum Tor - https://guardianproject.info/releases/orweb-latest.apk + Finndu öll Guardian Verkefnis smáforrit á Google Play https://play.google.com/store/search?q=guardianproject Gegnsæ Proxýun diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 866156c2..c1e2ce2c 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Client sicuro di messaggistica istantanea, per Android Impostazioni proxy - Ulteriori informazioni su come configurare le app per funzionare con Orbot App del motore di ricerca Duckduckgo - https://duckduckgo.com/android/latest.apk + Twitter supporta il proxy http \"localhost:8118\" https://guardianproject.info/2012/05/02/orbot-your-twitter/ Impostazioni proxy @@ -96,14 +96,14 @@ Orbot-App abilitate ChatSecure: App chat sicura con Cifratura Off-the-Record - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb - Browser progettato per la privacy e Orbot - https://guardianproject.info/releases/orweb-latest.apk + Cerca tutte le app del Guardian Project su Google Play https://play.google.com/store/search?q=guardianproject Proxying trasparente diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 9110d906..8b48b419 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Android 用のセキュアなインスタントメッセージクライアント Proxy Settings - Orbotでアプリを動かすための手順書 DuckDuckGo 検索エンジンアプリ - https://duckduckgo.com/android/latest.apk + Twitter proxyを「localhost」と8118番ポートに合わせる https://guardianproject.info/2012/05/02/orbot-your-twitter/ プロキシ設定 @@ -96,14 +96,14 @@ Orbotが有効化されたアプリ ChatSecure: 非記録式暗号によるセキュアなチャットアプリ - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Torを使う匿名インターネットブラウザ - https://guardianproject.info/releases/orweb-latest.apk + Google Playで全てのGuardian Projectのアプリを見つける https://play.google.com/store/search?q=guardianproject 透過プロキシ diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 0f460665..a044399d 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -9,7 +9,7 @@ diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index 0f460665..a044399d 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -9,7 +9,7 @@ Orbot을 사용하는 앱 ChatSecure: 오프 더 레코드 암호화를 적용한 안전한 채팅 앱 - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: 토르를 통해 작동하는 보안 강화 브라우저 - https://guardianproject.info/releases/orweb-latest.apk + 구글 플레이에서 모든 가디언 프로젝트 앱 찾기 https://play.google.com/store/search?q=guardianproject 투명 프록시 diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml index 0f460665..a044399d 100644 --- a/res/values-ku/strings.xml +++ b/res/values-ku/strings.xml @@ -9,7 +9,7 @@ Joks diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index ce19f64d..2ba06092 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Drošs Android\'a tūlītējās ziņojumapmaiņas klients Starpnieka iestatījumi - Uzzini kā konfigurēt lietotnes, lai tās strādātu ar Orbot Meklētājprogrammas Duckduckgo lietotne - https://duckduckgo.com/android/latest.apk + Twitter atbalsta http starpnieku \"localhost:8118\" https://guardianproject.info/2012/05/02/orbot-your-twitter/ Starpnieka iestatījumi @@ -96,14 +96,14 @@ Orbot\'a iespējotas lietotnes ChatSecure: Padarīt tērzēšanas lietotni drošāku ar Off-the-Record šifrēšanu - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Pārlūks ar uzlabotu privātumu un kurš strādā caur Tor tīklu - https://guardianproject.info/releases/orweb-latest.apk + Visas Guardian Project\'a lietotnes atrodamas Google Play\'ā https://play.google.com/store/search?q=guardianproject Pārredzama starpniekošana diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 3f320dca..5158e594 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -73,7 +73,7 @@ Ви препорачуваме да презимате и користите апликации кои што знаат како директно да се поврзат со Орбот. Притиснете на копчињата подолу за инсталирање. ChatSecure - Сигурносен инстант клиент за разговор за Android Подесувања на прокси - Научете како да ги конфигурирате апликациите да работат со Орбот - https://duckduckgo.com/android/latest.apk + https://guardianproject.info/2012/05/02/orbot-your-twitter/ Подесувања на прокси Орбот е спремен! @@ -92,14 +92,14 @@ Доколку не сакате ова да го направите, ве молиме осигурајте се дека користите апликации кои работат со Орбот ChatSecure: Сигурносна апликација за разговор со Off-the-Record Енкрипција - https://guardianproject.info/releases/chatsecure-latest.apk + Орвеб: Моќен анонимен прелистувач кој работи преку Тор - https://guardianproject.info/releases/orweb-latest.apk + Најди ги сите Guardian Project апликации на Google Play https://play.google.com/store/search?q=guardianproject Транспарентно прокси diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index d8d04672..cccea539 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -9,7 +9,7 @@ diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index d8d04672..cccea539 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -9,7 +9,7 @@ diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 4cbc683f..8e527d30 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -73,7 +73,7 @@ Aplikasi di bawah dibangunkan untuk digunakan bersama Orbot. Klik setiap butang untuk pasang sekarang, atau anda boleh cari nanti di Android Market. Tetapan Proksi - Belajar bagaimana untuk mengkonfigurasi aplikasi untuk bekerja dengan Orbot DuckDuckGo Enjin Carian - https://duckduckgo.com/android/latest.apk + Tetapkan proxy twitter kepada hos \"localhost\" dan pada port 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Tetapan proxy @@ -99,7 +99,7 @@ https://play.google.com/store/search?q=guardianproject Proxy Telus diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 55ff7469..c485ba7d 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -97,12 +97,12 @@ Aplikasi yang membenarkan Orbot Gibberbot: sembang app selamat dengan Penyulitan Off-the-Rekod - https://market.android.com/details?id=info.guardianproject.otr.app.im + Orweb: Privasi ditambah penyemak imbas yang bekerja melalui Tor - https://market.android.com/details?id=info.guardianproject.browser + Proxy Telus diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index b32196ce..6f1e1d05 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -23,7 +23,7 @@ ဘာမှမရှိ diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 17b2503d..07410734 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Sikret lynmeldingsklient for Android Proxy-innstillinger - Lær hvordan du konfigurerer applikasjoner til å fungere med Orbot DuckDuckGo søkemotor applikasjon - https://duckduckgo.com/android/latest.apk + Sett Twitters proxy til \"localhost\", og port 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxyinnstillinger @@ -96,14 +96,14 @@ Orbot aktiverte applikasjoner ChatSecure: Sikret sludreprogram med OTR-kryptering - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Nettleser med forsterket personvern som fungerer gjennom Tor - https://guardianproject.info/releases/orweb-latest.apk + Finn alle Guardian Prosjekt sine applikasjoner på Google Play https://play.google.com/store/search?q=guardianproject Transparent Proxying diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index ade3ed72..f982fcd1 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Beveiligde instant messaging cliënt voor Andrdoid Proxy Instellingen - Leer hoe je apps te configureren voor Orbot Duckduckgo Zoekmachine app - https://duckduckgo.com/android/latest.apk + Twitter ondersteunt http proxy \"localhost:8118\" https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy Instellingen @@ -96,14 +96,14 @@ Orbot geschikte Apps ChatSecure: Beveiligde chat app met Off-the-Record versleuteling - https://guardianproject.info/releases/chatsecure-latest.apk + ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot - https://guardianproject.info/releases/orweb-latest.apk + Vind alle Guardian Project apps op Google Play https://play.google.com/store/search?q=guardianproject Tranparante Proxy diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 3edb9f99..ef3b1c42 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -15,7 +15,7 @@ ਖਾਲੀ diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 0f8df677..34ee20a0 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -78,12 +78,12 @@ ChatSecure - Bezpieczny komunikator pod Androida Ustawienia Proxy - Dowiedz się, jak konfigurować aplikacje do współpracy z Orbotem Aplikacja Duckduckgo Search Engine - https://duckduckgo.com/android/latest.apk + Dodatek Proxy Mobile dla Firefox (https://guardianproject.info/apps/firefoxprivacy) https://guardianproject.info/apps/firefoxprivacy Twitter obsługuje proxy http \"localhost:8118\" StoryMaker - Napisz artukuł, historię, a bezpieczeństwo pozostaw Torowi. - https://play.google.com/store/apps/details?id=info.guardianproject.mrapp + https://guardianproject.info/2012/05/02/orbot-your-twitter/ Ustawienia Proxy Jeśli aplikacja na Androida, której używasz obsługuje proxy HTTP lub SOCKS proxy, to możesz skonfigurować ją do łączenia się z Orbotem i używania Tora. Ustawienie hosta to 127.0.0.1 lub \"localhost\". Dla HTTP, numer portu to 8118. Dla SOCKS proxy to 9050. Powinno się używać SOCKS4A lub SOCKS5, jeśli to możliwe.\n \n\n\n Możesz dowiedzieć się więcej o przekierowaniu ruchu na Androidzie z FAQ pod adresem: http://tinyurl.com/proxyandroid\n @@ -111,14 +111,14 @@ Orbot-Włączone Aplikacje ChatSecure: Bezpieczny komunikator z szyfrowaniem Off-the-Record - https://guardianproject.info/releases/chatsecure-latest.apk + ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota - https://guardianproject.info/releases/orweb-latest.apk + Znajdź wszystkie aplikacje Guardian Project na Google Play https://play.google.com/store/search?q=guardianproject Transparentne Proxy @@ -265,7 +265,7 @@ TYLKO DLA EKSPERTÓW: wpisz linijki konfiguracyjne torrc Torrc klienta Mobile Martus - Benetech Dokumentacja Aplikacji Praw Człowieka - https://play.google.com/store/apps/details?id=org.martus.android + Twoje publiczne Tor IP: Proszę wyłącz tą aplikację w Android->Ustawienia->Aplikacje jesli masz problemy z Orbot: Konflikt aplikacji diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 353f3589..e2775bf6 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -74,7 +74,7 @@ ChatSecure - cliente de mensagem instantânea segura para Android Configurações de Proxy - Aprenda como configurar apps para trabalhar com Orbot Ferramenta de Busca DuckDuckGo - https://duckduckgo.com/android/latest.apk + Define o proxy do Twitter para \"localhost\" e a porta 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Configurações de Proxy @@ -96,14 +96,14 @@ Apps Orbot Habilitadas ChatSecure: app de chat seguro com criptografia Off-the-Record - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Navegador de reforço de privacidade que trabalha através do Tor - https://guardianproject.info/releases/orweb-latest.apk + Encontre todos os aplicativos da Guardian Project no Google Play https://play.google.com/store/search?q=guardianproject Proxy Transparente diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 730f0e2f..790c8180 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -66,7 +66,7 @@ ChatSecure - Cliente de mensagens instantâneas seguras para Android Configurações do Proxy - Aprenda a configurar as apps para funcionarem com o Orbot App de Mecanismo de Procura DuckDuckGo - https://duckduckgo.com/android/latest.apk + Defina o proxy do Twitter para hospedeiro \"localhost\" e porta 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Definições Proxy @@ -85,14 +85,14 @@ Opcionalmente, pode conceder acesso de Administrador\' ao Orbot para ativar as funções avançadas, tais como, Proxy Transparente. Orbot - Apps Ativadas - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Privacidade melhorada que funciona via Tor - https://guardianproject.info/releases/orweb-latest.apk + Encontre todas as apps do Projeto Guardian na Play Store da Google https://play.google.com/store/search?q=guardianproject Proxy Transparente diff --git a/res/values-ro-rRO/strings.xml b/res/values-ro-rRO/strings.xml index c58f7667..183eff02 100644 --- a/res/values-ro-rRO/strings.xml +++ b/res/values-ro-rRO/strings.xml @@ -23,7 +23,7 @@ Nimic diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 73e071cc..373c6ae1 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Mesagerie instantanee securizată pentru Android Setari pentru proxy - Invata cum sa configurezi aplicatii sa fie compatibile cu Orbot Motor de cautare DuckDuckGo - https://duckduckgo.com/android/latest.apk + Seteaza proxy-ul Twitter \"localhost\" su portul 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Setări proxy @@ -96,14 +96,14 @@ Aplicatii cu Orbot activat ChatSecure: Aplicație sigură de chat cu codare Off-the-Record - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: browser de internet cu setari avansate de intimitate care functioneaza cu Tor - https://guardianproject.info/releases/orweb-latest.apk + Gaseste toate aplicatile Guardian Project pe Google Play https://play.google.com/store/search?q=guardianproject Proxy transparent diff --git a/res/values-rs-rAR/strings.xml b/res/values-rs-rAR/strings.xml index dc0d5162..44c2f118 100644 --- a/res/values-rs-rAR/strings.xml +++ b/res/values-rs-rAR/strings.xml @@ -48,7 +48,7 @@ Приложения, работающие с Orbot: ChatSecure: приложение для общения с поддержкой Off-the-Record шифрования - https://guardianproject.info/releases/chatsecure-latest.apk + ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot - https://guardianproject.info/releases/orweb-latest.apk + Найти все приложения Guardian Project на Google Play https://play.google.com/store/search?q=guardianproject Прозрачное Проксирование diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index 54e431e4..a5b002cc 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -73,7 +73,7 @@ පහත යොමු සාදා ඇත්තේ Orbot සමග වැඩ කිරීමට ය. ස්ථාපනය කිරීම සදහා එක් එක් බොත්තම මත ක්ලික් කරන්න. නැතහොත් ඔබට මෙම යොමු Google Play, GuardianProject.info වෙබ්අඩවියෙන් හෝ F-Droid.org වලින් සොයා ගත හැක. නියුතු සේවා සිටුවම් - Orbot සමග ක්‍රියාකිරීමට අනෙක් යොමු වින්‍යාස කරන ආකාරය හදාරන්න DuckDuckGo සෙවුම් යන්ත්‍ර යෙදුම - https://duckduckgo.com/android/latest.apk + Twitter නියුතුසේවාව \"localhost\" සත්කාරකයට හා පෝටය 8118 ට පිහිටුවන්න https://guardianproject.info/2012/05/02/orbot-your-twitter/ නියුතු සේවා සිටුවම් @@ -99,7 +99,7 @@ https://play.google.com/store/search?q=guardianproject පාරදෘශ්‍ය නියුතුසේවා diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 0f460665..a044399d 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -9,7 +9,7 @@ Žiadny diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index e7fa0f17..6b685d95 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -77,7 +77,7 @@ Stanje diff --git a/res/values-sn/strings.xml b/res/values-sn/strings.xml index 80f6e73f..ec319803 100644 --- a/res/values-sn/strings.xml +++ b/res/values-sn/strings.xml @@ -19,7 +19,7 @@ diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml index d8d04672..cccea539 100644 --- a/res/values-sq-rAL/strings.xml +++ b/res/values-sq-rAL/strings.xml @@ -9,7 +9,7 @@ diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 56be9b01..9bc7fa04 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -23,7 +23,7 @@ Asnjë diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 60b56ebe..c373fcc5 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -73,7 +73,7 @@ Апликације наведене испод су развијене да би радиле са Орботом. Кликните свако дугме које желите сада да инсталирате, а у супротном их можете пронаћи и у Google Play продавници, на GuardianProject.info веб страници или преко F-Droid.org. Прокси поставке - Научите како да подесите апликације да раде са Орботом DuckDuckGo апликација за претраживање интернета - https://duckduckgo.com/android/latest.apk + Подесите Твитер да користи порт 8118 на локалном хосту. https://guardianproject.info/2012/05/02/orbot-your-twitter/ Прокси подешавања @@ -99,7 +99,7 @@ https://play.google.com/store/search?q=guardianproject Транспарентно слање кроз прокси diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index fbf52549..a345fc0e 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Säker chattklient för Android Proxy-inställningar - Lär dig hur du konfigurerar appar att fungera med Orbot DuckDuckGo Sökmotor App - https://duckduckgo.com/android/latest.apk + Ställ in Twitter proxy till värd \"localhost\" och port 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy-inställningar @@ -96,14 +96,14 @@ Orbot-Anpassade Appar ChatSecure: Säkert chatt app med Off-the-Record kryptering - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Integritets-förbättrande webbläsare som fungerar genom Tor - https://guardianproject.info/releases/orweb-latest.apk + Hitta alla Guardian Project appar på Google Play https://play.google.com/store/search?q=guardianproject Transparent Proxy diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index d8d04672..cccea539 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -9,7 +9,7 @@ diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index 0f460665..a044399d 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -9,7 +9,7 @@ พร็อกซีล่อง diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index fa61dda4..472ef93b 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Isang Secure instant messaging client para sa Android Proxy Settings - Alamin paano magkompigura ng apps para gumana sa Orbot DuckDuckGo Search Engine app - https://duckduckgo.com/android/latest.apk + I-set ang Twitter proxy sa host \"localhost\" at port 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy Settings @@ -96,14 +96,14 @@ Orbot-Enabled Apps ChatSecure: Isang secure chat app na may Off-the-Record Encryption - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: rivacy-enhanced browser na gumagana sa Tor - https://guardianproject.info/releases/orweb-latest.apk + Hanapin ang lahat ng Guardian Project apps sa Google Play https://play.google.com/store/search?q=guardianproject Transparent Proxying diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 4c7f96d7..218db87f 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -75,10 +75,10 @@ ChatSecure - Android için güvenli anında mesajlaşma istemcisi Vekil Ayarları - Uygulamaların, Orbot ile birlikte çalışmalarını nasıl ayarlayacağınızı öğrenin. DuckDuckGo Arama Motoru uygulaması - https://duckduckgo.com/android/latest.apk + https://guardianproject.info/apps/firefoxprivacy Twitter proxy sunucusunu \"localhost\" ve bağlantı noktası 8118 olarak ayarlayın - https://play.google.com/store/apps/details?id=info.guardianproject.mrapp + https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy Ayarları Orbot hazır! @@ -99,14 +99,14 @@ Orbot\'un aktif olduğu eklentiler ChatSecure: Güvenli Kayıt-dışı Şifreleme yapabilen sohbet uygulaması - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Tor üzerinden çalışabilen, gizliliği artırılmış tarayıcı. - https://guardianproject.info/releases/orweb-latest.apk + Google Play\'deki tüm Guardian Projesi uygulamalarına bakın https://play.google.com/store/search?q=guardianproject Şeffaf Vekillendirme diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index ef141ca7..b4b9d9c7 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Захищений обмін повідомленнями в Android Налаштування проксі — дізнайтесь як налаштувати додатки для роботи з Orbot Додаток пошукової системи DuckDuckGo - https://duckduckgo.com/android/latest.apk + Twitter підтримує http проксі «localhost:8118» https://guardianproject.info/2012/05/02/orbot-your-twitter/ Налаштування Проксі @@ -96,14 +96,14 @@ Додатки, що працюють з Orbot: ChatSecure: додаток для спілкування з підтримкою Off-the-Record шифрування - https://guardianproject.info/releases/chatsecure-latest.apk + ORWEB (Тільки для версії Android 1.x) - браузер, розроблений для забезпечення безпеки і для Orbot - https://guardianproject.info/releases/orweb-latest.apk + Знайти всі додатки Guardian Project на Google Play https://play.google.com/store/search?q=guardianproject Прозоре Проксування diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index 22c1de74..338847e2 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -15,7 +15,7 @@ - https://duckduckgo.com/android/latest.apk + https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proksi moslamalari Orbot tayyor! @@ -35,7 +35,7 @@ Proksi turini kiriting diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 47db1802..0883aeed 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -74,7 +74,7 @@ ChatSecure - Ứng dụng tin nhắn an toàn cho Android Cài Đặt Proxy - Hãy học cách thức thiết trí ứng dụng để dùng với Orbot Ứng dụng tìm kiếm DuckDuckGo - https://duckduckgo.com/android/latest.apk + Cài Twitter proxy đến máy chủ \"localhost\" và cổng 8118 https://guardianproject.info/2012/05/02/orbot-your-twitter/ Những Cài đặt máy chủ proxy @@ -96,14 +96,14 @@ Các ứng dụng đã được áp dụng Orbot ChatSecure: ứng dụng chat an toàn với mã hóa Off-the-Record - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb: Trình duyệt có khả năng bảo mật cao được dùng qua mạng Tor - https://guardianproject.info/releases/orweb-latest.apk + Hãy tìm những ứng dụng của Guardian Project trên Google Play https://play.google.com/store/search?q=guardianproject Đang chuyển tiếp theo dạng hiển thị diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 0cb7073b..f23b133e 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -58,7 +58,7 @@ 組態 Tor 網路 所有應用程式都通過 Tor 代理 DuckDuckGo 搜尋引擎應用程式 - https://duckduckgo.com/android/latest.apk + https://guardianproject.info/2012/05/02/orbot-your-twitter/ 代理伺服器設定 @@ -71,13 +71,13 @@ 許可權 - https://guardianproject.info/releases/chatsecure-latest.apk - https://guardianproject.info/releases/orweb-latest.apk + + 在 Google Play 尋找所有的 Guardian Project 應用程式 https://play.google.com/store/search?q=guardianproject 通透式代理 diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml index 2858d23c..1f81af9f 100644 --- a/res/values-zh/strings.xml +++ b/res/values-zh/strings.xml @@ -77,11 +77,11 @@ ChatSecure - Android 上的安全即时通讯客户端 代理设置 - 学习如何配置应用程序使用 Orbot DuckDuckGo 搜索引擎应用程序 - https://duckduckgo.com/android/latest.apk + 适用于移动版 Firefox 的代理扩展 (https://guardianproject.info/apps/firefoxprivacy) https://guardianproject.info/apps/firefoxprivacy 将 Twitter 代理的主机设置 localhost 并将端口设置为 8118 - https://play.google.com/store/apps/details?id=info.guardianproject.mrapp + https://guardianproject.info/2012/05/02/orbot-your-twitter/ 代理设置 Orbot 已就绪！ @@ -103,14 +103,14 @@ 使用 Orbot 的应用程序 ChatSecure：具有 OTF 加密共的安全通讯应用 - https://guardianproject.info/releases/chatsecure-latest.apk + Orweb：使用 Tor 网络的隐私保护浏览器 - https://guardianproject.info/releases/orweb-latest.apk + 在 Google Play 商店查找所有 Guardian Project 的应用程序 https://play.google.com/store/search?q=guardianproject 透明代理 @@ -256,7 +256,7 @@ Torrc 自定义配置 仅供专家：直接输入 torrc 配置行 自定义 Torrc - https://play.google.com/store/apps/details?id=org.martus.android + 您的 Tor 公网 IP: 如果您使用 Orbot 遇到问题，请在 Android->设置->应用 中禁用本应用： 应用冲突 diff --git a/res/values/strings.xml b/res/values/strings.xml index 4844d425..309345c1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -78,10 +78,8 @@ ChatSecure - Secure instant messaging client for Android Proxy Settings - Learn how to configure apps to work with Orbot DuckDuckGo Search Engine app - https://duckduckgo.com/android/latest.apk Set Twitter proxy to host \"localhost\" and port 8118 StoryMaker - Make a story and leave it to tor for security! - https://play.google.com/store/apps/details?id=info.guardianproject.mrapp https://guardianproject.info/2012/05/02/orbot-your-twitter/ Proxy Settings If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n @@ -109,9 +107,7 @@ Orbot-Enabled Apps ChatSecure: Secure chat app with Off-the-Record Encryption - https://guardianproject.info/releases/chatsecure-latest.apk Orweb: Privacy-enhanced browser that works through Tor - https://guardianproject.info/releases/orweb-latest.apk Find all Guardian Project apps on Google Play https://play.google.com/store/search?q=guardianproject @@ -282,7 +278,6 @@ Custom Torrc Mobile Martus - Benetech Human Rights Documentation App - https://play.google.com/store/apps/details?id=org.martus.android Your Tor Public IPs: "Please disable this app in Android->Settings->Apps if you are having problems with Orbot: " App Conflict diff --git a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java index b049625f..a3681650 100644 --- a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java +++ b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java @@ -1,20 +1,35 @@ package org.torproject.android.ui.wizard; -import org.torproject.android.R; -import org.torproject.android.OrbotConstants; - import android.app.Activity; import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; +import android.text.TextUtils; +import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import android.widget.TextView; + +import org.torproject.android.OrbotConstants; +import org.torproject.android.R; + +import java.util.List; public class PromoAppsActivity extends Activity implements OrbotConstants { + final static String MARKET_URI = "market://details?id="; + final static String FDROID_APP_URI = "https://f-droid.org/repository/browse/?fdid="; + final static String PLAY_APP_URI = "https://play.google.com/store/apps/details?id="; + final static String FDROID_URI = "https://f-droid.org/repository/browse/?fdfilter=info.guardianproject"; + final static String PLAY_URI = "https://play.google.com/store/apps/developer?id=The+Guardian+Project"; + + private final static String FDROID_PACKAGE_NAME = "org.fdroid.fdroid"; + private final static String PLAY_PACKAGE_NAME = "com.android.vending"; + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -39,47 +54,45 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { } void stepFive(){ - - - String title = getString(R.string.wizard_tips_title); - - setTitle(title); - - Button btnLink = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot); - - btnLink.setOnClickListener(new OnClickListener() { - - public void onClick(View view) { - String url = getString(R.string.gibberbot_apk_url); + + String title = getString(R.string.wizard_tips_title); + + setTitle(title); + + Button btnLink = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot); + + btnLink.setOnClickListener(new OnClickListener() { + + @Override + public void onClick(View view) { finish(); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + startActivity(getInstallIntent("info.guardianproject.otr.app.im")); } }); - + btnLink = (Button)findViewById(R.id.WizardRootButtonInstallOrweb); btnLink.setOnClickListener(new OnClickListener() { - + + @Override public void onClick(View view) { - - String url = getString(R.string.orweb_apk_url); finish(); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + startActivity(getInstallIntent("info.guardianproject.browser")); } }); - + btnLink = (Button)findViewById(R.id.WizardRootButtonInstallDuckgo); btnLink.setOnClickListener(new OnClickListener() { - + + @Override public void onClick(View view) { - - String url = getString(R.string.duckgo_apk_url); + finish(); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + startActivity(getInstallIntent("com.duckduckgo.mobile.android")); } }); @@ -87,41 +100,42 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { btnLink = (Button)findViewById(R.id.WizardRootButtonInstallTwitter); btnLink.setOnClickListener(new OnClickListener() { - + + @Override public void onClick(View view) { - + String url = getString(R.string.twitter_setup_url); finish(); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); } }); - + btnLink = (Button)findViewById(R.id.WizardRootButtonInstallStoryMaker); btnLink.setOnClickListener(new OnClickListener() { - + + @Override public void onClick(View view) { - - String url = getString(R.string.story_maker_url); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + finish(); + startActivity(getInstallIntent("info.guardianproject.mrapp")); } }); - + btnLink = (Button)findViewById(R.id.WizardRootButtonInstallMartus); btnLink.setOnClickListener(new OnClickListener() { - + + @Override public void onClick(View view) { - - String url = getString(R.string.martus_url); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + finish(); + startActivity(getInstallIntent("org.martus.android")); } }); - - + + btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay); btnLink.setOnClickListener(new OnClickListener() { @@ -170,8 +184,33 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { } return false; } - - /* + + Intent getInstallIntent(String packageName) { + final Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse(MARKET_URI + packageName)); + + PackageManager pm = getPackageManager(); + List resInfos = pm.queryIntentActivities(intent, 0); + + String foundPackageName = null; + for (ResolveInfo r : resInfos) { + Log.i(TAG, "market: " + r.activityInfo.packageName); + if (TextUtils.equals(r.activityInfo.packageName, FDROID_PACKAGE_NAME) + || TextUtils.equals(r.activityInfo.packageName, PLAY_PACKAGE_NAME)) { + foundPackageName = r.activityInfo.packageName; + break; + } + } + + if (foundPackageName == null) { + intent.setData(Uri.parse(FDROID_APP_URI + packageName)); + } else { + intent.setPackage(foundPackageName); + } + return intent; + } + + /* private void showWizardFinal () { String title = null;