From a5be7bdc5e5b2dceb07545b649d0e4b06916f796 Mon Sep 17 00:00:00 2001
From: JG-Cody <julian.guerster@regensburg-mail.de>
Date: Sat, 14 Aug 2021 11:04:27 +0200
Subject: [PATCH] some translation, bug fixes and repair

---
 .../res/layout/addbuttondialog_single.xml     | 12 ++++-----
 .../res/layout/addbuttonsdialog_double.xml    | 20 +++++++-------
 app/src/main/res/layout/addheadlinedialog.xml |  4 +--
 app/src/main/res/layout/fragment_settings.xml |  8 +++---
 app/src/main/res/values-de-rDE/strings.xml    | 26 +++++++++++++------
 app/src/main/res/values/strings.xml           | 21 ++++++++-------
 6 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/app/src/main/res/layout/addbuttondialog_single.xml b/app/src/main/res/layout/addbuttondialog_single.xml
index effbbeb..f128184 100644
--- a/app/src/main/res/layout/addbuttondialog_single.xml
+++ b/app/src/main/res/layout/addbuttondialog_single.xml
@@ -10,22 +10,22 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:hint="NAME" />
+        android:hint="@string/name"
+        android:inputType="textPersonName" />
 
     <EditText
         android:id="@+id/dialogSingle_editText_buttonName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:hint="BUTTON" />
+        android:hint="@string/button"
+        android:inputType="textPersonName" />
 
     <EditText
         android:id="@+id/dialogSingle_editText_command"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:hint="COMMAND" />
+        android:hint="@string/command"
+        android:inputType="textPersonName" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/addbuttonsdialog_double.xml b/app/src/main/res/layout/addbuttonsdialog_double.xml
index 1f8cf1f..86e1ec0 100644
--- a/app/src/main/res/layout/addbuttonsdialog_double.xml
+++ b/app/src/main/res/layout/addbuttonsdialog_double.xml
@@ -11,38 +11,38 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:hint="NAME" />
+        android:hint="@string/name"
+        android:inputType="textPersonName" />
 
     <EditText
         android:id="@+id/dialogDouble_editText_command1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:hint="COMMAND1" />
+        android:hint="@string/command1"
+        android:inputType="textPersonName" />
 
     <EditText
         android:id="@+id/dialogDouble_editText_button1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:hint="BUTTON1" />
+        android:hint="@string/button1"
+        android:inputType="textPersonName" />
 
     <EditText
         android:id="@+id/dialogDouble_editText_command2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:hint="COMMAND2" />
+        android:hint="@string/command2"
+        android:inputType="textPersonName" />
 
     <EditText
         android:id="@+id/dialogDouble_editText_button2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:hint="BUTTON2" />
+        android:hint="@string/button2"
+        android:inputType="textPersonName" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/addheadlinedialog.xml b/app/src/main/res/layout/addheadlinedialog.xml
index 9567d20..2b06339 100644
--- a/app/src/main/res/layout/addheadlinedialog.xml
+++ b/app/src/main/res/layout/addheadlinedialog.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:hint="HEADLINE" />
+        android:hint="@string/heading"
+        android:inputType="textPersonName" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 028aee4..71f5623 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -121,13 +121,13 @@
                 app:layout_constraintTop_toTopOf="@+id/button_reset" />
 
             <TextView
-                android:id="@+id/reset_import_export"
+                android:id="@+id/import_export"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="35dp"
                 android:layout_marginTop="10dp"
                 android:gravity="center_horizontal|left"
-                android:text="@string/reset_settings"
+                android:text="@string/import_export"
                 android:textAlignment="center"
                 android:textColor="@color/mtrl_btn_text_color_selector"
                 android:textSize="18sp"
@@ -158,7 +158,7 @@
                 android:text="@string/button_export"
                 app:backgroundTint="@null"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/reset_import_export" />
+                app:layout_constraintTop_toBottomOf="@+id/import_export" />
 
             <Button
                 android:id="@+id/button_import"
@@ -170,7 +170,7 @@
                 android:text="@string/button_import"
                 app:backgroundTint="@null"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/reset_import_export" />
+                app:layout_constraintTop_toBottomOf="@+id/import_export" />
 
             <Button
                 android:id="@+id/button_theme_red_blue"
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 765a9f6..432799a 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -9,11 +9,7 @@
     <string name="login_password">PASSWORT</string>
     <string name="menu_home">HOME</string>
     <string name="menu_terminal">TERMINAL</string>
-    <string name="menu_kueche">KÜCHE</string>
-    <string name="menu_zeitsteuerung">ZEITSTEUERUNG</string>
-    <string name="menu_schlafzimmer">SCHLAFZIMMER</string>
     <string name="menu_tabs">TABS</string>
-    <string name="menu_küche">KÜCHE</string>
     <string name="menu_settings">EINSTELLUNGEN</string>
     <string name="menu_documentation">FRAGE</string>
     <string name="menu_logout">AUSLOGGEN</string>
@@ -32,9 +28,7 @@
     <string name="servercommands">SERVERBEFEHLE</string>
     <string name="reboot">NEUSTARTEN</string>
     <string name="shutdown">HERUNTERFAHREN</string>
-    <string name="timed_commands">ZEITGESTEUERTE KOMMANDOS</string>
     <string name="command">BEFEHL</string>
-    <string name="send_timed_command">ZEITGESTEUERTER BEFEHL</string>
     <string name="farben">FARBEN</string>
     <string name="background">HINTERGRUND</string>
     <string name="language">SPRACHE</string>
@@ -44,7 +38,7 @@
     <string name="ssh_remote">SSH-FERNBEDIENUNG</string>
     <string name="please_login">BITTE VERBINDE DICH MIT DEINEM SERVER</string>
     <string name="sie_sind_als_angemeldet">DU BIST ALS  {USERNAME} AUF {IP}</string>
-    <string name="nav_header_subtitle">android.studio@android.com</string>
+    <string name="nav_header_subtitle">ANDROID.STUDIO@ANDROID.COM</string>
     <string name="logout">AUSLOGGEN</string>
     <string name="are_you_sure_to_reset">MÖCHTEST DU WIRKLICH DIE APP UND ALL IHRE EINSTELLUNGEN ZURÜCKSETZEN?</string>
     <string name="reset_app">APP ZURÜCKSETZEN</string>
@@ -81,7 +75,23 @@
     <string name="are_you_sure">SIND SIE SICHER?</string>
     <string name="restart_server">SERVER NEUSTARTEN</string>
     <string name="shutdown_server">SERVER HERUNTERFAHREN</string>
-    <string name="choose_element">AUSAHL</string>
+    <string name="choose_element">AUSWAHL</string>
     <string name="reset_background">HINTERGRUND ZURÜCKSETZEN</string>
     <string name="image">BILDHINTERGRUND</string>
+    <string name="unable_to_connect">VERBINDUNG NICHT MÖGLICH</string>
+    <string name="try_again">BITTE VERSUCHEN SIE ES ERNEUT</string>
+    <string name="button_import">IMPORTIEREN</string>
+    <string name="button_export">EXPORTIEREN</string>
+    <string name="export_settings">EXPORTIERUNG-EINSTELLUNGEN</string>
+    <string name="import_export">IMPORTIEREN/EXPORTIEREN</string>
+    <string name="you_will_be_redirected">SIE WERDEN ZUR DOKUMENTATION AUF UNSERE WEBSITE WEITERGELEITET</string>
+    <string name="yes">JA</string>
+    <string name="no">NEIN</string>
+    <string name="add">HINZUFÜGEN</string>
+    <string name="command1">BEFEHL 1</string>
+    <string name="name">NAME</string>
+    <string name="command2">BEFEHL 1</string>
+    <string name="button">SCHALTFLÄCHE</string>
+    <string name="button1">SCHALTFLÄCHE 1</string>
+    <string name="button2">SCHALTFLÄCHE 2</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 c5c0f0f..5e3754c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,9 +1,9 @@
 <resources>
     <string name="app_name">TERAPLEX</string>
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="nav_header_title">Android Studio</string>
-    <string name="nav_header_subtitle">android.studio@android.com</string>
+    <string name="navigation_drawer_open">OPEN NAVIGATION DRAWER</string>
+    <string name="navigation_drawer_close">CLOSE NAVIGATION DRAWER</string>
+    <string name="nav_header_title">ANDROID STUDIO</string>
+    <string name="nav_header_subtitle">ANDROID.STUDIO@ANDROID.COM</string>
     <string name="action_logout">LOGOUT</string>
     <string name="ssh_remote">SSH-REMOTE</string>
     <string name="edit">EDIT</string>
@@ -35,6 +35,12 @@
 
     //main
     <string name="command">COMMAND</string>
+    <string name="command1">COMMAND 1</string>
+    <string name="command2">COMMAND 2</string>
+    <string name="name">NAME</string>
+    <string name="button">BUTTON</string>
+    <string name="button1">BUTTON 1</string>
+    <string name="button2">BUTTON 2</string>
 
     //settings
     <string name="farben">COLORS</string>
@@ -53,6 +59,7 @@
     <string name="yellow_blue">"YELLOW\nBLUE"</string>
     <string name="pink_green">"PINK\nGREEN"</string>
     <string name="reset_app">RESET APP</string>
+    <string name="import_export">IMPORT/EXPORT</string>
     <string name="are_you_sure_to_reset">ARE YOU SURE YOU WANT TO RESET THE APP AND DELETE ALL YOUR SETTINGS?</string>
 
     //credits
@@ -65,11 +72,7 @@
 
     <string name="menu_home">HOME</string>
     <string name="menu_terminal">TERMINAL</string>
-    <string name="menu_kueche">KITCHEN</string>
-    <string name="menu_zeitsteuerung">TIME-CONTROL</string>
-    <string name="menu_schlafzimmer">BEDROOM</string>
-    <string name="menu_tabs">HALL</string>
-    <string name="menu_küche">KITCHEN</string>
+    <string name="menu_tabs">TABS</string>
     <string name="menu_add">ADD TAB</string>
     <string name="menu_remove">REMOVE TABS</string>