diff --git a/.gitignore b/.gitignore
index 8642510bb..2e423e1a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,23 @@
-bin/
-gen/
-.classpath
+#Android generated
+bin
+gen
+obj
+libs/armeabi
+lint.xml
+local.properties
+
+#Eclipse
 .project
-.DS_Store
+.classpath
 .settings
+
+#IntelliJ IDEA
+.idea
+*.iml
+
+#Maven
+target
+release.properties
+
+#Mac
+.DS_Store
\ No newline at end of file
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 645fbcc58..fc7625216 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,255 +1,227 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!-- 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. -->
 
-     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.
--->
-
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    android:installLocation="auto"
     package="org.thialfihar.android.apg"
-    android:versionCode="11000" android:versionName="1.1"
-    android:installLocation="auto">
+    android:versionCode="11000"
+    android:versionName="1.1" >
 
-    <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name">
+    <uses-sdk
+        android:minSdkVersion="3"
+        android:targetSdkVersion="14" />
 
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:configChanges="keyboardHidden|orientation|keyboard">
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-        </activity>
-
-        <activity
-            android:name=".PublicKeyListActivity"
-            android:label="@string/title_managePublicKeys"
-            android:configChanges="keyboardHidden|orientation|keyboard"
-            android:launchMode="singleTop">
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable_public_keys"/>
-
-        </activity>
-
-        <activity
-            android:name=".SecretKeyListActivity"
-            android:label="@string/title_manageSecretKeys"
-            android:configChanges="keyboardHidden|orientation|keyboard"
-            android:launchMode="singleTop">
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable_secret_keys"/>
-
-        </activity>
-
-        <activity
-            android:name=".EditKeyActivity"
-            android:label="@string/title_editKey"
-            android:configChanges="keyboardHidden|orientation|keyboard"/>
-
-        <activity
-            android:name=".SelectPublicKeyListActivity"
-            android:label="@string/title_selectRecipients"
-            android:configChanges="keyboardHidden|orientation|keyboard"
-            android:launchMode="singleTop">
-
-            <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.SELECT_PUBLIC_KEYS" />
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable_public_keys"/>
-
-        </activity>
-
-        <activity
-            android:name=".SelectSecretKeyListActivity"
-            android:label="@string/title_selectSignature"
-            android:configChanges="keyboardHidden|orientation|keyboard"
-            android:launchMode="singleTop">
-
-            <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.SELECT_SECRET_KEY" />
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable_secret_keys"/>
-
-        </activity>
-
-        <activity
-            android:name=".EncryptActivity"
-            android:label="@string/title_encrypt"
-            android:configChanges="keyboardHidden|orientation|keyboard">
-
-            <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT" />
-                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_FILE" />
-                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_AND_RETURN" />
-                <action android:name="org.thialfihar.android.apg.intent.GENERATE_SIGNATURE" />
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="*/*"/>
-            </intent-filter>
-
-        </activity>
-
-        <activity
-            android:name=".DecryptActivity"
-            android:label="@string/title_decrypt"
-            android:configChanges="keyboardHidden|orientation|keyboard">
-
-            <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.DECRYPT" />
-                <action android:name="org.thialfihar.android.apg.intent.DECRYPT_FILE" />
-                <action android:name="org.thialfihar.android.apg.intent.DECRYPT_AND_RETURN" />
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="*/*"/>
-            </intent-filter>
-
-        </activity>
-
-        <activity
-            android:name=".GeneralActivity"
-            android:label="@string/app_name"
-            android:configChanges="keyboardHidden|orientation|keyboard"
-            android:theme="@android:style/Theme.Dialog">
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="*/*" android:scheme="file"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="text/*" android:scheme=""/>
-            </intent-filter>
-
-        </activity>
-
-        <activity
-            android:name=".MailListActivity"
-            android:label="@string/title_mailInbox"
-            android:configChanges="keyboardHidden|orientation|keyboard"/>
-
-        <activity
-            android:name=".KeyServerQueryActivity"
-            android:label="@string/title_keyServerQuery"
-            android:configChanges="keyboardHidden|orientation|keyboard"/>
-
-        <activity
-            android:name=".SendKeyActivity"
-            android:label="@string/title_sendKey"
-            android:configChanges="keyboardHidden|orientation|keyboard"/>
-
-        <activity
-            android:name=".PreferencesActivity"
-            android:label="@string/title_preferences"
-            android:configChanges="keyboardHidden|orientation|keyboard"/>
-
-        <activity
-            android:name=".KeyServerPreferenceActivity"
-            android:label="@string/title_keyServerPreference"
-            android:configChanges="keyboardHidden|orientation|keyboard"/>
-
-        <activity
-            android:name=".SignKeyActivity"
-            android:label="@string/title_signKey"
-            android:configChanges="keyboardHidden|orientation|keyboard"/>
-            
-        <activity
-            android:name=".ImportFromQRCodeActivity"
-            android:label="@string/title_importFromQRCode"
-            android:configChanges="keyboardHidden|orientation|keyboard"/>
-
-
-        <service android:name=".Service" />
-        <service
-            android:name=".ApgService"
-            android:enabled="true" android:exported="true"
-            android:process=":remote"
-            android:permission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS"
-            >
-            <intent-filter>
-                <action android:name="org.thialfihar.android.apg.IApgService"/>
-            </intent-filter>
-            <meta-data android:name="api_version" android:value="2" />
-        </service>  
-        <provider
-            android:readPermission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS"
-            android:name="org.thialfihar.android.apg.provider.DataProvider"
-            android:authorities="org.thialfihar.android.apg.provider"/>
-            
-        <provider
-            android:permission="org.thialfihar.android.apg.permission.STORE_BLOBS"
-            android:name="org.thialfihar.android.apg.provider.ApgServiceBlobProvider"
-            android:authorities="org.thialfihar.android.apg.provider.apgserviceblobprovider"/>
-
-    </application>
-    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
-
-    <permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS"
-                android:protectionLevel="dangerous"
-                android:label="@string/permission_read_key_details_label"
-                android:description="@string/permission_read_key_details_description"/>
-
-    <permission android:name="org.thialfihar.android.apg.permission.STORE_BLOBS"
-                android:protectionLevel="dangerous"
-                android:label="@string/permission_store_blobs_label"
-                android:description="@string/permission_store_blobs_description"/>
+    <permission
+        android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS"
+        android:description="@string/permission_read_key_details_description"
+        android:label="@string/permission_read_key_details_label"
+        android:protectionLevel="dangerous" />
+    <permission
+        android:name="org.thialfihar.android.apg.permission.STORE_BLOBS"
+        android:description="@string/permission_store_blobs_description"
+        android:label="@string/permission_store_blobs_label"
+        android:protectionLevel="dangerous" />
 
     <uses-permission android:name="com.google.android.providers.gmail.permission.READ_GMAIL" />
     <uses-permission android:name="com.google.android.gm.permission.READ_GMAIL" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.fsck.k9.permission.READ_ATTACHMENT" />
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="org.thialfihar.android.apg.permission.STORE_BLOBS"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="org.thialfihar.android.apg.permission.STORE_BLOBS" />
 
-</manifest>
+    <application
+        android:icon="@drawable/icon"
+        android:label="@string/app_name" >
+        <activity
+            android:name=".MainActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".PublicKeyListActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_managePublicKeys"
+            android:launchMode="singleTop" >
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable_public_keys" />
+        </activity>
+        <activity
+            android:name=".SecretKeyListActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_manageSecretKeys"
+            android:launchMode="singleTop" >
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable_secret_keys" />
+        </activity>
+        <activity
+            android:name=".EditKeyActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_editKey" />
+        <activity
+            android:name=".SelectPublicKeyListActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_selectRecipients"
+            android:launchMode="singleTop" >
+            <intent-filter>
+                <action android:name="org.thialfihar.android.apg.intent.SELECT_PUBLIC_KEYS" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable_public_keys" />
+        </activity>
+        <activity
+            android:name=".SelectSecretKeyListActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_selectSignature"
+            android:launchMode="singleTop" >
+            <intent-filter>
+                <action android:name="org.thialfihar.android.apg.intent.SELECT_SECRET_KEY" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable_secret_keys" />
+        </activity>
+        <activity
+            android:name=".EncryptActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_encrypt" >
+            <intent-filter>
+                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT" />
+                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_FILE" />
+                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_AND_RETURN" />
+                <action android:name="org.thialfihar.android.apg.intent.GENERATE_SIGNATURE" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="*/*" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".DecryptActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_decrypt" >
+            <intent-filter>
+                <action android:name="org.thialfihar.android.apg.intent.DECRYPT" />
+                <action android:name="org.thialfihar.android.apg.intent.DECRYPT_FILE" />
+                <action android:name="org.thialfihar.android.apg.intent.DECRYPT_AND_RETURN" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="*/*" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".GeneralActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.Dialog" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:mimeType="*/*"
+                    android:scheme="file" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:mimeType="text/*"
+                    android:scheme="" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".MailListActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_mailInbox" />
+        <activity
+            android:name=".KeyServerQueryActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_keyServerQuery" />
+        <activity
+            android:name=".SendKeyActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_sendKey" />
+        <activity
+            android:name=".PreferencesActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_preferences" />
+        <activity
+            android:name=".KeyServerPreferenceActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_keyServerPreference" />
+        <activity
+            android:name=".SignKeyActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_signKey" />
+        <activity
+            android:name=".ImportFromQRCodeActivity"
+            android:configChanges="keyboardHidden|orientation|keyboard"
+            android:label="@string/title_importFromQRCode" />
+
+        <service android:name=".Service" />
+        <service
+            android:name=".ApgService"
+            android:enabled="true"
+            android:exported="true"
+            android:permission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS"
+            android:process=":remote" >
+            <intent-filter>
+                <action android:name="org.thialfihar.android.apg.IApgService" />
+            </intent-filter>
+
+            <meta-data
+                android:name="api_version"
+                android:value="2" />
+        </service>
+
+        <provider
+            android:name="org.thialfihar.android.apg.provider.DataProvider"
+            android:authorities="org.thialfihar.android.apg.provider"
+            android:readPermission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" />
+        <provider
+            android:name="org.thialfihar.android.apg.provider.ApgServiceBlobProvider"
+            android:authorities="org.thialfihar.android.apg.provider.apgserviceblobprovider"
+            android:permission="org.thialfihar.android.apg.permission.STORE_BLOBS" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/README.markdown b/README.markdown
new file mode 100644
index 000000000..de0737b97
--- /dev/null
+++ b/README.markdown
@@ -0,0 +1,21 @@
+# APG+
+
+This is a fork of Android Privacy Guard (APG) named APG+
+
+I will try to reintegrate the various forks and build a new stable version, which can be released to the market.
+
+# Build APG+
+
+# Build XZing Integration Library
+
+1. Checkout their SVN (see http://code.google.com/p/zxing/source/checkout)
+2. Change android-home variable in "build.properties" in the main directory to point to your Android SDK
+3. Change directory to android-integration
+4. Build using "ant build"
+5. We use "android-integration-supportv4.jar"
+
+On error see: http://code.google.com/p/zxing/issues/detail?id=1207
+
+# Build SpongyCastle
+
+see https://github.com/rtyley/spongycastle
\ No newline at end of file
diff --git a/build.xml b/build.xml
new file mode 100644
index 000000000..69ad53aa6
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="MainActivity" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            unless="sdk.dir"
+    />
+
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+<!--
+    <target name="-pre-build">
+    </target>
+    <target name="-pre-compile">
+    </target>
+
+    /* This is typically used for code obfuscation.
+       Compiled code location: ${out.classes.absolute.dir}
+       If this is not done in place, override ${out.dex.input.absolute.dir} */
+    <target name="-post-compile">
+    </target>
+-->
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/lib/android-integration-supportv4.jar b/lib/android-integration-supportv4.jar
new file mode 100644
index 000000000..4a7f1a39c
Binary files /dev/null and b/lib/android-integration-supportv4.jar differ
diff --git a/lib/android-support-v4.jar b/lib/android-support-v4.jar
new file mode 100644
index 000000000..d006198e6
Binary files /dev/null and b/lib/android-support-v4.jar differ
diff --git a/lib/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar b/lib/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar
new file mode 100644
index 000000000..87c8669bb
Binary files /dev/null and b/lib/scprov-jdk15-1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE.jar differ
diff --git a/project.properties b/project.properties
index f049142c1..8da376af8 100644
--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-10
+target=android-15
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b2f89302c..418372fb9 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+     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.
@@ -15,7 +16,6 @@
 -->
 
 <resources>
-    <string name="app_name">APG</string>
 
     <!-- title_lowerCase: capitalized words, no punctuation -->
     <string name="title_mailInbox">Mail Inbox</string>
@@ -99,15 +99,14 @@
     <string name="label_passPhraseCacheTtl">Kodeords Cache</string>
     <string name="label_messageCompression">Besked Komprimering</string>
     <string name="label_fileCompression">Fil Komprimering</string>
-
     <string name="noKeysSelected">Vælg</string>
     <string name="oneKeySelected">1 Valgt</string>
     <string name="nKeysSelected">Valgt</string>
-    <string name="unknownUserId">&lt;ukendt&gt;</string>
-    <string name="none">&lt;ingen&gt;</string>
-    <string name="noKey">&lt;ingen nøgle&gt;</string>
+    <string name="unknownUserId">&lt;ukendt></string>
+    <string name="none">&lt;ingen></string>
+    <string name="noKey">&lt;ingen nøgle></string>
     <string name="noDate">-</string>
-    <string name="noExpiry">&lt;udløber ikke&gt;</string>
+    <string name="noExpiry">&lt;udløber ikke></string>
     <string name="unknownStatus"></string>
     <string name="canEncrypt">kan kryptere</string>
     <string name="canSign">kan signere</string>
@@ -131,18 +130,15 @@
     <string name="choice_4hours">4 timer</string>
     <string name="choice_8hours">8 timer</string>
     <string name="choice_untilQuit">Indtil slut</string>
-
     <string name="dsa">DSA</string>
     <string name="elgamal">ElGamal</string>
     <string name="rsa">RSA</string>
-
     <string name="filemanager_titleOpen">Åbn...</string>
     <string name="filemanager_titleSave">Gem Som...</string>
     <string name="filemanager_titleEncrypt">Vælg Fil Som Skal Krypteres...</string>
     <string name="filemanager_titleDecrypt">Vælg Fil Som Skal Afkrypteres...</string>
     <string name="filemanager_btnOpen">Åbn</string>
     <string name="filemanager_btnSave">Gem</string>
-
     <string name="warning">Advarsel</string>
     <string name="error">Fejl</string>
     <string name="warningMessage">Advarsel: %s</string>
@@ -185,8 +181,10 @@
     <string name="keyCreationElGamalInfo">NB: Kun undernøgler understøtter ElGamal, og for ELGamal vil den nærmeste nøglestørrelse - 1536, 2048, 3072, 4096, eller 8192 - blive brugt.</string>
     <string name="keyNotFound">Kunne ikke finde %08X nøglen.</string>
 
-    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
-         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <!--
+         error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found"
+    -->
     <string name="error_fileDeleteFailed">\'%s\' kunne ikke slettes</string>
     <string name="error_fileNotFound">filen findes ikke</string>
     <string name="error_noSecretKeyFound">ingen egnet privat nøgle fundet</string>
@@ -256,9 +254,8 @@
     <string name="action_decrypt">Afkryptér</string>
     <string name="action_importPublic">Importér Offentlige Nøgler</string>
     <string name="action_importSecret">Importér Private Nøgler</string>
-
     <string name="hint_publicKeys">Søg I Offentlige Nøgler</string>
     <string name="hint_secretKeys">Søg I Private Nøgler</string>
     <string name="filterInfo">Filter: \"%s\"</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d2de45eb3..732d58b0a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+     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.
@@ -17,7 +18,6 @@
 -->
 
 <resources>
-    <string name="app_name">APG</string>
 
     <!-- title_lowerCase: capitalized words, no punctuation -->
     <string name="title_mailInbox">Posteingang</string>
@@ -102,19 +102,16 @@
     <string name="label_passPhraseCacheTtl">Passwort-Cache</string>
     <string name="label_messageCompression">Nachrichten-Kompression</string>
     <string name="label_fileCompression">Datei-Kompression</string>
-
     <string name="noKeysSelected">Auswählen</string>
     <string name="oneKeySelected">1 ausgewählt</string>
     <string name="nKeysSelected">Ausgewählt</string>
-    <string name="unknownUserId">&lt;Unbekannt&gt;</string>
-
-    <string name="none">&lt;Kein&gt;</string>
-    <string name="noKey">&lt;Kein Schlüssel&gt;</string>
+    <string name="unknownUserId">&lt;Unbekannt></string>
+    <string name="none">&lt;Kein></string>
+    <string name="noKey">&lt;Kein Schlüssel></string>
     <string name="noDate">-</string>
-    <string name="noExpiry">&lt;Kein Verfallsdatum&gt;</string>
+    <string name="noExpiry">&lt;Kein Verfallsdatum></string>
     <string name="unknownStatus"></string>
     <string name="canEncrypt">Kann verschlüsseln</string>
-
     <string name="canSign">Kann signieren</string>
     <string name="expired">Verfallen</string>
     <string name="notValid">Ungültig</string>
@@ -122,7 +119,6 @@
     <!-- choice_lowerCase: capitalized first word, no punctuation -->
     <string name="choice_none">Keine Auswahl</string>
     <string name="choice_signOnly">Nur signieren</string>
-
     <string name="choice_encryptOnly">Nur verschlüsseln</string>
     <string name="choice_signAndEncrypt">Signieren und verschlüsseln</string>
     <string name="choice_15secs">15 Sek.</string>
@@ -137,18 +133,15 @@
     <string name="choice_4hours">4 Std.</string>
     <string name="choice_8hours">8 Std.</string>
     <string name="choice_untilQuit">Bis Programmende</string>
-
     <string name="dsa">DSA</string>
     <string name="elgamal">ElGamal</string>
     <string name="rsa">RSA</string>
-
     <string name="filemanager_titleOpen">Öffnen ...</string>
     <string name="filemanager_titleSave">Speichern unter ...</string>
     <string name="filemanager_titleEncrypt">Zu entschlüsselnde Datei wählen ...</string>
     <string name="filemanager_titleDecrypt">Zu verschlüsselnde Datei wählen ...</string>
     <string name="filemanager_btnOpen">Öffnen</string>
     <string name="filemanager_btnSave">Speichern</string>
-
     <string name="warning">Achtung</string>
     <string name="error">Fehler</string>
     <string name="warningMessage">Achtung: %s</string>
@@ -156,7 +149,6 @@
 
     <!-- sentences -->
     <string name="wrongPassPhrase">Falsches Passwort.</string>
-
     <string name="usingClipboardContent">Zwischenablage wird verwendet.</string>
     <string name="keySaved">Schlüssel gespeichert.</string>
     <string name="setAPassPhrase">Zuerst Passwort festlegen.</string>
@@ -169,65 +161,58 @@
     <string name="fileDeleteSuccessful">Erfolgreich gelöscht.</string>
     <string name="noFileSelected">Zuerst eine Datei auswählen.</string>
     <string name="decryptionSuccessful">Entschlüsselung erfolgreich.</string>
-
     <string name="encryptionSuccessful">Verschlüsselung erfolgreich.</string>
     <string name="encryptionToClipboardSuccessful">Verschlüsselung in die Zwischenablage erfolgreich.</string>
     <string name="enterPassPhraseTwice">Passwort bitte zwei Mal eingeben.</string>
     <string name="selectEncryptionKey">Bitte mindestens einen Schlüssel zur Verschlüsselung auswählen.</string>
     <string name="selectEncryptionOrSignatureKey">Bitte mindestens einen Schlüssel zur Verschlüsselung oder zum Signieren auswählen.</string>
     <string name="specifyFileToEncryptTo">Bitte Zieldatei für Verschlüsselung angeben.\nACHTUNG! Vorhandene Datei gleichen Namens wird überschrieben.</string>
-
     <string name="specifyFileToDecryptTo">Bitte Zieldatei für Entschlüsselung angeben.\nACHTUNG! Vorhandene Datei gleichen Namens wird überschrieben.</string>
     <string name="specifyGoogleMailAccount">Bitte Google-Mail-Konto angeben, das hinzugefügt werden soll.</string>
     <string name="specifyFileToImportFrom">Bitte Datei angeben, aus der Schlüssel importiert werden sollen. (.asc oder .gpg)</string>
     <string name="specifyFileToExportTo">Bitte Zieldatei zum Export angeben.\nACHTUNG! Vorhandene Datei gleichen Namens wird überschrieben.</string>
     <string name="specifyFileToExportSecretKeysTo">Bitte Zieldatei zum Export angeben.\nACHTUNG! Es sollen private Schlüssel exportiert werden.\nACHTUNG! Vorhandene Datei gleichen Namens wird überschrieben.</string>
     <string name="keyDeletionConfirmation">Soll der Schlüssel \'%s\' wirklich gelöscht werden?\nDiese Aktion lässt sich nicht rückgängig machen!</string>
-
     <string name="secretKeyDeletionConfirmation">Soll der PRIVATE Schlüssel \'%s\' wirklich gelöscht werden?\nDiese Aktion lässt sich nicht rückgängig machen!</string>
     <string name="keysAddedAndUpdated">Erfolgreich %1$s Schlüssel hinzugefügt und %2$s Schlüssel aktualisiert.</string>
     <string name="keysAdded">Erfolgreich %s Schlüssel hinzugefügt.</string>
     <string name="keysUpdated">Erfolgreich %s Schlüssel aktualisiert.</string>
     <string name="noKeysAddedOrUpdated">Keine Schlüssel hinzugefügt oder aktualisiert.</string>
     <string name="keyExported">Erfolgreich 1 Schlüssel exportiert.</string>
-
     <string name="keysExported"> Erfolgreich %s Schlüssel exportiert.</string>
     <string name="noKeysExported">Kein Schlüssel exportiert.</string>
     <string name="keyCreationElGamalInfo">Hinweis: Nur Subschlüssel unterstützen ElGamal, und für ElGamal wird die nächstmögliche Schlüssellänge 1536, 2048, 3072, 4096 oder 8192 genutzt.</string>
     <string name="keyNotFound">Es konnte kein Schlüssel %08X gefunden werden.</string>
 
-    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
-         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <!--
+         error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found"
+    -->
     <string name="error_fileDeleteFailed">Löschen von \'%s\' fehlgeschlagen</string>
-
     <string name="error_fileNotFound">Datei nicht gefunden</string>
     <string name="error_noSecretKeyFound">Kein geeigneter privater Schlüssel gefunden</string>
     <string name="error_noKnownEncryptionFound">Keine bekannte Verschlüsselungsmethode gefunden</string>
     <string name="error_externalStorageNotReady">Externer Speicher nicht bereit</string>
     <string name="error_accountNotFound">Konto \'%s\' nicht gefunden</string>
     <string name="error_addingAccountFailed">Hinzufügen von Konto \'%s\' fehlgeschlagen</string>
-
     <string name="error_invalidEmail">Ungültige E-Mail \'%s\'</string>
     <string name="error_keySizeMinimum512bit">Schlüssellänge von mindestens 512bit erforderlich</string>
     <string name="error_masterKeyMustNotBeElGamal">Primärschlüssel darf kein ElGamal-Schlüssel sein</string>
     <string name="error_unknownAlgorithmChoice">Unbekannter Algorithmus ausgewählt</string>
     <string name="error_userIdNeedsAName">Angabe eines Namens erforderlich</string>
     <string name="error_userIdNeedsAnEmailAddress">Angabe einer E-Mail-Adresse erforderlich</string>
-
     <string name="error_keyNeedsAUserId">Mindestens eine Benutzer-ID erforderlich</string>
     <string name="error_mainUserIdMustNotBeEmpty">Haupt-Benutzer-ID darf nicht leer bleiben</string>
     <string name="error_keyNeedsMasterKey">Mindestens ein Primärschlüssel erforderlich</string>
     <string name="error_expiryMustComeAfterCreation">Verfallsdatum muss später als Erstellungsdatum liegen</string>
     <string name="error_noEncryptionKeysOrPassPhrase">Kein(e) Schlüssel oder Passwort zur Verschlüsselung angegeben</string>
     <string name="error_signatureFailed">Signieren fehlgeschlagen</string>
-
     <string name="error_noSignaturePassPhrase">Kein Passwort angegeben</string>
     <string name="error_noSignatureKey">Kein Schlüssel zum Signieren angegeben</string>
     <string name="error_invalidData">Keine gültigen Verschlüsselungsdaten</string>
     <string name="error_corruptData">Daten nicht lesbar</string>
     <string name="error_noSymmetricEncryptionPacket">Kein Paket mit symmetrischer Verschlüsselung gefunden</string>
     <string name="error_wrongPassPhrase">Falsches Passwort</string>
-
     <string name="error_savingKeys">Fehler beim Abspeichern eines oder mehrerer Schlüssel</string>
 
     <!-- progress_lowerCase: lowercase, phrases, usually ending in '...' -->
@@ -235,35 +220,30 @@
     <string name="progress_initializing">Initialisierung ...</string>
     <string name="progress_saving">Speicherung ...</string>
     <string name="progress_importing">Import ...</string>
-
     <string name="progress_exporting">Export ...</string>
     <string name="progress_generating">Schlüssel wird erzeugt, dies kann eine Weile dauern ...</string>
     <string name="progress_buildingKey">Schlüssel wird erstellt ...</string>
     <string name="progress_preparingMasterKey">Primärschlüssel wird vorbereitet ...</string>
     <string name="progress_certifyingMasterKey">Primärschlüssel wird zertifiziert ...</string>
     <string name="progress_buildingMasterKeyRing">Primärschlüsselbund wird erstellt ...</string>
-
     <string name="progress_addingSubKeys">Unterschlüssel werden hinzugefügt ...</string>
     <string name="progress_savingKeyRing">Schlüsselbund wird gespeichert ...</string>
     <string name="progress_importingSecretKeys">Private Schlüssel werden importiert ...</string>
     <string name="progress_importingPublicKeys">Öffentliche Schlüssel werden importiert ...</string>
     <string name="progress_reloadingKeys">Schlüssel werden neu geladen ...</string>
     <string name="progress_exportingKey">Schlüssel wird exportiert ...</string>
-
     <string name="progress_exportingKeys">Schlüssel werden exportiert ...</string>
     <string name="progress_extractingSignatureKey">Signaturschlüssel wird extrahiert ...</string>
     <string name="progress_extractingKey">Schlüssel wird extrahiert ...</string>
     <string name="progress_preparingStreams">Daten werden vorbereitet ...</string>
     <string name="progress_encrypting">Daten werden verschlüsselt ...</string>
     <string name="progress_decrypting">Daten werden entschlüsselt ...</string>
-
     <string name="progress_preparingSignature">Signatur wird vorbereitet ...</string>
     <string name="progress_generatingSignature">Signatur wird erzeugt ...</string>
     <string name="progress_processingSignature">Signatur wird verarbeitet...</string>
     <string name="progress_verifyingSignature">Signatur wird verifiziert ...</string>
     <string name="progress_signing">Signieren ...</string>
     <string name="progress_readingData">Daten werden gelesen ...</string>
-
     <string name="progress_findingKey">Schlüssel wird gesucht ...</string>
     <string name="progress_decompressingData">Daten werden dekomprimiert ...</string>
     <string name="progress_verifyingIntegrity">Integrität wird verifiziert ...</string>
@@ -278,7 +258,6 @@
     <string name="action_importPublic">Öffentliche Schlüssel importieren</string>
     <string name="action_importSecret">Private Schlüssel importieren</string>
     <string name="hint_publicKeys">Öffentliche Schlüssel suchen</string>
-
     <string name="hint_secretKeys">Private Schlüssel suchen</string>
     <string name="filterInfo">Filter: \"%s\"</string>
 
@@ -287,4 +266,4 @@
     <string name="slow">langsam</string>
     <string name="very_slow">sehr langsam</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 54ebfa3d8..a2faf56d9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+     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.
@@ -15,7 +16,6 @@
 -->
 
 <resources>
-    <string name="app_name">APG</string>
 
     <!-- title_lowerCase: capitalized words, no punctuation -->
     <string name="title_mailInbox">Bandeja de Entrada</string>
@@ -123,15 +123,14 @@
     <string name="label_name">Nombre</string>
     <string name="label_comment">Comentario</string>
     <string name="label_email">Email</string>
-
     <string name="noKeysSelected">Seleccionar</string>
     <string name="oneKeySelected">1 Seleccionada</string>
     <string name="nKeysSelected">Seleccionada</string>
-    <string name="unknownUserId">&lt;desconocido&gt;</string>
-    <string name="none">&lt;ninguno&gt;</string>
-    <string name="noKey">&lt;sin llave&gt;</string>
+    <string name="unknownUserId">&lt;desconocido></string>
+    <string name="none">&lt;ninguno></string>
+    <string name="noKey">&lt;sin llave></string>
     <string name="noDate">-</string>
-    <string name="noExpiry">&lt;no expira&gt;</string>
+    <string name="noExpiry">&lt;no expira></string>
     <string name="unknownStatus"></string>
     <string name="canEncrypt">puede cifrar</string>
     <string name="canSign">puede firmar</string>
@@ -153,18 +152,15 @@
     <string name="choice_40mins">40 mins</string>
     <string name="choice_untilQuit">hasta salir</string>
     <string name="choice_language_system">Sistema por defecto</string>
-
     <string name="dsa">DSA</string>
     <string name="elgamal">ElGamal</string>
     <string name="rsa">RSA</string>
-
     <string name="filemanager_titleOpen">Abrir...</string>
     <string name="filemanager_titleSave">Guardar Como...</string>
     <string name="filemanager_titleEncrypt">Seleccionar Fichero Para Cifrar...</string>
     <string name="filemanager_titleDecrypt">Seleccionar Fichero Para Descifrar...</string>
     <string name="filemanager_btnOpen">Abrir</string>
     <string name="filemanager_btnSave">Guardar</string>
-
     <string name="warning">Advertencia</string>
     <string name="error">Error</string>
     <string name="warningMessage">Advertencia: %s</string>
@@ -210,8 +206,10 @@
     <string name="unknownSignatureKeyTouchToLookUp">Firma desconocida, pulsa para buscarla.</string>
     <string name="keyEditingIsBeta">Edición de llaves aún en fase beta.</string>
 
-    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
-         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <!--
+         error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found"
+    -->
     <string name="error_fileDeleteFailed">borrado de \'%s\' fallido</string>
     <string name="error_fileNotFound">no se encontró el fichero</string>
     <string name="error_noSecretKeyFound">no se encontró la llave secreta adecuada</string>
@@ -285,7 +283,6 @@
     <string name="action_decrypt">Descifrar</string>
     <string name="action_importPublic">Importar Llaves Públicas</string>
     <string name="action_importSecret">Importar Llaves Privadas</string>
-
     <string name="hint_publicKeys">Buscar Llaves Públicas</string>
     <string name="hint_secretKeys">Buscar Llaves Privadas</string>
     <string name="filterInfo">Filtro: \"%s\"</string>
@@ -297,12 +294,10 @@
 
     <!-- texts -->
     <!-- "OI File Manager", "ASTRO", and "K-9 Mail" must not be translated in order for the links to the market to work. -->
-    <string name="text_help">Puedes instalar K-9 Mail para una mejor integración, soporta APG para PGP de forma nativa y permite difrar/descifrar mensajes directamente.
+    <string name="text_help">uedes instalar K-9 Mail para una mejor integración, soporta APG para PGP de forma nativa y permite difrar/descifrar mensajes directamente.
 \n\nSe recomienda instalar OI File Manager o ASTRO para poder usar el botón de navegación para seleccioar ficheros en APG.
 \n\nPrimero necesitarás algunas llaves. Puedes importarlas mediante los menús de opciones en \"Administrar Llaves Públicas\" y \"Administrar Llaves Privadas\" o crearlas mediante \"Administrar Llaves Privadas\".
 \n\nTambién puedes añadir una cuenta GMail como actividad principal mediante \"Añadir Cuenta\", lo que simplifica el descifrado de mensajes recibidos en esa cuenta.
-\n\nDale un vistazo a los menús de opciones para encontrar más funciones.
-    </string>
-
-</resources>
+\n\nDale un vistazo a los menús de opciones para encontrar más funciones.</string>
 
+</resources>
\ No newline at end of file
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e6f286de5..21a6d3486 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+     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.
@@ -17,7 +18,6 @@
 -->
 
 <resources>
-    <string name="app_name">APG</string>
 
     <!-- title_lowerCase: capitalized words, no punctuation -->
     <string name="title_mailInbox">Posta in arrivo</string>
@@ -126,15 +126,14 @@
     <string name="label_name">Nome</string>
     <string name="label_comment">Commento</string>
     <string name="label_email">Email</string>
-
     <string name="noKeysSelected">Seleziona</string>
     <string name="oneKeySelected">1 Selezionato</string>
     <string name="nKeysSelected">Selezionato</string>
-    <string name="unknownUserId">&lt;sconosciuto&gt;</string>
-    <string name="none">&lt;nessuno&gt;</string>
-    <string name="noKey">&lt;nessuna chiave&gt;</string>
+    <string name="unknownUserId">&lt;sconosciuto></string>
+    <string name="none">&lt;nessuno></string>
+    <string name="noKey">&lt;nessuna chiave></string>
     <string name="noDate">-</string>
-    <string name="noExpiry">&lt;nessuna scadenza&gt;</string>
+    <string name="noExpiry">&lt;nessuna scadenza></string>
     <string name="unknownStatus"></string>
     <string name="canEncrypt">crittazione consentita</string>
     <string name="canSign">firma consentita</string>
@@ -161,18 +160,15 @@
     <string name="choice_8hours">8 ore</string>
     <string name="choice_untilQuit">tutta la sessione</string>
     <string name="choice_language_system">Default di sistema</string>
-
     <string name="dsa">DSA</string>
     <string name="elgamal">ElGamal</string>
     <string name="rsa">RSA</string>
-
     <string name="filemanager_titleOpen">Apri...</string>
     <string name="filemanager_titleSave">Salva con nome...</string>
     <string name="filemanager_titleEncrypt">Seleziona il file da crittare...</string>
     <string name="filemanager_titleDecrypt">Seleziona il file da decrittare...</string>
     <string name="filemanager_btnOpen">Apri</string>
     <string name="filemanager_btnSave">Salva</string>
-
     <string name="warning">Attenzione</string>
     <string name="error">Errore</string>
     <string name="warningMessage">Attenzione: %s</string>
@@ -220,8 +216,10 @@
     <string name="badKeysEncountered">%s chiavi segrete ignorate. Se hai esportato le chiavi con l\'opzione\n --export-secret-subkeys\nprovare ad utilizzare il parametro\n --export-secret-keys\n.</string>
     <string name="lookupUnknownKey">La chiave %s è sconosciuta; si desidera provare a cercarla su un keyserver?</string>
 
-    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
-         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <!--
+         error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found"
+    -->
     <string name="error_fileDeleteFailed">cancellazione di \'%s\' fallita</string>
     <string name="error_fileNotFound">file non trovato</string>
     <string name="error_noSecretKeyFound">non è stata trovata nessuna chiave privata utilizzabile</string>
@@ -296,7 +294,6 @@
     <string name="action_decrypt">Decritta</string>
     <string name="action_importPublic">Importa Chiavi Pubbliche</string>
     <string name="action_importSecret">Importa Chiavi Private</string>
-
     <string name="hint_publicKeys">Cerca Chiavi Pubbliche</string>
     <string name="hint_secretKeys">Cerca Chiavi Private</string>
     <string name="filterInfo">Filtra: \"%s\"</string>
@@ -308,12 +305,10 @@
 
     <!-- texts -->
     <!-- "OI File Manager", "ASTRO", and "K-9 Mail" must not be translated in order for the links to the market to work. -->
-    <string name="text_help">Per una migliore integrazione, si consiglia di installare K-9 Mail; questo applicativo supporta infatti APG e consente di crittare/decrittare direttamente le mail.
+    <string name="text_help">er una migliore integrazione, si consiglia di installare K-9 Mail; questo applicativo supporta infatti APG e consente di crittare/decrittare direttamente le mail.
 \n\nPer poter utilizzare il bottone \"sfoglia\" per la selezione dei file su APG, si consiglia di installare OI File Manager oppure ASTRO.
 \n\nCome prima cosa, è necessario disporre di una o più chiavi. E\' possibile importare chiavi esistenti tramite l\'opzione \"Manage Public Keys\" e \"Manage Secret Keys\", oppure crearne una nuova tramite l\'opzione \"Manage Secret Keys\".
 \n\nE\' possibile aggiungere un account GMail tramite l\'opzione \"Aggiungi Acconto GMail\"; questo semplifica il processo di decrittaggio delle mail ricevute sulla propria casella di posta su GMail.
-\n\nProva e controlla le opzioni dei vari menù per esplorare e conoscere tutte le funzionalità di APG.
-    </string>
-
-</resources>
+\n\nProva e controlla le opzioni dei vari menù per esplorare e conoscere tutte le funzionalità di APG.</string>
 
+</resources>
\ No newline at end of file
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index c40f53883..825701f38 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+     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.
@@ -18,11 +19,9 @@
 
      Send gjerne en e-post med spørsmål eller kommentarer. Kom gjerne med forslag til bedre
      oversettelser!
-
 -->
 
 <resources>
-    <string name="app_name">APG</string>
 
     <!-- title_lowerCase: capitalized words, no punctuation -->
     <string name="title_mailInbox">Epost innboks</string>
@@ -130,15 +129,14 @@
     <string name="label_name">Navn</string>
     <string name="label_comment">Kommentar</string>
     <string name="label_email">Epost</string>
-
     <string name="noKeysSelected">Velg</string>
     <string name="oneKeySelected">1 Valgt</string>
     <string name="nKeysSelected">Valgt</string>
-    <string name="unknownUserId">&lt;ukjent&gt;</string>
-    <string name="none">&lt;ingen&gt;</string>
-    <string name="noKey">&lt;ingen nøkkel&gt;</string>
+    <string name="unknownUserId">&lt;ukjent></string>
+    <string name="none">&lt;ingen></string>
+    <string name="noKey">&lt;ingen nøkkel></string>
     <string name="noDate">-</string>
-    <string name="noExpiry">&lt;utløper ikke&gt;</string>
+    <string name="noExpiry">&lt;utløper ikke></string>
     <string name="unknownStatus"></string>
     <string name="canEncrypt">kan kryptere</string>
     <string name="canSign">kan signere</string>
@@ -164,18 +162,15 @@
     <string name="choice_8hours">8 timer</string>
     <string name="choice_untilQuit">til avsluttning</string>
     <string name="choice_language_system">System </string>
-
     <string name="dsa">DSA</string>
     <string name="elgamal">ElGamal</string>
     <string name="rsa">RSA</string>
-
     <string name="filemanager_titleOpen">Åpne...</string>
     <string name="filemanager_titleSave">Lagre Som...</string>
     <string name="filemanager_titleEncrypt">Velg Fil Som Skal Krypteres...</string>
     <string name="filemanager_titleDecrypt">Velg Fil Som Skal Dekrypteres...</string>
     <string name="filemanager_btnOpen">Åpne</string>
     <string name="filemanager_btnSave">Lagre</string>
-
     <string name="warning">Advarsel</string>
     <string name="error">Feil</string>
     <string name="warningMessage">Advarsel: %s</string>
@@ -221,8 +216,10 @@
     <string name="unknownSignatureKeyTouchToLookUp">Ukjent signatur, trykk for å sjekke nøkkel.</string>
     <string name="keyEditingIsBeta">Nøkkelredigering er enda beta.</string>
 
-    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
-         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <!--
+         error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found"
+    -->
     <string name="error_fileDeleteFailed">sletting \'%s\' mislyktes</string>
     <string name="error_fileNotFound">finner ikke fil</string>
     <string name="error_noSecretKeyFound">finner ingen passende hemmelig nøkkel</string>
@@ -296,7 +293,6 @@
     <string name="action_decrypt">Dekrypter</string>
     <string name="action_importPublic">Importer Offentlige Nøkler</string>
     <string name="action_importSecret">Importer Private Nøkler</string>
-
     <string name="hint_publicKeys">Søk I Offentlige Nøkler</string>
     <string name="hint_secretKeys">Søk I Private Nøkler</string>
     <string name="filterInfo">Filter: \"%s\"</string>
@@ -309,11 +305,9 @@
     <!-- texts -->
     <!-- "OI File Manager", "ASTRO", and "K-9 Mail" must not be translated in order for the links to the market to work. -->
     <string name="text_help">Installer K-9 Mail for den beste integrasjonen, det støtter APG for PGP/INLINE og lar deg kryptere/dekryptere epost direkte.
-\n\nDet er anbefalt at du installerer OI File Manager eller ASTRO for å kunne velge filer igjennom APG, med manuelt søk. <!-- to be able to use the browse button for file selection in APG. -->
+\n\nDet er anbefalt at du installerer OI File Manager eller ASTRO for å kunne velge filer igjennom APG, med manuelt søk.         <!-- to be able to use the browse button for file selection in APG. -->
 \n\nFørst trenger du noen nøkler. Du kan enten importere dem via menyene i \"Håndter Offentlige Nøkler\" og \"Håndter Private Nøkler\" eller lage dem selv i \"Håndter Private Nøkler\".
 \n\nDu kan også legge til en GMail-konto i hovedmenyen via \"Legg Til Konto\", noe som forenkler dekryptering av epost mottatt der.
-\n\nSjekk menyene under de forskjellige aktivitetene for å finne flere funksjoner.
-    </string>
-
-</resources>
+\n\nSjekk menyene under de forskjellige aktivitetene for å finne flere funksjoner.</string>
 
+</resources>
\ No newline at end of file
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f64e123c2..76e0cb244 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+     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.
@@ -15,34 +16,29 @@
 -->
 
 <resources>
-    <string name="app_name">APG</string>
 
     <!-- title_lowerCase: capitalized words, no punctuation -->
     <string name="title_mailInbox">Caixa de Entrada</string>
     <string name="title_managePublicKeys">Gerir Chaves Públicas</string>
     <string name="title_manageSecretKeys">Gerir Chaves Privadas</string>
-
     <string name="title_selectRecipients">Escolher Destinatários</string>
     <string name="title_selectSignature">Escolher Assinatura</string>
     <string name="title_encrypt">Cifrar</string>
     <string name="title_decrypt">Decifrar</string>
     <string name="title_authentication">Senha</string>
     <string name="title_createKey">Criar Chave</string>
-
     <string name="title_editKey">Editar Chave</string>
     <string name="title_preferences">Preferências</string>
     <string name="title_keyServerPreference">Preferências de Servidor de Chaves</string>
     <string name="title_changePassPhrase">Alterar Senha</string>
     <string name="title_setPassPhrase">Definir Senha</string>
     <string name="title_sendEmail">"Enviar Email..."</string>
-
     <string name="title_encryptToFile">Cifrar Para Arquivo</string>
     <string name="title_decryptToFile">Descifrar Para Arquivo</string>
     <string name="title_addAccount">Adicionar Conta</string>
     <string name="title_importKeys">Importar Chaves</string>
     <string name="title_exportKey">Exportar Chave</string>
     <string name="title_exportKeys">Exportar Chaves</string>
-
     <string name="title_keyNotFound">Chave Não Encontrada</string>
     <string name="title_help">Conhecendo</string>
     <string name="title_keyServerQuery">Busca no Servidor de Chaves</string>
@@ -50,7 +46,6 @@
 
     <!-- section_lowerCase: capitalized words, no punctuation -->
     <string name="section_userIds">IDs de Usuários</string>
-
     <string name="section_keys">Chaves</string>
     <string name="section_general">Geral</string>
     <string name="section_defaults">Padrões</string>
@@ -58,28 +53,24 @@
 
     <!-- btn_lowerCase: capitalized words, no punctuation -->
     <string name="btn_signToClipboard">Assinar Para Clipboard</string>
-
     <string name="btn_encryptToClipboard">Cifrar Para Clipboard</string>
     <string name="btn_encryptAndEmail">Cifrar Para Email</string>
     <string name="btn_signAndEmail">Assinar Para Email</string>
     <string name="btn_encrypt">Cifrar</string>
     <string name="btn_sign">Assinar</string>
     <string name="btn_decrypt">Decifrar</string>
-
     <string name="btn_verify">Verificar</string>
     <string name="btn_selectEncryptKeys">Escolher Destinatários</string>
     <string name="btn_reply">Responder</string>
     <string name="btn_encryptMessage">Cifrar Mensagem</string>
     <string name="btn_decryptMessage">Decifrar Mesagem</string>
     <string name="btn_encryptFile">Cifrar Arquivo</string>
-
     <string name="btn_decryptFile">Decifrar Arquivo</string>
     <string name="btn_save">Salvar</string>
     <string name="btn_doNotSave">Cancelar</string>
     <string name="btn_delete">Apagar</string>
     <string name="btn_noDate">Nenhuma</string>
     <string name="btn_clearFilter">Limpar Filtro</string>
-
     <string name="btn_changePassPhrase">Alterar Senha</string>
     <string name="btn_setPassPhrase">Definir Senha</string>
     <string name="btn_search">Buscar</string>
@@ -87,21 +78,18 @@
     <!-- menu_lowerCase: capitalized words, no punctuation -->
     <string name="menu_about">Sobre</string>
     <string name="menu_addAccount">Adicionar Conta GMail</string>
-
     <string name="menu_deleteAccount">Apagar Conta</string>
     <string name="menu_managePublicKeys">Gerir Chaves Públicas</string>
     <string name="menu_manageSecretKeys">Gerir Chaves Privadas</string>
     <string name="menu_preferences">Configurações</string>
     <string name="menu_importKeys">Importar Chaves</string>
     <string name="menu_exportKeys">Exportar Chaves</string>
-
     <string name="menu_exportKey">Exportar Chave</string>
     <string name="menu_deleteKey">Apagar Chave</string>
     <string name="menu_createKey">Criar Chave</string>
     <string name="menu_editKey">Editar Chave</string>
     <string name="menu_search">Buscar</string>
     <string name="menu_help">Ajuda</string>
-
     <string name="menu_keyServer">Servidor de Chaves</string>
     <string name="menu_updateKey">Atualizar</string>
 
@@ -109,50 +97,42 @@
     <string name="label_sign">Assinar</string>
     <string name="label_message">Mensagem</string>
     <string name="label_file">Arquivo</string>
-
     <string name="label_passPhrase">Senha</string>
     <string name="label_passPhraseAgain">Novamente</string>
     <string name="label_algorithm">Algoritmo</string>
     <string name="label_asciiArmour">Armadura ASCII</string>
     <string name="label_selectPublicKeys">Chave(s) Pública(s)</string>
     <string name="label_deleteAfterEncryption">Apagar Após Cifrar</string>
-
     <string name="label_deleteAfterDecryption">Apagar Após Decifrar</string>
     <string name="label_deleteAfterImport">Apagar Após Importar</string>
     <string name="label_encryptionAlgorithm">Algoritmo de Cifragem</string>
     <string name="label_hashAlgorithm">Algoritmo de Hash</string>
     <string name="label_asymmetric">Chave Pública</string>
     <string name="label_symmetric">Senha</string>
-
     <string name="label_passPhraseCacheTtl">Cache de Senhas</string>
     <string name="label_messageCompression">Compressão de Mensagem</string>
     <string name="label_fileCompression">Compressão de Arquivo</string>
     <string name="label_language">Língua</string>
     <string name="label_forceV3Signature">Forçar Assinaturas V3</string>
     <string name="label_keyServers">Servidores de Chave</string>
-
     <string name="label_keyId">ID da Chave</string>
     <string name="label_creation">Criação</string>
     <string name="label_expiry">Expiração</string>
     <string name="label_usage">Uso</string>
     <string name="label_keySize">Tamanho da Chave</string>
     <string name="label_mainUserId">ID do Usuário Principal</string>
-
     <string name="label_name">Nome</string>
     <string name="label_comment">Comentário</string>
     <string name="label_email">Email</string>
-
     <string name="noKeysSelected">Selecionar</string>
     <string name="oneKeySelected">1 Selecionada</string>
     <string name="nKeysSelected">Selecionada</string>
-
-    <string name="unknownUserId">&lt;desconhecido&gt;</string>
-    <string name="none">&lt;ninguém&gt;</string>
-    <string name="noKey">&lt;sem chave&gt;</string>
+    <string name="unknownUserId">&lt;desconhecido></string>
+    <string name="none">&lt;ninguém></string>
+    <string name="noKey">&lt;sem chave></string>
     <string name="noDate">-</string>
-    <string name="noExpiry">&lt;não expira&gt;</string>
+    <string name="noExpiry">&lt;não expira></string>
     <string name="unknownStatus"></string>
-
     <string name="canEncrypt">pode cifrar</string>
     <string name="canSign">pode assinar</string>
     <string name="expired">expirada</string>
@@ -166,36 +146,29 @@
     <string name="choice_encryptOnly">Cifrar apenas</string>
     <string name="choice_signAndEncrypt">Assinar e Cifrar</string>
     <string name="choice_15secs">15 segs</string>
-
     <string name="choice_1min">1 min</string>
     <string name="choice_3mins">3 mins</string>
     <string name="choice_5mins">5 mins</string>
     <string name="choice_10mins">10 mins</string>
     <string name="choice_20mins">20 mins</string>
     <string name="choice_40mins">40 mins</string>
-
     <string name="choice_1hour">1 hora</string>
     <string name="choice_2hours">2 horas</string>
     <string name="choice_4hours">4 horas</string>
     <string name="choice_8hours">8 horas</string>
     <string name="choice_untilQuit">até sair</string>
     <string name="choice_language_system">Padrões do sistema</string>
-
     <string name="dsa">DSA</string>
     <string name="elgamal">ElGamal</string>
     <string name="rsa">RSA</string>
-
     <string name="filemanager_titleOpen">Abrir...</string>
     <string name="filemanager_titleSave">Salvar Como...</string>
-
     <string name="filemanager_titleEncrypt">Selecionar Arquivo para Cifrar...</string>
     <string name="filemanager_titleDecrypt">Selecionar Arquivo para Decifrar...</string>
     <string name="filemanager_btnOpen">Abrir</string>
     <string name="filemanager_btnSave">Salvar</string>
-
     <string name="warning">Advertência</string>
     <string name="error">Erro</string>
-
     <string name="warningMessage">Advertência: %s</string>
     <string name="errorMessage">Erro: %s</string>
 
@@ -203,87 +176,75 @@
     <string name="wrongPassPhrase">Chave errada.</string>
     <string name="usingClipboardContent">Usando conteúdo do clipboard.</string>
     <string name="keySaved">Chave salva.</string>
-
     <string name="setAPassPhrase">Defina uma senha antes.</string>
     <string name="noFilemanagerInstalled">Não há gerenciador de arquivos compatível instalado.</string>
     <string name="passPhrasesDoNotMatch">A senha não confere.</string>
     <string name="passPhraseMustNotBeEmpty">Não são permitidas senhas vazias.</string>
     <string name="passPhraseForSymmetricEncryption">Cifragem simétrica.</string>
     <string name="passPhraseFor">%s</string>
-
     <string name="fileDeleteConfirmation">Tem certeza que deseja apagar\n%s?</string>
     <string name="fileDeleteSuccessful">Apagado com sucesso.</string>
     <string name="noFileSelected">Selecione um arquivo primeiro.</string>
     <string name="decryptionSuccessful">Decifrado com sucesso.</string>
     <string name="encryptionSuccessful">Cifrado com sucesso.</string>
     <string name="encryptionToClipboardSuccessful">Cifrado para clipboard com sucesso.</string>
-
     <string name="enterPassPhraseTwice">Insira a senha duas vezes.</string>
     <string name="selectEncryptionKey">Selecione pelo menos uma chave de cifragem.</string>
     <string name="selectEncryptionOrSignatureKey">Selecione pelo menos uma chave de cifragem ou uma chave de assinatura.</string>
     <string name="specifyFileToEncryptTo">Especifique o arquivo a cifrar sobre.\nATENÇÃO! O arquivo, se existir, será sobrescrito!</string>
     <string name="specifyFileToDecryptTo">Especifique o arquivo a decifrar sobre.\nATENÇÃO! O arquivo, se existir, será sobrescrito!</string>
     <string name="specifyGoogleMailAccount">Especifique a conta de Email do Google que deseja adicionar.</string>
-
     <string name="specifyFileToImportFrom">Especifique o arquivo para importação de chaves. (.asc or .gpg)</string>
-
     <string name="specifyFileToExportTo">Especifique o arquivo de exportação.\nATENÇÃO! O arquivo, se existir, será sobrescrito!</string>
     <string name="specifyFileToExportSecretKeysTo">Especifique o arquivo de exportação.\nATENÇÃO! Você está exportando suas chaves PRIVADAS (SECRETAS).\nATENÇÃO! O arquivo, se existir, será sobrescrito.</string>
     <string name="keyDeletionConfirmation">Você realmente deseja apagar a chave \'%s\'?\nEssa ação não pode ser desfeita!</string>
     <string name="secretKeyDeletionConfirmation">Você realmente deseja apagar a chave PRIVADA \'%s\'?\nEssa ação não pode ser desfeita!</string>
     <string name="keysAddedAndUpdated">Adicionada(s) com sucesso %1$s chave(s) e atualizada(s) %2$s chave(s).</string>
-
     <string name="keysAdded">Adicionada(s) %s chave(s) com sucesso.</string>
     <string name="keysUpdated">Atualizada(s) %s chaves(s) com sucesso.</string>
     <string name="noKeysAddedOrUpdated">Nenhuma chave adicionada ou atualizada.</string>
     <string name="keyExported">1 chave exportada com sucesso.</string>
     <string name="keysExported">%s chaves exportadas com sucesso.</string>
     <string name="noKeysExported">Nenhuma chave exportada.</string>
-
     <string name="keyCreationElGamalInfo">Nota: apenas as sub-chaves suportam ElGamal, e para ElGamal se usuára o tamanho mais próximo a 1536, 2048, 3072, 4096, ou 8192.</string>
     <string name="keyNotFound">Não se pode encontrar a chave %08X.</string>
     <string name="keysFound">%s chave(s) encontrada(s).</string>
     <string name="unknownSignatureKeyTouchToLookUp">Assinatura desconhecida, toque para buscar a chave.</string>
     <string name="keyEditingIsBeta">A edição de chaves ainda está na versão beta.</string>
-
-
     <string name="badKeysEncountered">%s chave(s) secreta(s) ignoradas. Provavelmente foram exportadas com a opção\n --export-secret-subkeys\nCertifique-se de exporta com a opção\n --export-secret-keys</string>
     <string name="lookupUnknownKey">Chave %s desconhecida, você gostaria de procurá-la em um servidor de chaves?</string>
 
-    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
-         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <!--
+         error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found"
+    -->
     <string name="error_fileDeleteFailed">erro ao apagar \'%s\'</string>
     <string name="error_fileNotFound">arquivo não encontrado</string>
     <string name="error_noSecretKeyFound">não foi encontrado uma chave secreta adequada</string>
-
     <string name="error_noKnownEncryptionFound">não foi encontrado tipo de cifragem conhecido</string>
     <string name="error_externalStorageNotReady">armazenamento externo não disponível</string>
     <string name="error_accountNotFound">conta \'%s\' não encontrada</string>
     <string name="error_accountReadingNotAllowed">sem permissões para ler a conta</string>
     <string name="error_addingAccountFailed">falha ao adicionar a conta \'%s\'</string>
     <string name="error_invalidEmail">email inválido \'%s\'</string>
-
     <string name="error_keySizeMinimum512bit">o tamanho da chave deve ser pelo menos 512bit</string>
     <string name="error_masterKeyMustNotBeElGamal">a chave primária não pode ser do tipo ElGamal</string>
     <string name="error_unknownAlgorithmChoice">algoritmo selecionado desconhecido</string>
     <string name="error_userIdNeedsAName">é necessário informar um nome</string>
     <string name="error_userIdNeedsAnEmailAddress">é necessário informar um endereço de email</string>
     <string name="error_keyNeedsAUserId">é necessário pelo menos um id de usuário</string>
-
     <string name="error_mainUserIdMustNotBeEmpty">id de usuário principal não pode ser vazio</string>
     <string name="error_keyNeedsMasterKey">é necessário pelo menos uma chave primária</string>
     <string name="error_expiryMustComeAfterCreation">data de expiração deve ser após a data de criação</string>
     <string name="error_noEncryptionKeysOrPassPhrase">não foram inseridos chave(s) de cifragem ou senha</string>
     <string name="error_signatureFailed">falha na assinatura</string>
     <string name="error_noSignaturePassPhrase">senha não inserida</string>
-
     <string name="error_noSignatureKey">chave para assinatura não inserida</string>
     <string name="error_invalidData">dados a serem cifrados inválidos</string>
     <string name="error_corruptData">dados corrompidos</string>
     <string name="error_noSymmetricEncryptionPacket">não foi encontrado um pacote com criptografia simétrica</string>
     <string name="error_wrongPassPhrase">senha inválida</string>
     <string name="error_savingKeys">erro ao salvar chave(s)</string>
-
     <string name="error_couldNotExtractPrivateKey">não foi possível extrair chave privada</string>
 
     <!-- progress_lowerCase: lowercase, phrases, usually ending in '...' -->
@@ -291,35 +252,30 @@
     <string name="progress_initializing">inicializando...</string>
     <string name="progress_saving">salvando...</string>
     <string name="progress_importing">importando...</string>
-
     <string name="progress_exporting">exportando...</string>
     <string name="progress_generating">criando chave, isso pode demorar um pouco...</string>
     <string name="progress_buildingKey">criando chave...</string>
     <string name="progress_preparingMasterKey">preparando chave primária...</string>
     <string name="progress_certifyingMasterKey">certificando chave primária...</string>
     <string name="progress_buildingMasterKeyRing">criando anel de chave primária...</string>
-
     <string name="progress_addingSubKeys">adicionando sub-chaves...</string>
     <string name="progress_savingKeyRing">salvando anel de chaves...</string>
     <string name="progress_importingSecretKeys">importando chaves secretas...</string>
     <string name="progress_importingPublicKeys">importando chaves públicas...</string>
     <string name="progress_reloadingKeys">recarregando chaves...</string>
     <string name="progress_exportingKey">exportando chave...</string>
-
     <string name="progress_exportingKeys">exportando chaves...</string>
     <string name="progress_extractingSignatureKey">extraindo chave de assinatura...</string>
     <string name="progress_extractingKey">extraindo chave...</string>
     <string name="progress_preparingStreams">preparando fluxos...</string>
     <string name="progress_encrypting">cifrando dados...</string>
     <string name="progress_decrypting">decifrando dados...</string>
-
     <string name="progress_preparingSignature">preparando assinatura...</string>
     <string name="progress_generatingSignature">gerando assinatura...</string>
     <string name="progress_processingSignature">processando assinatura...</string>
     <string name="progress_verifyingSignature">verificando assinatura...</string>
     <string name="progress_signing">assinando...</string>
     <string name="progress_readingData">carregando dados...</string>
-
     <string name="progress_findingKey">buscando chave...</string>
     <string name="progress_decompressingData">descompactando dados...</string>
     <string name="progress_verifyingIntegrity">verificando integridade...</string>
@@ -334,10 +290,8 @@
     <!-- action strings -->
     <string name="action_encrypt">Cifrar</string>
     <string name="action_decrypt">Decifrar</string>
-
     <string name="action_importPublic">Importar Chaves Públicas</string>
     <string name="action_importSecret">Importar Chaves Privadas</string>
-
     <string name="hint_publicKeys">Buscar Chaves Públicas</string>
     <string name="hint_secretKeys">Buscar Chaves Privadas</string>
     <string name="filterInfo">Filter: \"%s\"</string>
@@ -349,13 +303,10 @@
 
     <!-- texts -->
     <!-- "OI File Manager", "ASTRO", and "K-9 Mail" must not be translated in order for the links to the market to work. -->
-    <string name="text_help">
-
-    Instale o leitor de emails K-9 para uma melhor integração. Ele suporta o APG para PGP/INLINE e permite cifragem e decifragem de emails diretamente.
+    <string name="text_help">    Instale o leitor de emails K-9 para uma melhor integração. Ele suporta o APG para PGP/INLINE e permite cifragem e decifragem de emails diretamente.
 \n\nÉ recomendado o uso dos Gerenciadores de Arquivos OI ou ASTRO para ser possível a utilização do botão de buscar arquivos no APG.
 \n\nSão necessárias chaves para o APG. Importe-as pela opção do menu  \"Gerir Chaves Públicas\" ou \"Gerir Chaves Privadas\" ou crie-as no menu \"Gerir Chaves Privadas\".
 \n\nVocê também pode adicionar uma conta GMail pela opção \"Adicionar Conta\", isso simplifica a decifragem de emails.
-\n\nVerifique as opções de menus para conhecer as funcionalides disponíveis.
-    </string>
+\n\nVerifique as opções de menus para conhecer as funcionalides disponíveis.</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 5c6c4b84e..576d6e56b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+     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.
@@ -17,7 +18,6 @@
 -->
 
 <resources>
-    <string name="app_name">APG</string>
 
     <!-- title_lowerCase: capitalized words, no punctuation -->
     <string name="title_mailInbox">Poštni nabiralnik</string>
@@ -125,15 +125,14 @@
     <string name="label_name">Ime</string>
     <string name="label_comment">Komentar</string>
     <string name="label_email">E-pošta</string>
-
     <string name="noKeysSelected">Izberi</string>
     <string name="oneKeySelected">1 izbran</string>
     <string name="nKeysSelected">Izbrani</string>
-    <string name="unknownUserId">&lt;nepoznan&gt;</string>
-    <string name="none">&lt;brez&gt;</string>
-    <string name="noKey">&lt;brez ključa&gt;</string>
+    <string name="unknownUserId">&lt;nepoznan></string>
+    <string name="none">&lt;brez></string>
+    <string name="noKey">&lt;brez ključa></string>
     <string name="noDate">-</string>
-    <string name="noExpiry">&lt;nikoli&gt;</string>
+    <string name="noExpiry">&lt;nikoli></string>
     <string name="unknownStatus"></string>
     <string name="canEncrypt">lahko šifrira</string>
     <string name="canSign">lahko podpiše</string>
@@ -155,18 +154,15 @@
     <string name="choice_40mins">40 min</string>
     <string name="choice_untilQuit">do izhoda</string>
     <string name="choice_language_system">Sistemsko nastavljeno</string>
-
     <string name="dsa">DSA</string>
     <string name="elgamal">ElGamal</string>
     <string name="rsa">RSA</string>
-
     <string name="filemanager_titleOpen">Odpri...</string>
     <string name="filemanager_titleSave">Shrani kot...</string>
     <string name="filemanager_titleEncrypt">Izberi datoteko za šifriranje...</string>
     <string name="filemanager_titleDecrypt">Izberi datoteko za dešifriranje...</string>
     <string name="filemanager_btnOpen">Odpri</string>
     <string name="filemanager_btnSave">Shrani</string>
-
     <string name="warning">Opozorilo</string>
     <string name="error">Napaka</string>
     <string name="warningMessage">Opozorilo: %s</string>
@@ -212,8 +208,10 @@
     <string name="unknownSignatureKeyTouchToLookUp">Neznan podpis, za ogled pritisni.</string>
     <string name="keyEditingIsBeta">Urejanje ključev je še vedno v precej testni fazi.</string>
 
-    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
-         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <!--
+         error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found"
+    -->
     <string name="error_fileDeleteFailed">izbris \'%s\' ni uspel</string>
     <string name="error_fileNotFound">ne najdem datoteke</string>
     <string name="error_noSecretKeyFound">najden ni bil noben ustrezen zasebni kluč</string>
@@ -286,7 +284,6 @@
     <string name="action_decrypt">Dešifriraj</string>
     <string name="action_importPublic">Uvozi javne ključe</string>
     <string name="action_importSecret">Uvozi zasebne ključe</string>
-
     <string name="hint_publicKeys">Poišči javne ključe</string>
     <string name="hint_secretKeys">Poišči zasebne ključe</string>
     <string name="filterInfo">Filter: \"%s\"</string>
@@ -298,11 +295,10 @@
 
     <!-- texts -->
     <!-- "OI File Manager", "ASTRO", and "K-9 Mail" must not be translated in order for the links to the market to work. -->
-    <string name="text_help"> Za boljšo integracijo namestite program K-9 Mail, ki omogoča način PGP/INLINE in neposredno šifriranje/dešifriranje e-pošte.
+    <string name="text_help">Za boljšo integracijo namestite program K-9 Mail, ki omogoča način PGP/INLINE in neposredno šifriranje/dešifriranje e-pošte.
     \n\nZaželjeno je, da namestite programa OI File Manager ali ASTRO, ki omogočata iskanje, izbiro in vnos datotek v APG.
     \n\nZa začetek potrebujete nekaj ključev. Lahko jih uvozite s klikom na menija \"Upravljanje javnih ključev\" in \"Upravljanje zasebnih ključev\" ali jih ustvarite v meniju \"Upravljanje zasebnih ključev\".
     \n\nPreko menija \"Dodaj račun\" lahko dodate vaše GMail račune in tako poenostavite dešifriranje e-pošte prejete nanje.
-    \n\nDa bi odkrili dodatne funkcije in zmožnosti programa APG, se sprehodite skozi njegove menije.
-    </string>
+    \n\nDa bi odkrili dodatne funkcije in zmožnosti programa APG, se sprehodite skozi njegove menije.</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 430825791..1e34829a7 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+     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.
@@ -17,7 +18,6 @@
 -->
 
 <resources>
-    <string name="app_name">APG</string>
 
     <!-- title_lowerCase: capitalized words, no punctuation -->
     <string name="title_mailInbox">收件箱</string>
@@ -126,15 +126,14 @@
     <string name="label_name">姓名</string>
     <string name="label_comment">注释</string>
     <string name="label_email">电子邮件</string>
-
     <string name="noKeysSelected">选择</string>
     <string name="oneKeySelected">1个选定</string>
     <string name="nKeysSelected">个选定</string>
-    <string name="unknownUserId">&lt;未知&gt;</string>
-    <string name="none">&lt;无&gt;</string>
-    <string name="noKey">&lt;无密钥&gt;</string>
+    <string name="unknownUserId">&lt;未知></string>
+    <string name="none">&lt;无></string>
+    <string name="noKey">&lt;无密钥></string>
     <string name="noDate">-</string>
-    <string name="noExpiry">&lt;不过期&gt;</string>
+    <string name="noExpiry">&lt;不过期></string>
     <string name="unknownStatus"></string>
     <string name="canEncrypt">可以加密</string>
     <string name="canSign">可以签名</string>
@@ -157,18 +156,15 @@
     <string name="choice_60mins">60 分钟</string>
     <string name="choice_untilQuit">直到退出</string>
     <string name="choice_language_system">系统默认</string>
-
     <string name="dsa">DSA</string>
     <string name="elgamal">ElGamal</string>
     <string name="rsa">RSA</string>
-
     <string name="filemanager_titleOpen">打开...</string>
     <string name="filemanager_titleSave">另存为...</string>
     <string name="filemanager_titleEncrypt">选择要加密的文件...</string>
     <string name="filemanager_titleDecrypt">选择要解密的文件...</string>
     <string name="filemanager_btnOpen">打开</string>
     <string name="filemanager_btnSave">保存</string>
-
     <string name="warning">警告</string>
     <string name="error">错误</string>
     <string name="warningMessage">警告: %s</string>
@@ -216,8 +212,10 @@
     <string name="badKeysEncountered">忽略 %s 个错误的密钥. 或许导出时你使用了\n --export-secret-subkeys\n请确保使用\n --export-secret-keys\n代替前者.</string>
     <string name="lookupUnknownKey">未知密钥 %s, 是否需要在密钥服务器上查找?</string>
 
-    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
-         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <!--
+         error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found"
+    -->
     <string name="error_fileDeleteFailed">删除 \'%s\' 失败</string>
     <string name="error_fileNotFound">文件没有找到</string>
     <string name="error_noSecretKeyFound">未发现合适的私钥</string>
@@ -292,7 +290,6 @@
     <string name="action_decrypt">解密</string>
     <string name="action_importPublic">导入公钥</string>
     <string name="action_importSecret">导入私钥</string>
-
     <string name="hint_publicKeys">搜索公钥</string>
     <string name="hint_secretKeys">搜索私钥</string>
     <string name="filterInfo">过滤信息: \"%s\"</string>
@@ -304,11 +301,10 @@
 
     <!-- texts -->
     <!-- "OI File Manager", "ASTRO", and "K-9 Mail" must not be translated in order for the links to the market to work. -->
-    <string name="text_help">安装 K-9 Mail 以便达到最好的集成, K9支持APG处理PGP/INLINE并让你直接加密或解密邮件.
+    <string name="text_help">装 K-9 Mail 以便达到最好的集成, K9支持APG处理PGP/INLINE并让你直接加密或解密邮件.
 \n\n建议安装 OI File Manager 或 ASTRO 以便在APG中浏览文件夹.
 \n\n首先你需要一些密钥. 可以通过菜单 \"管理公钥\" 和 \"管理私钥\" 来导入, 或者在菜单 \"管理私钥\" 中创建.
 \n\n你也可以通过菜单 \"添加账户\" 来添加GMail账户, 这样可以简化解密那些账户中邮件的过程.
-\n\n可以通过查看选项菜单寻找更多的功能.
-    </string>
+\n\n可以通过查看选项菜单寻找更多的功能.</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values/static_strings.xml b/res/values/static_strings.xml
new file mode 100644
index 000000000..41adbfad7
--- /dev/null
+++ b/res/values/static_strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">APG Plus</string>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 68233ff80..2e6386182 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+<!--
+     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.
@@ -15,7 +16,6 @@
 -->
 
 <resources>
-    <string name="app_name">APG</string>
 
     <!-- title_lowerCase: capitalized words, no punctuation -->
     <string name="title_mailInbox">Mail Inbox</string>
@@ -133,15 +133,14 @@
     <string name="label_comment">Comment</string>
     <string name="label_email">Email</string>
     <string name="label_sendKey">Send Key to Server?</string>
-
     <string name="noKeysSelected">Select</string>
     <string name="oneKeySelected">1 Selected</string>
     <string name="nKeysSelected">Selected</string>
-    <string name="unknownUserId">&lt;unknown&gt;</string>
-    <string name="none">&lt;none&gt;</string>
-    <string name="noKey">&lt;no key&gt;</string>
+    <string name="unknownUserId">&lt;unknown></string>
+    <string name="none">&lt;none></string>
+    <string name="noKey">&lt;no key></string>
     <string name="noDate">-</string>
-    <string name="noExpiry">&lt;no expiry&gt;</string>
+    <string name="noExpiry">&lt;no expiry></string>
     <string name="unknownStatus"></string>
     <string name="canEncrypt">can encrypt</string>
     <string name="canSign">can sign</string>
@@ -168,18 +167,15 @@
     <string name="choice_8hours">8 hours</string>
     <string name="choice_untilQuit">until quit</string>
     <string name="choice_language_system">System default</string>
-
     <string name="dsa">DSA</string>
     <string name="elgamal">ElGamal</string>
     <string name="rsa">RSA</string>
-
     <string name="filemanager_titleOpen">Open...</string>
     <string name="filemanager_titleSave">Save As...</string>
     <string name="filemanager_titleEncrypt">Select File To Encrypt...</string>
     <string name="filemanager_titleDecrypt">Select File To Decrypt...</string>
     <string name="filemanager_btnOpen">Open</string>
     <string name="filemanager_btnSave">Save</string>
-
     <string name="warning">Warning</string>
     <string name="error">Error</string>
     <string name="warningMessage">Warning: %s</string>
@@ -230,8 +226,10 @@
     <string name="keySignSuccess">Successfully signed key</string>
     <string name="qrScanImportSuccess">Successfully validated and imported key</string>
 
-    <!-- error_lowerCase: phrases, no punctuation, all lowercase,
-         they will be put after "errorMessage", e.g. "Error: file not found" -->
+    <!--
+         error_lowerCase: phrases, no punctuation, all lowercase,
+         they will be put after "errorMessage", e.g. "Error: file not found"
+    -->
     <string name="error_fileDeleteFailed">deleting \'%s\' failed</string>
     <string name="error_fileNotFound">file not found</string>
     <string name="error_noSecretKeyFound">no suitable secret key found</string>
@@ -300,15 +298,14 @@
     <!-- permission strings -->
     <string name="permission_read_key_details_label">Read key details from APG.</string>
     <string name="permission_read_key_details_description">Read key details of public and secret keys stored in APG, such as key ID and user IDs. The keys themselves can NOT be read.</string>
-	<string name="permission_store_blobs_label">Store blobs to en/decrypt with APG.</string>
-	<string name="permission_store_blobs_description">Store and read files on the android file system through APG. It cannot read files of other applications.</string>
+    <string name="permission_store_blobs_label">Store blobs to en/decrypt with APG.</string>
+    <string name="permission_store_blobs_description">Store and read files on the android file system through APG. It cannot read files of other applications.</string>
 
     <!-- action strings -->
     <string name="action_encrypt">Encrypt</string>
     <string name="action_decrypt">Decrypt</string>
     <string name="action_importPublic">Import Public Keys</string>
     <string name="action_importSecret">Import Secret Keys</string>
-
     <string name="hint_publicKeys">Search Public Keys</string>
     <string name="hint_secretKeys">Search Secret Keys</string>
     <string name="filterInfo">Filter: \"%s\"</string>
@@ -324,8 +321,6 @@
 \n\nIt is recommended that you install OI File Manager or ASTRO to be able to use the browse button for file selection in APG.
 \n\nFirst you need some keys. Either import them via the option menus in \"Manage Public Keys\" and \"Manage Secret Keys\" or create them in \"Manage Secret Keys\".
 \n\nYou can also add a GMail account in the main activity via \"Add Account\", which simplifies decrypting emails received there.
-\n\nCheck out the option menus in the various activities to find more functions.
-    </string>
-
-</resources>
+\n\nCheck out the option menus in the various activities to find more functions.</string>
 
+</resources>
\ No newline at end of file
diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java
index 4d898ab5e..5b9ba6241 100644
--- a/src/org/thialfihar/android/apg/Apg.java
+++ b/src/org/thialfihar/android/apg/Apg.java
@@ -32,6 +32,7 @@ import org.spongycastle.openpgp.PGPEncryptedDataGenerator;
 import org.spongycastle.openpgp.PGPEncryptedDataList;
 import org.spongycastle.openpgp.PGPException;
 import org.spongycastle.openpgp.PGPKeyPair;
+import org.spongycastle.openpgp.PGPKeyRing;
 import org.spongycastle.openpgp.PGPKeyRingGenerator;
 import org.spongycastle.openpgp.PGPLiteralData;
 import org.spongycastle.openpgp.PGPLiteralDataGenerator;
@@ -52,6 +53,7 @@ import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator;
 import org.spongycastle.openpgp.PGPSignatureSubpacketVector;
 import org.spongycastle.openpgp.PGPUtil;
 import org.spongycastle.openpgp.PGPV3SignatureGenerator;
+import org.thialfihar.android.apg.KeyServer.AddKeyException;
 import org.thialfihar.android.apg.provider.DataProvider;
 import org.thialfihar.android.apg.provider.Database;
 import org.thialfihar.android.apg.provider.KeyRings;
diff --git a/src/org/thialfihar/android/apg/ImportFromQRCodeActivity.java b/src/org/thialfihar/android/apg/ImportFromQRCodeActivity.java
index b875f2eef..773a5b727 100644
--- a/src/org/thialfihar/android/apg/ImportFromQRCodeActivity.java
+++ b/src/org/thialfihar/android/apg/ImportFromQRCodeActivity.java
@@ -26,7 +26,7 @@ public class ImportFromQRCodeActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        IntentIntegrator.initiateScan(this);
+        new IntentIntegrator(this).initiateScan();
     }
 
     private void importAndSign(final long keyId, final String expectedFingerprint) {
diff --git a/src/org/thialfihar/android/apg/SecretKeyListActivity.java b/src/org/thialfihar/android/apg/SecretKeyListActivity.java
index 87005510a..d160042fc 100644
--- a/src/org/thialfihar/android/apg/SecretKeyListActivity.java
+++ b/src/org/thialfihar/android/apg/SecretKeyListActivity.java
@@ -108,7 +108,8 @@ public class SecretKeyListActivity extends KeyListActivity implements OnChildCli
                 
                 long keyId = ((KeyListAdapter) mList.getExpandableListAdapter()).getGroupId(mSelectedItem);
                 String msg = keyId + "," + Apg.getFingerPrint(keyId);;
-                IntentIntegrator.shareText(this, msg);
+                
+                new IntentIntegrator(this).shareText(msg);
             }
 
             default: {