summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-08-21 00:03:00 +0200
committerArne Schwabe <arne@rfc2549.org>2012-08-21 00:03:00 +0200
commit561313d5521abea226d4e976959b490732add16e (patch)
tree0ab9398d7bec3d1d50f1785b1dd49bfb8dc9bf57
parentbd5fa709e2ed9c49c8d643ac85407050a906fa2f (diff)
Add FAQ Entry for the duplicate notifications
-rw-r--r--missingtranslations.txt10
-rw-r--r--res/layout/faq.xml8
-rw-r--r--res/values-de/strings.xml3
-rw-r--r--res/values/strings.xml2
4 files changed, 20 insertions, 3 deletions
diff --git a/missingtranslations.txt b/missingtranslations.txt
index 2e97894b..bd63ad64 100644
--- a/missingtranslations.txt
+++ b/missingtranslations.txt
@@ -188,7 +188,7 @@ res/values/strings.xml:219: Error: "error_rsa_sign" is not translated in es, ko,
<string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
^
res/values/strings.xml:220: Error: "faq_system_dialogs" is not translated in de, es, zh [MissingTranslation]
- <string name="faq_system_dialogs">The VPN connection warning telling you that this app can intercept all traffic is imposed by the system to prevent abuse of the VPNService API.\nThe VPN connection notification (The key symbol) is also imposed by the Android system to signal an ongoing VPN connection. On some images this notification plays a sound.\nAndroid introduced these system dialog are for your own safety and made sure that they cannot be circumenvented. (On some images this unfortunely includes a notifciation sound)</string>
+ <string name="faq_system_dialogs">The VPN connection warning telling you that this app can intercept all traffic is imposed by the system to prevent abuse of the VPNService API.\nThe VPN connection notification (The key symbol) is also imposed by the Android system to signal an ongoing VPN connection. On some images this notification plays a sound.\nAndroid introduced these system dialogs for your own safety and made sure that they cannot be circumenvented. (On some images this unfortunely includes a notifciation sound)</string>
^
res/values/strings.xml:221: Error: "faq_system_dialogs_title" is not translated in es, zh [MissingTranslation]
<string name="faq_system_dialogs_title">Connection warning and notification sound</string>
@@ -253,4 +253,10 @@ res/values/strings.xml:250: Error: "configuration_changed" is not translated in
res/values/strings.xml:251: Error: "log_no_last_vpn" is not translated in es, ko, zh [MissingTranslation]
<string name="log_no_last_vpn">Could not determine last connected profile for editing</string>
^
-84 errors, 0 warnings
+res/values/strings.xml:252: Error: "faq_duplicate_notification_title" is not translated in es, ko, zh [MissingTranslation]
+ <string name="faq_duplicate_notification_title">Duplicate notifications</string>
+ ^
+res/values/strings.xml:253: Error: "faq_duplicate_notification" is not translated in es, ko, zh [MissingTranslation]
+ <string name="faq_duplicate_notification">If Android is under system memory (RAM) pressure app and service which are not needed at the moment are removed from active memory. This terminates an ongoing VPN connection. To ensure that the connection/Openvpn survices the service runs with higher priority. To run with higher priority the application must display a notification. The key notification icon is imposed by the system as described in the previous FAQ entry. It does not count as app notification for purpose of running with higher priority.</string>
+ ^
+86 errors, 0 warnings
diff --git a/res/layout/faq.xml b/res/layout/faq.xml
index b18446c0..ec12ffda 100644
--- a/res/layout/faq.xml
+++ b/res/layout/faq.xml
@@ -26,6 +26,14 @@
<TextView
style="@style/faqhead"
+ android:text="@string/faq_duplicate_notification_title" />
+
+ <TextView
+ style="@style/faqitem"
+ android:text="@string/faq_duplicate_notification" />
+
+ <TextView
+ style="@style/faqhead"
android:text="@string/tap_mode" />
<TextView
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 060ff12b..8478d014 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -207,5 +207,6 @@
<string name="restart_vpn_after_change">Konfigurationsänderungen werden erst nach einem VPN Neustart aktiv. Jetzt neu verbinden?</string>
<string name="configuration_changed">Konfiguration geändert</string>
<string name="log_no_last_vpn">Konnte das zuletzt verbundene Profile beim Versuch des Editieren nicht ermitteln.</string>
-
+<string name="faq_duplicate_notification_title">Doppelte Benachrichtigungen</string>
+ <string name="faq_duplicate_notification">Android beendet automatisch Anwendungen und Dienste, die im Hintergrund laufen, wenn der Arbeitsspeicher knapp wird. Wird dabei Openvpn beendet, bricht die VPN Verbindung ab. Um dies zu vermeiden, läuft der VPN Prozess mit einer höheren Priorität. Um eine höhere Prioität nutzen zu können, muss die Anwesenheit des Prozesses dem Benutzer im Form einer Benachrichtigung mitgeteilt werden. Daher zeigt Openvpn für Android immer seine eigene Benachrichtigung an. Die Schlüssel Benachrichtung, die auch im letzen Eintrag erklärt wird, zählt leider nicht als Benachrichtigung, die der Anwendung erlaubt mit höherer Priorität zu arbeiten.</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6d1042a5..f03ee660 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -249,4 +249,6 @@
<string name="restart_vpn_after_change">Configuration changes are applied after restarting the VPN. (Re)start the VPN now?</string>
<string name="configuration_changed">Configuration changed</string>
<string name="log_no_last_vpn">Could not determine last connected profile for editing</string>
+ <string name="faq_duplicate_notification_title">Duplicate notifications</string>
+ <string name="faq_duplicate_notification">If Android is under system memory (RAM) pressure app and service which are not needed at the moment are removed from active memory. This terminates an ongoing VPN connection. To ensure that the connection/Openvpn survices the service runs with higher priority. To run with higher priority the application must display a notification. The key notification icon is imposed by the system as described in the previous FAQ entry. It does not count as app notification for purpose of running with higher priority.</string>
</resources>