moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 04:22:18 -05:00
Code Issues Releases Wiki Activity

more language fixes and cleanup

Browse Source
This commit is contained in:
Dominik Schürmann 2014-01-19 16:06:23 +01:00
parent f4a9688bd9
commit 1b1927883b
16 changed files with 84 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenPGP-Keychain/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 144 B

BIN
OpenPGP-Keychain/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 134 B

BIN
OpenPGP-Keychain/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 166 B

BIN
OpenPGP-Keychain/res/drawable/ic_btn_round_minus.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 288 B

BIN
OpenPGP-Keychain/res/drawable/ic_btn_round_plus.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 526 B

40
OpenPGP-Keychain/res/raw-fr/help_changelog.html
View File

@ -9,7 +9,7 @@
<ul> <ul>
<li>Beaucoup de bogues corrigés</li> <li>Beaucoup de bogues corrigés</li>
<li>Nouvelle API pour les développeurs</li> <li>Nouvelle API pour les développeurs</li>
<li>Correction du blogue PRNG par Google</li> <li>Correctif du blogue PRNG par Google</li>
</ul> </ul>
<h2>2.0</h2> <h2>2.0</h2>
<ul> <ul>
@ -26,7 +26,7 @@
<li>app2sd (non-testé, me signaler tout problème)</li> <li>app2sd (non-testé, me signaler tout problème)</li>
<li>plus de choix pour le cache de phrase de passe : 1, 2, 4, 8 heures</li> <li>plus de choix pour le cache de phrase de passe : 1, 2, 4, 8 heures</li>
<li>traductions : norvégien (merci Sander Danielsen), chinois (merci Zhang Fredrick)</li> <li>traductions : norvégien (merci Sander Danielsen), chinois (merci Zhang Fredrick)</li>
<li>corrections de bogues</li> <li>correctifs de bogues</li>
<li>optimisations</li> <li>optimisations</li>
</ul> </ul>
<h2>1.0.7</h2> <h2>1.0.7</h2>
@ -39,46 +39,46 @@
<li>correction de l'ajout de compte sur Froyo</li> <li>correction de l'ajout de compte sur Froyo</li>
<li>suppression sécurisée de fichiers</li> <li>suppression sécurisée de fichiers</li>
<li>option de suppression du fichier de clef après l'importation</li> <li>option de suppression du fichier de clef après l'importation</li>
<li>chiffrage/déchiffrage de flux (galerie, etc...)</li> <li>chiffrement/déchiffrement de flux (galerie, etc...)</li>
<li>nouvelles options (langue, forcer les signatures v3)</li> <li>nouvelles options (langue, forcer les signatures v3)</li>
<li>changements dans l'interface</li> <li>changements dans l'interface</li>
<li>corrections de bogues</li> <li>correctifs de bogues</li>
</ul> </ul>
<h2>1.0.5</h2> <h2>1.0.5</h2>
<ul> <ul>
<li>German and Italian translation</li> <li>Traduction allemande et italienne</li>
<li>much smaller package, due to reduced BC sources</li> <li>paquet beaucoup plus petit grâce à des sources BC réduites</li>
<li>new preferences GUI</li> <li>nouvelle interface utilisateur pour les paramètres</li>
<li>layout adjustment for localization</li> <li>ajustement de la mise en page pour les localisations</li>
<li>signature bugfix</li> <li>correctif de bogue de signature</li>
</ul> </ul>
<h2>1.0.4</h2> <h2>1.0.4</h2>
<ul> <ul>
<li>fixed another crash caused by some SDK bug with query builder</li> <li>correction d'un autre plantage causé par quelque bogue SDK avec le constructeur de requêtes</li>
</ul> </ul>
<h2>1.0.3</h2> <h2>1.0.3</h2>
<ul> <ul>
<li>fixed crashes during encryption/signing and possibly key export</li> <li>corrections de plantages durant le chiffrement/la signature et aussi peut-être l'exportation de clef</li>
</ul> </ul>
<h2>1.0.2</h2> <h2>1.0.2</h2>
<ul> <ul>
<li>filterable key lists</li> <li>listes de clefs filtrables</li>
<li>smarter preselection of encryption keys</li> <li>présélection plus intelligente ds clefs de chiffrement</li>
<li>new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li> <li>nouvelle gestion des intentions pour VIEW et SEND, permet le chiffrement/déchiffrement des fichiers depuis les gestionnaires de fichiers</li>
<li>fixes and additional features (key preselection) for k9, new beta build available</li> <li>correctifs et fonctions additionnelles (présélection des clefs) pour k9, nouvelle version bêta disponible.</li>
</ul> </ul>
<h2>1.0.1</h2> <h2>1.0.1</h2>
<ul> <ul>
<li>GMail account listing was broken in 1.0.0, fixed again</li> <li>Le listage des comptes Gmail était brisé dans 1.0.0, maintenant corrigé </li>
</ul> </ul>
<h2>1.0.0</h2> <h2>1.0.0</h2>
<ul> <ul>
<li>k9mail integration, APG supporting beta build of k9mail</li> <li>intégration K-9 Mail, APG prenant en charge la version bêta de K-9 Mail</li>
<li>support of more file managers (including ASTRO)</li> <li>prise en charge de plus de gestionnaires de fichiers (incluant ASTRO)</li>
<li>Slovenian translation</li> <li>Traduction slovène</li>
<li>new database, much faster, less memory usage</li> <li>new database, much faster, less memory usage</li>
<li>defined Intents and content provider for other apps</li> <li>defined Intents and content provider for other apps</li>
<li>corrections de bogues</li> <li>correctifs de bogues</li>
</ul> </ul>
</body> </body>
</html> </html>

6
OpenPGP-Keychain/res/raw-tr/help_about.html
View File

@ -3,11 +3,11 @@
<body> <body>
<p><a href="http://sufficientlysecure.org/keychain">http://sufficientlysecure.org/keychain</a></p> <p><a href="http://sufficientlysecure.org/keychain">http://sufficientlysecure.org/keychain</a></p>
<p><a href="http://sufficientlysecure.org/keychain">OpenPGP Keychain</a> is an OpenPGP implementation for Android. The development began as a fork of Android Privacy Guard (APG).</p> <p><a href="http://sufficientlysecure.org/keychain">OpenPGP Keychain</a> is an OpenPGP implementation for Android. The development began as a fork of Android Privacy Guard (APG).</p>
<p>License: GPLv3+</p> <p>Lisans: GPLv3+</p>
<h2>Developers OpenPGP Keychain</h2> <h2>Geliştiriciler OpenPGP Keychain</h2>
<ul> <ul>
<li>Dominik Schürmann (Lead developer)</li> <li>Dominik Schürmann (Baş geliştirici)</li>
<li>Ash Hughes (crypto patches)</li> <li>Ash Hughes (crypto patches)</li>
<li>Brian C. Barnes</li> <li>Brian C. Barnes</li>
<li>Bahtiar 'kalkin' Gadimov (UI)</li> <li>Bahtiar 'kalkin' Gadimov (UI)</li>

8
OpenPGP-Keychain/res/values-sw600dp/dimens.xml
View File

@ -1,8 +0,0 @@
<resources>
<!--
Customize dimensions originally defined in res/values/dimens.xml (such as
screen margins) for sw600dp devices (e.g. 7" tablets) here.
-->
</resources>

9
OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml
View File

@ -1,9 +0,0 @@
<resources>
<!--
Customize dimensions originally defined in res/values/dimens.xml (such as
screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-->
<dimen name="activity_horizontal_margin">128dp</dimen>
</resources>

37
OpenPGP-Keychain/res/values-tr/strings.xml
View File

@ -1,6 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<resources> <resources>
<!--title--> <!--title-->
<string name="title_select_recipients">Açık Anahtar Seç</string>
<string name="title_select_secret_key">Özel Anahtar Seç</string>
<string name="title_create_key">Anahtar oluştur</string> <string name="title_create_key">Anahtar oluştur</string>
<string name="title_edit_key">Anahtarı düzenle</string> <string name="title_edit_key">Anahtarı düzenle</string>
<string name="title_preferences">Seçenekler</string> <string name="title_preferences">Seçenekler</string>
@ -8,6 +10,7 @@
<string name="title_key_not_found">Anahtar Bulunamadı</string> <string name="title_key_not_found">Anahtar Bulunamadı</string>
<string name="title_key_server_query">Anahtar Sunucusunu Sorgula</string> <string name="title_key_server_query">Anahtar Sunucusunu Sorgula</string>
<string name="title_sign_key">Anahtarı İmzala</string> <string name="title_sign_key">Anahtarı İmzala</string>
<string name="title_key_details">Anahtar Detayları</string>
<string name="title_help">Yardım</string> <string name="title_help">Yardım</string>
<!--section--> <!--section-->
<string name="section_keys">Anahtarlar</string> <string name="section_keys">Anahtarlar</string>
@ -16,6 +19,10 @@
<string name="section_upload_key">Anahtar Yükle</string> <string name="section_upload_key">Anahtar Yükle</string>
<string name="section_key_server">Anahtar Sunucusu</string> <string name="section_key_server">Anahtar Sunucusu</string>
<!--button--> <!--button-->
<string name="btn_sign_to_clipboard">İmzala (Pano)</string>
<string name="btn_encrypt_to_clipboard">Panoya Şifrele</string>
<string name="btn_encrypt_and_send">Şifrele ve gönder...</string>
<string name="btn_sign_and_send">İmzala ve gönder...</string>
<string name="btn_sign">İmzala</string> <string name="btn_sign">İmzala</string>
<string name="btn_verify">Doğrula</string> <string name="btn_verify">Doğrula</string>
<string name="btn_select_encrypt_keys">Alıcıları Seç</string> <string name="btn_select_encrypt_keys">Alıcıları Seç</string>
@ -32,6 +39,7 @@
<string name="menu_help">Yardım</string> <string name="menu_help">Yardım</string>
<string name="menu_import_from_file">Dosyadan al</string> <string name="menu_import_from_file">Dosyadan al</string>
<string name="menu_import_from_qr_code">QR Kodundan al</string> <string name="menu_import_from_qr_code">QR Kodundan al</string>
<string name="menu_import">Al</string>
<string name="menu_import_from_nfc">NFCden al</string> <string name="menu_import_from_nfc">NFCden al</string>
<string name="menu_export_key">Dosyaya ver</string> <string name="menu_export_key">Dosyaya ver</string>
<string name="menu_delete_key">Anahtar sil</string> <string name="menu_delete_key">Anahtar sil</string>
@ -40,6 +48,7 @@
<string name="menu_edit_key">Anahtarı düzenle</string> <string name="menu_edit_key">Anahtarı düzenle</string>
<string name="menu_search">Ara</string> <string name="menu_search">Ara</string>
<string name="menu_key_server">Anahtar sunucusundan al</string> <string name="menu_key_server">Anahtar sunucusundan al</string>
<string name="menu_copy_to_clipboard">Panoya kopyala</string>
<string name="menu_sign_key">Anahtarı imzala</string> <string name="menu_sign_key">Anahtarı imzala</string>
<string name="menu_key_edit_cancel">İptal</string> <string name="menu_key_edit_cancel">İptal</string>
<!--label--> <!--label-->
@ -48,6 +57,9 @@
<string name="label_file">Dosya</string> <string name="label_file">Dosya</string>
<string name="label_passphrase_again">Tekrar</string> <string name="label_passphrase_again">Tekrar</string>
<string name="label_algorithm">Algoritma</string> <string name="label_algorithm">Algoritma</string>
<string name="label_select_public_keys">Açık Anahtar(lar)</string>
<string name="label_asymmetric">Açık Anahtar</string>
<string name="label_key_servers">Anahtar Sunucuları</string>
<string name="label_creation">Oluşturma</string> <string name="label_creation">Oluşturma</string>
<string name="label_usage">Kullanım</string> <string name="label_usage">Kullanım</string>
<string name="label_key_size">Anahtar Boyutu</string> <string name="label_key_size">Anahtar Boyutu</string>
@ -58,6 +70,7 @@
<string name="one_key_selected">1 Seçili</string> <string name="one_key_selected">1 Seçili</string>
<string name="n_keys_selected">Seçili</string> <string name="n_keys_selected">Seçili</string>
<string name="unknown_status"></string> <string name="unknown_status"></string>
<string name="secret_key">Özel Anahtar:</string>
<!--choice--> <!--choice-->
<string name="choice_15secs">15 saniye</string> <string name="choice_15secs">15 saniye</string>
<string name="choice_1min">1 dakika</string> <string name="choice_1min">1 dakika</string>
@ -80,6 +93,9 @@
<!--sentences--> <!--sentences-->
<string name="file_delete_successful">Başarıyla silindi.</string> <string name="file_delete_successful">Başarıyla silindi.</string>
<string name="no_file_selected">Önce bir dosya seçin.</string> <string name="no_file_selected">Önce bir dosya seçin.</string>
<string name="encryption_successful">Başarıyla şifrelendi.</string>
<string name="keys_added">%s anahtar() başarıyla eklendi.</string>
<string name="keys_updated">%s anahtar() başarıyla yenilendi.</string>
<string name="key_not_found">Anahtar %08X bulunamadı.</string> <string name="key_not_found">Anahtar %08X bulunamadı.</string>
<string name="keys_found">%s anahtar() bulundu.</string> <string name="keys_found">%s anahtar() bulundu.</string>
<string name="key_send_success">Anahtar sunucuya başarıyla gönderildi</string> <string name="key_send_success">Anahtar sunucuya başarıyla gönderildi</string>
@ -89,13 +105,23 @@
no punctuation, all lowercase, no punctuation, all lowercase,
they will be put after "error_message", e.g. "Error: file not found"--> they will be put after "error_message", e.g. "Error: file not found"-->
<string name="error_file_not_found">dosya bulunamadı</string> <string name="error_file_not_found">dosya bulunamadı</string>
<string name="error_invalid_email">geçersiz eposta \'%s\'</string>
<string name="error_key_size_minimum512bit">anahtar uzunluğu en az 512bit olmalı</string>
<string name="error_corrupt_data">bozuk veri</string> <string name="error_corrupt_data">bozuk veri</string>
<!--progress dialogs, usually ending in '…'--> <!--progress dialogs, usually ending in '…'-->
<string name="progress_done">bitti.</string>
<string name="progress_saving">kaydediliyor...</string> <string name="progress_saving">kaydediliyor...</string>
<string name="progress_importing">alıyor...</string>
<string name="progress_exporting">veriyor...</string>
<string name="progress_generating">anahtar üretiliyor, bu biraz süre alabilir...</string>
<string name="progress_building_key">anahtar oluşturuluyor...</string>
<string name="progress_preparing_signature">imza hazırlanıyor...</string> <string name="progress_preparing_signature">imza hazırlanıyor...</string>
<string name="progress_generating_signature">imza oluşturuluyor...</string> <string name="progress_generating_signature">imza oluşturuluyor...</string>
<string name="progress_processing_signature">imza işleniyor...</string> <string name="progress_processing_signature">imza işleniyor...</string>
<string name="progress_verifying_signature">imza doğrulanıyor...</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--> <!--action strings-->
<!--key bit length selections--> <!--key bit length selections-->
<string name="key_size_512">512</string> <string name="key_size_512">512</string>
@ -103,16 +129,27 @@
<string name="key_size_2048">2048</string> <string name="key_size_2048">2048</string>
<string name="key_size_4096">4096</string> <string name="key_size_4096">4096</string>
<!--compression--> <!--compression-->
<string name="compression_fast">hızlı</string>
<string name="compression_very_slow">çok yavaş</string>
<!--Dashboard--> <!--Dashboard-->
<string name="dashboard_my_keys">Özel Anahtarlarım</string>
<string name="dashboard_encrypt">Şifrele</string>
<string name="dashboard_help">Yardım</string>
<!--Help--> <!--Help-->
<string name="help_tab_about">Hakkında</string> <string name="help_tab_about">Hakkında</string>
<string name="help_about_version">Sürüm:</string>
<!--Import--> <!--Import-->
<string name="import_import">Seçili anahtarları al</string>
<string name="import_nfc_help_button">Yardım</string> <string name="import_nfc_help_button">Yardım</string>
<!--Intent labels--> <!--Intent labels-->
<!--Remote API--> <!--Remote API-->
<string name="api_settings_no_key">Anahtar seçilmedi</string> <string name="api_settings_no_key">Anahtar seçilmedi</string>
<string name="api_settings_select_key">Anahtar seç</string> <string name="api_settings_select_key">Anahtar seç</string>
<string name="api_settings_save">Kaydet</string> <string name="api_settings_save">Kaydet</string>
<string name="api_settings_cancel">İptal</string>
<string name="api_register_allow">Erişime izin ver</string>
<string name="api_register_disallow">Erişime izin verme</string>
<string name="api_register_error_select_key">Lütfen bir anahtar seçin!</string>
<!--Share--> <!--Share-->
<!--Key list--> <!--Key list-->
<!--Key view--> <!--Key view-->

24
OpenPGP-Keychain/res/values/arrays.xml
View File

@ -1,23 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources> <resources>
<string-array name="pass_phrase_cache_ttl_entries"> <string-array name="pass_phrase_cache_ttl_entries" translatable="false">
<item>@string/choice_15secs</item> <item>@string/choice_15secs</item>
<item>@string/choice_1min</item> <item>@string/choice_1min</item>
<item>@string/choice_3mins</item> <item>@string/choice_3mins</item>
@ -30,7 +14,7 @@
<item>@string/choice_4hours</item> <item>@string/choice_4hours</item>
<item>@string/choice_8hours</item> <item>@string/choice_8hours</item>
</string-array> </string-array>
<string-array name="pass_phrase_cache_ttl_values"> <string-array name="pass_phrase_cache_ttl_values" translatable="false">
<item>15</item> <item>15</item>
<item>60</item> <item>60</item>
<item>180</item> <item>180</item>
@ -43,13 +27,13 @@
<item>14400</item> <item>14400</item>
<item>28800</item> <item>28800</item>
</string-array> </string-array>
<string-array name="key_size_spinner_values"> <string-array name="key_size_spinner_values" translatable="false">
<item>@string/key_size_512</item> <item>@string/key_size_512</item>
<item>@string/key_size_1024</item> <item>@string/key_size_1024</item>
<item>@string/key_size_2048</item> <item>@string/key_size_2048</item>
<item>@string/key_size_4096</item> <item>@string/key_size_4096</item>
</string-array> </string-array>
<string-array name="import_action_list"> <string-array name="import_action_list" translatable="false">
<item>@string/menu_key_server</item> <item>@string/menu_key_server</item>
<item>@string/menu_import_from_file</item> <item>@string/menu_import_from_file</item>
<item>@string/menu_import_from_qr_code</item> <item>@string/menu_import_from_qr_code</item>

7
OpenPGP-Keychain/res/values/dimens.xml
View File

@ -1,7 +0,0 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
</resources>

2
OpenPGP-Keychain/res/values/static_strings.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name" translate="false">OpenPGP Keychain</string> <string name="app_name" translatable="false">OpenPGP Keychain</string>
</resources> </resources>

26
OpenPGP-Keychain/res/values/strings.xml
View File

@ -29,7 +29,6 @@
<string name="title_sign_key">Sign Key</string> <string name="title_sign_key">Sign Key</string>
<string name="title_key_details">Key Details</string> <string name="title_key_details">Key Details</string>
<string name="title_help">Help</string> <string name="title_help">Help</string>
<string name="title_share_by_nfc">Share key with NFC</string>
<!-- section --> <!-- section -->
<string name="section_user_ids">User IDs</string> <string name="section_user_ids">User IDs</string>
@ -69,7 +68,6 @@
<!-- menu --> <!-- menu -->
<string name="menu_preferences">Settings</string> <string name="menu_preferences">Settings</string>
<string name="menu_help">Help</string> <string name="menu_help">Help</string>
<string name="menu_api_app_settings">Registered Apps</string>
<string name="menu_import_from_file">Import from file</string> <string name="menu_import_from_file">Import from file</string>
<string name="menu_import_from_qr_code">Import from QR Code</string> <string name="menu_import_from_qr_code">Import from QR Code</string>
<string name="menu_import">Import</string> <string name="menu_import">Import</string>
@ -79,7 +77,6 @@
<string name="menu_delete_key">Delete key</string> <string name="menu_delete_key">Delete key</string>
<string name="menu_create_key">Create key</string> <string name="menu_create_key">Create key</string>
<string name="menu_create_key_expert">Create key (expert)</string> <string name="menu_create_key_expert">Create key (expert)</string>
<string name="menu_edit_key">Edit key</string>
<string name="menu_search">Search</string> <string name="menu_search">Search</string>
<string name="menu_key_server">Import from key server</string> <string name="menu_key_server">Import from key server</string>
<string name="menu_update_key">Update from key server</string> <string name="menu_update_key">Update from key server</string>
@ -151,7 +148,6 @@
<string name="fingerprint">Fingerprint:</string> <string name="fingerprint">Fingerprint:</string>
<string name="secret_key">Secret Key:</string> <string name="secret_key">Secret Key:</string>
<string name="notValid">not valid</string>
<!-- choice --> <!-- choice -->
<string name="choice_none">None</string> <string name="choice_none">None</string>
@ -211,12 +207,10 @@
<item quantity="one"> and updated %d key.</item> <item quantity="one"> and updated %d key.</item>
<item quantity="other"> and updated %d keys.</item> <item quantity="other"> and updated %d keys.</item>
</plurals> </plurals>
<plurals name="keys_added"> <plurals name="keys_added">
<item quantity="one">Successfully added %d key.</item> <item quantity="one">Successfully added %d key.</item>
<item quantity="other">Successfully added %d keys.</item> <item quantity="other">Successfully added %d keys.</item>
</plurals> </plurals>
<plurals name="keys_updated"> <plurals name="keys_updated">
<item quantity="one">Successfully updated %d key.</item> <item quantity="one">Successfully updated %d key.</item>
<item quantity="other">Successfully updated %d keys.</item> <item quantity="other">Successfully updated %d keys.</item>
@ -228,10 +222,12 @@
<string name="no_keys_exported">No keys exported.</string> <string name="no_keys_exported">No keys exported.</string>
<string name="key_creation_el_gamal_info">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string> <string name="key_creation_el_gamal_info">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string>
<string name="key_not_found">Couldn\'t find key %08X.</string> <string name="key_not_found">Couldn\'t find key %08X.</string>
<plurals name="keys_found"> <plurals name="keys_found">
<item quantity="one">Found %d key.</item> <item quantity="one">Found %d key.</item>
<item quantity="other">Found %d keys.</item> <item quantity="other">Found %d keys.</item>
</plurals> </plurals>
<string name="unknown_signature_key_touch_to_look_up">Unknown signature, touch to look up key.</string> <string name="unknown_signature_key_touch_to_look_up">Unknown signature, touch to look up key.</string>
<string name="bad_keys_encountered">%d bad secret key(s) ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</string> <string name="bad_keys_encountered">%d bad secret key(s) ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</string>
<string name="lookup_unknown_key">Unknown key %s, do you want to try finding it on a keyserver?</string> <string name="lookup_unknown_key">Unknown key %s, do you want to try finding it on a keyserver?</string>
@ -289,10 +285,14 @@
<string name="progress_certifying_master_key">certifying master key…</string> <string name="progress_certifying_master_key">certifying master key…</string>
<string name="progress_building_master_key">building master ring…</string> <string name="progress_building_master_key">building master ring…</string>
<string name="progress_adding_sub_keys">adding sub keys…</string> <string name="progress_adding_sub_keys">adding sub keys…</string>
<string name="progress_saving_key_ring">saving key key…</string> <string name="progress_saving_key_ring">saving key…</string>
<string name="progress_importing_secret_keys">importing secret keys…</string> <string name="progress_importing_secret_keys">importing secret keys…</string>
<string name="progress_exporting_key">exporting key…</string>
<string name="progress_exporting_keys">exporting keys…</string> <plurals name="progress_exporting_key">
<item quantity="one">exporting key…</item>
<item quantity="other">exporting keys…</item>
</plurals>
<string name="progress_extracting_signature_key">extracting signature key…</string> <string name="progress_extracting_signature_key">extracting signature key…</string>
<string name="progress_extracting_key">extracting key…</string> <string name="progress_extracting_key">extracting key…</string>
<string name="progress_preparing_streams">preparing streams…</string> <string name="progress_preparing_streams">preparing streams…</string>
@ -325,14 +325,6 @@
<string name="compression_fast">fast</string> <string name="compression_fast">fast</string>
<string name="compression_very_slow">very slow</string> <string name="compression_very_slow">very slow</string>
<!-- Dashboard -->
<string name="dashboard_manage_keys">Contacts</string>
<string name="dashboard_my_keys">My Secret Keys</string>
<string name="dashboard_encrypt">Encrypt</string>
<string name="dashboard_decrypt">Decrypt</string>
<string name="dashboard_help">Help</string>
<string name="dashboard_import_keys">Import Keys</string>
<!-- Help --> <!-- Help -->
<string name="help_tab_start">Start</string> <string name="help_tab_start">Start</string>
<string name="help_tab_nfc_beam">NFC Beam</string> <string name="help_tab_nfc_beam">NFC Beam</string>

30
OpenPGP-Keychain/res/values/styles.xml
View File

@ -1,40 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources> <resources>
<style name="DashboardButton">
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:drawablePadding">2dp</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<item name="android:background">@android:color/transparent</item>
</style>
<style name="SectionHeader"> <style name="SectionHeader">
<item name="android:drawableBottom">@drawable/section_header</item> <item name="android:drawableBottom">@drawable/section_header</item>
<item name="android:drawablePadding">4dp</item> <item name="android:drawablePadding">4dp</item>
<item name="android:layout_marginTop">8dp</item> <item name="android:layout_marginTop">8dp</item>
<item name="android:paddingLeft">4dp</item> <item name="android:paddingLeft">4dp</item>
<!-- <item name="android:textAllCaps">true</item> --> <!-- <item name="android:textAllCaps">true</item> -->
<item name="android:textColor">@color/emphasis</item> <item name="android:textColor">@color/emphasis</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
</style> </style>

17
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
View File

@ -24,9 +24,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import org.spongycastle.bcpg.ArmoredOutputStream; import org.spongycastle.bcpg.ArmoredOutputStream;
import org.spongycastle.openpgp.PGPException; import org.spongycastle.openpgp.PGPException;
@ -72,6 +69,12 @@ public class PgpImportExport {
} }
} }
public void updateProgress(String message, int current, int total) {
if (mProgress != null) {
mProgress.setProgress(message, current, total);
}
}
public void updateProgress(int current, int total) { public void updateProgress(int current, int total) {
if (mProgress != null) { if (mProgress != null) {
mProgress.setProgress(current, total); mProgress.setProgress(current, total);
@ -194,11 +197,9 @@ public class PgpImportExport {
PGPException, IOException { PGPException, IOException {
Bundle returnData = new Bundle(); Bundle returnData = new Bundle();
if (keyRingMasterKeyIds.size() == 1) { updateProgress(
updateProgress(R.string.progress_exporting_key, 0, 100); mContext.getResources().getQuantityString(R.plurals.progress_exporting_key,
} else { keyRingMasterKeyIds.size()), 0, 100);
updateProgress(R.string.progress_exporting_keys, 0, 100);
}
if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
throw new PgpGeneralException( throw new PgpGeneralException(