Better exception handling for import of keys

6 files changed, 6 insertions, 6 deletions

diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 002243482..72af24255 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -253,7 +253,7 @@
   <string name="error_keyserver_insufficient_query">Petición de búsqueda de clave demasiado corta</string>
   <string name="error_searching_keys">Error irrecuperable buscando claves en el servidor</string>
   <string name="error_keyserver_too_many_responses">La petición de búsqueda de clave devolvió demasiados candidatos; por favor refine su petición</string>
-  <string name="error_import_file_no_content">El Fichero/Portapapeles está vacío</string>
+  <string name="error_import_no_valid_keys">El Fichero/Portapapeles está vacío</string>
   <string name="error_generic_report_bug">Ha ocurrido un error genérico, por favor, informa de este bug a OpenKeychain</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">parte del archivo cargado es un objeto OpenPGP válido pero no una clave OpenPGP</item>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index a3030a65e..a4eb177e8 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -253,7 +253,7 @@
   <string name="error_keyserver_insufficient_query">La requête de recherche de clef est trop courte</string>
   <string name="error_searching_keys">Erreur irrécupérable lors de la recherche de clef sur le serveur</string>
   <string name="error_keyserver_too_many_responses">La requête de recherche de clef a retourné trop de candidats. Veuillez raffiner la requête</string>
-  <string name="error_import_file_no_content">Le fichier/le presse-papiers est vide</string>
+  <string name="error_import_no_valid_keys">Le fichier/le presse-papiers est vide</string>
   <string name="error_generic_report_bug">Une erreur générique est survenue, veuillez créer un nouveau rapport de bogue pour OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">une partie du fichier chargé est un objet OpenPGP valide mais pas une clef OpenPGP</item>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 476b7fb31..6debc0418 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -253,7 +253,7 @@
   <string name="error_keyserver_insufficient_query">Chiave della query di ricerca troppo corta</string>
   <string name="error_searching_keys">Errore irreversibile nella ricerca di chiavi sul server</string>
   <string name="error_keyserver_too_many_responses">Chiave della query di ricerca ha generato troppi candidati; Si prega di perfezionare la ricerca</string>
-  <string name="error_import_file_no_content">File/Appunti vuoti</string>
+  <string name="error_import_no_valid_keys">File/Appunti vuoti</string>
   <string name="error_generic_report_bug">Si è verificato un errore generico, si prega di creare una nuova segnalazione di errore per OpenKeychain.</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">parte del file caricato e\' un oggetto OpenPGP valido, ma non una chave OpenPGP</item>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index db1150102..7d12af22e 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -249,7 +249,7 @@
   <string name="error_keyserver_insufficient_query">鍵検索のクエリが短かすぎます</string>
   <string name="error_searching_keys">サーバでの鍵の検索が回復不可能なエラーになりました</string>
   <string name="error_keyserver_too_many_responses">鍵検索のクエリが沢山の候補を返しました; クエリを精密化してください</string>
-  <string name="error_import_file_no_content">ファイル/クリップボードが空です</string>
+  <string name="error_import_no_valid_keys">ファイル/クリップボードが空です</string>
   <string name="error_generic_report_bug">一般エラーが発生しました、この新しいバグの情報をOpenKeychainプロジェクトに送ってください</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="other">読み込んだファイルのOpenPGPオブジェクト部分は正しいですが、OpenPGPの鍵ではありません</item>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index d15e35f50..465e9bb8c 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -257,7 +257,7 @@
   <string name="error_keyserver_insufficient_query">Запрос слишком короткий</string>
   <string name="error_searching_keys">Ошибка поиска ключей на сервере</string>
   <string name="error_keyserver_too_many_responses">Поиск ключа вернул слишком много вариантов; Пожалуйста, уточните запрос</string>
-  <string name="error_import_file_no_content">Файл/Буфер пуст</string>
+  <string name="error_import_no_valid_keys">Файл/Буфер пуст</string>
   <string name="error_generic_report_bug">Выявлена ошибка. Пожалуйста, сообщите о ней разработчику.</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">часть загруженного файла содержит данные OpenPGP, но это не ключ</item>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6fa90b31a..37132237a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -273,7 +273,7 @@
     <string name="error_keyserver_insufficient_query">Key search query too short</string>
     <string name="error_searching_keys">Unrecoverable error searching for keys at server</string>
     <string name="error_keyserver_too_many_responses">Key search query returned too many candidates; Please refine query</string>
-    <string name="error_import_file_no_content">File/Clipboard is empty</string>
+    <string name="error_import_no_valid_keys">No valid keys found in File/Clipboard!</string>
     <string name="error_generic_report_bug">A generic error occurred, please create a new bug report for OpenKeychain.</string>
     <plurals name="error_import_non_pgp_part">
         <item quantity="one">part of the loaded file is a valid OpenPGP object but not a OpenPGP key</item>