From 2b9bfb6682f0a936af5b76a03c36d0d8fe42eb08 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 3 May 2016 10:43:27 +0200
Subject: [PATCH] android: Use separate label strings for text fields in login
 dialog

In the profile editor the password is now marked as optional in the
label, which looks a bit strange in the login dialog.
---
 .../android/app/src/main/res/layout/login_dialog.xml          | 4 ++--
 src/frontends/android/app/src/main/res/values-de/strings.xml  | 2 ++
 src/frontends/android/app/src/main/res/values-pl/strings.xml  | 2 ++
 src/frontends/android/app/src/main/res/values-ru/strings.xml  | 2 ++
 src/frontends/android/app/src/main/res/values-ua/strings.xml  | 2 ++
 src/frontends/android/app/src/main/res/values/strings.xml     | 2 ++
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/frontends/android/app/src/main/res/layout/login_dialog.xml b/src/frontends/android/app/src/main/res/layout/login_dialog.xml
index adfaac5e29..32892da16c 100644
--- a/src/frontends/android/app/src/main/res/layout/login_dialog.xml
+++ b/src/frontends/android/app/src/main/res/layout/login_dialog.xml
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:enabled="false"
             android:inputType="none"
-            android:hint="@string/profile_username_label" />
+            android:hint="@string/login_username" />
 
     </android.support.design.widget.TextInputLayout>
 
@@ -48,7 +48,7 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:inputType="textPassword|textNoSuggestions"
-            android:hint="@string/profile_password_label" />
+            android:hint="@string/login_password" />
 
     </android.support.design.widget.TextInputLayout>
 
diff --git a/src/frontends/android/app/src/main/res/values-de/strings.xml b/src/frontends/android/app/src/main/res/values-de/strings.xml
index 15ccf24fd4..857a18aaaf 100644
--- a/src/frontends/android/app/src/main/res/values-de/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-de/strings.xml
@@ -124,6 +124,8 @@
 
     <!-- Dialogs -->
     <string name="login_title">Passwort eingeben um zu verbinden</string>
+    <string name="login_username">Benutzername</string>
+    <string name="login_password">Passwort</string>
     <string name="login_confirm">Verbinden</string>
     <string name="error_introduction">Fehler beim Aufsetzen des VPN:</string>
     <string name="error_lookup_failed">Server-Adresse konnte nicht aufgelöst werden.</string>
diff --git a/src/frontends/android/app/src/main/res/values-pl/strings.xml b/src/frontends/android/app/src/main/res/values-pl/strings.xml
index c7aadb9943..df44122103 100644
--- a/src/frontends/android/app/src/main/res/values-pl/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-pl/strings.xml
@@ -124,6 +124,8 @@
 
     <!-- Dialogs -->
     <string name="login_title">Wprowadż hasło</string>
+    <string name="login_username">Użytkownik</string>
+    <string name="login_password">Hasło</string>
     <string name="login_confirm">Połącz</string>
     <string name="error_introduction">Nie udało się utworzyć tunelu VPN:</string>
     <string name="error_lookup_failed">Nie znaleziono adresu serwer</string>
diff --git a/src/frontends/android/app/src/main/res/values-ru/strings.xml b/src/frontends/android/app/src/main/res/values-ru/strings.xml
index c0a6484f83..933b2fb2dd 100644
--- a/src/frontends/android/app/src/main/res/values-ru/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-ru/strings.xml
@@ -121,6 +121,8 @@
 
     <!-- Dialogs -->
     <string name="login_title">Введите пароль для соединения</string>
+    <string name="login_username">Логин</string>
+    <string name="login_password">Пароль</string>
     <string name="login_confirm">Соединить</string>
     <string name="error_introduction">Ошибка подключения к VPN:</string>
     <string name="error_lookup_failed">Не найден адрес сервер.</string>
diff --git a/src/frontends/android/app/src/main/res/values-ua/strings.xml b/src/frontends/android/app/src/main/res/values-ua/strings.xml
index a852dfdbaa..e48a9215eb 100644
--- a/src/frontends/android/app/src/main/res/values-ua/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-ua/strings.xml
@@ -122,6 +122,8 @@
 
     <!-- Dialogs -->
     <string name="login_title">Введіть пароль для з\'єднання</string>
+    <string name="login_username">Логін</string>
+    <string name="login_password">Пароль</string>
     <string name="login_confirm">Підключити</string>
     <string name="error_introduction">Помилка підлючення VPN:</string>
     <string name="error_lookup_failed">Помилка пошуку адреси сервер.</string>
diff --git a/src/frontends/android/app/src/main/res/values/strings.xml b/src/frontends/android/app/src/main/res/values/strings.xml
index d70712181d..0ceace143f 100644
--- a/src/frontends/android/app/src/main/res/values/strings.xml
+++ b/src/frontends/android/app/src/main/res/values/strings.xml
@@ -124,6 +124,8 @@
 
     <!-- Dialogs -->
     <string name="login_title">Enter password to connect</string>
+    <string name="login_username">Username</string>
+    <string name="login_password">Password</string>
     <string name="login_confirm">Connect</string>
     <string name="error_introduction">Failed to establish VPN:</string>
     <string name="error_lookup_failed">Server address lookup failed.</string>
-- 
2.47.2