diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-05 20:05:16 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-05 20:05:16 +0100 |
commit | 452d8d3fa4a84a66662c7432a8dfe706b4acba7f (patch) | |
tree | 67a2dd28bc1d5dbbf4d700c2b7d47886624656ad | |
parent | 205e3d7f86fc44388f90193a56b92b491f564b07 (diff) | |
parent | bcad3ebc6949bf34d88322b00321d994ed2568d0 (diff) | |
download | open-keychain-452d8d3fa4a84a66662c7432a8dfe706b4acba7f.tar.gz open-keychain-452d8d3fa4a84a66662c7432a8dfe706b4acba7f.tar.bz2 open-keychain-452d8d3fa4a84a66662c7432a8dfe706b4acba7f.zip |
Merge pull request #335 from honnel/master
updated build.gradle-Files to current Versions of build-tools and SDK.
22 files changed, 312 insertions, 277 deletions
diff --git a/OpenPGP-Keychain-API/example-app/build.gradle b/OpenPGP-Keychain-API/example-app/build.gradle index 1f8854431..975666b19 100644 --- a/OpenPGP-Keychain-API/example-app/build.gradle +++ b/OpenPGP-Keychain-API/example-app/build.gradle @@ -18,7 +18,7 @@ dependencies { android { compileSdkVersion 19 - buildToolsVersion "19.0.1" + buildToolsVersion "19.0.3" defaultConfig { minSdkVersion 9 diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle b/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle index 1d5911783..7c923e7f6 100644 --- a/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle +++ b/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion '19.0.1' + buildToolsVersion '19.0.3' // NOTE: We are using the old folder structure to also support Eclipse sourceSets { diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle index 1e48d8bcd..284f0430c 100644 --- a/OpenPGP-Keychain/build.gradle +++ b/OpenPGP-Keychain/build.gradle @@ -18,7 +18,7 @@ dependencies { android { compileSdkVersion 19 - buildToolsVersion "19.0.1" + buildToolsVersion "19.0.3" defaultConfig { minSdkVersion 9 diff --git a/OpenPGP-Keychain/src/main/res/values-de/strings.xml b/OpenPGP-Keychain/src/main/res/values-de/strings.xml index df76f4e52..493a3a9bb 100644 --- a/OpenPGP-Keychain/src/main/res/values-de/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-de/strings.xml @@ -15,7 +15,7 @@ <string name="title_key_server_preference">Schlüsselserver</string> <string name="title_change_pass_phrase">Passwort ändern</string> <string name="title_set_passphrase">Passwort setzen</string> - <string name="title_send_email">E-Mail senden...</string> + <string name="title_send_email">E-Mail senden…</string> <string name="title_encrypt_to_file">In eine Datei verschlüsseln</string> <string name="title_decrypt_to_file">In eine Datei entschlüsseln</string> <string name="title_import_keys">Schlüssel importieren</string> @@ -163,7 +163,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Öffnen...</string> + <string name="filemanager_title_open">Öffnen…</string> <string name="warning">Warnung</string> <string name="error">Fehler</string> <string name="error_message">Fehler: %s</string> @@ -273,40 +273,40 @@ </plurals> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">fertig.</string> - <string name="progress_saving">speichern...</string> - <string name="progress_importing">importieren...</string> - <string name="progress_exporting">exportieren...</string> - <string name="progress_generating">erstelle Schlüssel, dies kann bis zu 3 Minuten dauern...</string> - <string name="progress_building_key">erstelle Schlüssel...</string> - <string name="progress_preparing_master_key">Hauptschlüssel wird vorbereitet...</string> - <string name="progress_certifying_master_key">Hauptschlüssel wird beglaubigt...</string> - <string name="progress_building_master_key">erstelle Hauptring...</string> - <string name="progress_adding_sub_keys">füge Unterschlüssel hinzu...</string> - <string name="progress_saving_key_ring">Schlüssel wird gespeichert...</string> + <string name="progress_saving">speichern…</string> + <string name="progress_importing">importieren…</string> + <string name="progress_exporting">exportieren…</string> + <string name="progress_generating">erstelle Schlüssel, dies kann bis zu 3 Minuten dauern…</string> + <string name="progress_building_key">erstelle Schlüssel…</string> + <string name="progress_preparing_master_key">Hauptschlüssel wird vorbereitet…</string> + <string name="progress_certifying_master_key">Hauptschlüssel wird beglaubigt…</string> + <string name="progress_building_master_key">erstelle Hauptring…</string> + <string name="progress_adding_sub_keys">füge Unterschlüssel hinzu…</string> + <string name="progress_saving_key_ring">Schlüssel wird gespeichert…</string> <plurals name="progress_exporting_key"> <item quantity="one">Schlüssel wird exportiert…</item> <item quantity="other">Schlüssel werden exportiert…</item> </plurals> - <string name="progress_extracting_signature_key">extrahiere Signaturschlüssel...</string> - <string name="progress_extracting_key">extrahiere Schlüssel...</string> - <string name="progress_preparing_streams">Datenstrom wird vorbereitet...</string> - <string name="progress_encrypting">Daten werden verschlüsselt...</string> - <string name="progress_decrypting">Daten werden entschlüsselt...</string> - <string name="progress_preparing_signature">Signatur wird vorbereitet...</string> - <string name="progress_generating_signature">Signatur wird erstellt...</string> - <string name="progress_processing_signature">Signatur wird verarbeitet...</string> - <string name="progress_verifying_signature">Signatur wird verifiziert...</string> - <string name="progress_signing">signiere...</string> - <string name="progress_reading_data">Daten werden gelesen...</string> - <string name="progress_finding_key">Schlüssel wird gesucht...</string> - <string name="progress_decompressing_data">Daten werden entpackt...</string> - <string name="progress_verifying_integrity">Integrität wird überprüft...</string> - <string name="progress_deleting_securely">\'%s\' wird sicher gelöscht...</string> - <string name="progress_querying">Anfrage wird gestellt...</string> + <string name="progress_extracting_signature_key">extrahiere Signaturschlüssel…</string> + <string name="progress_extracting_key">extrahiere Schlüssel…</string> + <string name="progress_preparing_streams">Datenstrom wird vorbereitet…</string> + <string name="progress_encrypting">Daten werden verschlüsselt…</string> + <string name="progress_decrypting">Daten werden entschlüsselt…</string> + <string name="progress_preparing_signature">Signatur wird vorbereitet…</string> + <string name="progress_generating_signature">Signatur wird erstellt…</string> + <string name="progress_processing_signature">Signatur wird verarbeitet…</string> + <string name="progress_verifying_signature">Signatur wird verifiziert…</string> + <string name="progress_signing">signiere…</string> + <string name="progress_reading_data">Daten werden gelesen…</string> + <string name="progress_finding_key">Schlüssel wird gesucht…</string> + <string name="progress_decompressing_data">Daten werden entpackt…</string> + <string name="progress_verifying_integrity">Integrität wird überprüft…</string> + <string name="progress_deleting_securely">\'%s\' wird sicher gelöscht…</string> + <string name="progress_querying">Anfrage wird gestellt…</string> <!--action strings--> <string name="hint_public_keys">Öffentliche Schlüssel suchen</string> <string name="hint_secret_keys">Private Schlüssel suchen</string> - <string name="action_share_key_with">Teile Schlüssel über...</string> + <string name="action_share_key_with">Teile Schlüssel über…</string> <!--key bit length selections--> <string name="key_size_512">512</string> <string name="key_size_1024">1024</string> diff --git a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml index 6efe9548d..e43cecc2c 100644 --- a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml @@ -12,7 +12,7 @@ <string name="title_api_registered_apps">Aplicaciones registradas</string> <string name="title_change_pass_phrase">Cambiar contraseña</string> <string name="title_set_passphrase">Establecer contraseña</string> - <string name="title_send_email">Enviar correo electrónico...</string> + <string name="title_send_email">Enviar correo electrónico…</string> <string name="title_encrypt_to_file">Cifrar a archivo</string> <string name="title_decrypt_to_file">Descifrar a archivo</string> <string name="title_import_keys">Importar claves</string> diff --git a/OpenPGP-Keychain/src/main/res/values-es/strings.xml b/OpenPGP-Keychain/src/main/res/values-es/strings.xml index e07e049cd..edf190184 100644 --- a/OpenPGP-Keychain/src/main/res/values-es/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-es/strings.xml @@ -15,7 +15,7 @@ <string name="title_key_server_preference">Prioridad del servidor de claves</string> <string name="title_change_pass_phrase">Cambiar la frase de contraseña</string> <string name="title_set_passphrase">Establecer frase de contraseña</string> - <string name="title_send_email">Enviar email...</string> + <string name="title_send_email">Enviar email…</string> <string name="title_encrypt_to_file">Cifrar hacia archivo</string> <string name="title_decrypt_to_file">Descifrar hacia archivo</string> <string name="title_import_keys">Importar claves</string> @@ -61,7 +61,7 @@ <string name="btn_next">Siguiente</string> <string name="btn_back">Volver</string> <string name="btn_clipboard">Portapapeles</string> - <string name="btn_share">Compartir con...</string> + <string name="btn_share">Compartir con…</string> <string name="btn_lookup_key">Buscar clave</string> <!--menu--> <string name="menu_preferences">Ajustes</string> @@ -80,10 +80,10 @@ <string name="menu_update_key">Actualizar desde servidor de claves</string> <string name="menu_export_key_to_server">Cargar al servidor de claves</string> <string name="menu_share">Compartir</string> - <string name="menu_share_title_fingerprint">Compartir la huella digital...</string> - <string name="menu_share_title">Compartir la clave completa...</string> - <string name="menu_share_default_fingerprint">con...</string> - <string name="menu_share_default">con...</string> + <string name="menu_share_title_fingerprint">Compartir la huella digital…</string> + <string name="menu_share_title">Compartir la clave completa…</string> + <string name="menu_share_default_fingerprint">con…</string> + <string name="menu_share_default">con…</string> <string name="menu_share_qr_code">con código QR</string> <string name="menu_share_qr_code_fingerprint">con código QR</string> <string name="menu_share_nfc">con NFC</string> @@ -91,7 +91,7 @@ <string name="menu_sign_key"> Clave de firma</string> <string name="menu_beam_preferences">Ajustes de Beam</string> <string name="menu_key_edit_cancel">Cancelar</string> - <string name="menu_encrypt_to">Cifrar hacia...</string> + <string name="menu_encrypt_to">Cifrar hacia…</string> <!--label--> <string name="label_sign">Firmar</string> <string name="label_message">Mensaje</string> @@ -163,7 +163,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Abrir...</string> + <string name="filemanager_title_open">Abrir…</string> <string name="warning">Advertencia</string> <string name="error">Error</string> <string name="error_message">Error: %s</string> @@ -275,40 +275,40 @@ </plurals> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">hecho.</string> - <string name="progress_saving">guardando...</string> - <string name="progress_importing">importando...</string> - <string name="progress_exporting">exportando...</string> - <string name="progress_generating">generando la clave, esto puede tardar más de 3 minutos...</string> - <string name="progress_building_key">construyendo la clave...</string> - <string name="progress_preparing_master_key">preparando la clave maestra...</string> - <string name="progress_certifying_master_key">certificando la clave maestra...</string> - <string name="progress_building_master_key">construyendo el anillo maestro...</string> - <string name="progress_adding_sub_keys">añadiendo las subclaves...</string> - <string name="progress_saving_key_ring">guardando claves...</string> + <string name="progress_saving">guardando…</string> + <string name="progress_importing">importando…</string> + <string name="progress_exporting">exportando…</string> + <string name="progress_generating">generando la clave, esto puede tardar más de 3 minutos…</string> + <string name="progress_building_key">construyendo la clave…</string> + <string name="progress_preparing_master_key">preparando la clave maestra…</string> + <string name="progress_certifying_master_key">certificando la clave maestra…</string> + <string name="progress_building_master_key">construyendo el anillo maestro…</string> + <string name="progress_adding_sub_keys">añadiendo las subclaves…</string> + <string name="progress_saving_key_ring">guardando claves…</string> <plurals name="progress_exporting_key"> - <item quantity="one">exportando clave...</item> - <item quantity="other">exportando claves...</item> + <item quantity="one">exportando clave…</item> + <item quantity="other">exportando claves…</item> </plurals> - <string name="progress_extracting_signature_key">extrayendo la clave de firma...</string> - <string name="progress_extracting_key">extrayendo la clave...</string> - <string name="progress_preparing_streams">preparando las transmisiones...</string> - <string name="progress_encrypting">cifrando los datos...</string> - <string name="progress_decrypting">descifrando los datos...</string> - <string name="progress_preparing_signature">preparando la firma...</string> - <string name="progress_generating_signature">generando la firma...</string> - <string name="progress_processing_signature">procesando la firma...</string> - <string name="progress_verifying_signature">verificando la firma...</string> - <string name="progress_signing">firmando...</string> - <string name="progress_reading_data">leyendo los datos...</string> - <string name="progress_finding_key">localizando la clave...</string> - <string name="progress_decompressing_data">descomprimiendo los datos...</string> - <string name="progress_verifying_integrity">verificando la integridad...</string> + <string name="progress_extracting_signature_key">extrayendo la clave de firma…</string> + <string name="progress_extracting_key">extrayendo la clave…</string> + <string name="progress_preparing_streams">preparando las transmisiones…</string> + <string name="progress_encrypting">cifrando los datos…</string> + <string name="progress_decrypting">descifrando los datos…</string> + <string name="progress_preparing_signature">preparando la firma…</string> + <string name="progress_generating_signature">generando la firma…</string> + <string name="progress_processing_signature">procesando la firma…</string> + <string name="progress_verifying_signature">verificando la firma…</string> + <string name="progress_signing">firmando…</string> + <string name="progress_reading_data">leyendo los datos…</string> + <string name="progress_finding_key">localizando la clave…</string> + <string name="progress_decompressing_data">descomprimiendo los datos…</string> + <string name="progress_verifying_integrity">verificando la integridad…</string> <string name="progress_deleting_securely">borrando \'%s\' de forma segura…</string> - <string name="progress_querying">consultando...</string> + <string name="progress_querying">consultando…</string> <!--action strings--> <string name="hint_public_keys">Buscar claves públicas</string> <string name="hint_secret_keys">Buscar claves secretas</string> - <string name="action_share_key_with">Compartir la clave con...</string> + <string name="action_share_key_with">Compartir la clave con…</string> <!--key bit length selections--> <string name="key_size_512">512</string> <string name="key_size_1024">1024</string> @@ -374,7 +374,7 @@ <item quantity="one">1 clave seleccionada.</item> <item quantity="other">%d claves seleccionadas.</item> </plurals> - <string name="key_list_empty_text1">Aún no hay claves disponibles...</string> + <string name="key_list_empty_text1">Aún no hay claves disponibles…</string> <string name="key_list_empty_text2">Puedes empezar por</string> <string name="key_list_empty_text3">o</string> <string name="key_list_empty_button_create">crear tu propia clave</string> diff --git a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml index 563ee636e..171ce1fa5 100644 --- a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml @@ -15,7 +15,7 @@ <string name="title_key_server_preference">Préférences du serveur de clefs</string> <string name="title_change_pass_phrase">Changer la phrase de passe</string> <string name="title_set_passphrase">Définir la phrase de passe</string> - <string name="title_send_email">Envoyer un courriel...</string> + <string name="title_send_email">Envoyer un courriel…</string> <string name="title_encrypt_to_file">Chiffrer vers un fichier</string> <string name="title_decrypt_to_file">Déchiffrer vers un fichier</string> <string name="title_import_keys">importer des clefs</string> @@ -61,7 +61,7 @@ <string name="btn_next">Suivant</string> <string name="btn_back">Retour</string> <string name="btn_clipboard">Presse-papiers</string> - <string name="btn_share">Partager avec...</string> + <string name="btn_share">Partager avec…</string> <string name="btn_lookup_key">Rechercher la clef</string> <!--menu--> <string name="menu_preferences">Paramètres</string> @@ -80,10 +80,10 @@ <string name="menu_update_key">Mettre à jour depuis le serveur de clefs</string> <string name="menu_export_key_to_server">Téléverser vers le serveur de clefs</string> <string name="menu_share">Partager</string> - <string name="menu_share_title_fingerprint">Partager l\'empreinte...</string> - <string name="menu_share_title">Partager la clef entière...</string> - <string name="menu_share_default_fingerprint">avec...</string> - <string name="menu_share_default">avec...</string> + <string name="menu_share_title_fingerprint">Partager l\'empreinte…</string> + <string name="menu_share_title">Partager la clef entière…</string> + <string name="menu_share_default_fingerprint">avec…</string> + <string name="menu_share_default">avec…</string> <string name="menu_share_qr_code">par un code QR</string> <string name="menu_share_qr_code_fingerprint">par un code QR</string> <string name="menu_share_nfc">par la NFC</string> @@ -91,7 +91,7 @@ <string name="menu_sign_key">Signer la clef</string> <string name="menu_beam_preferences">Paramètres Beam</string> <string name="menu_key_edit_cancel">Annuler</string> - <string name="menu_encrypt_to">Chiffrer vers...</string> + <string name="menu_encrypt_to">Chiffrer vers…</string> <!--label--> <string name="label_sign">Signer</string> <string name="label_message">Message</string> @@ -163,7 +163,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Ouvrir...</string> + <string name="filemanager_title_open">Ouvrir…</string> <string name="warning">Avertissement</string> <string name="error">Erreur</string> <string name="error_message">Erreur : %s</string> @@ -275,40 +275,40 @@ </plurals> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">fait.</string> - <string name="progress_saving">sauvegarde...</string> - <string name="progress_importing">importation...</string> - <string name="progress_exporting">exportation...</string> - <string name="progress_generating">génération de la clef, ceci peut prendre jusqu\'à 3 minutes...</string> - <string name="progress_building_key">assemblage de la clef...</string> - <string name="progress_preparing_master_key">préparation de la clef maîtresse...</string> - <string name="progress_certifying_master_key">certification de la clef maîtresse...</string> - <string name="progress_building_master_key">assemblage du trousseau maître...</string> - <string name="progress_adding_sub_keys">ajout des sous-clefs...</string> - <string name="progress_saving_key_ring">sauvegarde de la clef...</string> + <string name="progress_saving">sauvegarde…</string> + <string name="progress_importing">importation…</string> + <string name="progress_exporting">exportation…</string> + <string name="progress_generating">génération de la clef, ceci peut prendre jusqu\'à 3 minutes…</string> + <string name="progress_building_key">assemblage de la clef…</string> + <string name="progress_preparing_master_key">préparation de la clef maîtresse…</string> + <string name="progress_certifying_master_key">certification de la clef maîtresse…</string> + <string name="progress_building_master_key">assemblage du trousseau maître…</string> + <string name="progress_adding_sub_keys">ajout des sous-clefs…</string> + <string name="progress_saving_key_ring">sauvegarde de la clef…</string> <plurals name="progress_exporting_key"> - <item quantity="one">exportation de la clef...</item> - <item quantity="other">exportation des clefs...</item> + <item quantity="one">exportation de la clef…</item> + <item quantity="other">exportation des clefs…</item> </plurals> - <string name="progress_extracting_signature_key">extraction de la clef de signature...</string> - <string name="progress_extracting_key">extraction de la clef...</string> - <string name="progress_preparing_streams">préparation des flux...</string> - <string name="progress_encrypting">chiffrement des données...</string> - <string name="progress_decrypting">déchiffrement des données...</string> - <string name="progress_preparing_signature">préparation de la signature...</string> - <string name="progress_generating_signature">génération de la signature...</string> - <string name="progress_processing_signature">traitement de la signature...</string> - <string name="progress_verifying_signature">vérification de la signature...</string> - <string name="progress_signing">signature...</string> - <string name="progress_reading_data">lecture des données...</string> - <string name="progress_finding_key">recherche de la clef...</string> - <string name="progress_decompressing_data">décompression des données...</string> - <string name="progress_verifying_integrity">vérification de l\'intégrité...</string> - <string name="progress_deleting_securely">suppression sûre de « %s »...</string> - <string name="progress_querying">interrogation...</string> + <string name="progress_extracting_signature_key">extraction de la clef de signature…</string> + <string name="progress_extracting_key">extraction de la clef…</string> + <string name="progress_preparing_streams">préparation des flux…</string> + <string name="progress_encrypting">chiffrement des données…</string> + <string name="progress_decrypting">déchiffrement des données…</string> + <string name="progress_preparing_signature">préparation de la signature…</string> + <string name="progress_generating_signature">génération de la signature…</string> + <string name="progress_processing_signature">traitement de la signature…</string> + <string name="progress_verifying_signature">vérification de la signature…</string> + <string name="progress_signing">signature…</string> + <string name="progress_reading_data">lecture des données…</string> + <string name="progress_finding_key">recherche de la clef…</string> + <string name="progress_decompressing_data">décompression des données…</string> + <string name="progress_verifying_integrity">vérification de l\'intégrité…</string> + <string name="progress_deleting_securely">suppression sûre de « %s »…</string> + <string name="progress_querying">interrogation…</string> <!--action strings--> <string name="hint_public_keys">Rechercher des clefs publiques</string> <string name="hint_secret_keys">Rechercher des clefs secrètes</string> - <string name="action_share_key_with">Partager la clef avec...</string> + <string name="action_share_key_with">Partager la clef avec…</string> <!--key bit length selections--> <string name="key_size_512">512</string> <string name="key_size_1024">1024</string> @@ -374,7 +374,7 @@ <item quantity="one">1 clef choisie</item> <item quantity="other">%d clefs choisies</item> </plurals> - <string name="key_list_empty_text1">Aucune clef encore disponible...</string> + <string name="key_list_empty_text1">Aucune clef encore disponible…</string> <string name="key_list_empty_text2">Vous pouvez commencer par</string> <string name="key_list_empty_text3">ou</string> <string name="key_list_empty_button_create">créer votre propre clef</string> diff --git a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml index 041a9d0f1..5ceb4f45b 100644 --- a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml @@ -15,7 +15,7 @@ <string name="title_key_server_preference">Preferenze Server delle Chiavi</string> <string name="title_change_pass_phrase">Cambia Frase di Accesso</string> <string name="title_set_passphrase">Imposta Frase di Accesso</string> - <string name="title_send_email">Invia Mail...</string> + <string name="title_send_email">Invia Mail…</string> <string name="title_encrypt_to_file">Codifica File</string> <string name="title_decrypt_to_file">Decodifica File</string> <string name="title_import_keys">Importa Chiavi</string> @@ -61,7 +61,7 @@ <string name="btn_next">Prossimo</string> <string name="btn_back">Precedente</string> <string name="btn_clipboard">Appunti</string> - <string name="btn_share">Condividi con...</string> + <string name="btn_share">Condividi con…</string> <string name="btn_lookup_key">Chiave di ricerca</string> <!--menu--> <string name="menu_preferences">Impostazioni</string> @@ -80,10 +80,10 @@ <string name="menu_update_key">Aggiorna dal server delle chiavi</string> <string name="menu_export_key_to_server">Carica chiave nel server</string> <string name="menu_share">Condividi</string> - <string name="menu_share_title_fingerprint">Condivi impronta...</string> - <string name="menu_share_title">Condividi intera chiave...</string> + <string name="menu_share_title_fingerprint">Condivi impronta…</string> + <string name="menu_share_title">Condividi intera chiave…</string> <string name="menu_share_default_fingerprint">con..</string> - <string name="menu_share_default">con...</string> + <string name="menu_share_default">con…</string> <string name="menu_share_qr_code">con Codice QR</string> <string name="menu_share_qr_code_fingerprint">con Codice QR</string> <string name="menu_share_nfc">con NFC</string> @@ -91,7 +91,7 @@ <string name="menu_sign_key">Firma chiave</string> <string name="menu_beam_preferences">Impostazioni Beam</string> <string name="menu_key_edit_cancel">Annulla</string> - <string name="menu_encrypt_to">Codifica su...</string> + <string name="menu_encrypt_to">Codifica su…</string> <!--label--> <string name="label_sign">Firma</string> <string name="label_message">Messaggio</string> @@ -163,7 +163,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Apri...</string> + <string name="filemanager_title_open">Apri…</string> <string name="warning">Attenzione</string> <string name="error">Errore</string> <string name="error_message">Errore: %s</string> @@ -275,40 +275,40 @@ </plurals> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">fatto.</string> - <string name="progress_saving">salvataggio...</string> - <string name="progress_importing">importazione...</string> - <string name="progress_exporting">esportazione...</string> - <string name="progress_generating">generazione chiave, richiede fino a 3 minuti...</string> - <string name="progress_building_key">fabbricazione chiave...</string> - <string name="progress_preparing_master_key">preparazione chiave principale...</string> - <string name="progress_certifying_master_key">certificazione chiave principale...</string> - <string name="progress_building_master_key">fabbricazione portachiavi principale...</string> - <string name="progress_adding_sub_keys">aggiunta sottochiavi...</string> - <string name="progress_saving_key_ring">salvataggio chiavi...</string> + <string name="progress_saving">salvataggio…</string> + <string name="progress_importing">importazione…</string> + <string name="progress_exporting">esportazione…</string> + <string name="progress_generating">generazione chiave, richiede fino a 3 minuti…</string> + <string name="progress_building_key">fabbricazione chiave…</string> + <string name="progress_preparing_master_key">preparazione chiave principale…</string> + <string name="progress_certifying_master_key">certificazione chiave principale…</string> + <string name="progress_building_master_key">fabbricazione portachiavi principale…</string> + <string name="progress_adding_sub_keys">aggiunta sottochiavi…</string> + <string name="progress_saving_key_ring">salvataggio chiavi…</string> <plurals name="progress_exporting_key"> - <item quantity="one">esportazione chiave...</item> - <item quantity="other">esportazione chiavi...</item> + <item quantity="one">esportazione chiave…</item> + <item quantity="other">esportazione chiavi…</item> </plurals> - <string name="progress_extracting_signature_key">estrazione chiavi di firma...</string> - <string name="progress_extracting_key">estrazione chiave...</string> - <string name="progress_preparing_streams">preparazione flussi...</string> - <string name="progress_encrypting">codifica dati...</string> - <string name="progress_decrypting">decodifica dati...</string> - <string name="progress_preparing_signature">preparazione firma...</string> - <string name="progress_generating_signature">generazione firma...</string> - <string name="progress_processing_signature">elaborazione firma...</string> - <string name="progress_verifying_signature">verifica firma...</string> - <string name="progress_signing">firma...</string> - <string name="progress_reading_data">lettura dati...</string> - <string name="progress_finding_key">ricerca chiave...</string> - <string name="progress_decompressing_data">decompressione dati...</string> - <string name="progress_verifying_integrity">verifica integrita\'...</string> - <string name="progress_deleting_securely">eliminazione sicura di \'%s\'...</string> - <string name="progress_querying">interrogazione...</string> + <string name="progress_extracting_signature_key">estrazione chiavi di firma…</string> + <string name="progress_extracting_key">estrazione chiave…</string> + <string name="progress_preparing_streams">preparazione flussi…</string> + <string name="progress_encrypting">codifica dati…</string> + <string name="progress_decrypting">decodifica dati…</string> + <string name="progress_preparing_signature">preparazione firma…</string> + <string name="progress_generating_signature">generazione firma…</string> + <string name="progress_processing_signature">elaborazione firma…</string> + <string name="progress_verifying_signature">verifica firma…</string> + <string name="progress_signing">firma…</string> + <string name="progress_reading_data">lettura dati…</string> + <string name="progress_finding_key">ricerca chiave…</string> + <string name="progress_decompressing_data">decompressione dati…</string> + <string name="progress_verifying_integrity">verifica integrita\'…</string> + <string name="progress_deleting_securely">eliminazione sicura di \'%s\'…</string> + <string name="progress_querying">interrogazione…</string> <!--action strings--> <string name="hint_public_keys">Ricerca Chiavi Pubbliche</string> <string name="hint_secret_keys">Cerca Chiave Privata</string> - <string name="action_share_key_with">Condividi chiave con...</string> + <string name="action_share_key_with">Condividi chiave con…</string> <!--key bit length selections--> <string name="key_size_512">512</string> <string name="key_size_1024">1024</string> @@ -374,7 +374,7 @@ <item quantity="one">1 chiave selezionata.</item> <item quantity="other">%d chiavi selezionate.</item> </plurals> - <string name="key_list_empty_text1">Nessuna chiave disponibile...</string> + <string name="key_list_empty_text1">Nessuna chiave disponibile…</string> <string name="key_list_empty_text2">Puoi iniziare da</string> <string name="key_list_empty_text3">o</string> <string name="key_list_empty_button_create">creazione della tua chiave</string> diff --git a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml index 0c80d4a2c..0ba511c1e 100644 --- a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml @@ -15,7 +15,7 @@ <string name="title_key_server_preference">鍵サーバ設定</string> <string name="title_change_pass_phrase">パスフレーズの変更</string> <string name="title_set_passphrase">パスフレーズの設定</string> - <string name="title_send_email">メールの送信...</string> + <string name="title_send_email">メールの送信…</string> <string name="title_encrypt_to_file">暗号化してファイルに</string> <string name="title_decrypt_to_file">復号化してファイルに</string> <string name="title_import_keys">鍵のインポート</string> @@ -61,7 +61,7 @@ <string name="btn_next">次</string> <string name="btn_back">戻る</string> <string name="btn_clipboard">クリップボード</string> - <string name="btn_share">共有...</string> + <string name="btn_share">共有…</string> <string name="btn_lookup_key">鍵検出</string> <!--menu--> <string name="menu_preferences">設定</string> @@ -80,10 +80,10 @@ <string name="menu_update_key">鍵サーバからの更新</string> <string name="menu_export_key_to_server">鍵サーバへのアップロード</string> <string name="menu_share">共有</string> - <string name="menu_share_title_fingerprint">指紋の共有...</string> - <string name="menu_share_title">すべての鍵の共有...</string> - <string name="menu_share_default_fingerprint">...(指紋)</string> - <string name="menu_share_default">...(鍵)</string> + <string name="menu_share_title_fingerprint">指紋の共有…</string> + <string name="menu_share_title">すべての鍵の共有…</string> + <string name="menu_share_default_fingerprint">…(指紋)</string> + <string name="menu_share_default">…(鍵)</string> <string name="menu_share_qr_code">QRコードで共有(鍵)</string> <string name="menu_share_qr_code_fingerprint">QRコードで共有(指紋)</string> <string name="menu_share_nfc">NFCで共有</string> @@ -91,7 +91,7 @@ <string name="menu_sign_key">鍵を署名</string> <string name="menu_beam_preferences">Beamの設定</string> <string name="menu_key_edit_cancel">キャンセル</string> - <string name="menu_encrypt_to">暗号化...</string> + <string name="menu_encrypt_to">暗号化…</string> <!--label--> <string name="label_sign">署名</string> <string name="label_message">メッセージ</string> @@ -161,7 +161,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">開く...</string> + <string name="filemanager_title_open">開く…</string> <string name="warning">注意</string> <string name="error">エラー</string> <string name="error_message">エラー: %s</string> @@ -266,39 +266,39 @@ </plurals> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">完了。</string> - <string name="progress_saving">保存...</string> - <string name="progress_importing">インポート...</string> - <string name="progress_exporting">エクスポート...</string> - <string name="progress_generating">鍵の生成、3分ほどかかります...</string> - <string name="progress_building_key">鍵の構築中...</string> - <string name="progress_preparing_master_key">主鍵の準備中...</string> - <string name="progress_certifying_master_key">主鍵の検証中...</string> - <string name="progress_building_master_key">主鍵輪の構築中...</string> - <string name="progress_adding_sub_keys">副鍵の追加中...</string> - <string name="progress_saving_key_ring">鍵の保存...</string> + <string name="progress_saving">保存…</string> + <string name="progress_importing">インポート…</string> + <string name="progress_exporting">エクスポート…</string> + <string name="progress_generating">鍵の生成、3分ほどかかります…</string> + <string name="progress_building_key">鍵の構築中…</string> + <string name="progress_preparing_master_key">主鍵の準備中…</string> + <string name="progress_certifying_master_key">主鍵の検証中…</string> + <string name="progress_building_master_key">主鍵輪の構築中…</string> + <string name="progress_adding_sub_keys">副鍵の追加中…</string> + <string name="progress_saving_key_ring">鍵の保存…</string> <plurals name="progress_exporting_key"> - <item quantity="other">鍵のエクスポート...</item> + <item quantity="other">鍵のエクスポート…</item> </plurals> - <string name="progress_extracting_signature_key">署名鍵の取り出し中...</string> - <string name="progress_extracting_key">鍵の取り出し中...</string> - <string name="progress_preparing_streams">ストリームの準備中...</string> - <string name="progress_encrypting">データの暗号化中...</string> - <string name="progress_decrypting">データの復号化中...</string> - <string name="progress_preparing_signature">署名の準備中...</string> - <string name="progress_generating_signature">署名の生成中...</string> - <string name="progress_processing_signature">署名処理中...</string> - <string name="progress_verifying_signature">署名の検証中...</string> - <string name="progress_signing">署名中...</string> - <string name="progress_reading_data">データ読み込み中...</string> - <string name="progress_finding_key">鍵検索中...</string> - <string name="progress_decompressing_data">データの展開中...</string> - <string name="progress_verifying_integrity">完全性の検証中...</string> + <string name="progress_extracting_signature_key">署名鍵の取り出し中…</string> + <string name="progress_extracting_key">鍵の取り出し中…</string> + <string name="progress_preparing_streams">ストリームの準備中…</string> + <string name="progress_encrypting">データの暗号化中…</string> + <string name="progress_decrypting">データの復号化中…</string> + <string name="progress_preparing_signature">署名の準備中…</string> + <string name="progress_generating_signature">署名の生成中…</string> + <string name="progress_processing_signature">署名処理中…</string> + <string name="progress_verifying_signature">署名の検証中…</string> + <string name="progress_signing">署名中…</string> + <string name="progress_reading_data">データ読み込み中…</string> + <string name="progress_finding_key">鍵検索中…</string> + <string name="progress_decompressing_data">データの展開中…</string> + <string name="progress_verifying_integrity">完全性の検証中…</string> <string name="progress_deleting_securely">\'%s\' を完全に削除中…</string> - <string name="progress_querying">要求中...</string> + <string name="progress_querying">要求中…</string> <!--action strings--> <string name="hint_public_keys">公開鍵の検索</string> <string name="hint_secret_keys">秘密鍵の検索</string> - <string name="action_share_key_with">鍵の共有...</string> + <string name="action_share_key_with">鍵の共有…</string> <!--key bit length selections--> <string name="key_size_512">512</string> <string name="key_size_1024">1024</string> @@ -362,7 +362,7 @@ <plurals name="key_list_selected_keys"> <item quantity="other">%d の鍵を選択。</item> </plurals> - <string name="key_list_empty_text1">すでにその鍵は存在しません...</string> + <string name="key_list_empty_text1">すでにその鍵は存在しません…</string> <string name="key_list_empty_text2">で始める</string> <string name="key_list_empty_text3">もしくは</string> <string name="key_list_empty_button_create">あなた所有の鍵を作る</string> 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 7d7efa616..35a0b5a03 100644 --- a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml @@ -12,7 +12,7 @@ <string name="title_api_registered_apps">Geregistreerde apps</string> <string name="title_change_pass_phrase">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 +109,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 +172,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> diff --git a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml index 7d865cc23..c8aff125b 100644 --- a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml @@ -15,7 +15,7 @@ <string name="title_key_server_preference">Настройки сервера ключей</string> <string name="title_change_pass_phrase">Изменить пароль</string> <string name="title_set_passphrase">Задать пароль</string> - <string name="title_send_email">Отправить...</string> + <string name="title_send_email">Отправить…</string> <string name="title_encrypt_to_file">Зашифровать в файл</string> <string name="title_decrypt_to_file">Расшифровать в файл</string> <string name="title_import_keys">Импорт ключей</string> @@ -61,7 +61,7 @@ <string name="btn_next">Далее</string> <string name="btn_back">Назад</string> <string name="btn_clipboard">Буфер обмена</string> - <string name="btn_share">Поделиться...</string> + <string name="btn_share">Поделиться…</string> <string name="btn_lookup_key">Найти ключ</string> <!--menu--> <string name="menu_preferences">Настройки</string> @@ -79,9 +79,9 @@ <string name="menu_key_server">Импорт с сервера ключей</string> <string name="menu_update_key">Обновить с сервера ключей</string> <string name="menu_export_key_to_server">Загрузить на сервер ключей</string> - <string name="menu_share">Отправить...</string> - <string name="menu_share_title_fingerprint">Отправить отпечаток...</string> - <string name="menu_share_title">Отправить ключ...</string> + <string name="menu_share">Отправить…</string> + <string name="menu_share_title_fingerprint">Отправить отпечаток…</string> + <string name="menu_share_title">Отправить ключ…</string> <string name="menu_share_default_fingerprint">Отправить</string> <string name="menu_share_default">Отправить</string> <string name="menu_share_qr_code">QR код</string> @@ -91,7 +91,7 @@ <string name="menu_sign_key">Подписать ключ</string> <string name="menu_beam_preferences">Настройки Beam</string> <string name="menu_key_edit_cancel">Отмена</string> - <string name="menu_encrypt_to">Зашифровать....</string> + <string name="menu_encrypt_to">Зашифровать….</string> <!--label--> <string name="label_sign">Подписать</string> <string name="label_message">Сообщение</string> @@ -115,7 +115,7 @@ <string name="label_key_servers">Серверы ключей</string> <string name="label_key_id">ID ключа</string> <string name="label_creation">Создан</string> - <string name="label_expiry">Годен до...</string> + <string name="label_expiry">Годен до…</string> <string name="label_usage">Применение</string> <string name="label_key_size">Размер ключа</string> <string name="label_main_user_id">Основной ID пользователя</string> @@ -165,7 +165,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Открыть...</string> + <string name="filemanager_title_open">Открыть…</string> <string name="warning">Внимание</string> <string name="error">Ошибка</string> <string name="error_message">Ошибка: %s</string> @@ -284,41 +284,41 @@ </plurals> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">готово.</string> - <string name="progress_saving">сохранение...</string> - <string name="progress_importing">импорт...</string> - <string name="progress_exporting">экспорт...</string> - <string name="progress_generating">создание ключа. это может занять до 3 минут...</string> - <string name="progress_building_key">создание ключа...</string> - <string name="progress_preparing_master_key">подготовка основного ключа...</string> - <string name="progress_certifying_master_key">сертификация основного ключа...</string> - <string name="progress_building_master_key">создание основной связки...</string> - <string name="progress_adding_sub_keys">добавление доп. ключей...</string> - <string name="progress_saving_key_ring">сохранение ключа...</string> + <string name="progress_saving">сохранение…</string> + <string name="progress_importing">импорт…</string> + <string name="progress_exporting">экспорт…</string> + <string name="progress_generating">создание ключа. это может занять до 3 минут…</string> + <string name="progress_building_key">создание ключа…</string> + <string name="progress_preparing_master_key">подготовка основного ключа…</string> + <string name="progress_certifying_master_key">сертификация основного ключа…</string> + <string name="progress_building_master_key">создание основной связки…</string> + <string name="progress_adding_sub_keys">добавление доп. ключей…</string> + <string name="progress_saving_key_ring">сохранение ключа…</string> <plurals name="progress_exporting_key"> - <item quantity="one">экспорт ключа...</item> - <item quantity="few">экспорт ключей...</item> - <item quantity="other">экспорт ключей...</item> + <item quantity="one">экспорт ключа…</item> + <item quantity="few">экспорт ключей…</item> + <item quantity="other">экспорт ключей…</item> </plurals> - <string name="progress_extracting_signature_key">извлечение подписи ключа...</string> - <string name="progress_extracting_key">извлечение ключа...</string> - <string name="progress_preparing_streams">подготовка к передаче...</string> - <string name="progress_encrypting">шифрование данных...</string> - <string name="progress_decrypting">расшифровка данных...</string> - <string name="progress_preparing_signature">подготовка подписи...</string> - <string name="progress_generating_signature">формирование подписи...</string> - <string name="progress_processing_signature">обработка подписи...</string> - <string name="progress_verifying_signature">проверка подписи...</string> - <string name="progress_signing">подписание...</string> - <string name="progress_reading_data">чтение данных...</string> - <string name="progress_finding_key">поиск ключа...</string> - <string name="progress_decompressing_data">распаковка данных...</string> - <string name="progress_verifying_integrity">проверка целостности...</string> - <string name="progress_deleting_securely">безопасное удаление \'%s\'...</string> - <string name="progress_querying">запрос...</string> + <string name="progress_extracting_signature_key">извлечение подписи ключа…</string> + <string name="progress_extracting_key">извлечение ключа…</string> + <string name="progress_preparing_streams">подготовка к передаче…</string> + <string name="progress_encrypting">шифрование данных…</string> + <string name="progress_decrypting">расшифровка данных…</string> + <string name="progress_preparing_signature">подготовка подписи…</string> + <string name="progress_generating_signature">формирование подписи…</string> + <string name="progress_processing_signature">обработка подписи…</string> + <string name="progress_verifying_signature">проверка подписи…</string> + <string name="progress_signing">подписание…</string> + <string name="progress_reading_data">чтение данных…</string> + <string name="progress_finding_key">поиск ключа…</string> + <string name="progress_decompressing_data">распаковка данных…</string> + <string name="progress_verifying_integrity">проверка целостности…</string> + <string name="progress_deleting_securely">безопасное удаление \'%s\'…</string> + <string name="progress_querying">запрос…</string> <!--action strings--> <string name="hint_public_keys">Найти публичные ключи</string> <string name="hint_secret_keys">Найти секретные ключи</string> - <string name="action_share_key_with">Отправить...</string> + <string name="action_share_key_with">Отправить…</string> <!--key bit length selections--> <string name="key_size_512">512</string> <string name="key_size_1024">1024</string> @@ -386,7 +386,7 @@ <item quantity="few">%d ключей выбрано.</item> <item quantity="other">%d ключей выбрано.</item> </plurals> - <string name="key_list_empty_text1">У вас пока нет ключей...</string> + <string name="key_list_empty_text1">У вас пока нет ключей…</string> <string name="key_list_empty_text2">Но Вы можете</string> <string name="key_list_empty_text3">или</string> <string name="key_list_empty_button_create">создать свой ключ</string> diff --git a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml index 5bb5225b5..4f1becaa1 100644 --- a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml @@ -76,7 +76,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Aç...</string> + <string name="filemanager_title_open">Aç…</string> <string name="warning">Uyarı</string> <string name="error">Hata</string> <string name="error_message">Hata: %s</string> @@ -96,17 +96,17 @@ <string name="error_corrupt_data">bozuk veri</string> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">bitti.</string> - <string name="progress_saving">kaydediliyor...</string> - <string name="progress_importing">alıyor...</string> - <string name="progress_exporting">veriyor...</string> - <string name="progress_building_key">anahtar oluşturuluyor...</string> - <string name="progress_preparing_signature">imza hazırlanıyor...</string> - <string name="progress_generating_signature">imza oluşturuluyor...</string> - <string name="progress_processing_signature">imza işleniyor...</string> - <string name="progress_verifying_signature">imza doğrulanıyor...</string> - <string name="progress_signing">imzalanıyor...</string> - <string name="progress_reading_data">veri okunuyor...</string> - <string name="progress_finding_key">anahtar bulunuyor...</string> + <string name="progress_saving">kaydediliyor…</string> + <string name="progress_importing">alıyor…</string> + <string name="progress_exporting">veriyor…</string> + <string name="progress_building_key">anahtar oluşturuluyor…</string> + <string name="progress_preparing_signature">imza hazırlanıyor…</string> + <string name="progress_generating_signature">imza oluşturuluyor…</string> + <string name="progress_processing_signature">imza işleniyor…</string> + <string name="progress_verifying_signature">imza doğrulanıyor…</string> + <string name="progress_signing">imzalanıyor…</string> + <string name="progress_reading_data">veri okunuyor…</string> + <string name="progress_finding_key">anahtar bulunuyor…</string> <!--action strings--> <!--key bit length selections--> <string name="key_size_512">512</string> diff --git a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml index f9422b64b..5848fb8db 100644 --- a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml @@ -24,7 +24,7 @@ <string name="menu_copy_to_clipboard">复制到剪贴板</string> <string name="menu_sign_key">签署密钥</string> <string name="menu_key_edit_cancel">取消</string> - <string name="menu_encrypt_to">加密到...</string> + <string name="menu_encrypt_to">加密到…</string> <!--label--> <string name="label_sign">签署</string> <string name="label_message">讯息</string> @@ -64,7 +64,7 @@ <string name="choice_4hours">4小时</string> <string name="choice_8hours">8小时</string> <string name="choice_forever">永远</string> - <string name="filemanager_title_open">打开...</string> + <string name="filemanager_title_open">打开…</string> <string name="warning">警告</string> <string name="error">错误</string> <!--sentences--> @@ -106,13 +106,13 @@ <string name="error_wrong_passphrase">错误的密语</string> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">完成。</string> - <string name="progress_saving">保存...</string> - <string name="progress_importing">导入中...</string> - <string name="progress_exporting">导出中...</string> + <string name="progress_saving">保存…</string> + <string name="progress_importing">导入中…</string> + <string name="progress_exporting">导出中…</string> <string name="progress_building_key">建立密钥</string> <string name="progress_preparing_master_key">正在准备主密钥</string> - <string name="progress_verifying_signature">正在验证签名...</string> - <string name="progress_signing">正在签名...</string> + <string name="progress_verifying_signature">正在验证签名…</string> + <string name="progress_signing">正在签名…</string> <string name="progress_reading_data">正在读取数据</string> <string name="progress_finding_key">正在查找密钥</string> <string name="progress_querying">正在查询</string> @@ -32,9 +32,9 @@ Development mailinglist at http://groups.google.com/d/forum/openpgp-keychain-dev 1. Have Android SDK "tools", "platform-tools", and "build-tools" directories in your PATH (http://developer.android.com/sdk/index.html) 2. Open the Android SDK Manager (shell command: ``android``). -Expand the Tools directory and select "Android SDK Build-tools" newest version. +Expand the Tools directory and select "Android SDK Build-tools (Version 19.0.3)". Expand the Extras directory and install "Android Support Repository" -Select everything for the newest SDK +Select everything for the newest SDK (API-Level 19) 3. Export ANDROID_HOME pointing to your Android SDK 4. Execute ``./gradlew build`` 5. You can install the app with ``adb install -r OpenPGP-Keychain/build/apk/OpenPGP-Keychain-debug-unaligned.apk`` diff --git a/libraries/Android-AppMsg/library/build.gradle b/libraries/Android-AppMsg/library/build.gradle index 934cf1cb1..f77f1a098 100644 --- a/libraries/Android-AppMsg/library/build.gradle +++ b/libraries/Android-AppMsg/library/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion '19.0.1' + buildToolsVersion '19.0.3' defaultConfig { minSdkVersion 4 diff --git a/libraries/AndroidBootstrap/build.gradle b/libraries/AndroidBootstrap/build.gradle index 7724c6d9c..220613132 100644 --- a/libraries/AndroidBootstrap/build.gradle +++ b/libraries/AndroidBootstrap/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion "19.0.1" + buildToolsVersion "19.0.3" defaultConfig { minSdkVersion 7 - targetSdkVersion 17 + targetSdkVersion 19 } sourceSets { main { diff --git a/libraries/HtmlTextView/build.gradle b/libraries/HtmlTextView/build.gradle index a0b9b1bc6..d1b26d2bd 100644 --- a/libraries/HtmlTextView/build.gradle +++ b/libraries/HtmlTextView/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'android-library' android { - compileSdkVersion 17 - buildToolsVersion '19.0.1' + compileSdkVersion 19 + buildToolsVersion '19.0.3' sourceSets { main { diff --git a/libraries/HtmlTextView/project.properties b/libraries/HtmlTextView/project.properties index 484dab075..91d2b0246 100644 --- a/libraries/HtmlTextView/project.properties +++ b/libraries/HtmlTextView/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-17 +target=android-19 android.library=true diff --git a/libraries/StickyListHeaders/library/build.gradle b/libraries/StickyListHeaders/library/build.gradle index a92c4d80e..b67172c12 100644 --- a/libraries/StickyListHeaders/library/build.gradle +++ b/libraries/StickyListHeaders/library/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion '19.0.1' + buildToolsVersion '19.0.3' sourceSets { main { diff --git a/libraries/keychain-api-library/build.gradle b/libraries/keychain-api-library/build.gradle new file mode 100644 index 000000000..7c923e7f6 --- /dev/null +++ b/libraries/keychain-api-library/build.gradle @@ -0,0 +1,35 @@ +// please leave this here, so this library builds on its own +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:0.8.3' + } +} + +apply plugin: 'android-library' + +android { + compileSdkVersion 19 + buildToolsVersion '19.0.3' + + // NOTE: We are using the old folder structure to also support Eclipse + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + } + + // Do not abort build if lint finds errors + lintOptions { + abortOnError false + } +} diff --git a/libraries/zxing-android-integration/build.gradle b/libraries/zxing-android-integration/build.gradle index a92c4d80e..b67172c12 100644 --- a/libraries/zxing-android-integration/build.gradle +++ b/libraries/zxing-android-integration/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion '19.0.1' + buildToolsVersion '19.0.3' sourceSets { main { diff --git a/libraries/zxing/build.gradle b/libraries/zxing/build.gradle index a92c4d80e..b67172c12 100644 --- a/libraries/zxing/build.gradle +++ b/libraries/zxing/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion '19.0.1' + buildToolsVersion '19.0.3' sourceSets { main { |