CEff correction

app/src/main/res/menu/menu_introduction.xml

@@ -2,8 +2,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.kauron.dungeonmanager.Introduction">
-    <item android:id="@+id/action_finish"
-        android:title="@string/action_finish"
+    <item android:id="@+id/action_save"
+        android:title="@string/action_save"
         android:orderInCategory="100"
         android:icon="@drawable/ic_action_save"
         app:showAsAction="ifRoom" />

app/src/main/res/menu/menu_main.xml

@@ -5,13 +5,50 @@
         android:id="@+id/action_undo"
         android:title="@string/action_undo"
         android:orderInCategory="1"
-        app:showAsAction="always"
+        app:showAsAction="never"
         android:icon="@drawable/ic_action_undo"/>
     <item
         android:id="@+id/action_cure"
         android:title="@string/action_cure"
         android:orderInCategory="2"
-        app:showAsAction="always"/>
+        android:icon="@drawable/ic_action_heal"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_time"
+        android:title="@string/action_time"
+        android:orderInCategory="3"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_time">
+            <menu>
+                <item
+                    android:title="@string/action_time_turn"
+                    android:id="@+id/action_time_turn"
+                    android:orderInCategory="1"
+                    app:showAsAction="never"/>
+                <item
+                    android:title="@string/action_time_rest"
+                    android:id="@+id/action_time_rest"
+                    android:orderInCategory="2"
+                    app:showAsAction="never"/>
+                <item
+                    android:title="@string/action_time_day"
+                    android:id="@+id/action_time_day"
+                    android:orderInCategory="5"
+                    app:showAsAction="never"/>
+                <item
+                    android:title="@string/action_time_long_rest"
+                    android:id="@+id/action_time_long_rest"
+                    android:orderInCategory="4"
+                    app:showAsAction="never"/>
+                <item
+                    android:title="@string/action_time_encounter_end"
+                    android:id="@+id/action_time_encounter_end"
+                    android:orderInCategory="5"
+                    app:showAsAction="never"/>
+            </menu>
+
+        </item>
 
     <item
         android:id="@+id/action_edit_basics"

app/src/main/res/values-es/strings.xml

@@ -2,7 +2,7 @@
 <resources>
     <string name="action_cure">Curar</string>
     <string name="action_edit_basics">Editar personaje</string>
-    <string name="action_finish">Hecho</string>
+    <string name="action_finish">PG Máx.</string>
     <string name="adventurer_name">Nombre</string>
     <string name="cancel">Cancelar</string>
     <string name="class_name">Clase</string>
@@ -17,6 +17,7 @@
     <string name="no">No</string>
     <string name="no_curative_efforts_error">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>
@@ -24,16 +25,10 @@
     <string name="max_curative_efforts">Máx. esfuerzos curativos</string>
     <string name="suffer_damage_hint">PG perdidos</string>
     <string name="action_undo">Deshacer</string>
-    <string name="action_save">Guardar</string>
     <string name="action_undo_current_pg">Acción deshecha</string>
-    <string name="dungeons_and_dragons">Dragones y Mazmorras</string>
-    <string name="action_load">Cargar</string>
     <string name="curative_efforts">Esfuerzos curativos</string>
     <string name="pg">PG</string>
     <string name="action_reset">Borrar datos</string>
-    <string name="curative_display_text1">Te quedan</string>
-    <string name="curative_display_text2">de</string>
-    <string name="curative_display_text3">esfuerzos curativos diarios</string>
     <string name="die">Morir</string>
     <string name="message_death">Has muerto</string>
     <string name="message_reset">Los datos han sido borrados</string>
@@ -45,8 +40,8 @@
     <string name="FUE">FUE</string>
     <string name="INT">INT</string>
     <string name="SAB">SAB</string>
-    <string name="state_changed_debilitado">Te has caído al suelo debilitado, no puedes moverte ni hacer nada.</string>
-    <string name="state_changed_malherido">¡Sólo tienes la mitad de la vida!</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="new_energies_message">¿Quién va a usar un esfuerzo curativo?</string>
     <string name="me">Yo</string>
     <string name="other">Otro</string>
@@ -56,4 +51,11 @@
     <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</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="curative_display_text">Tienes %1$d de %2$d esfuerzos curativos</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -13,36 +13,37 @@
     <string name="VOL">VOL</string>
     <string name="defense">Defense</string>
     <string name="curative_efforts">Curative efforts</string>
-    <string name="curative_display_text1">You have</string>
-    <string name="curative_display_text2">out of</string>
-    <string name="curative_display_text3">daily curative efforts.</string>
-    <string name="action_load">Load</string>
-    <string name="dungeons_and_dragons">Dungeons and Dragons</string>
-    <string name="action_save">Save</string>
+    <string name="curative_display_text">You have %1$d out of %2$d curative efforts</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 curative effort?</string>
     <string name="class_name">Class</string>
     <string name="race_name">Race</string>
-    <string name="state_changed_debilitado">You have fainted. You can\'t move or do anything!</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">Your character has died</string>
+    <string name="message_death">You have died</string>
     <string name="new_energies1">You have</string>
     <string name="new_energies2">curative efforts</string>
     <string name="new_energies">New energies</string>
     <string name="title_activity_introduction">Edit character</string>
-    <string name="action_finish">Done</string>
+    <string name="action_finish">Save</string>
 
     <string name="level">Level</string>
     <string name="max_curative_efforts">Max curative efforts</string>
@@ -61,4 +62,5 @@
     <string name="INT">INT</string>
     <string name="CAR">CAR</string>
     <string name="SAB">SAB</string>
+    <string name="action_save">Save</string>
 </resources>