From 7c02ae2d3bac47a6f152701e28d35942f9c30f81 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Thu, 7 Nov 2013 10:36:07 +0000
Subject: [PATCH] 2013-11-07  Miguel de Dios  <miguel.dedios@artica.es>

	* res/values-ja/strings.xml, res/values/strings.xml,
	res/values-es/strings.xml, res/layout/main.xml: changes in the
	themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9027 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 extras/pandroid_event_viewer/ChangeLog        |  6 +++
 .../pandroid_event_viewer/res/layout/main.xml | 51 +++++++++++--------
 .../res/values-es/strings.xml                 |  4 +-
 .../res/values-ja/strings.xml                 |  4 +-
 .../res/values/strings.xml                    |  5 +-
 5 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index 45b658fbf0..83ffd64c91 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-07  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* res/values-ja/strings.xml, res/values/strings.xml,
+	res/values-es/strings.xml, res/layout/main.xml: changes in the
+	themes.
+
 2013-11-06  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* res/layout/item_list_event_extended.xml, res/layout/main.xml,
diff --git a/extras/pandroid_event_viewer/res/layout/main.xml b/extras/pandroid_event_viewer/res/layout/main.xml
index 600fb01c33..ce91957926 100644
--- a/extras/pandroid_event_viewer/res/layout/main.xml
+++ b/extras/pandroid_event_viewer/res/layout/main.xml
@@ -21,6 +21,7 @@
     android:orientation="vertical" >
 
     <!-- BEGIN THE HEADER -->
+
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -32,9 +33,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:padding="0dp"
-            android:background="@drawable/refresh_icon_button" />
-        
+            android:background="@drawable/refresh_icon_button"
+            android:padding="0dp" />
+
         <LinearLayout
             android:layout_width="2px"
             android:layout_height="fill_parent"
@@ -49,7 +50,7 @@
             android:textColor="#ffffff"
             android:textSize="20dp"
             android:textStyle="bold" />
-        
+
         <LinearLayout
             android:layout_width="2px"
             android:layout_height="fill_parent"
@@ -60,14 +61,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:padding="0dp"
             android:background="@null"
+            android:padding="0dp"
             android:src="@drawable/icon_filter_pressed" />
     </LinearLayout>
-     <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="2px"
-            android:background="#6D9624" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="2px"
+        android:background="#6D9624" />
     <!-- END THE HEADER -->
 
     <TextView
@@ -100,31 +102,38 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:padding="0dp"
-                android:background="@drawable/delete_icon_button" />
+                android:background="@drawable/delete_icon_button"
+                android:padding="0dp" />
 
             <ImageButton
                 android:id="@+id/button_save_profile"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:padding="0dp"
-                android:background="@drawable/save_icon_button" />
+                android:background="@drawable/save_icon_button"
+                android:padding="0dp" />
         </LinearLayout>
 
         <Button
             android:id="@+id/button_set_as_filter_watcher"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/set_as_filter_watcher_button_str"
-            android:background="@drawable/pandora_button" />
+            android:background="@drawable/pandora_button"
+            android:text="@string/set_as_filter_watcher_button_str" />
+    </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="2dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp"
-            android:background="#ffffff" />
+    <TextView
+        style="@style/options_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:text="@string/filter_options_label_str" />
+
+    <LinearLayout
+        style="@style/margin_pandora"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
 
         <ScrollView
             android:layout_width="fill_parent"
diff --git a/extras/pandroid_event_viewer/res/values-es/strings.xml b/extras/pandroid_event_viewer/res/values-es/strings.xml
index c02a440b3c..fcf4a065a0 100644
--- a/extras/pandroid_event_viewer/res/values-es/strings.xml
+++ b/extras/pandroid_event_viewer/res/values-es/strings.xml
@@ -34,7 +34,9 @@
 	<string name="load_more_events_button_str">Cargar mas eventos</string>
 	<string name="empty_label_str">Lista vacia de eventos</string>
 	<string name="refresh_time_label_str">Refresco scanner eventos</string>
-	<string name="set_as_filter_watcher_button_str">Filtro por defecto</string>
+	<string name="set_as_filter_watcher_button_str">Poner como filtro de notificaciones</string>
+	<string name="profile_label_str">Filtros guardados</string>
+	<string name="filter_options_label_str">Opciones filtro</string>
 	<string name="validate_event_button_str">Validar Evento</string>
 	<string name="config_update_succesful_str">Configuración guardada correctamente.</string>
 	<string name="config_update_fail_str">Configuración no ha podido guardarse..</string>
diff --git a/extras/pandroid_event_viewer/res/values-ja/strings.xml b/extras/pandroid_event_viewer/res/values-ja/strings.xml
index 12e03a3760..6acc9781eb 100644
--- a/extras/pandroid_event_viewer/res/values-ja/strings.xml
+++ b/extras/pandroid_event_viewer/res/values-ja/strings.xml
@@ -39,7 +39,9 @@
 	<string name="load_more_events_button_str">イベント読み込み</string>
 	<string name="empty_label_str">イベントがありません</string>
 	<string name="refresh_time_label_str">更新時間</string>
-	<string name="set_as_filter_watcher_button_str">デフォルトのフィルタ</string>
+	<string name="set_as_filter_watcher_button_str">Set this filter for notifications</string>
+	<string name="profile_label_str">Stored filters</string>
+	<string name="filter_options_label_str">Filter options</string>
 	<string name="config_update_succesful_str">設定を更新しました。</string>
 	<string name="config_update_fail_str">設定の更新に失敗しました。</string>
 	<string name="please_set_preferences_str">Pandora FMS の API URL、ユーザ、パスワードを設定してください。</string>
diff --git a/extras/pandroid_event_viewer/res/values/strings.xml b/extras/pandroid_event_viewer/res/values/strings.xml
index cb5a5b275d..b462a7b7f0 100644
--- a/extras/pandroid_event_viewer/res/values/strings.xml
+++ b/extras/pandroid_event_viewer/res/values/strings.xml
@@ -44,7 +44,7 @@
     <string name="load_more_events_button_str">Load more events</string>
     <string name="empty_label_str">Empty list events</string>
     <string name="refresh_time_label_str">Refresh time</string>
-    <string name="set_as_filter_watcher_button_str">Set background check filter</string>
+    <string name="set_as_filter_watcher_button_str">Set this filter for notifications</string>
     <string name="validate_event_button_str">Validate Event</string>
     <string name="config_update_succesful_str">Update configuration successful.</string>
     <string name="config_update_fail_str">Update configuration failed.</string>
@@ -110,7 +110,8 @@
     <string name="options_not_saved">Options not saved.</string>
     <string name="notification_error_parsing">There was an error retrieving data from server.</string>
     <string name="save_profile_button_str">Save profile</string>
-    <string name="profile_label_str">Profile</string>
+    <string name="profile_label_str">Stored filters</string>
+    <string name="filter_options_label_str">Filter options</string>
     <string name="profile_name">Insert the profile\'s name</string>
     <string name="profile_saved">Profile saved</string>
     <string name="profile_already_exists">A profile with that name already exists.</string>