Merge remote-tracking branch 'upstream/master' into Lint-error-fix

1 files changed, 27 insertions, 28 deletions

diff --git a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
index 863932a80..de6ba554d 100644
--- a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml
@@ -10,9 +10,8 @@
   <string name="title_edit_key">Sleutel bewerken</string>
   <string name="title_preferences">Instellingen</string>
   <string name="title_api_registered_apps">Geregistreerde apps</string>
-  <string name="title_change_passphrase">Wachtwoord wijzigen</string>
   <string name="title_set_passphrase">Wachtwoord instellen</string>
-  <string name="title_send_email">E-mail verzenden…</string>
+  <string name="title_send_email">E-mail verzenden...</string>
   <string name="title_encrypt_to_file">Versleutelen naar bestand</string>
   <string name="title_decrypt_to_file">Ontsleutelen naar bestand</string>
   <string name="title_import_keys">Sleutels importeren</string>
@@ -109,7 +108,7 @@
   <string name="dsa">DSA</string>
   <string name="elgamal">ElGamal</string>
   <string name="rsa">RSA</string>
-  <string name="filemanager_title_open">Openen…</string>
+  <string name="filemanager_title_open">Openen...</string>
   <string name="warning">Waarschuwing</string>
   <string name="error">Fout</string>
   <string name="error_message">Fout: %s</string>
@@ -172,34 +171,34 @@
   <string name="error_nothing_import">Niets te importeren</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">gereed.</string>
-  <string name="progress_saving">opslaan…</string>
-  <string name="progress_importing">importeren…</string>
-  <string name="progress_exporting">exporteren…</string>
-  <string name="progress_building_key">sleutel maken…</string>
-  <string name="progress_preparing_master_key">hoofdsleutel voorbereiden…</string>
-  <string name="progress_certifying_master_key">hoofdsleutel certificeren…</string>
-  <string name="progress_building_master_key">hoofdsleutelbos maken…</string>
-  <string name="progress_adding_sub_keys">sub-sleutels toevoegen…</string>
-  <string name="progress_extracting_signature_key">ondertekeningssleutel uitpakken…</string>
-  <string name="progress_extracting_key">sleutel uitpakken…</string>
-  <string name="progress_preparing_streams">streams voorbereiden…</string>
-  <string name="progress_encrypting">gegevens versleutelen…</string>
-  <string name="progress_decrypting">gegevens ontsleutelen…</string>
-  <string name="progress_preparing_signature">handtekening voorbereiden…</string>
-  <string name="progress_generating_signature">handtekening genereren…</string>
-  <string name="progress_processing_signature">handtekening verwerken…</string>
-  <string name="progress_verifying_signature">handtekening verifiëren…</string>
-  <string name="progress_signing">ondertekenen…</string>
-  <string name="progress_reading_data">gegevens lezen…</string>
-  <string name="progress_finding_key">sleutel opzoeken…</string>
-  <string name="progress_decompressing_data">gegevens decomprimeren…</string>
-  <string name="progress_verifying_integrity">integriteit verifiëren…</string>
-  <string name="progress_deleting_securely">\'%s\' veilig verwijderen…</string>
-  <string name="progress_querying">opvragen…</string>
+  <string name="progress_saving">opslaan...</string>
+  <string name="progress_importing">importeren...</string>
+  <string name="progress_exporting">exporteren...</string>
+  <string name="progress_building_key">sleutel maken...</string>
+  <string name="progress_preparing_master_key">hoofdsleutel voorbereiden...</string>
+  <string name="progress_certifying_master_key">hoofdsleutel certificeren...</string>
+  <string name="progress_building_master_key">hoofdsleutelbos maken...</string>
+  <string name="progress_adding_sub_keys">sub-sleutels toevoegen...</string>
+  <string name="progress_extracting_signature_key">ondertekeningssleutel uitpakken...</string>
+  <string name="progress_extracting_key">sleutel uitpakken...</string>
+  <string name="progress_preparing_streams">streams voorbereiden...</string>
+  <string name="progress_encrypting">gegevens versleutelen...</string>
+  <string name="progress_decrypting">gegevens ontsleutelen...</string>
+  <string name="progress_preparing_signature">handtekening voorbereiden...</string>
+  <string name="progress_generating_signature">handtekening genereren...</string>
+  <string name="progress_processing_signature">handtekening verwerken...</string>
+  <string name="progress_verifying_signature">handtekening verifiëren...</string>
+  <string name="progress_signing">ondertekenen...</string>
+  <string name="progress_reading_data">gegevens lezen...</string>
+  <string name="progress_finding_key">sleutel opzoeken...</string>
+  <string name="progress_decompressing_data">gegevens decomprimeren...</string>
+  <string name="progress_verifying_integrity">integriteit verifiëren...</string>
+  <string name="progress_deleting_securely">\'%s\' veilig verwijderen...</string>
+  <string name="progress_querying">opvragen...</string>
   <!--action strings-->
   <string name="hint_public_keys">Publieke sleutels zoeken</string>
   <string name="hint_secret_keys">Privésleutels zoeken</string>
-  <string name="action_share_key_with">Sleutel delen met…</string>
+  <string name="action_share_key_with">Sleutel delen met...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_1024">1024</string>