android: Change format for error strings

Place the dot in the main message not the descriptions of the individual
errors.

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnStateFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnStateFragment.java
index d682be4252bee7ff417078a7740efd1bd410c2bb..d75db9b6e458b555f471c4fd187fcbf66168254f 100644 (file)
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnStateFragment.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnStateFragment.java
@@ -323,7 +323,7 @@ public class VpnStateFragment extends Fragment implements VpnStateListener
                final boolean show_instructions = mService.getImcState() == ImcState.BLOCK && !instructions.isEmpty();
                int text = show_instructions ? R.string.show_remediation_instructions : R.string.show_log;
 
-               mErrorText.setText(getString(R.string.error_introduction) + " " + getString(textid));
+               mErrorText.setText(getString(R.string.error_format, getString(textid)));
                mErrorDetails.setText(text);
                mErrorDetails.setOnClickListener(new OnClickListener()
                {

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 17b456d56c3efadb3c6ae14ccd9c60e94b3d3154..c3ea58ced972f79c81d2457a4cd1f24c81498a80 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-de/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-de/strings.xml
@@ -179,13 +179,13 @@
     <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>
-    <string name="error_unreachable">Server ist nicht erreichbar.</string>
-    <string name="error_peer_auth_failed">Authentifizierung des Servers ist fehlgeschlagen.</string>
-    <string name="error_auth_failed">Benutzerauthentifizierung ist fehlgeschlagen.</string>
-    <string name="error_assessment_failed">Sicherheitsassessment ist fehlgeschlagen.</string>
-    <string name="error_generic">Unbekannter Fehler während des Verbindens.</string>
+    <string name="error_format">Fehler beim Aufsetzen des VPN: %1$s.</string>
+    <string name="error_lookup_failed">Server-Adresse konnte nicht aufgelöst werden</string>
+    <string name="error_unreachable">Server ist nicht erreichbar</string>
+    <string name="error_peer_auth_failed">Authentifizierung des Servers ist fehlgeschlagen</string>
+    <string name="error_auth_failed">Benutzerauthentifizierung ist fehlgeschlagen</string>
+    <string name="error_assessment_failed">Sicherheitsassessment ist fehlgeschlagen</string>
+    <string name="error_generic">Unbekannter Fehler während des Verbindens</string>
     <string name="vpn_connected">VPN verbunden</string>
     <string name="vpn_profile_connected">Dieses VPN Profil ist momentan verbunden!</string>
     <string name="reconnect">Neu verbinden</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 bfa09adaf1dfa36a32d3650f6c11836a93efe0e9..9b668a9aa31ea6bfa790ce7b668f1ff8598b142c 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-pl/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-pl/strings.xml
@@ -179,12 +179,12 @@
     <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_format">Nie udało się utworzyć tunelu VPN: %1$s.</string>
     <string name="error_lookup_failed">Nie znaleziono adresu serwer</string>
     <string name="error_unreachable">Serwer jest nieosiągalna</string>
     <string name="error_peer_auth_failed">Błąd przy weryfikacji serwer</string>
     <string name="error_auth_failed">Błąd przy autoryzacji użytkownika</string>
-    <string name="error_assessment_failed">Security assessment failed.</string>
+    <string name="error_assessment_failed">Security assessment failed</string>
     <string name="error_generic">Nieznany błąd w czasie połączenia</string>
     <string name="vpn_connected">Połączenie z VPN</string>
     <string name="vpn_profile_connected">Ten profil VPN jest obecnie połaczony!</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 cae13c4217c84451c5d53f498194b3c7b9312cd6..b081f21e3efc078793e1f4b428b14e4cc09eb7f8 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-ru/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-ru/strings.xml
@@ -176,13 +176,13 @@
     <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>
-    <string name="error_unreachable">Сервер недоступен.</string>
-    <string name="error_peer_auth_failed">Ошибка авторизаци при подключении к сервер.</string>
-    <string name="error_auth_failed">Ошибка авторизации пользователя.</string>
-    <string name="error_assessment_failed">Security assessment failed.</string>
-    <string name="error_generic">Неизвестная ошибка.</string>
+    <string name="error_format">Ошибка подключения к VPN: %1$s.</string>
+    <string name="error_lookup_failed">Не найден адрес сервер</string>
+    <string name="error_unreachable">Сервер недоступен</string>
+    <string name="error_peer_auth_failed">Ошибка авторизаци при подключении к сервер</string>
+    <string name="error_auth_failed">Ошибка авторизации пользователя</string>
+    <string name="error_assessment_failed">Security assessment failed</string>
+    <string name="error_generic">Неизвестная ошибка</string>
     <string name="vpn_connected">Соединение с VPN установлено</string>
     <string name="vpn_profile_connected">Подключение к этому профилю VPN уже существует!</string>
     <string name="reconnect">Переподключить</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 58e977f43311c5171a5e2367d6699d00cb80cea7..192f8aa2c4d0e2d366976a05c52a273a0967b6b0 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-ua/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-ua/strings.xml
@@ -177,13 +177,13 @@
     <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>
-    <string name="error_unreachable">Сервер зв\'язку зі шлюзом.</string>
-    <string name="error_peer_auth_failed">Помилка перевірки данних аутентифікації сервер.</string>
-    <string name="error_auth_failed">Помилка аутентифікації користувача.</string>
-    <string name="error_assessment_failed">Security assessment failed.</string>
-    <string name="error_generic">Невідома помилка під час підключення.</string>
+    <string name="error_format">Помилка підлючення VPN: %1$s.</string>
+    <string name="error_lookup_failed">Помилка пошуку адреси сервер</string>
+    <string name="error_unreachable">Сервер зв\'язку зі шлюзом</string>
+    <string name="error_peer_auth_failed">Помилка перевірки данних аутентифікації сервер</string>
+    <string name="error_auth_failed">Помилка аутентифікації користувача</string>
+    <string name="error_assessment_failed">Security assessment failed</string>
+    <string name="error_generic">Невідома помилка під час підключення</string>
     <string name="vpn_connected">VPN підключено</string>
     <string name="vpn_profile_connected">Цей VPN профіль зараз підключений!</string>
     <string name="reconnect">Перепідключитися</string>

diff --git a/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml b/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml
index 7b2a644d91abe6a9eed0b90cae340161cfe6c719..982ca236a522fd26bb8767b1e9d92079a52c68fa 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -176,13 +176,13 @@
     <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>
-    <string name="error_unreachable">服务器地址无法连接。</string>
-    <string name="error_peer_auth_failed">核验服务器鉴权失败。</string>
-    <string name="error_auth_failed">用户鉴权失败。</string>
-    <string name="error_assessment_failed">可靠性评估失败。</string>
-    <string name="error_generic">连接中遭遇未知失败。</string>
+    <string name="error_format">无法建立VPN：%1$s。</string>
+    <string name="error_lookup_failed">服务器地址查找失败</string>
+    <string name="error_unreachable">服务器地址无法连接</string>
+    <string name="error_peer_auth_failed">核验服务器鉴权失败</string>
+    <string name="error_auth_failed">用户鉴权失败</string>
+    <string name="error_assessment_failed">可靠性评估失败</string>
+    <string name="error_generic">连接中遭遇未知失败</string>
     <string name="vpn_connected">VPN已连接</string>
     <string name="vpn_profile_connected">此VPN配置目前已连接。</string>
     <string name="reconnect">重连</string>

diff --git a/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml b/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml
index b085a11b8d31eb9a345cf75dc464241297a82c39..975a8f145d36c955c3a3c211c86504cbf10abcfa 100644 (file)
--- a/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/frontends/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -176,13 +176,13 @@
     <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>
-    <string name="error_unreachable">伺服器位置無法連線。</string>
-    <string name="error_peer_auth_failed">驗證伺服器授權失敗。</string>
-    <string name="error_auth_failed">用戶授權失敗。</string>
-    <string name="error_assessment_failed">穩定性評估失敗。</string>
-    <string name="error_generic">連線中遇到不明錯誤。</string>
+    <string name="error_format">無法建立VPN：%1$s。</string>
+    <string name="error_lookup_failed">伺服器位置查詢失敗</string>
+    <string name="error_unreachable">伺服器位置無法連線</string>
+    <string name="error_peer_auth_failed">驗證伺服器授權失敗</string>
+    <string name="error_auth_failed">用戶授權失敗</string>
+    <string name="error_assessment_failed">穩定性評估失敗</string>
+    <string name="error_generic">連線中遇到不明錯誤</string>
     <string name="vpn_connected">VPN已連線</string>
     <string name="vpn_profile_connected">這個VPN設定檔目前已經連線。</string>
     <string name="reconnect">重新連線</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 dc90b1134be550dec4d126e653e59a0133880589..1021d19aa7d88d12f1ed4a28b0d8c717ddc70700 100644 (file)
--- a/src/frontends/android/app/src/main/res/values/strings.xml
+++ b/src/frontends/android/app/src/main/res/values/strings.xml
@@ -179,13 +179,13 @@
     <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>
-    <string name="error_unreachable">Server is unreachable.</string>
-    <string name="error_peer_auth_failed">Verifying server authentication failed.</string>
-    <string name="error_auth_failed">User authentication failed.</string>
-    <string name="error_assessment_failed">Security assessment failed.</string>
-    <string name="error_generic">Unspecified failure while connecting.</string>
+    <string name="error_format">Failed to establish VPN: %1$s.</string>
+    <string name="error_lookup_failed">Server address lookup failed</string>
+    <string name="error_unreachable">Server is unreachable</string>
+    <string name="error_peer_auth_failed">Verifying server authentication failed</string>
+    <string name="error_auth_failed">User authentication failed</string>
+    <string name="error_assessment_failed">Security assessment failed</string>
+    <string name="error_generic">Unspecified failure while connecting</string>
     <string name="vpn_connected">VPN connected</string>
     <string name="vpn_profile_connected">This VPN profile is currently connected!</string>
     <string name="reconnect">Reconnect</string>