diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/basic_settings.xml | 6 | ||||
| -rw-r--r-- | res/layout/file_dialog_main.xml | 2 | ||||
| -rw-r--r-- | res/layout/keystore_selector.xml | 2 | ||||
| -rw-r--r-- | res/values-de/strings.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 8 |
5 files changed, 18 insertions, 6 deletions
diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml index d47ba207..409936e1 100644 --- a/res/layout/basic_settings.xml +++ b/res/layout/basic_settings.xml @@ -106,6 +106,12 @@ android:visibility="gone" > <include layout="@layout/keystore_selector" /> + + <TextView + style="@style/item" + android:singleLine="false" + android:text="@string/extracahint" + android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> <LinearLayout diff --git a/res/layout/file_dialog_main.xml b/res/layout/file_dialog_main.xml index 2f88ffb7..68af9b18 100644 --- a/res/layout/file_dialog_main.xml +++ b/res/layout/file_dialog_main.xml @@ -23,7 +23,7 @@ android:id="@+id/fdButtonSelect" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/select" > + android:text="@string/select_file" > </Button> </LinearLayout> diff --git a/res/layout/keystore_selector.xml b/res/layout/keystore_selector.xml index 21945104..211e977b 100644 --- a/res/layout/keystore_selector.xml +++ b/res/layout/keystore_selector.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:text="@string/select_certificate" /> + android:text="@string/select" /> <TextView android:id="@+id/title" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index be0a518d..aebfe351 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -14,7 +14,7 @@ <string name="client_certificate_title">Clientzertifikat</string> <string name="client_key_title">Clientzertifikatsschlüssel</string> <string name="ca_title">CA Zertifikat</string> - <string name="select_certificate">Auswählen</string> + <string name="select_file">Auswählen</string> <string name="no_certificate">Nichts ausgewählt</string> <string name="about">Über</string> <string name="vpn_type">Typ</string> @@ -171,5 +171,9 @@ <string name="building_configration">Generiere OpenVPN Konfigration…</string> <string name="netchange_summary">Aktivieren dieser Option zwingt OpenVPN dazu beim Wechsel des Netzwerkes (WLAN zu Mobilfunk und umgekehrt) neu zu verbinden.</string> <string name="netchange">Netzwerkänderungen beachten</string> + <string name="netstatus">Netzwerkstatus: %s</string> + <string name="keychain_nocacert">Beim Abfragen des Android KeyStore wurde kein CA Zertifikat zurückgegeben. Überprüfen des Serverzertifikat wird warscheinlich fehlschlagen. Geben Sie manuell ein CA Zertifikat an.</string> + <string name="cert_from_keystore">Zertifikat (KeyStore): \'%s\' </string> + <string name="extracahint">Das CA Zertifikat wird meist aus dem Zertifikatsspeicher automatisch ausgewählt. Sollte dies nicht funktionieren und Sie Verifizierungsprobleme erhalten(self signed certificate), wählen Sie manuell ein Zertifikat aus.</string> </resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 08bb0a27..f7c9817f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -24,7 +24,6 @@ <string name="defaultport" translatable="false">1194</string> <string name="location">Location</string> <string name="cant_read_folder">folder can\'t be read!</string> - <string name="select">Select</string> <string name="cancel">Cancel</string> <string name="no_data">No Data</string> <string name="useLZO">LZO Compression</string> @@ -33,7 +32,6 @@ <string name="client_key_title">Client Certificate Key</string> <string name="client_pkcs12_title">PKCS12 File</string> <string name="ca_title">CA Certificate</string> - <string name="select_certificate">Select</string> <string name="no_certificate">Nothing selected</string> <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. <sales@openvpn.net>\n @@ -57,6 +55,7 @@ <string name="vpn_list_title">All your precious VPNs</string> <string name="vpn_type">Type</string> <string name="pkcs12pwquery">PKCS12 Password</string> + <string name="select">Select…</string> <string name="file_select">Select…</string> <string name="file_nothing_selected">Nothing Selected</string> <string name="useTLSAuth">Use TLS Authentication</string> @@ -209,7 +208,10 @@ <string name="building_configration">Building configration…</string> <string name="netchange_summary">Turning this option on will force a reconnet if the network state is change (WIFI to/from mobile)</string> <string name="netchange">Reconnect on Network change</string> - <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Auhtentication will probably fail.</string> <string name="cert_from_keystore">Got certificate \'%s\' from Keystore</string> <string name="netstatus">Network Status: %s</string> + <string name="extracahint">The CA cert is usually returned from the Android Keystore. Specify a seperate certificate if you get certificate verification errors.</string> + <string name="select_file">Select</string> + <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Auhtentication will probably fail.</string> + </resources> |