diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-05-03 22:51:47 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-03 22:51:47 +0200 |
| commit | 815eb143e98b57b6cd1f43c7c3007416ed4b1a91 (patch) | |
| tree | 2359f4fca5e51d2b7eb253728f62b74db7da0e69 /res/xml/vpn_authentification.xml | |
| parent | b7b4e00536107c951a2642a2a1a3fe21a65510a0 (diff) | |
| parent | 69f36a1ffafafc233291f44af0b7146428b764a3 (diff) | |
Merge Merge try number 2
Diffstat (limited to 'res/xml/vpn_authentification.xml')
| -rw-r--r-- | res/xml/vpn_authentification.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml index ceeb514b..bd8d8ca5 100644 --- a/res/xml/vpn_authentification.xml +++ b/res/xml/vpn_authentification.xml @@ -3,29 +3,29 @@ <CheckBoxPreference android:key="remoteServerTLS" - android:summary="Checks whether the server uses a TLS Server Certificate" - android:title="Except TLS Server" /> + android:summary="@string/check_remote_tlscert" + android:title="@string/check_remote_tlscert_title" /> <CheckBoxPreference android:key="checkRemoteCN" - android:summary="Checks the Remote Server Certificate CN against a String" - android:title="Certificate Hostname Check" /> + android:summary="@string/remote_tlscn_check_summary" + android:title="@string/remote_tlscn_check_title" /> <EditTextPreference android:dependency="checkRemoteCN" - android:dialogMessage="Enter the String against which the remote Server is checked. Openvpn will use prefix matching. "Server" matches "Server-1" and "Server-2"\nLeave empty to check the CN against the server hostname." + android:dialogMessage="@string/enter_tlscn_dialog" android:key="remotecn" - android:title="Remote Hostname(CN)" /> + android:title="@string/enter_tlscn_title" /> <PreferenceCategory android:title="TLS Authentication" > <SwitchPreference android:key="useTLSAuth" - android:summary="Enables the TLS Key Authentication" + android:summary="@string/tls_key_auth" android:title="@string/useTLSAuth" /> <Preference android:dependency="useTLSAuth" android:key="tlsAuthFile" - android:title="TLS Auth File" /> + android:title="@string/tls_auth_file" /> <ListPreference android:entries="@array/tls_directions_entries" @@ -34,7 +34,7 @@ android:entryValues="@array/tls_directions_values" android:key="tls_direction" android:persistent="false" - android:title="TLS Direction" /> + android:title="@string/tls_direction" /> </PreferenceCategory> /> |