From 6d654db37ae357514d0b12189625ed932b84f712 Mon Sep 17 00:00:00 2001
From: n8fr8 <nathan@freitas.net>
Date: Thu, 28 Jun 2012 17:00:14 -0400
Subject: [PATCH] updated strings, removing unneeded values & layouts

---
 res/layout-xlarge/layout_main.xml | 55 -------------------------------
 res/values-ar/strings.xml         |  5 ---
 res/values-ca/strings.xml         |  5 ---
 res/values-cs/strings.xml         |  5 ---
 res/values-de/strings.xml         |  6 +---
 res/values-el/strings.xml         |  5 ---
 res/values-es/strings.xml         |  5 ---
 res/values-eu/strings.xml         |  5 ---
 res/values-fa/strings.xml         |  5 ---
 res/values-fr/strings.xml         |  5 ---
 res/values-zh/strings.xml         |  5 ---
 res/values/strings.xml            |  6 ++--
 12 files changed, 5 insertions(+), 107 deletions(-)
 delete mode 100644 res/layout-xlarge/layout_main.xml

diff --git a/res/layout-xlarge/layout_main.xml b/res/layout-xlarge/layout_main.xml
deleted file mode 100644
index 6e89e2cd..00000000
--- a/res/layout-xlarge/layout_main.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/bgtitanium" android:orientation="vertical">
-    
-    	<RelativeLayout android:id="@+id/layoutHeaderMain"
-		android:layout_width="fill_parent"
-		android:layout_height="30dp"
-		android:layout_gravity="center_horizontal"
-		android:background="#A0909090">
-        <ImageView android:id="@+id/radioModeImage"
- 		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-			android:layout_marginTop="3px"
-			android:layout_marginRight="3px"
-			android:gravity="right"
-			android:layout_toRightOf="@+id/radioModeLabel"
-			android:layout_alignParentRight="true"
-			android:layout_alignParentTop="true"
-			android:src="@drawable/tor25"
-			/>
-		<TextView android:id="@+id/radioModeText"
- 		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"           
-            android:text="@string/powered_by"
-			android:layout_marginTop="8px"
-			android:layout_marginRight="0px"
-			android:gravity="right"
-			android:layout_toLeftOf="@+id/radioModeImage"
-            android:textColor="#cccccc" />
-	</RelativeLayout>
-        
-			<ImageView
-			android:id="@+id/imgStatus"
-			 android:layout_width="fill_parent"
-			 android:layout_margin="15dip"
- 			android:layout_height="400dp"
-			android:layout_gravity="center_horizontal"
-			android:src="@drawable/toroff" android:layout_weight="1"/>
-	
-        <TextView android:id="@+id/lblStatus"
-			android:text="@string/press_to_start"
-			android:layout_gravity="center_horizontal"
-			android:textStyle="bold"
-			android:layout_width="wrap_content"
-			 			android:layout_height="wrap_content"
-			
-			android:textColor="#ffffff"
-			 />
-
-
-       
-</LinearLayout>
-
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 01a6a12e..9f07aa88 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -183,11 +183,6 @@
   <string name="the_tor_license">رخصة استخدام تور</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">برامج من جهات أخرى:</string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.orgب</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">أحد البرامج يحاول تشغيل خدمة مخفية بمنفذ %S على شبكة تور. هذه الميزة آمنة فقط اذا كنت تثق بالبرنامج</string>
   <string name="found_existing_tor_process">تم العثور على برنامج تور </string>
   <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6a63bb1e..f9e06d2c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -183,11 +183,6 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
   <string name="found_existing_tor_process">found existing Tor process...</string>
   <string name="something_bad_happened">Something bad happened. Check the log</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 027de608..4f202787 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -177,11 +177,6 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
   <string name="found_existing_tor_process">found existing Tor process...</string>
   <string name="something_bad_happened">Something bad happened. Check the log</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9b75c7f7..a9d4b837 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -184,11 +184,7 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail
   <string name="the_tor_license">Die Tor Lizenz</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Drittanbieter-Software:</string>
-  <string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
+  
   <string name="hidden_service_request">Eine Anwendungen möchte den Port für versteckte Dienste %S öffnen. Dies ist sicher wenn Sie der Anwendung vertrauen.</string>
   <string name="found_existing_tor_process">existierender Tor Prozess gefunden...</string>
   <string name="something_bad_happened">Etwasist schief gelaufen. Bitte Log prüfen</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 9ad6ffbd..2705a38d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -177,11 +177,6 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
   <string name="found_existing_tor_process">found existing Tor process...</string>
   <string name="something_bad_happened">Something bad happened. Check the log</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a5d0ca8c..28fa0a18 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -183,11 +183,6 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec
   <string name="the_tor_license">Licencia de uso Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Software de terceras partes</string>
-  <string name="tor_version">Tor v0.2.3.7-alfa: https://www.torproject.org</string>
-  <string name="libevent_version">Libevent v1.4.13: http://www.monkey.org/ ~ provos / libevent /</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">Una aplicación esta intentando abrir el siguiente puerto %S a la red Tor. Esto es seguro, si confía en la aplicación, que lo esta intentando abrir.</string>
   <string name="found_existing_tor_process">Se ha encontrado proceso activo de Tor ...</string>
   <string name="something_bad_happened">Algo ha ocurrido con el normal funcionamiento de la aplicacion. Compruebe el log de registro del sistema Tor</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 72c98651..678af251 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -177,11 +177,6 @@
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
   <string name="found_existing_tor_process">found existing Tor process...</string>
   <string name="something_bad_happened">Something bad happened. Check the log</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ec83d4dc..1bdbfa26 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -178,11 +178,6 @@ Orbot  اگر فقط
   <string name="the_tor_license">The Tor License</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
   <string name="found_existing_tor_process">found existing Tor process...</string>
   <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ee3d7961..98b07b5e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -178,11 +178,6 @@
   <string name="the_tor_license">La licence de Tor</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Logiciels tierce-partie :</string>
-  <string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string>
-  <string name="libevent_version">Libevent v1.4.13 : http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12 : http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7 : http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">Une application veut ouvrir le port %S du serveur caché sur le réseau Tor. C\'est sécuritaire si vous faites confiance à l\'application.</string>
   <string name="found_existing_tor_process">trouvé un processus existant de Tor ...</string>
   <string name="something_bad_happened">Quelque chose d\'incorrect s\'est passé. Vérifiez le journal</string>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 8d55b454..3e90dbca 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -176,11 +176,6 @@
   <string name="the_tor_license">Tor许可证</string>
   <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
   <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
   <string name="found_existing_tor_process">found existing Tor process...</string>
   <string name="something_bad_happened">Something bad happened. Check the log</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 911caf68..10e51eb0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -238,11 +238,13 @@
 <string name="the_tor_license">The Tor License</string>
 <string name="https_torproject_org">https://torproject.org</string>
 <string name="third_party_software">3rd-Party-Software: </string>
-<string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
+
+ <string name="tor_version">Tor v0.2.3.17: https://www.torproject.org</string>
 <string name="libevent_version">LibEvent v2.1: http://www.monkey.org/~provos/libevent/</string>
 <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
 <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-<string name="openssl_version">OpenSSL v0.9.8c: http://www.openssl.org</string>
+<string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+ 
 <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
 <string name="found_existing_tor_process">found existing Tor process...</string>
 <string name="something_bad_happened">Something bad happened. Check the log</string>