diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-20 22:42:50 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-20 22:42:50 +0200 |
commit | 0b181743a3d6b1423e112b17a400b5ac4ac09bcb (patch) | |
tree | ca4c54fe004f1dde0a0b0a62ee10db4231d9f443 /OpenKeychain/src/main/res | |
parent | 4c1d48bd951cbc302bdb2821bdfd501405f3abe0 (diff) | |
download | open-keychain-0b181743a3d6b1423e112b17a400b5ac4ac09bcb.tar.gz open-keychain-0b181743a3d6b1423e112b17a400b5ac4ac09bcb.tar.bz2 open-keychain-0b181743a3d6b1423e112b17a400b5ac4ac09bcb.zip |
Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on add (OKC-01-018)
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml | 36 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-cs/strings.xml | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-de/strings.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-es/strings.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-eu/strings.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-fa/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-fr/strings.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-it/strings.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-ja/strings.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-nl/strings.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-ru/strings.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-sr/strings.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-sv/strings.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values-zh-rTW/strings.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 10 |
15 files changed, 66 insertions, 48 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml b/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml index 78e9247ea..b83681537 100644 --- a/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml +++ b/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml @@ -9,21 +9,37 @@ android:paddingRight="24dp" android:paddingTop="16dp"> - <EditText - android:id="@+id/keyserver_url_edit_text" + <android.support.design.widget.TextInputLayout + android:id="@+id/keyserver_url_edit_text_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginBottom="8dp" - android:ems="10" - android:hint="@string/label_enter_keyserver_url" - android:imeOptions="actionDone" /> + android:layout_marginBottom="8dp"> + + <EditText + android:id="@+id/keyserver_url_edit_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:ems="10" + android:hint="@string/label_enter_keyserver_url" + android:imeOptions="actionDone" + android:inputType="textUri" /> + + </android.support.design.widget.TextInputLayout> + + + <CheckBox + android:id="@+id/verify_connection_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:checked="true" + android:text="@string/label_verify_keyserver_connection" /> <CheckBox - android:id="@+id/verify_keyserver_checkbox" + android:id="@+id/only_trusted_keyserver_checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/label_verify_keyserver" - android:checked="true"/> + android:checked="true" + android:text="@string/label_only_trusted_keyserver" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml index 6b6bc956b..79a5a276c 100644 --- a/OpenKeychain/src/main/res/values-cs/strings.xml +++ b/OpenKeychain/src/main/res/values-cs/strings.xml @@ -135,7 +135,7 @@ <string name="label_enable_compression">Zapnout kompresi</string> <string name="label_encrypt_filenames">Zašifrovat jména souborů</string> <string name="label_hidden_recipients">Skrýt příjemce</string> - <string name="label_verify_keyserver">Ověřit keyserver</string> + <string name="label_verify_keyserver_connection">Ověřit keyserver</string> <string name="label_enter_keyserver_url">Zadejte URL keyserveru</string> <string name="pref_keyserver">OpenPGP keyserver</string> <string name="pref_keyserver_summary">Vyhledat klíče na vybraném OpenPGP keyserveru (protokol HKP)</string> @@ -496,7 +496,7 @@ <string name="view_key_fragment_no_system_contact"><žádný></string> <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Přidat keyserver</string> - <string name="add_keyserver_verified">Keyserver ověřen!</string> + <string name="add_keyserver_connection_verified">Keyserver ověřen!</string> <string name="add_keyserver_without_verification">Keyserver přidán bez verifikace.</string> <string name="add_keyserver_invalid_url">Neplatná URL!</string> <string name="add_keyserver_connection_failed">Nepodařilo se připojit ke key severu. Prosím ověřte URL a vaše připojení k internetu.</string> diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index 291ebf238..0e4a43c6f 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -155,7 +155,7 @@ <string name="label_enable_compression">Komprimierung aktivieren</string> <string name="label_encrypt_filenames">Dateinamen verschlüsseln</string> <string name="label_hidden_recipients">Empfänger verbergen</string> - <string name="label_verify_keyserver">Schlüsselserver verifizieren</string> + <string name="label_verify_keyserver_connection">Schlüsselserver verifizieren</string> <string name="label_enter_keyserver_url">Schlüsselserver-URL eingeben</string> <string name="label_keyserver_dialog_delete">Schlüsselserver löschen</string> <string name="label_theme">Design</string> @@ -386,7 +386,7 @@ <string name="progress_deleting">Lösche Schlüssel…</string> <string name="progress_con_saving">Zusammenführung: Sichere in den Zwischenspeicher...</string> <string name="progress_con_reimport">Zusammenführung: Reimportiere...</string> - <string name="progress_verifying_keyserver_url">Schlüsselserver wird verifiziert…</string> + <string name="progress_verifying_keyserver_connection">Schlüsselserver wird verifiziert…</string> <string name="progress_starting_orbot">Orbot wird gestartet…</string> <!--action strings--> <string name="hint_cloud_search_hint">Via Name, E-Mail suchen...</string> @@ -691,7 +691,7 @@ <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Schlüsselserver hinzufügen</string> <string name="edit_keyserver_dialog_title">Schlüsselserver bearbeiten</string> - <string name="add_keyserver_verified">Schlüsselserver verifiziert!</string> + <string name="add_keyserver_connection_verified">Schlüsselserver verifiziert!</string> <string name="add_keyserver_without_verification">Schlüsselserver ohne Verifikation hinzugefügt.</string> <string name="add_keyserver_invalid_url">Ungültige URL!</string> <string name="add_keyserver_connection_failed">Verbindung zum Schlüsselserver fehlgeschlagen. Bitte überprüfe die URL und deine Internetverbindung.</string> diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index 043918c64..a6849c542 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -155,7 +155,7 @@ <string name="label_enable_compression">Habilitar compresión</string> <string name="label_encrypt_filenames">Cifrar nombres de ficheros</string> <string name="label_hidden_recipients">Ocultar receptores</string> - <string name="label_verify_keyserver">Verificar servidor de claves</string> + <string name="label_verify_keyserver_connection">Verificar servidor de claves</string> <string name="label_enter_keyserver_url">Introduzca URL de servidor de claves</string> <string name="label_keyserver_dialog_delete">Borrar servidor de claves</string> <string name="label_theme">Tema decorativo</string> @@ -386,7 +386,7 @@ <string name="progress_deleting">borrando claves...</string> <string name="progress_con_saving">consolidación: guardando en caché...</string> <string name="progress_con_reimport">consolidación: reimportando</string> - <string name="progress_verifying_keyserver_url">verificando servidor de claves...</string> + <string name="progress_verifying_keyserver_connection">verificando servidor de claves...</string> <string name="progress_starting_orbot">Iniciando Orbot...</string> <!--action strings--> <string name="hint_cloud_search_hint">Buscar mediante Nombre, Correo electrónico...</string> @@ -691,7 +691,7 @@ <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Añadir servidor de claves</string> <string name="edit_keyserver_dialog_title">Editar servidor de claves</string> - <string name="add_keyserver_verified">¡Servidor de claves verificado!</string> + <string name="add_keyserver_connection_verified">¡Servidor de claves verificado!</string> <string name="add_keyserver_without_verification">Servidor de claves añadido sin verificación</string> <string name="add_keyserver_invalid_url">¡URL no válida!</string> <string name="add_keyserver_connection_failed">Fallo al conectar al servidor de claves. Por favor, compuebe la URL y su conexión a Internet.</string> diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml index de4fb68d6..f57297498 100644 --- a/OpenKeychain/src/main/res/values-eu/strings.xml +++ b/OpenKeychain/src/main/res/values-eu/strings.xml @@ -154,7 +154,7 @@ <string name="label_enable_compression">Gaitu konpresioa</string> <string name="label_encrypt_filenames">Enkriptatu agirizenak</string> <string name="label_hidden_recipients">Ezkutatu jasotzaileak</string> - <string name="label_verify_keyserver">Egiaztatu giltza-zerbitzaria</string> + <string name="label_verify_keyserver_connection">Egiaztatu giltza-zerbitzaria</string> <string name="label_enter_keyserver_url">Sartu giltza-zerbitzariaren URL-a</string> <string name="label_keyserver_dialog_delete">Ezabatu giltza-zerbitzaria</string> <string name="label_theme">Azalgaia</string> @@ -376,7 +376,7 @@ <string name="progress_deleting">giltzak ezabatzen...</string> <string name="progress_con_saving">sendotu: katxean gordetzen...</string> <string name="progress_con_reimport">sendotu: berrinportatzen...</string> - <string name="progress_verifying_keyserver_url">giltza-zerbitzaria egiaztatzen...</string> + <string name="progress_verifying_keyserver_connection">giltza-zerbitzaria egiaztatzen...</string> <string name="progress_starting_orbot">Orbot Abiarazten...</string> <!--action strings--> <string name="hint_cloud_search_hint">Bilatu Izena, Post@... bidez</string> @@ -675,7 +675,7 @@ <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Gehitu giltza-zerbitzaria</string> <string name="edit_keyserver_dialog_title">Editatu giltza-zerbitzaria</string> - <string name="add_keyserver_verified">Giltza-zerbitzaria egiaztatuta!</string> + <string name="add_keyserver_connection_verified">Giltza-zerbitzaria egiaztatuta!</string> <string name="add_keyserver_without_verification">Giltza-zerbitzaria gehituta egiaztapen gabe.</string> <string name="add_keyserver_invalid_url">URL baliogabea!</string> <string name="add_keyserver_connection_failed">Hutsegitea giltza-zerbitzariarekin elkartzerakoan. Mesedez egiaztatu URL-a eta zure internet elkarketa.</string> diff --git a/OpenKeychain/src/main/res/values-fa/strings.xml b/OpenKeychain/src/main/res/values-fa/strings.xml index 86d8ab5cd..790d5e90c 100644 --- a/OpenKeychain/src/main/res/values-fa/strings.xml +++ b/OpenKeychain/src/main/res/values-fa/strings.xml @@ -146,7 +146,7 @@ <string name="label_enable_compression">فشردهکردن</string> <string name="label_encrypt_filenames">رمزگذاری اسمِ فایلها</string> <string name="label_hidden_recipients">مخفیکردن گیرندهها</string> - <string name="label_verify_keyserver">بررسی سرورِ کلیدها</string> + <string name="label_verify_keyserver_connection">بررسی سرورِ کلیدها</string> <string name="label_enter_keyserver_url">آدرس URL سرورِ کلید را وارد کنید</string> <string name="label_keyserver_dialog_delete">حذف سرورهای کلید</string> <string name="label_theme">قالب</string> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index 4a6c2bbfe..b5e5f3d53 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -155,7 +155,7 @@ <string name="label_enable_compression">Activer la compression</string> <string name="label_encrypt_filenames">Chiffrer les nom de fichier</string> <string name="label_hidden_recipients">Cacher les destinataires</string> - <string name="label_verify_keyserver">Vérifier le serveur de clefs</string> + <string name="label_verify_keyserver_connection">Vérifier le serveur de clefs</string> <string name="label_enter_keyserver_url">Saisir l\'URL du serveur de clefs</string> <string name="label_keyserver_dialog_delete">Supprimer le serveur de clefs</string> <string name="label_theme">Thème</string> @@ -386,7 +386,7 @@ <string name="progress_deleting">suppression des clefs...</string> <string name="progress_con_saving">consolider : enregistrement dans le cache...</string> <string name="progress_con_reimport">consolider : réimportation...</string> - <string name="progress_verifying_keyserver_url">vérification du serveur de clefs...</string> + <string name="progress_verifying_keyserver_connection">vérification du serveur de clefs...</string> <string name="progress_starting_orbot">Démarrage d\'Orbot...</string> <!--action strings--> <string name="hint_cloud_search_hint">Chercher par nom, adresse courriel...</string> @@ -691,7 +691,7 @@ <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Ajouter un serveur de clefs</string> <string name="edit_keyserver_dialog_title">Modifier le serveur de clefs</string> - <string name="add_keyserver_verified">Le serveur de clefs a été vérifié !</string> + <string name="add_keyserver_connection_verified">Le serveur de clefs a été vérifié !</string> <string name="add_keyserver_without_verification">Le serveur de clefs a été ajouté sans vérification.</string> <string name="add_keyserver_invalid_url">URL invalide !</string> <string name="add_keyserver_connection_failed">Échec de connexion au serveur de clefs. Veuillez vérifier l\'URL et votre connexion Internet.</string> diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index 9f58dc3ba..5b87c6ced 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -149,7 +149,7 @@ <string name="label_enable_compression">Abilitare compressione</string> <string name="label_encrypt_filenames">Codifica nome dei file</string> <string name="label_hidden_recipients">Nascondi destinatari</string> - <string name="label_verify_keyserver">Verificare server chiavi</string> + <string name="label_verify_keyserver_connection">Verificare server chiavi</string> <string name="label_enter_keyserver_url">Inserisci URL server chiavi</string> <string name="label_keyserver_dialog_delete">Cancella server chiavi</string> <string name="pref_keyserver">Server chiavi OpenPGP</string> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 6f735b35b..789a35e75 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -155,7 +155,7 @@ <string name="label_enable_compression">圧縮を有効</string> <string name="label_encrypt_filenames">暗号化するファイル名</string> <string name="label_hidden_recipients">受信者を隠す</string> - <string name="label_verify_keyserver">鍵サーバを検証</string> + <string name="label_verify_keyserver_connection">鍵サーバを検証</string> <string name="label_enter_keyserver_url">鍵サーバのURLを入力</string> <string name="label_keyserver_dialog_delete">鍵サーバの削除</string> <string name="label_theme">テーマ</string> @@ -382,7 +382,7 @@ <string name="progress_deleting">鍵の削除中...</string> <string name="progress_con_saving">統合: キャッシュへ保存…</string> <string name="progress_con_reimport">統合: 再インポート中…</string> - <string name="progress_verifying_keyserver_url">鍵サーバの検証...</string> + <string name="progress_verifying_keyserver_connection">鍵サーバの検証...</string> <string name="progress_starting_orbot">Orbotを始める...</string> <!--action strings--> <string name="hint_cloud_search_hint">名前、Email...で検索</string> @@ -674,7 +674,7 @@ <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">鍵サーバを追加</string> <string name="edit_keyserver_dialog_title">鍵サーバの編集</string> - <string name="add_keyserver_verified">鍵サーバを検証しました!</string> + <string name="add_keyserver_connection_verified">鍵サーバを検証しました!</string> <string name="add_keyserver_without_verification">鍵サーバを検証なしで追加した。</string> <string name="add_keyserver_invalid_url">無効なURLです!</string> <string name="add_keyserver_connection_failed">鍵サーバへの接続し失敗。URLとあなたのインターネット接続をチェックしてください。</string> diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index 1a02fdc07..812376026 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -151,7 +151,7 @@ <string name="label_enable_compression">Compressie aanzetten</string> <string name="label_encrypt_filenames">Versleutel bestandsnamen</string> <string name="label_hidden_recipients">Verberg ontvangers</string> - <string name="label_verify_keyserver">Sleutelserver verifiëren</string> + <string name="label_verify_keyserver_connection">Sleutelserver verifiëren</string> <string name="label_enter_keyserver_url">Voer sleutelserver-URL in</string> <string name="label_keyserver_dialog_delete">Sleutelserver verwijderen</string> <string name="label_theme">Thema</string> @@ -366,7 +366,7 @@ <string name="progress_deleting">bezig met verwijderen van sleutels…</string> <string name="progress_con_saving">consolidatie: bezig met opslaan naar cache…</string> <string name="progress_con_reimport">consolidatie: bezig met opnieuw importeren…</string> - <string name="progress_verifying_keyserver_url">bezig met verifiëren van sleutelserver…</string> + <string name="progress_verifying_keyserver_connection">bezig met verifiëren van sleutelserver…</string> <!--action strings--> <string name="hint_cloud_search_hint">Zoeken via naam, e-mail, ...</string> <!--key bit length selections--> @@ -648,7 +648,7 @@ <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Sleutelserver toevoegen</string> <string name="edit_keyserver_dialog_title">Sleutelserver bewerken</string> - <string name="add_keyserver_verified">Sleutelserver geverifieerd!</string> + <string name="add_keyserver_connection_verified">Sleutelserver geverifieerd!</string> <string name="add_keyserver_without_verification">Sleutelserver toegevoegd zonder verificatie.</string> <string name="add_keyserver_invalid_url">Ongeldige URL!</string> <string name="add_keyserver_connection_failed">Kon niet verbinden met sleutelserver. Controleer de URL en je internetverbinding.</string> diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index 55a5afa5e..6b73d367c 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -152,7 +152,7 @@ <string name="label_enable_compression">Использовать сжатие</string> <string name="label_encrypt_filenames">Шифровать имена файлов</string> <string name="label_hidden_recipients">Скрыть получателей</string> - <string name="label_verify_keyserver">Подтвердить сервер ключей</string> + <string name="label_verify_keyserver_connection">Подтвердить сервер ключей</string> <string name="label_enter_keyserver_url">Введите адрес сервера ключей</string> <string name="label_keyserver_dialog_delete">Удалить сервер ключей</string> <string name="label_theme">Тема</string> @@ -364,7 +364,7 @@ <string name="progress_deleting">удаление ключей...</string> <string name="progress_con_saving">объединение: сохранение в кэш...</string> <string name="progress_con_reimport">объединение: реимпорт...</string> - <string name="progress_verifying_keyserver_url">подтверждение сервера ключей...</string> + <string name="progress_verifying_keyserver_connection">подтверждение сервера ключей...</string> <!--action strings--> <string name="hint_cloud_search_hint">Искать через Имя, Email...</string> <!--key bit length selections--> @@ -568,7 +568,7 @@ <string name="view_key_fragment_no_system_contact"><нет></string> <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Добавить сервер ключей</string> - <string name="add_keyserver_verified">Сервер ключей подтверждён!</string> + <string name="add_keyserver_connection_verified">Сервер ключей подтверждён!</string> <string name="add_keyserver_without_verification">Сервер ключей добавлен без подтверждения.</string> <string name="add_keyserver_invalid_url">Неправильный адрес!</string> <!--Navigation Drawer--> diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml index 5c6d03950..ed7bce5f7 100644 --- a/OpenKeychain/src/main/res/values-sr/strings.xml +++ b/OpenKeychain/src/main/res/values-sr/strings.xml @@ -155,7 +155,7 @@ <string name="label_enable_compression">Омогући компресију</string> <string name="label_encrypt_filenames">Шифруј имена фајлова</string> <string name="label_hidden_recipients">Сакриј примаоце</string> - <string name="label_verify_keyserver">Овери сервер кључева</string> + <string name="label_verify_keyserver_connection">Овери сервер кључева</string> <string name="label_enter_keyserver_url">Унесите УРЛ сервера кључева</string> <string name="label_keyserver_dialog_delete">Обриши сервер кључева</string> <string name="label_theme">Тема</string> @@ -390,7 +390,7 @@ <string name="progress_deleting">бришем кључеве…</string> <string name="progress_con_saving">учвршћивање: уписујем у кеш…</string> <string name="progress_con_reimport">учвршћивање: поново увозим…</string> - <string name="progress_verifying_keyserver_url">оверавам сервер кључева…</string> + <string name="progress_verifying_keyserver_connection">оверавам сервер кључева…</string> <string name="progress_starting_orbot">Покрећем Орбот…</string> <!--action strings--> <string name="hint_cloud_search_hint">Тражи преко имена, е-адресе…</string> @@ -709,7 +709,7 @@ <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Додај сервер кључева</string> <string name="edit_keyserver_dialog_title">Промени сервер кључева</string> - <string name="add_keyserver_verified">Сервер кључева оверен!</string> + <string name="add_keyserver_connection_verified">Сервер кључева оверен!</string> <string name="add_keyserver_without_verification">Сервер кључева додат без оверивања.</string> <string name="add_keyserver_invalid_url">Неисправан УРЛ!</string> <string name="add_keyserver_connection_failed">Неуспех повезивања са сервером кључева. Проверите УРЛ и вашу везу са интернетом.</string> diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index 1ccac9199..4a0a9d083 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -135,7 +135,7 @@ <string name="label_enable_compression">Aktivera kompression</string> <string name="label_encrypt_filenames">Kryptera filnamn</string> <string name="label_hidden_recipients">Dölj mottagare</string> - <string name="label_verify_keyserver">Verifiera nyckelserver</string> + <string name="label_verify_keyserver_connection">Verifiera nyckelserver</string> <string name="label_enter_keyserver_url">Ange nyckelserver-URL</string> <string name="pref_keyserver">OpenPGP nyckelservrar</string> <string name="pref_keyserver_summary">Sök nycklar på valda OpenPGP nyckelservrar (HKP-protokollet)</string> @@ -313,7 +313,7 @@ <string name="progress_deleting">raderar nycklar…</string> <string name="progress_con_saving">konsolidera: sparar till cache…</string> <string name="progress_con_reimport">konsolidera: återimporterar…</string> - <string name="progress_verifying_keyserver_url">verifierar nyckelserver...</string> + <string name="progress_verifying_keyserver_connection">verifierar nyckelserver...</string> <!--action strings--> <string name="hint_cloud_search_hint">Söker via Namn, E-post...</string> <!--key bit length selections--> @@ -565,7 +565,7 @@ <string name="view_key_fragment_no_system_contact"><ingen></string> <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">Lägg till nyckelserver</string> - <string name="add_keyserver_verified">Nyckelserver verifierad!</string> + <string name="add_keyserver_connection_verified">Nyckelserver verifierad!</string> <string name="add_keyserver_without_verification">Nyckelserver tillagd utan verifiering.</string> <string name="add_keyserver_invalid_url">Ogiltig URL!</string> <string name="add_keyserver_connection_failed">Misslyckades med att ansluta till nyckelserver. Kontrollera URL:en och din internetanslutning.</string> diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml index 74d1cd781..87144422d 100644 --- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml +++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml @@ -149,7 +149,7 @@ <string name="label_enable_compression">啓用壓縮</string> <string name="label_encrypt_filenames">加密檔名</string> <string name="label_hidden_recipients">隱藏收件人</string> - <string name="label_verify_keyserver">驗證金鑰伺服器</string> + <string name="label_verify_keyserver_connection">驗證金鑰伺服器</string> <string name="label_enter_keyserver_url">輸入金鑰伺服器網址</string> <string name="label_keyserver_dialog_delete">刪除金鑰伺服器</string> <string name="label_theme">主題</string> @@ -362,7 +362,7 @@ <string name="progress_verifying_integrity">正在驗證完整性…</string> <string name="progress_deleting_securely">正在安全地刪除 \'%s\'...</string> <string name="progress_deleting">正在刪除金鑰…</string> - <string name="progress_verifying_keyserver_url">正在驗證金鑰伺服器...</string> + <string name="progress_verifying_keyserver_connection">正在驗證金鑰伺服器...</string> <string name="progress_starting_orbot">正在啟動Orbot...</string> <!--action strings--> <string name="hint_cloud_search_hint">使用姓名,電子郵件尋找...</string> @@ -625,7 +625,7 @@ <!--Add/Edit keyserver--> <string name="add_keyserver_dialog_title">新增金鑰伺服器</string> <string name="edit_keyserver_dialog_title">編輯金鑰伺服器</string> - <string name="add_keyserver_verified">已驗證金鑰伺服器!</string> + <string name="add_keyserver_connection_verified">已驗證金鑰伺服器!</string> <string name="add_keyserver_without_verification">已新增金鑰伺服器但並未進行驗證。</string> <string name="add_keyserver_invalid_url">URL無效!</string> <string name="add_keyserver_connection_failed">連線到金鑰伺服器失敗。請確認金鑰伺服器網址及網路連線。</string> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 62083cbb4..c83b598ed 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -172,8 +172,9 @@ <string name="label_encrypt_filenames">"Encrypt filenames"</string> <string name="label_hidden_recipients">"Hide recipients"</string> - <string name="label_verify_keyserver">"Verify keyserver"</string> - <string name="label_enter_keyserver_url">"Enter keyserver URL"</string> + <string name="label_verify_keyserver_connection">"Test connection"</string> + <string name="label_only_trusted_keyserver">"Only trusted keyserver"</string> + <string name="label_enter_keyserver_url">"URL"</string> <string name="label_keyserver_dialog_delete">"Delete keyserver"</string> <string name="label_theme">"Theme"</string> @@ -445,7 +446,7 @@ <string name="progress_con_saving">"consolidate: saving to cache…"</string> <string name="progress_con_reimport">"consolidate: reimporting…"</string> - <string name="progress_verifying_keyserver_url">"verifying keyserver…"</string> + <string name="progress_verifying_keyserver_connection">"verifying connection…"</string> <string name="progress_starting_orbot">"Starting Orbot…"</string> @@ -778,9 +779,10 @@ <!-- Add/Edit keyserver --> <string name="add_keyserver_dialog_title">"Add keyserver"</string> <string name="edit_keyserver_dialog_title">"Edit keyserver"</string> - <string name="add_keyserver_verified">"Keyserver verified!"</string> + <string name="add_keyserver_connection_verified">"Connection verified!"</string> <string name="add_keyserver_without_verification">"Keyserver added without verification."</string> <string name="add_keyserver_invalid_url">"Invalid URL!"</string> + <string name="add_keyserver_keyserver_not_trusted">"Keyserver is not one of the trusted ones (no pinned certificate available)!"</string> <string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your Internet connection."</string> <string name="keyserver_preference_deleted">"%s deleted"</string> <string name="keyserver_preference_cannot_delete_last">"Cannot delete last keyserver. At least one is required!"</string> |