aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-02-01 23:04:35 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-02-01 23:04:35 +0100
commitd385f9cce007aa0caf63a5da0696561e5047b2cf (patch)
treede8b537db5ce631727b74e02e45de4be8b9fd0e5 /OpenPGP-Keychain
parentb49bf09e909b11da73e73db11d4d5349c04e2e8e (diff)
downloadopen-keychain-d385f9cce007aa0caf63a5da0696561e5047b2cf.tar.gz
open-keychain-d385f9cce007aa0caf63a5da0696561e5047b2cf.tar.bz2
open-keychain-d385f9cce007aa0caf63a5da0696561e5047b2cf.zip
importing progress dialog language fixed
Diffstat (limited to 'OpenPGP-Keychain')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java2
-rw-r--r--OpenPGP-Keychain/src/main/res/values/strings.xml1
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index 9018bd21c..0e12a94f4 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -113,7 +113,7 @@ public class PgpImportExport {
public Bundle importKeyRings(List<ImportKeysListEntry> entries) throws PgpGeneralException, PGPException, IOException {
Bundle returnData = new Bundle();
- updateProgress(R.string.progress_importing_secret_keys, 0, entries.size());
+ updateProgress(R.string.progress_importing, 0, entries.size());
int newKeys = 0;
int oldKeys = 0;
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 61d6bbe30..c47f9e860 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -294,7 +294,6 @@
<string name="progress_building_master_key">building master ring…</string>
<string name="progress_adding_sub_keys">adding sub keys…</string>
<string name="progress_saving_key_ring">saving key…</string>
- <string name="progress_importing_secret_keys">importing secret keys…</string>
<plurals name="progress_exporting_key">
<item quantity="one">exporting key…</item>