From 1b1927883b2c08a0c062fa0fcd65e97766218c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 19 Jan 2014 16:06:23 +0100 Subject: [PATCH] more language fixes and cleanup --- .../abs__ab_bottom_solid_light_holo.9.png | Bin 144 -> 0 bytes .../abs__ab_bottom_solid_light_holo.9.png | Bin 134 -> 0 bytes .../abs__ab_bottom_solid_light_holo.9.png | Bin 166 -> 0 bytes .../res/drawable/ic_btn_round_minus.png | Bin 288 -> 0 bytes .../res/drawable/ic_btn_round_plus.png | Bin 526 -> 0 bytes .../res/raw-fr/help_changelog.html | 40 +++++++++--------- OpenPGP-Keychain/res/raw-tr/help_about.html | 6 +-- .../res/values-sw600dp/dimens.xml | 8 ---- .../res/values-sw720dp-land/dimens.xml | 9 ---- OpenPGP-Keychain/res/values-tr/strings.xml | 37 ++++++++++++++++ OpenPGP-Keychain/res/values/arrays.xml | 24 ++--------- OpenPGP-Keychain/res/values/dimens.xml | 7 --- .../res/values/static_strings.xml | 2 +- OpenPGP-Keychain/res/values/strings.xml | 26 ++++-------- OpenPGP-Keychain/res/values/styles.xml | 30 +------------ .../keychain/pgp/PgpImportExport.java | 17 ++++---- 16 files changed, 84 insertions(+), 122 deletions(-) delete mode 100644 OpenPGP-Keychain/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png delete mode 100644 OpenPGP-Keychain/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png delete mode 100644 OpenPGP-Keychain/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png delete mode 100644 OpenPGP-Keychain/res/drawable/ic_btn_round_minus.png delete mode 100644 OpenPGP-Keychain/res/drawable/ic_btn_round_plus.png delete mode 100644 OpenPGP-Keychain/res/values-sw600dp/dimens.xml delete mode 100644 OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml delete mode 100644 OpenPGP-Keychain/res/values/dimens.xml diff --git a/OpenPGP-Keychain/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png deleted file mode 100644 index 73050476e77aa798919b829a5566973e231f9d49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^S!aZFaLn02py|Iz^fCC51!MFRR zxpqaJ>-4UOe6iPKwm$=BLD{Wo!i)yScSSDT-Jo*!N?wFe;-MB!VKtu_20%tEPqwzt q4f{lgTEQ5`;-9UxjMeKCf^DQ_uhd?;-Btm#g2B_(&t;ucLK6V6dokDm diff --git a/OpenPGP-Keychain/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png deleted file mode 100644 index 0706c8af658bde9602634950dfe3d5fa5886163f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%zMd|QAs)xyUfsxfz<`JK;_Z5A z-Y@ApO*&r-OgQM+#9X>wkYiu(tId138dhyGKCm}H$eLN@qysZ=3D*)nlM7YC@0xyy hn}nCMmBhQI$CPR`ipOiMnG7_T!PC{xWt~$(698&aE5rZ* diff --git a/OpenPGP-Keychain/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png deleted file mode 100644 index 8155fe840532e1d0fc25450729892ea73c4e007a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nETTu&Frkc@k8Z|>$jV8FrZ@J;?q zbcL8uwC8*^`8m#29p5Ib=%`p$wC&7oqt#odO)b{rdQv>$UUk^Hs0pDSr z1<%~X^wgl##FWaylc_d9MTb0H978H@y}4q`=jbTH`k?si9v9UqTD*IGBO1Emw1u=U zW~^MPb08>VO~VQmo9i2!E6@A8oKsPs>G|y5&#u{q<;V5)gnbMSvcQRbT(f8MR@90H zHYM0=r(H!Qin zQ4iA$!x^JaVxPqXA86AX7;p1QN&cbShOGi{5imY9v-3lM28rtn=V4U6#czHA>_WYRPbox%K?ig(m=7Wy|UF5 zxK~E|kb#;zi=}=M2bO~VhRRAwZb_I0nEpyqFa=XE1ye8uQ!oYlTlp4X0EjV>gx4b+ Q$^ZZW07*qoM6N<$f|9b`bpQYW diff --git a/OpenPGP-Keychain/res/raw-fr/help_changelog.html b/OpenPGP-Keychain/res/raw-fr/help_changelog.html index 138483c14..9d2a95ad0 100644 --- a/OpenPGP-Keychain/res/raw-fr/help_changelog.html +++ b/OpenPGP-Keychain/res/raw-fr/help_changelog.html @@ -9,7 +9,7 @@
  • Beaucoup de bogues corrigés
  • Nouvelle API pour les développeurs
    • -
  • Correction du blogue PRNG par Google
    • +
  • Correctif du blogue PRNG par Google

2.0

    @@ -26,7 +26,7 @@
  • app2sd (non-testé, me signaler tout problème)
  • plus de choix pour le cache de phrase de passe : 1, 2, 4, 8 heures
  • traductions : norvégien (merci Sander Danielsen), chinois (merci Zhang Fredrick)
    • -
  • corrections de bogues
    • +
  • correctifs de bogues
  • optimisations

1.0.7

@@ -39,46 +39,46 @@
  • correction de l'ajout de compte sur Froyo
  • suppression sécurisée de fichiers
  • option de suppression du fichier de clef après l'importation
    • -
  • chiffrage/déchiffrage de flux (galerie, etc...)
    • +
  • chiffrement/déchiffrement de flux (galerie, etc...)
  • nouvelles options (langue, forcer les signatures v3)
  • changements dans l'interface
    • -
  • corrections de bogues
    • +
  • correctifs de bogues

    • 1.0.5

      -
    • German and Italian translation
      • -
    • much smaller package, due to reduced BC sources
      • -
    • new preferences GUI
      • -
    • layout adjustment for localization
      • -
    • signature bugfix
      • +
    • Traduction allemande et italienne
      • +
    • paquet beaucoup plus petit grâce à des sources BC réduites
      • +
    • nouvelle interface utilisateur pour les paramètres
      • +
    • ajustement de la mise en page pour les localisations
      • +
    • correctif de bogue de signature

    1.0.4

      -
    • fixed another crash caused by some SDK bug with query builder
      • +
    • correction d'un autre plantage causé par quelque bogue SDK avec le constructeur de requêtes

    1.0.3

      -
    • fixed crashes during encryption/signing and possibly key export
      • +
    • corrections de plantages durant le chiffrement/la signature et aussi peut-être l'exportation de clef

    1.0.2

      -
    • filterable key lists
      • -
    • smarter preselection of encryption keys
      • -
    • new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
      • -
    • fixes and additional features (key preselection) for k9, new beta build available
      • +
    • listes de clefs filtrables
      • +
    • présélection plus intelligente ds clefs de chiffrement
      • +
    • nouvelle gestion des intentions pour VIEW et SEND, permet le chiffrement/déchiffrement des fichiers depuis les gestionnaires de fichiers
      • +
    • correctifs et fonctions additionnelles (présélection des clefs) pour k9, nouvelle version bêta disponible.

    1.0.1

      -
    • GMail account listing was broken in 1.0.0, fixed again
      • +
    • Le listage des comptes Gmail était brisé dans 1.0.0, maintenant corrigé

    1.0.0

      -
    • k9mail integration, APG supporting beta build of k9mail
      • -
    • support of more file managers (including ASTRO)
      • -
    • Slovenian translation
      • +
    • intégration K-9 Mail, APG prenant en charge la version bêta de K-9 Mail
      • +
    • prise en charge de plus de gestionnaires de fichiers (incluant ASTRO)
      • +
    • Traduction slovène
    • new database, much faster, less memory usage
    • defined Intents and content provider for other apps
      • -
    • corrections de bogues
      • +
    • correctifs de bogues
    diff --git a/OpenPGP-Keychain/res/raw-tr/help_about.html b/OpenPGP-Keychain/res/raw-tr/help_about.html index 7db2f83de..1f081ba99 100644 --- a/OpenPGP-Keychain/res/raw-tr/help_about.html +++ b/OpenPGP-Keychain/res/raw-tr/help_about.html @@ -3,11 +3,11 @@

    http://sufficientlysecure.org/keychain

    OpenPGP Keychain is an OpenPGP implementation for Android. The development began as a fork of Android Privacy Guard (APG).

    -

    License: GPLv3+

    +

    Lisans: GPLv3+

    -

    Developers OpenPGP Keychain

    +

    Geliştiriciler OpenPGP Keychain

      -
    • Dominik Schürmann (Lead developer)
      • +
    • Dominik Schürmann (Baş geliştirici)
    • Ash Hughes (crypto patches)
    • Brian C. Barnes
    • Bahtiar 'kalkin' Gadimov (UI)
      • diff --git a/OpenPGP-Keychain/res/values-sw600dp/dimens.xml b/OpenPGP-Keychain/res/values-sw600dp/dimens.xml deleted file mode 100644 index 1ba777d65..000000000 --- a/OpenPGP-Keychain/res/values-sw600dp/dimens.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml b/OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml deleted file mode 100644 index eee741a51..000000000 --- a/OpenPGP-Keychain/res/values-sw720dp-land/dimens.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - 128dp - - \ No newline at end of file diff --git a/OpenPGP-Keychain/res/values-tr/strings.xml b/OpenPGP-Keychain/res/values-tr/strings.xml index b4779ae0a..ea0106534 100644 --- a/OpenPGP-Keychain/res/values-tr/strings.xml +++ b/OpenPGP-Keychain/res/values-tr/strings.xml @@ -1,6 +1,8 @@ + Açık Anahtar Seç + Özel Anahtar Seç Anahtar oluştur Anahtarı düzenle Seçenekler @@ -8,6 +10,7 @@ Anahtar Bulunamadı Anahtar Sunucusunu Sorgula Anahtarı İmzala + Anahtar Detayları Yardım Anahtarlar @@ -16,6 +19,10 @@ Anahtar Yükle Anahtar Sunucusu + İmzala (Pano) + Panoya Şifrele + Şifrele ve gönder... + İmzala ve gönder... İmzala Doğrula Alıcıları Seç @@ -32,6 +39,7 @@ Yardım Dosyadan al QR Kodundan al + Al NFCden al Dosyaya ver Anahtar sil @@ -40,6 +48,7 @@ Anahtarı düzenle Ara Anahtar sunucusundan al + Panoya kopyala Anahtarı imzala İptal @@ -48,6 +57,9 @@ Dosya Tekrar Algoritma + Açık Anahtar(lar) + Açık Anahtar + Anahtar Sunucuları Oluşturma Kullanım Anahtar Boyutu @@ -58,6 +70,7 @@ 1 Seçili Seçili + Özel Anahtar: 15 saniye 1 dakika @@ -80,6 +93,9 @@ Başarıyla silindi. Önce bir dosya seçin. + Başarıyla şifrelendi. + %s anahtar() başarıyla eklendi. + %s anahtar() başarıyla yenilendi. Anahtar %08X bulunamadı. %s anahtar() bulundu. Anahtar sunucuya başarıyla gönderildi @@ -89,13 +105,23 @@ no punctuation, all lowercase, they will be put after "error_message", e.g. "Error: file not found"--> dosya bulunamadı + geçersiz eposta \'%s\' + anahtar uzunluğu en az 512bit olmalı bozuk veri + bitti. kaydediliyor... + alıyor... + veriyor... + anahtar üretiliyor, bu biraz süre alabilir... + anahtar oluşturuluyor... imza hazırlanıyor... imza oluşturuluyor... imza işleniyor... imza doğrulanıyor... + imzalanıyor... + veri okunuyor... + anahtar bulunuyor... 512 @@ -103,16 +129,27 @@ 2048 4096 + hızlı + çok yavaş + Özel Anahtarlarım + Şifrele + Yardım Hakkında + Sürüm: + Seçili anahtarları al Yardım Anahtar seçilmedi Anahtar seç Kaydet + İptal + Erişime izin ver + Erişime izin verme + Lütfen bir anahtar seçin! diff --git a/OpenPGP-Keychain/res/values/arrays.xml b/OpenPGP-Keychain/res/values/arrays.xml index bd547b302..0c1684919 100644 --- a/OpenPGP-Keychain/res/values/arrays.xml +++ b/OpenPGP-Keychain/res/values/arrays.xml @@ -1,23 +1,7 @@ - - - + @string/choice_15secs @string/choice_1min @string/choice_3mins @@ -30,7 +14,7 @@ @string/choice_4hours @string/choice_8hours - + 15 60 180 @@ -43,13 +27,13 @@ 14400 28800 - + @string/key_size_512 @string/key_size_1024 @string/key_size_2048 @string/key_size_4096 - + @string/menu_key_server @string/menu_import_from_file @string/menu_import_from_qr_code diff --git a/OpenPGP-Keychain/res/values/dimens.xml b/OpenPGP-Keychain/res/values/dimens.xml deleted file mode 100644 index a6dd14032..000000000 --- a/OpenPGP-Keychain/res/values/dimens.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 16dp - 16dp - - \ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/static_strings.xml b/OpenPGP-Keychain/res/values/static_strings.xml index ac5b024b4..3c9cf6673 100644 --- a/OpenPGP-Keychain/res/values/static_strings.xml +++ b/OpenPGP-Keychain/res/values/static_strings.xml @@ -1,6 +1,6 @@ - OpenPGP Keychain + OpenPGP Keychain \ No newline at end of file diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index fe243bfbc..7692ac50d 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -29,7 +29,6 @@ Sign Key Key Details Help - Share key with NFC User IDs @@ -69,7 +68,6 @@ Settings Help - Registered Apps Import from file Import from QR Code Import @@ -79,7 +77,6 @@ Delete key Create key Create key (expert) - Edit key Search Import from key server Update from key server @@ -151,7 +148,6 @@ Fingerprint: Secret Key: - not valid None @@ -211,12 +207,10 @@ and updated %d key. and updated %d keys. - Successfully added %d key. Successfully added %d keys. - Successfully updated %d key. Successfully updated %d keys. @@ -228,10 +222,12 @@ No keys exported. Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used. Couldn\'t find key %08X. + Found %d key. Found %d keys. + Unknown signature, touch to look up key. %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. Unknown key %s, do you want to try finding it on a keyserver? @@ -289,10 +285,14 @@ certifying master key… building master ring… adding sub keys… - saving key key… + saving key… importing secret keys… - exporting key… - exporting keys… + + + exporting key… + exporting keys… + + extracting signature key… extracting key… preparing streams… @@ -325,14 +325,6 @@ fast very slow - - Contacts - My Secret Keys - Encrypt - Decrypt - Help - Import Keys - Start NFC Beam diff --git a/OpenPGP-Keychain/res/values/styles.xml b/OpenPGP-Keychain/res/values/styles.xml index 15214fa62..9e61bbef4 100644 --- a/OpenPGP-Keychain/res/values/styles.xml +++ b/OpenPGP-Keychain/res/values/styles.xml @@ -1,40 +1,12 @@ - - - - diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java index 2d112cc72..0a4806239 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpImportExport.java @@ -24,9 +24,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; import org.spongycastle.bcpg.ArmoredOutputStream; 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) { if (mProgress != null) { mProgress.setProgress(current, total); @@ -194,11 +197,9 @@ public class PgpImportExport { PGPException, IOException { Bundle returnData = new Bundle(); - if (keyRingMasterKeyIds.size() == 1) { - updateProgress(R.string.progress_exporting_key, 0, 100); - } else { - updateProgress(R.string.progress_exporting_keys, 0, 100); - } + updateProgress( + mContext.getResources().getQuantityString(R.plurals.progress_exporting_key, + keyRingMasterKeyIds.size()), 0, 100); if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { throw new PgpGeneralException(