From fa6daa9f3ced437b5521d72488d5de20ff0cb6fa Mon Sep 17 00:00:00 2001
From: Carlos Galindo <carlos.s.galindo@gmail.com>
Date: Wed, 29 Apr 2015 14:20:11 +0200
Subject: [PATCH] Rearranged strings files

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../kauron/dungeonmanager/PlayerEditor.java   |  6 +-
 .../com/kauron/dungeonmanager/ShowPlayer.java | 10 +--
 .../res/layout/activity_player_editor.xml     | 10 +--
 .../main/res/layout/activity_show_player.xml  |  2 +-
 .../res/layout/fragment_player_creator.xml    |  3 -
 app/src/main/res/menu/menu_player_editor.xml  |  2 +-
 app/src/main/res/values-es/strings.xml        | 68 +++--------------
 app/src/main/res/values/strings.xml           | 73 ++++---------------
 9 files changed, 42 insertions(+), 134 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a703714..75e5917 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
         </activity>
         <activity
             android:name=".PlayerEditor"
-            android:label="@string/title_activity_introduction"
+            android:label="@string/title_activity_player_editor"
             android:parentActivityName=".Welcome">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/app/src/main/java/com/kauron/dungeonmanager/PlayerEditor.java b/app/src/main/java/com/kauron/dungeonmanager/PlayerEditor.java
index 4fbb5cf..9af0c97 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/PlayerEditor.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/PlayerEditor.java
@@ -1,8 +1,8 @@
 package com.kauron.dungeonmanager;
 
 import android.content.SharedPreferences;
-import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -72,7 +72,7 @@ public class PlayerEditor extends ActionBarActivity {
         super.onBackPressed();
         Toast.makeText(
                 getApplicationContext(),
-                R.string.message_no_back_button_intro,
+                R.string.player_not_saved,
                 Toast.LENGTH_SHORT
         ).show();
     }
@@ -90,7 +90,7 @@ public class PlayerEditor extends ActionBarActivity {
                 finish();
             } else {
                 SnackbarManager.show(
-                        Snackbar.with(getApplicationContext()).text(R.string.missing_info_error), this
+                        Snackbar.with(getApplicationContext()).text(R.string.fill_all_info), this
                 );
             }
             return true;
diff --git a/app/src/main/java/com/kauron/dungeonmanager/ShowPlayer.java b/app/src/main/java/com/kauron/dungeonmanager/ShowPlayer.java
index de7d5aa..923e333 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/ShowPlayer.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/ShowPlayer.java
@@ -8,8 +8,8 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.PorterDuff;
-import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.InputType;
 import android.util.Log;
@@ -133,7 +133,7 @@ public class ShowPlayer extends ActionBarActivity {
                 SnackbarManager.show(
                         Snackbar
                                 .with(this)
-                                .text(R.string.maxed_curative)
+                                .text(R.string.full_hp)
                                 .duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE)
                 );
             } else {
@@ -142,7 +142,7 @@ public class ShowPlayer extends ActionBarActivity {
             return true;
         } else if (id == R.id.action_time_encounter_end) {
             AlertDialog.Builder alert = new AlertDialog.Builder(this);
-            alert.setTitle(R.string.px_awarded_title);
+            alert.setTitle(R.string.xp_awarded_title);
             final EditText input = new EditText(this);
             input.setInputType(InputType.TYPE_CLASS_NUMBER);
             input.setImeOptions(EditorInfo.IME_ACTION_DONE);
@@ -155,7 +155,7 @@ public class ShowPlayer extends ActionBarActivity {
                     return false;
                 }
             });
-            input.setHint(R.string.px_awarded_hint);
+            input.setHint(R.string.xp_awarded_hint);
             alert.setView(input);
             alert.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                 @Override
@@ -255,7 +255,7 @@ public class ShowPlayer extends ActionBarActivity {
             SnackbarManager.show(
                     Snackbar
                             .with(this)
-                            .text(R.string.no_curative_efforts_error)
+                            .text(R.string.no_surges)
                             .duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE)
             );
             return false;
diff --git a/app/src/main/res/layout/activity_player_editor.xml b/app/src/main/res/layout/activity_player_editor.xml
index e27b578..5b4f967 100644
--- a/app/src/main/res/layout/activity_player_editor.xml
+++ b/app/src/main/res/layout/activity_player_editor.xml
@@ -45,7 +45,7 @@
                 android:layout_height="wrap_content"
                 android:inputType="number"
                 android:id="@+id/xpEdit"
-                android:hint="@string/px"
+                android:hint="@string/xp"
                 android:layout_weight="1"
                 android:nextFocusDown="@+id/STR"
                 android:nextFocusForward="@+id/STR"
@@ -94,7 +94,7 @@
                     android:layout_column="0"
 
                     android:id="@+id/STR"
-                    android:hint="@string/FUE"
+                    android:hint="@string/STR"
                     android:nextFocusDown="@+id/DEX"/>
 
                 <EditText
@@ -120,7 +120,7 @@
                     android:layout_column="1"
 
                     android:id="@+id/DEX"
-                    android:hint="@string/DES"
+                    android:hint="@string/DEX"
                     android:nextFocusDown="@+id/WIS"/>
 
                 <EditText
@@ -146,7 +146,7 @@
                     android:layout_column="2"
 
                     android:id="@+id/WIS"
-                    android:hint="@string/SAB"
+                    android:hint="@string/WIS"
                     android:nextFocusDown="@+id/CON"/>
 
                 <EditText
@@ -160,7 +160,7 @@
                     android:layout_column="2"
 
                     android:id="@+id/CHA"
-                    android:hint="@string/CAR"/>
+                    android:hint="@string/CHA"/>
             </GridLayout>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/activity_show_player.xml b/app/src/main/res/layout/activity_show_player.xml
index 4488645..f3ac8ef 100644
--- a/app/src/main/res/layout/activity_show_player.xml
+++ b/app/src/main/res/layout/activity_show_player.xml
@@ -143,7 +143,7 @@
 
                 <TextView
                     android:id="@+id/xpTitle"
-                    android:text="@string/px"
+                    android:text="@string/xp"
                     android:textAllCaps="true"
                     android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
                     android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/fragment_player_creator.xml b/app/src/main/res/layout/fragment_player_creator.xml
index 6d4b683..0adf3f5 100644
--- a/app/src/main/res/layout/fragment_player_creator.xml
+++ b/app/src/main/res/layout/fragment_player_creator.xml
@@ -6,7 +6,4 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="com.kauron.dungeonmanager.PlayerCreatorFragment">
 
-    <TextView android:text="@string/hello_world" android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
 </RelativeLayout>
diff --git a/app/src/main/res/menu/menu_player_editor.xml b/app/src/main/res/menu/menu_player_editor.xml
index 418e97b..982fd21 100644
--- a/app/src/main/res/menu/menu_player_editor.xml
+++ b/app/src/main/res/menu/menu_player_editor.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.kauron.dungeonmanager.PlayerEditor">
     <item android:id="@+id/action_save"
-        android:title="@string/action_save"
+        android:title="@string/save"
         android:orderInCategory="100"
         android:icon="@drawable/ic_action_save"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 49d4405..7f8182a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,83 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_cure">Curar</string>
-    <string name="action_edit_basics">Editar personaje</string>
-    <string name="action_finish">Guardar</string>
     <string name="adventurer_name">Nombre del personaje</string>
     <string name="cancel">Cancelar</string>
-    <string name="class_name">Clase</string>
-    <string name="edit_PG_Title">Sufrir daño</string>
     <string name="level">Nivel</string>
-    <string name="max_pg">PG máx.</string>
-    <string name="maxed_curative">Has llegado a tus PG máximos</string>
-    <string name="missing_info_error">Tienes que rellenar todos los campos</string>
-    <string name="new_energies1">Te quedan</string>
-    <string name="new_energies2">esfuerzos curativos.</string>
+    <string name="full_hp">Has llegado a tus PG máximos</string>
+    <string name="fill_all_info">Tienes que rellenar todos los campos</string>
     <string name="new_energies">Nuevas energías</string>
-    <string name="no">No</string>
-    <string name="no_curative_efforts_error">No te quedan esfuerzos curativos</string>
+    <string name="no_surges">No te quedan esfuerzos curativos</string>
     <string name="ok">Ok</string>
-    <string name="action_save">Guardar</string>
-    <string name="race_name">Raza</string>
     <string name="suffer_damage">Indica el daño sufrido</string>
-    <string name="title_activity_introduction">Editar personaje</string>
-    <string name="yes">Sí</string>
-    <string name="max_curative_efforts">Máx. esfuerzos curativos</string>
+    <string name="title_activity_player_editor">Editar personaje</string>
     <string name="suffer_damage_hint">PG perdidos</string>
     <string name="action_undo">Deshacer</string>
-    <string name="action_undo_current_pg">Acción deshecha</string>
     <string name="curative_efforts">Esfuerzos curativos</string>
     <string name="hp">PG</string>
-    <string name="action_reset">Borrar datos</string>
-    <string name="die">Morir</string>
-    <string name="message_death">Has muerto</string>
-    <string name="message_reset">Los datos han sido borrados</string>
-    <string name="reset_confirmation">Todos los datos se perderán irrevocablemente</string>
-    <string name="reset_confirmation_title">¿Estás seguro?</string>
-    <string name="CAR">CAR</string>
+    <string name="CHA">CAR</string>
     <string name="CON">CON</string>
-    <string name="DES">DES</string>
-    <string name="FUE">FUE</string>
+    <string name="DEX">DES</string>
+    <string name="STR">FUE</string>
     <string name="INT">INT</string>
-    <string name="SAB">SAB</string>
-    <string name="state_changed_debilitado">Te has caído al suelo inconsciente, no puedes hacer nada.</string>
-    <string name="state_changed_malherido">Estás maltrecho</string>
+    <string name="WIS">SAB</string>
     <string name="new_energies_message">¿Quién va a usar un esfuerzo curativo?</string>
     <string name="me">Yo</string>
     <string name="other">Otro</string>
-    <string name="attack">Ataque</string>
-    <string name="defense">Defensa</string>
-    <string name="CA">CA</string>
-    <string name="FORT">FORT</string>
-    <string name="REF">REF</string>
-    <string name="VOL">VOL</string>
     <string name="action_time">Avanzar tiempo</string>
-    <string name="action_time_day">Día siguiente</string>
     <string name="action_time_encounter_end">Fin de encuentro</string>
     <string name="action_time_long_rest">Descanso largo</string>
     <string name="action_time_rest">Descanso corto</string>
-    <string name="action_time_turn">Turno siguiente</string>
-    <string name="px">PX</string>
-    <string name="px_awarded_hint">PX del encuentro</string>
-    <string name="px_awarded_title">Introduce los PX ganados</string>
-    <string name="message_no_px">No has ganado ningún PX</string>
-    <string name="dialog_resolve_max_pg_hint">Máx PG</string>
-    <string name="dialog_resolve_max_pg_message">No se han podido calcular tus PG a partir de tu nivel</string>
-    <string name="dialog_resolve_max_pg_title">Alerta</string>
-    <string name="empty_field">Por favor, escribe algo</string>
-    <string name="action_download">Actualizar app</string>
-    <string name="message_no_back_button_intro">Tu personaje no se ha guardado</string>
+    <string name="xp">PX</string>
+    <string name="xp_awarded_hint">PX del encuentro</string>
+    <string name="xp_awarded_title">Introduce los PX ganados</string>
+    <string name="player_not_saved">Tu personaje no se ha guardado</string>
     <string name="long_rest_done">Has descansado y restaurado todos tus poderes</string>
     <string name="rest_done">Tus poderes de encuentro han sido restaurados</string>
-    <string name="action_settings">Ajustes</string>
-    <string name="load_text">Cargar %1$s</string>
-    <string name="new_character">Nuevo personaje</string>
-    <string name="title_activity_welcome">Bienvenido</string>
-    <string name="load_character">Cargar personaje</string>
-    <string name="new_character_warning">Esto borrará al personaje anterior</string>
     <string name="new_attack">Nuevo ataque</string>
     <string name="add_player">Añadir personaje</string>
-    <string name="character_creation">Creación de personaje</string>
     <string name="delete">Borrar</string>
     <string name="edit">Editar</string>
     <string name="help_welcome_text">Toca un jugador para seleccionarlo, mantén pulsado para opciones</string>
@@ -90,9 +48,7 @@
     <string name="objective">Objetivo</string>
     <string name="objectiveHint">Una criatura</string>
     <string name="powerNameHint">Mordedura visual</string>
-    <string name="power_editor">Editor de ataques</string>
     <string name="save">Guardar</string>
-    <string name="save_player">Guardar personaje</string>
     <string name="title_activity_power_editor">Editor de poderes</string>
 
     <string-array name="frequencies">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1260237..0e4fef5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,85 +2,44 @@
 <resources>
 
     <string name="app_name" translatable="false">Dungeon Manager</string>
-    <string name="attack">Attack</string>
     <string name="action_cure">Cure</string>
     <string name="action_undo">Undo</string>
     <string name="hp">HP</string>
-    <string name="die">Die</string>
-    <string name="CA">AC</string>
-    <string name="FORT">FORT</string>
-    <string name="REF">REF</string>
-    <string name="VOL">WILL</string>
-    <string name="defense">Defense</string>
     <string name="curative_efforts">Surges</string>
-    <string name="load_text">Load %1$s</string>
     <string name="rest_done">Your encounter powers have been restored</string>
     <string name="long_rest_done">You have rested and restored all your powers</string>
-    <string name="action_reset">Reset</string>
-    <string name="message_reset">All the data has been cleared</string>
-    <string name="reset_confirmation_title">Are you sure?</string>
-    <string name="reset_confirmation">All data will be lost!</string>
-    <string name="action_undo_current_pg">Action undone</string>
-    <string name="action_edit_basics">Edit character</string>
     <string name="action_time">Time events</string>
-    <string name="action_time_turn">Next turn</string>
     <string name="action_time_rest">Short rest</string>
     <string name="action_time_long_rest">Long rest</string>
-    <string name="action_time_day">Next day</string>
     <string name="action_time_encounter_end">Encounter ended</string>
     <string name="adventurer_name">Adventurer name</string>
-    <string name="state_changed_malherido">You have less than half of your maximum health</string>
     <string name="new_energies_message">Who is using a surge?</string>
-    <string name="class_name">Class</string>
-    <string name="race_name">Race</string>
-    <string name="state_changed_debilitado">You have fainted. You can\'t do anything!</string>
     <string name="cancel">Cancel</string>
     <string name="ok">OK</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
 
-    <string name="edit_PG_Title">Suffer damage</string>
-    <string name="message_death">You have died</string>
-    <string name="new_energies1">You have</string>
-    <string name="new_energies2">surges</string>
-    <string name="new_energies">Surge</string>
-    <string name="title_activity_introduction">Edit character</string>
-    <string name="action_finish">Save</string>
+    <string name="new_energies">New energies</string>
+    <string name="title_activity_player_editor">Edit character</string>
 
     <string name="level">Level</string>
-    <string name="max_curative_efforts">Max surges</string>
-    <string name="max_pg">Max HP</string>
-    <string name="missing_info_error">You need to fill all the information</string>
-    <string name="no_curative_efforts_error">You don\'t have any surges left!</string>
-    <string name="maxed_curative">You have reached your maximum level of HP</string>
+    <string name="fill_all_info">You need to fill all the information</string>
+    <string name="no_surges">You don\'t have any surges left!</string>
+    <string name="full_hp">You have reached your maximum level of HP</string>
     <string name="suffer_damage">Input the damage suffered</string>
     <string name="suffer_damage_hint">HP lost</string>
     <string name="me">Me</string>
-    <string name="px_awarded_title">Input XP awarded</string>
-    <string name="px_awarded_hint">XP from the encounter</string>
-    <string name="message_no_px">You haven\'t won any XP</string>
-    <string name="other">Otro</string>
-    <string name="px">XP</string>
+    <string name="xp_awarded_title">Input XP awarded</string>
+    <string name="xp_awarded_hint">XP from the encounter</string>
+    <string name="other">Other</string>
+    <string name="xp">XP</string>
 
-    <string name="FUE">STR</string>
+    <string name="STR">STR</string>
     <string name="CON">CON</string>
-    <string name="DES">DEX</string>
+    <string name="DEX">DEX</string>
     <string name="INT">INT</string>
-    <string name="CAR">CHA</string>
-    <string name="SAB">WIS</string>
-    <string name="action_save">Save</string>
-    <string name="dialog_resolve_max_pg_hint">Max HP</string>
-    <string name="empty_field">Please input something</string>
-    <string name="dialog_resolve_max_pg_title">Alert</string>
-    <string name="dialog_resolve_max_pg_message">Couldn\'t compute your max HP based on your level</string>
-    <string name="action_download">Update app</string>
-    <string name="message_no_back_button_intro">Your information hasn\'t been saved</string>
-    <string name="title_activity_welcome">Welcome</string>
+    <string name="CHA">CHA</string>
+    <string name="WIS">WIS</string>
+    <string name="player_not_saved">Your information hasn\'t been saved</string>
 
-    <string name="action_settings">Settings</string>
-    <string name="new_character">New character</string>
-    <string name="load_character">Load character</string>
-    <string name="new_character_warning">This will erase any previously existing data saved</string>
     <string name="new_attack">New power</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
@@ -90,7 +49,6 @@
     <string name="zero" translatable="false">0</string>
     <string name="no_players">No players, please add one</string>
     <string name="help_welcome_text">Press a player to open, hold for options</string>
-    <string name="character_creation">Character creation</string>
     <string name="name">Name</string>
     <string name="keywords">Keywords</string>
     <string name="powerNameHint">Blasting charm</string>
@@ -102,8 +60,6 @@
     <string name="impact">Impact</string>
     <string name="objective">Objective</string>
     <string name="objectiveHint">One creature</string>
-    <string name="power_editor">Power Editor</string>
-    <string name="save_player">Save player</string>
     <string name="required">This field is required</string>
     <string name="used">You have used</string>
     <string name="sure">Are you sure?</string>
@@ -228,7 +184,6 @@
     </string-array>
 
     <string name="title_activity_player_creator">Player Creator</string>
-    <string name="hello_world">Hello world!</string>
     <string name="lost_hp">Lost %d HP</string>
     <string name="level_up">Level up</string>
     <string name="use">Use</string>