clean up translation files

luelista · Oct 10, 2018 · 94fde4b · 94fde4b
1 parent f9e37ce
commit 94fde4b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 19 deletions.
diff --git a/app/src/main/res/layout/login_activity.xml b/app/src/main/res/layout/login_activity.xml
@@ -44,15 +44,14 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/encryption"
+        android:text="@string/encryption_label"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textStyle="bold" />
 
     <Spinner
         android:id="@+id/encryption"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/encryption" />
+        android:layout_height="wrap_content" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -119,7 +118,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="right"
         android:onClick="next"
-        android:text="@string/next" />
+        android:text="@string/next_button" />
 
 </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  Copyright 2010 Daniel Weisser
+ Copyright 2018 Max Weller
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -20,13 +21,18 @@
 	<string name="app_name">LDAP Sync</string>
 
 	<!-- AuthenticatorActivity -->
-	<skip />
-	<string name="login_activity_host_label">Hostname</string>
-	<string name="login_activity_port_label">Port</string>
-	<string name="login_activity_encryption_label">Verschlüsselung</string>
-	<string name="login_activity_encryption_prompt">Wählen Sie die gewünschte Verschlüsselung</string>
-	<string name="login_activity_username_label">Bind DN (Leer für anonymen Zugang)</string>
-	<string name="login_activity_password_label">Bind Passwort (Leer für anonymen Zugang)</string>
+	<string name="host_label">Hostname</string>
+	<string name="host">ldap.example.org</string>
+	<string name="port_label">Port</string>
+	<string name="port">389</string>
+	<string name="encryption_label">Verschlüsselung</string>
+	<string name="username_label">Bind-DN (Leer für anonymen Zugang)</string>
+	<string name="password_label">Bind-Passwort (Leer für anonymen Zugang)</string>
+	<string name="account_name_label">Account-Name</string>
+	<string name="account_name">z.B. user@host</string>
+	<string name="next_button">Weiter</string>
+
+	<!--AccountSettingsActivity-->
 	<string name="login_activity_basedn_label">BaseDN</string>
 	<string name="login_activity_searchfilter_label">Suchfilter</string>
 	<string name="login_activity_ldap_mappings_label">LDAP Zuordnungen</string>
@@ -43,7 +49,7 @@
 	<string name="login_activity_zip_label">Postleitzahl</string>
 	<string name="login_activity_country_label">Land</string>
 	<string name="login_activity_next_button">Weiter</string>
-	<string name="login_activity_done_button">Fertig</string>
+	<string name="done">Fertig</string>
 
 	<!-- Message shown in dialog if the username or password is invalid. -->
 	<string name="login_activity_loginfail">Der Benutzername oder das Passwort ist ungültig.
@@ -56,6 +62,10 @@
 
 	<!-- Title string for Login activity-->
 	<string name="ui_activity_title">LDAP Server Einstellungen</string>
-	<string name="done">Fertig</string>
+
     <string name="action_save">Speichern</string>
+	<string name="email_error_report">Fehlerbericht senden</string>
+	<string name="add_account">Account hinzufügen</string>
+	<string name="add_account_from_qr">QR-Code scannen</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  Copyright 2010 Daniel Weisser
+ Copyright 2018 Max Weller
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -25,12 +26,14 @@
     <string name="host">IP address or hostname</string>
     <string name="port_label">Port</string>
     <string name="port">Port</string>
-    <string name="encryption">Encryption</string>
-
+    <string name="encryption_label">Encryption</string>
     <string name="username_label">Bind DN (Leave empty for anonymous)</string>
     <string name="password_label">Bind Password (Leave empty for anonymous)</string>
     <string name="account_name_label">Account name</string>
     <string name="account_name">e.g. user@host</string>
+    <string name="next_button">Next</string>
+
+    <!--AccountSettingsActivity-->
     <string name="login_activity_basedn_label">BaseDN</string>
     <string name="login_activity_searchfilter_label">Search Filter</string>
     <string name="login_activity_ldap_mappings_label">LDAP Mappings</string>
@@ -46,8 +49,7 @@
     <string name="login_activity_state_label">State</string>
     <string name="login_activity_zip_label">Zip code</string>
     <string name="login_activity_country_label">Country</string>
-    <string name="next">Next</string>
-    <string name="login_activity_done_button">Done</string>
+    <string name="done">Done</string>
 
     <!-- Message shown in dialog if the username or password is invalid. -->
     <string name="login_activity_loginfail">The username or password isn\'t valid. A LDAP
@@ -57,8 +59,8 @@
 
     <!-- Title string for Login activity -->
     <string name="ui_activity_title">LDAP Server settings</string>
-    <string name="defaultLdapPort">636</string>
-    <string name="done">Done</string>
+    <string name="defaultLdapPort" translatable="false">636</string>
+
     <string name="action_save">Save</string>
     <string name="email_error_report">Send Error Report</string>
     <string name="add_account">Add account</string>