diff options
| author | bju <bju@maxi.fritz.box> | 2013-04-22 00:53:50 +0200 |
|---|---|---|
| committer | bju <bju@maxi.fritz.box> | 2013-04-22 00:53:50 +0200 |
| commit | 612cf3729bf532e100b520118e4fa7d567b13f41 (patch) | |
| tree | 2669e7db5df4cb2ab6eb00dd78632a9917fcfb4f /vdrmanager/res | |
| parent | 6f0394b5d60df470f245bd7581f92bc7889ac0d5 (diff) | |
| parent | 75516dd3d04aa9a8f61adfb882d5d78b9267b613 (diff) | |
| download | vdr-manager-612cf3729bf532e100b520118e4fa7d567b13f41.tar.gz vdr-manager-612cf3729bf532e100b520118e4fa7d567b13f41.tar.bz2 | |
merged SSL client implementation
Diffstat (limited to 'vdrmanager/res')
| -rw-r--r-- | vdrmanager/res/values-de/strings.xml | 20 | ||||
| -rw-r--r-- | vdrmanager/res/values/strings.xml | 20 | ||||
| -rw-r--r-- | vdrmanager/res/xml/vdr_prefs.xml | 1 |
3 files changed, 40 insertions, 1 deletions
diff --git a/vdrmanager/res/values-de/strings.xml b/vdrmanager/res/values-de/strings.xml index b174aaf..7a7ab5f 100644 --- a/vdrmanager/res/values-de/strings.xml +++ b/vdrmanager/res/values-de/strings.xml @@ -337,4 +337,24 @@ herrlado<herrlado@gmail.com></string> <item>Aufzeichnungen</item> <item>Timer</item> </string-array> + + <!-- + SSL related messages + --> + + <string name="certificate_problem_message_title">Zertifikat-Warnung</string> + <string name="certificate_problem_message_text" formatted="false"> +Das Zertifikat des Servers wurde nicht akzeptiert:\n\n +Hostname:\n + %s\n +Gültig ab:\n + %s\n +Gültig bis:\n + %s\n\n +Was wollen Sie tun? + </string> + <string name="certificate_accept_once">Einmal akzeptieren</string> + <string name="certificate_accepted_forever">Immer akzeptieren</string> + <string name="certificate_not_accepted">Nicht akzeptieren</string> + </resources> diff --git a/vdrmanager/res/values/strings.xml b/vdrmanager/res/values/strings.xml index 4b1702f..1ccc5ff 100644 --- a/vdrmanager/res/values/strings.xml +++ b/vdrmanager/res/values/strings.xml @@ -395,4 +395,24 @@ <string name="recording_started">Recording started</string> <string name="set_time">Set time</string> <!-- … --> + + <!-- + SSL related messages + --> + + <string name="certificate_problem_message_title">Certificate warning</string> + <string name="certificate_problem_message_text" formatted="false"> +The server certificate was not accepted:\n\n +Hostname:\n + %s\n +Valid from:\n + %s\n +Valid until:\n + %s\n\n +What do you want to do? + </string> + <string name="certificate_accept_once">Accept once</string> + <string name="certificate_accepted_forever">Accept forever</string> + <string name="certificate_not_accepted">Abort</string> + </resources>
\ No newline at end of file diff --git a/vdrmanager/res/xml/vdr_prefs.xml b/vdrmanager/res/xml/vdr_prefs.xml index 3720db4..041a08e 100644 --- a/vdrmanager/res/xml/vdr_prefs.xml +++ b/vdrmanager/res/xml/vdr_prefs.xml @@ -28,7 +28,6 @@ android:title="@string/vdr_password_title" /> <CheckBoxPreference - android:enabled="false" android:key="@string/vdr_ssl_key" android:summary="@string/vdr_ssl_summary" android:title="@string/vdr_ssl_title" /> |