Merge branch 'master' of https://git.cringe-studios.com/CringeStudios/Cringe-Authenticator

app/src/main/res/layout/activity_unlock.xml

@@ -10,7 +10,7 @@
         android:id="@+id/unlock_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="Unlock Cringe Authenticator"
+        android:text="@string/unlock_cringe_authenticator"
         android:textSize="21sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
@@ -22,7 +22,7 @@
         android:layout_width="0dp"
         android:layout_height="19dp"
         android:layout_marginTop="32dp"
-        android:text="Password"
+        android:text="@string/password"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/unlock_title" />
@@ -44,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
         android:background="@drawable/button_themed"
-        android:text="Unlock"
+        android:text="@string/unlock"
         android:textAllCaps="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -56,7 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
         android:background="@drawable/button_themed"
-        android:text="Unlock using biometrics"
+        android:text="@string/unlock_using_biometrics"
         android:textAllCaps="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/dialog_create_group.xml

@@ -13,7 +13,7 @@
         android:layout_marginEnd="10dp"
         android:ems="10"
         android:inputType="text"
-        android:text="Name"
+        android:text="@string/name"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/otp_code.xml

@@ -52,7 +52,7 @@
                 <TextView
                     android:id="@+id/otpCode"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="top"
                     android:text="000000"

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

@@ -5,13 +5,13 @@
     <item
         android:id="@+id/action_code"
         android:orderInCategory="100"
-        android:title="Add Code"
+        android:title="@string/add_code"
         app:showAsAction="never"
         android:onClick="addCode" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:title="Settings"
+        android:title="@string/settings"
         app:showAsAction="never"
         android:onClick="openSettings" />
 </menu>

app/src/main/res/values-de-rDE/strings.xml

@@ -61,4 +61,14 @@
     </string-array>
     <string name="screen_security">Bildschirmsicherheit</string>
     <string name="hide_codes">Codes verstecken</string>
+    <string name="enable_encryption">Verschlüsselung aktivieren</string>
+    <string name="password">Passwort</string>
+    <string name="set_password">Passwort setzen</string>
+    <string name="confirm_password">Passwort bestätigen</string>
+    <string name="unlock_cringe_authenticator">Authenticator entsperren</string>
+    <string name="unlock">Entsperren</string>
+    <string name="unlock_using_biometrics">Mit Biometrie ensperren</string>
+    <string name="add_code">Code hinzufügen</string>
+    <string name="settings">Einstellungen</string>
+    <string name="developed_by">Developed by Cringe Studios and JG-Cody</string>
 </resources>

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

@@ -55,6 +55,13 @@
     <string name="password">Password</string>
     <string name="set_password">set Password</string>
     <string name="confirm_password">confirm Password</string>
+    <string name="unlock_cringe_authenticator">Unlock Authenticator</string>
+    <string name="unlock">Unlock</string>
+    <string name="unlock_using_biometrics">Unlock using biometrics</string>
+    <string name="name" translatable="false">Name</string>
+    <string name="add_code">Add Code</string>
+    <string name="settings">Settings</string>
+    <string name="developed_by">Developed by Cringe Studios and JG-Cody</string>
     <string-array name="view_edit_move_delete">
         <item>View</item>
         <item>Edit</item>