diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e43d5f3f3..aa6975b2e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -166,9 +166,9 @@
Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.
Do you really want to delete the key '%s'?\nYou can't undo this!
Do you really want to delete the SECRET key '%s'?\nYou can't undo this!
- Succssfully added %s keys and updated %s keys."
- Succssfully added %s keys.
- Succssfully updated %s keys.
+ Succssfully added %s key(s) and updated %s key(s)."
+ Succssfully added %s key(s).
+ Succssfully updated %s key(s).
No keys added or updated.
Succssfully exported 1 key.
Succssfully exported %s keys.
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e43d5f3f3..aa6975b2e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -166,9 +166,9 @@
Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.
Do you really want to delete the key '%s'?\nYou can't undo this!
Do you really want to delete the SECRET key '%s'?\nYou can't undo this!
- Succssfully added %s keys and updated %s keys."
- Succssfully added %s keys.
- Succssfully updated %s keys.
+ Succssfully added %s key(s) and updated %s key(s)."
+ Succssfully added %s key(s).
+ Succssfully updated %s key(s).
No keys added or updated.
Succssfully exported 1 key.
Succssfully exported %s keys.
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e43d5f3f3..aa6975b2e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -166,9 +166,9 @@
Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.
Do you really want to delete the key '%s'?\nYou can't undo this!
Do you really want to delete the SECRET key '%s'?\nYou can't undo this!
- Succssfully added %s keys and updated %s keys."
- Succssfully added %s keys.
- Succssfully updated %s keys.
+ Succssfully added %s key(s) and updated %s key(s)."
+ Succssfully added %s key(s).
+ Succssfully updated %s key(s).
No keys added or updated.
Succssfully exported 1 key.
Succssfully exported %s keys.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e43d5f3f3..aa6975b2e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -166,9 +166,9 @@
Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.
Do you really want to delete the key '%s'?\nYou can't undo this!
Do you really want to delete the SECRET key '%s'?\nYou can't undo this!
- Succssfully added %s keys and updated %s keys."
- Succssfully added %s keys.
- Succssfully updated %s keys.
+ Succssfully added %s key(s) and updated %s key(s)."
+ Succssfully added %s key(s).
+ Succssfully updated %s key(s).
No keys added or updated.
Succssfully exported 1 key.
Succssfully exported %s keys.
diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java
index dee9fe94e..c9a163f94 100644
--- a/src/org/thialfihar/android/apg/Apg.java
+++ b/src/org/thialfihar/android/apg/Apg.java
@@ -691,7 +691,6 @@ public class Apg {
ProgressDialogUpdater progress)
throws GeneralException, FileNotFoundException, PGPException, IOException {
Bundle returnData = new Bundle();
- PGPObjectFactory objectFactory = null;
if (type == Id.type.secret_key) {
progress.setProgress(R.string.progress_importingSecretKeys, 0, 100);
@@ -704,47 +703,48 @@ public class Apg {
}
FileInputStream fileIn = new FileInputStream(filename);
- InputStream in = PGPUtil.getDecoderStream(fileIn);
- objectFactory = new PGPObjectFactory(in);
-
- Vector