From 54b531596bfd5cd178ea6d0f81c0b93abc4b34c3 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Sat, 22 May 2021 11:27:41 +0200
Subject: [PATCH 1/3] German translation

---
 app/src/main/res/values-de/strings.xml | 30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 app/src/main/res/values-de/strings.xml

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..a51df7b
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,30 @@
+<resources>
+    <string name="app_name">OneTwo</string>
+    <string name="instruction">Knopf drücken um Zähler hinzuzufügen</string>
+    <string name="add_counter">Zähler hinzufügen</string>
+    <string name="alert_tv_object">Wer spielt?</string>
+    <string name="alert_tv_number">Leben/Punkte: </string>
+    <string name="menu_counter">Zähler</string>
+    <string name="menu_dice">Würfel</string>
+    <string name="menu_chooser">Wählen</string>
+    <string name="menu_timer">Timer</string>
+    <string name="menu_counter_space">&#160;Zähler</string>
+    <string name="menu_dice_space">&#160;Würfel</string>
+    <string name="menu_chooser_space">&#160;Wählen</string>
+    <string name="menu_timer_space">&#160;Timer</string>
+    <string name="drawer_open">Menü öffnen</string>
+    <string name="drawer_close">Menü schließen</string>
+    <string name="nav_header">OneTwo</string>
+    <string name="dice_title">Würfelseiten</string>
+    <string name="touch_me">Jeder legt einen Finger auf, dann wird einer ausgewählt</string>
+    <string name="edit">Bearbeiten</string>
+    <string name="roll_all">Alle würfeln</string>
+    <string name="add_timer">Hinzufügen </string>
+    <string name="remove_timer">Entfernen</string>
+    <string name="space">      </string>
+    <string name="order">Reihenfolge</string>
+    <string name="play">Start</string>
+    <string name="pause">Pause</string>
+    <string name="counter_instruction">Knopf drücken um Zähler hinzuzufügen oder nach rechts wischen für mehr Optionen</string>
+
+</resources>

From 7ac51a8778b705b90d245cf74102e2bdbecbec47 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Sat, 22 May 2021 11:36:49 +0200
Subject: [PATCH 2/3] Translate dice "Roll" button (en+de)

---
 app/src/main/res/layout/dice_item.xml  | 4 ++--
 app/src/main/res/values-de/strings.xml | 1 +
 app/src/main/res/values/strings.xml    | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/dice_item.xml b/app/src/main/res/layout/dice_item.xml
index 6711adc..0cec698 100644
--- a/app/src/main/res/layout/dice_item.xml
+++ b/app/src/main/res/layout/dice_item.xml
@@ -56,7 +56,7 @@
                 <Button
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Roll"
+                    android:text="@string/roll"
                     android:id="@+id/throw_button"
                     android:layout_toEndOf="@+id/imageView_dice"
                     android:layout_centerVertical="true"/>
@@ -64,4 +64,4 @@
         </LinearLayout>
     </android.support.v7.widget.CardView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a51df7b..b55d51f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -18,6 +18,7 @@
     <string name="dice_title">Würfelseiten</string>
     <string name="touch_me">Jeder legt einen Finger auf, dann wird einer ausgewählt</string>
     <string name="edit">Bearbeiten</string>
+    <string name="roll">Würfeln</string>
     <string name="roll_all">Alle würfeln</string>
     <string name="add_timer">Hinzufügen </string>
     <string name="remove_timer">Entfernen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 580360b..743e954 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
     <string name="dice_title">Dice\'s faces</string>
     <string name="touch_me">Place a finger each to choose among you</string>
     <string name="edit">Edit</string>
+    <string name="roll">Roll</string>
     <string name="roll_all">Roll All</string>
     <string name="add_timer">Add </string>
     <string name="remove_timer">Remove</string>

From e95fc53c404830e18a148f16758d44359f4cd34a Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Sat, 22 May 2021 14:55:32 +0200
Subject: [PATCH 3/3] Make all strings translatable

.. and translate the new strings to german (de)
---
 .../main/java/com/nicue/onetwo/Utils/TouchDisplayView.java  | 5 +++--
 .../java/com/nicue/onetwo/fragments/CounterFragment.java    | 4 ++--
 .../main/java/com/nicue/onetwo/fragments/DiceFragment.java  | 6 +++---
 .../main/java/com/nicue/onetwo/fragments/TimerFragment.java | 6 +++---
 app/src/main/res/values-de/strings.xml                      | 5 +++++
 app/src/main/res/values/strings.xml                         | 5 +++++
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/nicue/onetwo/Utils/TouchDisplayView.java b/app/src/main/java/com/nicue/onetwo/Utils/TouchDisplayView.java
index f576ee7..af96b03 100644
--- a/app/src/main/java/com/nicue/onetwo/Utils/TouchDisplayView.java
+++ b/app/src/main/java/com/nicue/onetwo/Utils/TouchDisplayView.java
@@ -17,6 +17,7 @@
 import android.view.View;
 import android.os.Vibrator;
 
+import com.nicue.onetwo.R;
 import com.nicue.onetwo.Utils.Pools.SimplePool;
 
 import java.util.Arrays;
@@ -368,10 +369,10 @@ protected void drawCircle(Canvas canvas, int id, TouchHistory data) {
                 canvas.drawCircle(data.x, (data.y) - half_r, radius + 90,
                         mTransStrokePaint);
                 if ((data.x + radius + 50)<mScreenWidth ) {
-                    canvas.drawText("Chosen", data.x + radius, data.y
+                    canvas.drawText(getContext().getString(R.string.chosen), data.x + radius, data.y
                             - radius, mTextPaint);
                 }else{
-                    canvas.drawText("Chosen", data.x - radius -100, data.y
+                    canvas.drawText(getContext().getString(R.string.chosen), data.x - radius -100, data.y
                             - radius - 90, mTextPaint);
                 }
 
diff --git a/app/src/main/java/com/nicue/onetwo/fragments/CounterFragment.java b/app/src/main/java/com/nicue/onetwo/fragments/CounterFragment.java
index cf42239..bee60b0 100644
--- a/app/src/main/java/com/nicue/onetwo/fragments/CounterFragment.java
+++ b/app/src/main/java/com/nicue/onetwo/fragments/CounterFragment.java
@@ -129,7 +129,7 @@ public void fabClick(View view) {
         final EditText etNumber = (EditText) alertView.findViewById(R.id.et_number);
         AlertDialog dialog = new AlertDialog.Builder(getActivity())
                 .setView(alertView)
-                .setPositiveButton("Add", new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.add), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         String object_dirty = etToCount.getText().toString();
@@ -167,7 +167,7 @@ public void onClick(DialogInterface dialog, int which) {
 
                     }
                 })
-                .setNegativeButton("Cancel", null)
+                .setNegativeButton(getString(R.string.cancel), null)
                 .create();
         dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN | WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
         dialog.show();
diff --git a/app/src/main/java/com/nicue/onetwo/fragments/DiceFragment.java b/app/src/main/java/com/nicue/onetwo/fragments/DiceFragment.java
index 56c93e1..de72c24 100644
--- a/app/src/main/java/com/nicue/onetwo/fragments/DiceFragment.java
+++ b/app/src/main/java/com/nicue/onetwo/fragments/DiceFragment.java
@@ -133,8 +133,8 @@ public void fabDiceClick(View view) {
         //et_dice.setRawInputType(InputType.TYPE_CLASS_NUMBER |InputType.TYPE_NUMBER_FLAG_DECIMAL);
         AlertDialog dialog = new AlertDialog.Builder(getActivity())
                 .setView(alertView)
-                .setTitle("Dice\'s Faces:")
-                .setPositiveButton("Add", new DialogInterface.OnClickListener() {
+                .setTitle(getString(R.string.dice_title))
+                .setPositiveButton(getString(R.string.add), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 
@@ -155,7 +155,7 @@ public void onClick(DialogInterface dialog, int which) {
 
                     }
                 })
-                .setNegativeButton("Cancel", null)
+                .setNegativeButton(getString(R.string.cancel), null)
                 .create();
         dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN | WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
         dialog.show();
diff --git a/app/src/main/java/com/nicue/onetwo/fragments/TimerFragment.java b/app/src/main/java/com/nicue/onetwo/fragments/TimerFragment.java
index 230fd4a..853d7d7 100644
--- a/app/src/main/java/com/nicue/onetwo/fragments/TimerFragment.java
+++ b/app/src/main/java/com/nicue/onetwo/fragments/TimerFragment.java
@@ -217,8 +217,8 @@ public String format(int index) {
         });
         AlertDialog dialog = new AlertDialog.Builder(getActivity())
                 .setView(alertView)
-                .setTitle("Set Time:")
-                .setPositiveButton("Set", new DialogInterface.OnClickListener() {
+                .setTitle(getString(R.string.timer_dialog_message))
+                .setPositiveButton(getString(R.string.timer_dialog_set), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         setMiliSeconds = npMinutes.getValue() * 60 + npSeconds.getValue();
@@ -229,7 +229,7 @@ public void onClick(DialogInterface dialog, int which) {
 
                     }
                 })
-                .setNegativeButton("Cancel", null)
+                .setNegativeButton(getString(R.string.cancel), null)
                 .create();
         dialog.show();
     }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b55d51f..ab5585e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -27,5 +27,10 @@
     <string name="play">Start</string>
     <string name="pause">Pause</string>
     <string name="counter_instruction">Knopf drücken um Zähler hinzuzufügen oder nach rechts wischen für mehr Optionen</string>
+    <string name="add">Hinzufügen</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="timer_dialog_message">Zeit einstellen:</string>
+    <string name="timer_dialog_set">Setzen</string>
+    <string name="chosen">Gewählt</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 743e954..0e0f486 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,5 +27,10 @@
     <string name="play">Play</string>
     <string name="pause">Pause</string>
     <string name="counter_instruction">Press the button to add a counter or swipe right for more options</string>
+    <string name="add">Add</string>
+    <string name="cancel">Cancel</string>
+    <string name="timer_dialog_message">Set Time:</string>
+    <string name="timer_dialog_set">Set</string>
+    <string name="chosen">Chosen</string>
 
 </resources>