Author: n8fr8 Date: 2011-04-15 16:37:58 +0000 (Fri, 15 Apr 2011) New Revision: 24628 Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml projects/android/trunk/Orbot/res/values-ar/strings.xml projects/android/trunk/Orbot/res/values-ca/strings.xml projects/android/trunk/Orbot/res/values-de/strings.xml projects/android/trunk/Orbot/res/values-es/strings.xml projects/android/trunk/Orbot/res/values-fa/strings.xml projects/android/trunk/Orbot/res/values-mk/strings.xml projects/android/trunk/Orbot/res/values-nl/strings.xml projects/android/trunk/Orbot/res/values-pl/strings.xml projects/android/trunk/Orbot/res/values-ru/strings.xml projects/android/trunk/Orbot/res/values-zh/strings.xml projects/android/trunk/Orbot/res/values/strings.xml Log: update to string for wizard with gibberbot link Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml =================================================================== --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -58,7 +58,7 @@ android:layout_gravity="center_horizontal" android:gravity="center_horizontal" android:textStyle="bold" - android:width="300px" + android:width="330px" android:height="75px" android:textColor="#ffffff" /> Modified: projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml =================================================================== --- projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -17,7 +17,7 @@ <TextView android:text="@string/wizard_tips_msg" android:layout_gravity="left" android:textColor="#ffffff" android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView> -<Button android:text="@string/wizard_tips_otrchat" android:layout_gravity="left" android:drawableLeft="@drawable/icon_otrchat" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOtrchat" android:layout_width="wrap_content" android:layout_height="wrap_content"/> +<Button android:text="@string/wizard_tips_otrchat" android:layout_gravity="left" android:drawableLeft="@drawable/ic_launcher_gibberbot" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOtrchat" android:layout_width="wrap_content" android:layout_height="wrap_content"/> <Button android:text="@string/wizard_tips_orweb" android:drawableLeft="@drawable/icon_orweb" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOrweb" android:layout_width="wrap_content" android:layout_height="wrap_content"/> Modified: projects/android/trunk/Orbot/res/values/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -94,7 +94,7 @@ <string name="wizard_tips_tricks">Orbot-enabled Apps</string> <string name="wizard_tips_msg">We encourage you to download & use apps that know how to connect directly to Orbot. Click on the buttons below to install.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Secure instant messaging client for Android</string> + <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_orweb">ORWEB (Android 1.x Only) - Browser designed for privacy & for Orbot</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> @@ -108,8 +108,8 @@ <string name="wizard_final">Orbot is ready!</string> <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> - <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <!-- END Welcome Wizard strings (DJH) --> Modified: projects/android/trunk/Orbot/res/values-ar/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -97,7 +97,7 @@ <string name="wizard_tips_tricks">تطبيقات مهيئة لأوربوت</string> <string name="wizard_tips_msg">نشجعكم على تحميل واستخدام التطبيقات التي تعرف كيفية الاتصال مباشرة بأوربوت. اضغط على الأزرار في الأسفل للتثبيت.</string> - <string name="wizard_tips_otrchat">OTRCHAT - عميل التراسل الفوري الآمن للأندرويد</string> + <string name="wizard_tips_otrchat">GibberBot - عميل التراسل الفوري الآمن للأندرويد</string> <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string> <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string> @@ -115,7 +115,7 @@ <string name="wizard_final">أوربوت جاهز!</string> <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة: الصحفيين والمدونين، والعاملين في مجال حقوق الإنسان، والجنود والشركات والمواطنين من الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لأن تستخدمه كذلك!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> <!-- END Welcome Wizard strings (DJH) --> Modified: projects/android/trunk/Orbot/res/values-ca/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -97,7 +97,7 @@ <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string> <string name="wizard_tips_msg">T\'animem a descarregar-te & utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Client de missatgeria instantània segura per a Android</string> + <string name="wizard_tips_otrchat">GibberBot - Client de missatgeria instantània segura per a Android</string> <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat & per a Orbot</string> <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string> @@ -115,7 +115,7 @@ <string name="wizard_final">Orbot és a punt!</string> <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> <!-- END Welcome Wizard strings (DJH) --> Modified: projects/android/trunk/Orbot/res/values-de/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-de/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-de/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -97,7 +97,7 @@ <string name="wizard_tips_tricks">Programme, für die Orbot aktiviert ist</string> <string name="wizard_tips_msg">Wir raten Ihnen Programme herunterzuladen & zu nutzen, die wissen, wie sie sich direkt mit Orbot verbinden. Klicken Sie zum Installieren auf den Knopf unten.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Ein sicheres Instant-Messaging-Programm für Android</string> + <string name="wizard_tips_otrchat">GibberBot - Ein sicheres Instant-Messaging-Programm für Android</string> <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser</string> <string name="wizard_tips_proxy">Proxy-Einstellungen - Lernen Sie Anwendungen so zu konfigurieren, dass sie mit Orbot zusammenarbeiten.</string> @@ -115,7 +115,7 @@ <string name="wizard_final">Orbot ist bereit!</string> <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und sind Sie ebenfalls bereit!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> <!-- END Welcome Wizard strings (DJH) --> Modified: projects/android/trunk/Orbot/res/values-es/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-es/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-es/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -97,7 +97,7 @@ <string name="wizard_tips_tricks">Aplicaciones activas en Orbot</string> <string name="wizard_tips_msg">Le invitamos a descargar y utilizar aplicaciones que saben cómo conectarse directamente a Orbot. Haga clic en los botones a continuación para Instalar.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Cliente de mensajería instantánea seguro para Android</string> + <string name="wizard_tips_otrchat">GibberBot - Cliente de mensajería instantánea seguro para Android</string> <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string> <string name="wizard_tips_proxy">Configuraciones Proxy - Aprenda cómo configurar aplicaciones para que trabajen con Orbot</string> @@ -115,7 +115,7 @@ <string name="wizard_final">¡Orbot está listo!</string> <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora también lo estás!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> <!-- END Welcome Wizard strings (DJH) --> Modified: projects/android/trunk/Orbot/res/values-fa/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -95,7 +95,7 @@ <string name="wizard_tips_tricks">اپلیکیشن هایی که برای اوربات تنظیم شده اند</string> <string name="wizard_tips_msg">توصیه می کنیم داون لود و فعال کنید؛ اپلیکیشن هایی را استفاده کنید که مستقیم به اوربات وصل می شوند. دکمه های زیر را فشار دهید تا نصب شود. </string> - <string name="wizard_tips_otrchat">OTRCHAT - کاربر ایمن انتقال پیام فوری برای آندروید</string> + <string name="wizard_tips_otrchat">GibberBot - کاربر ایمن انتقال پیام فوری برای آندروید</string> <string name="wizard_tips_orweb">ORWEB (فقط آندروید 1.x) - مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز اوربات</string> <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با اوربات</string> @@ -105,7 +105,7 @@ <string name="wizard_final">اوربات آماده استفاده میباشد!</string> <string name="wizard_final_msg">صدها هزار نفر در سراسر جهان به دلایل گوناگون از Tor استفاده می کنند: روزنامه نویسها و بلاگرها، کارکنان حقوق بشر، ماموران انتظامی، سربازان، شرکتها، شهروندان دولتهای سرکوبگر، و شهروندان عادی، و حالا شما نیز آماده استفاده از آن هستید!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> <!-- END Welcome Wizard strings (DJH) --> Modified: projects/android/trunk/Orbot/res/values-mk/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-mk/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-mk/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -95,7 +95,7 @@ <string name="wizard_tips_tricks">Орбот-вклучени апликации</string> <string name="wizard_tips_msg">Ви препорачуваме да презимате и користите апликации кои што знаат како директно да се поврзат со Орбот. Притиснете на копчињата подолу за инсталирање.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Безбеден клиент за инстант-пораки за Андроид</string> + <string name="wizard_tips_otrchat">GibberBot - Безбеден клиент за инстант-пораки за Андроид</string> <string name="wizard_tips_orweb">ORWEB (само Андроид 1.x) - Браусер дизајниран за приватност и за Орбот</string> <string name="wizard_tips_proxy">Подесувања на прокси - Научете како да ги конфигурирате апликациите да работат со Орбот</string> @@ -109,7 +109,7 @@ <string name="wizard_final">Орбот е спремен!</string> <string name="wizard_final_msg">Стотици илјади луѓе низ целиот Свет го користат Тор од многу различни причини: новинари и блогери, борци за човекови права, полицајци, војници, корпорации, граѓани на репресивни режими, и обични граѓани... а сега и Вие сте спремин да го користите!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> <!-- END Welcome Wizard strings (DJH) --> Modified: projects/android/trunk/Orbot/res/values-nl/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -97,7 +97,7 @@ <string name="wizard_tips_tricks">Orbot-beschikbare Apps</string> <string name="wizard_tips_msg">We raden u aan om te apps te downloaden welke zich zich automatisch verbinden met Orbot. Klik op de buttons hier beneden om te installeren.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Veilige instant message programma voor Android</string> + <string name="wizard_tips_otrchat">GibberBot - Veilige instant message programma voor Android</string> <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string> <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe u uw apps kunt configureren voor Orbot</string> @@ -114,7 +114,7 @@ <string name="wizard_final">Orbot is klaar!</string> <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu bent u ook klaar om te gaan!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> <!-- END Welcome Wizard strings (DJH) --> Modified: projects/android/trunk/Orbot/res/values-pl/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -95,7 +95,7 @@ <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string> <string name="wizard_tips_msg">Zachęcamy do pobierania i używania aplikacji, które wiedzą, jak łączyć się bezpośrednio z Orbotem. Kliknij na poniższe przyciski, by zainstalować.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Bezpieczny klieny rozmów dla Androida</string> + <string name="wizard_tips_otrchat">GibberBot - Bezpieczny klieny rozmów dla Androida</string> <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</string> <string name="wizard_tips_proxy">Ustawienia Proxy - NDowiedz się, jak konfiguroać aplikacje do współpracy z Orbotem</string> @@ -109,7 +109,7 @@ <string name="wizard_final">Orbot jest gotowy!</string> <string name="wizard_final_msg">Setki tysięcy ludzi na całym świecie używają Tora z różnych powodów: dziennikarze i blogerzy, działacze na rzecz praw człowieka, stróże prawa, żołnierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> <!-- END Welcome Wizard strings (DJH) --> Modified: projects/android/trunk/Orbot/res/values-ru/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -95,7 +95,7 @@ <string name="wizard_tips_tricks">Orbot-задействованные приложения</string> <string name="wizard_tips_msg">Мы советуем вам скачать и использовать приложения, которые умеют работать напрямую через Orbot. Нажмите на кнопки ниже, чтобы запустить процесс установки.</string> - <string name="wizard_tips_otrchat">OTRCHAT - Обезопасте обмен мгновенными сообщениями для клиентов в Android</string> + <string name="wizard_tips_otrchat">GibberBot - Обезопасте обмен мгновенными сообщениями для клиентов в Android</string> <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string> <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string> @@ -109,7 +109,7 @@ <string name="wizard_final">Программа Orbot готова к использованию!</string> <string name="wizard_final_msg">Сотни тысяч людей по всему миру используют Tor по различным причинам: журналисты и блоггеры, активисты организаций, выступающих в защиту прав человека, судебные исполнители, солдаты, корпорации, граждане стран с репрессивным режимом, и простые люди... а теперь готовы и вы!</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> <!-- END Welcome Wizard strings (DJH) --> Modified: projects/android/trunk/Orbot/res/values-zh/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -95,7 +95,7 @@ <string name="wizard_tips_tricks">可用 Orbot 的应用程序</string> <string name="wizard_tips_msg">我们建议您下载和使用能直接连接到 Orbot 的应用程序。点击以下按钮安装。</string> - <string name="wizard_tips_otrchat">OTRCHAT - Android 上的安全即时消息客户端</string> + <string name="wizard_tips_otrchat">GibberBot - Android 上的安全即时消息客户端</string> <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string> <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string> @@ -108,7 +108,7 @@ <string name="wizard_final">Orbot 已就绪！</string> <string name="wizard_final_msg">数以万计的各国人们因为各种原因使用 Tor：记者、人权工作者、法律工作者、士兵、公司、迫于实际情况使用的市民，当然也有普通的市民。现在你也即将成为其中的一员！</string> - <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> + <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> <!-- END Welcome Wizard strings (DJH) -->