summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-07-20 00:24:37 +0200
committerArne Schwabe <arne@rfc2549.org>2012-07-20 00:24:37 +0200
commit3d1f8403b9034bd6cf39aa6697be4f4ca76946b8 (patch)
tree3019521416204d2956261127c3dce234395d64b2
parentf68126a62315fc3a31b19e4e98e300d7fcdb3e70 (diff)
- Remove now unused string to import pkcs12.
- Translate new string into german
-rw-r--r--res/values-de/strings.xml3
-rw-r--r--res/values-es/strings.xml1
-rw-r--r--res/values-ko/strings.xml1
-rw-r--r--res/values/strings.xml1
4 files changed, 2 insertions, 4 deletions
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 303706a2..c7a80eed 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -41,7 +41,6 @@
<string name="trying_to_read">Versuche Datei %1$s zu lesen</string>
<string name="import_could_not_open">Konnte die Datei %1$s, die in der importierten Konfiguration angeben war, nicht finden</string>
<string name="importing_config">Importiere Konfigurationsdatei aus %1$s</string>
- <string name="import_pkcs12_to_keystore">Ihre Konfigurationsdatei spezifiziert eine PKCS12 Datei. Bitte importieren Sie diese Datei indem Sie Select in den Grundeinstellungen auswählen.</string>
<string name="import_warning_custom_options">Ihre Konfigurations hat spezielle Optionen, die nicht direkt auf Einstellungen übertragen werden konnten. Diese Eistellungen wurden als spezielle Optionen gespeichert:</string>
<string name="import_done">Konfigurationsdatei lesen abgeschlossen.</string>
<string name="nobind_summary">Binde nicht an lokalen Port und IP Adresse</string>
@@ -194,4 +193,6 @@
<string name="translationby"></string>
<string name="faq_system_dialogs_title">Warnung beim Verbinden und Benachrichtigungston</string>
<string name="tun_error_helpful">Auf manchen ROM Version sind eventuell die Zugriffsrechte von /dev/tun falsch oder das tun Kernel Modul fehlt. Für Cyanogenmod 9 ROMs mit root gibt einen provisorischen Fix in den generellen Einstellungen.</string>
+ <string name="importpkcs12fromconfig">Importiere die PKCS12 Datei, die in der Konfiguration angegeben ist, in den Android Keystore</string>
+
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dfaeedb4..a90a6bfc 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -153,7 +153,6 @@
<string name="trying_to_read">Intentando leer el archivo: %1$s</string>
<string name="import_could_not_open">No se encontró el archivo %1$s que se menciona en el archivo de configuración importado</string>
<string name="importing_config">Importando archivo de configuración de la fuente %1$s</string>
- <string name="import_pkcs12_to_keystore">Tu archivo de configuración especificó un archivo PKCS12. Selecciónalo en la configuración básica de la VPN convertida para importarlo.</string>
<string name="import_warning_custom_options">Tu configuración tiene algunas opciones de configuración que no se pudieron analizar. Estas opciones se han añadido como opciones de configuración personalizada. La configuración personalizada se muestra abajo:</string>
<string name="import_done">Lectura del archivo de configuración terminada.</string>
<string name="nobind_summary">No enlazar a la dirección local y el puerto</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 38978bfb..ac674d2d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -158,7 +158,6 @@
<string name="trying_to_read">Trying to read file: %1$s</string>
<string name="import_could_not_open">Could not find file %1$s mentioned in the imported config file</string>
<string name="importing_config">Importing config file from source %1$s</string>
- <string name="import_pkcs12_to_keystore">Your config file specified a pkcs12 file. Please import the file by selecting select in the Basic Settings configuration of the converted VPN</string>
<string name="import_warning_custom_options">Your configuration had a few configuration options that could be parsed. These options were added as custom configuration options. The custom configuration is displayed below:</string>
<string name="import_done">설정 파일 읽기 완료</string>
<string name="nobind_summary">로컬 주소와 포트로 바인드 안하기</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fca7a777..6ad486a5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -174,7 +174,6 @@
<string name="trying_to_read">Trying to read file: %1$s</string>
<string name="import_could_not_open">Could not find file %1$s mentioned in the imported config file</string>
<string name="importing_config">Importing config file from source %1$s</string>
- <string name="import_pkcs12_to_keystore">Your config file specified a pkcs12 file. Please import the file by selecting select in the Basic Settings configuration of the converted VPN</string>
<string name="import_warning_custom_options">Your configuration had a few configuration options that could be parsed. These options were added as custom configuration options. The custom configuration is displayed below:</string>
<string name="import_done">Done reading config file.</string>
<string name="nobind_summary">Do not bind to local address and port</string>