From 8374fa346c6fc5c3f40f75c11a2c5924e9b1ecaf Mon Sep 17 00:00:00 2001
From: kauron <carlos.s.galindo@gmail.com>
Date: Sun, 19 Jul 2015 13:57:09 +0200
Subject: [PATCH] PowerDisplay: corrected errors and translations

---
 app/src/main/res/layout/attack_display.xml | 21 ++++++++++++---------
 app/src/main/res/values-es/strings.xml     |  3 ++-
 app/src/main/res/values/strings.xml        |  3 ++-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/layout/attack_display.xml b/app/src/main/res/layout/attack_display.xml
index 606e649..4b7bac1 100644
--- a/app/src/main/res/layout/attack_display.xml
+++ b/app/src/main/res/layout/attack_display.xml
@@ -56,7 +56,7 @@
             tools:text="Standard action"
             android:textColor="@color/black"
             android:id="@+id/typeText"
-            android:layout_below="@+id/freqText"
+            android:layout_below="@+id/keywordsText"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_marginRight="25dp"
@@ -87,9 +87,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Objective: "
+            android:text="@string/objective"
+            android:paddingRight="3sp"
             android:id="@+id/objective"
-            android:layout_below="@+id/typeText"
+            android:layout_below="@+id/distanceText"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:textStyle="bold" />
@@ -98,11 +99,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Attack: "
+            android:text="@string/attack"
+            android:paddingRight="3sp"
             android:textStyle="bold"
             android:textColor="@color/black"
             android:id="@+id/attack"
-            android:layout_below="@+id/objective"
+            android:layout_below="@+id/objectiveText"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true" />
 
@@ -111,7 +113,8 @@
             android:textColor="@color/black"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Impact: "
+            android:text="@string/impact"
+            android:paddingRight="3sp"
             android:textStyle="bold"
             android:id="@+id/impact"
             android:layout_below="@+id/attack"
@@ -126,7 +129,7 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             tools:text="Constitución contra Reflejos"
             android:id="@+id/attackText"
-            android:layout_below="@+id/objective"
+            android:layout_below="@+id/objectiveText"
             android:layout_toRightOf="@+id/attack"
             android:layout_toEndOf="@+id/attack" />
 
@@ -137,7 +140,7 @@
             tools:text="one creature"
             android:textColor="@color/black"
             android:id="@+id/objectiveText"
-            android:layout_below="@+id/typeText"
+            android:layout_below="@+id/distanceText"
             android:layout_toRightOf="@+id/objective"
             android:layout_toEndOf="@+id/objective" />
 
@@ -157,7 +160,7 @@
             android:textColor="@color/black"
             android:layout_height="wrap_content"
             android:id="@+id/otherText"
-            android:layout_below="@+id/impact"
+            android:layout_below="@+id/impactText"
             tools:text="If you are reading this the description has been displayed"
             android:layout_alignParentLeft="true"/>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8631aa8..9fb03f4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -178,7 +178,7 @@
     <string name="title_activity_player_creator">Creador de personaje</string>
     <string name="lost_hp">Has perdido %d PG</string>
     <string name="level_up">Subir un nivel</string>
-    <string name="use">Usar</string>
+    <string name="use">USAR</string>
     <string name="no_powers">No tienes poderes, añade uno</string>
     <string name="show_stats">Mostrar ataque/defensa</string>
     <string name="action_settings">Ajustes</string>
@@ -194,4 +194,5 @@
     <string name="add_new_player">Añadir un nuevo aventurero</string>
     <string name="import_confirmation">Importar</string>
     <string name="paste_here">Pega el código de personaje aquí</string>
+    <string name="attack">Ataque</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2201cc1..39875a8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -188,7 +188,7 @@
     <string name="title_activity_player_creator">Player Creator</string>
     <string name="lost_hp">Lost %d HP</string>
     <string name="level_up">Level up</string>
-    <string name="use">Use</string>
+    <string name="use">USE</string>
     <string name="no_powers">There are no powers, try creating one</string>
     <string name="show_stats">Show attack/defense</string>
     <string name="title_activity_display">Display</string>
@@ -207,5 +207,6 @@
     <string name="add_import">Import an adventurer from text</string>
     <string name="paste_here">Paste here</string>
     <string name="import_confirmation">Import</string>
+    <string name="attack">Attack</string>
 
 </resources>