merge 1.0.x back into trunk

src/org/thialfihar/android/apg/MainActivity.java

@@ -192,11 +192,10 @@ public class MainActivity extends BaseActivity {
                 message.setText("Read the warnings!\n\n" +
                                 "Changes:\n" +
                                 "* k9mail integration, k9mail beta build is available on the k9mail website\n" +
-                                "* support of other file managers (e.g. ASTRO)\n" +
-                                "* Slovenian translation (thanks, 359)\n" +
-                                "* new database, much faster, less memory usage\n" +
-                                "* defined Intents and content provider for other apps\n" +
-                                "* bugfixes\n" +
+                                "* German and Italian translation (thanks, cwoehrl and Fabrizio)\n" +
+                                "* new preferences GUI\n" +
+                                "* much smaller package\n" +
+                                "* signature bugfix\n" +
                                 "\n" +
                                 "WARNING: be careful editing your existing keys, as they " +
                                 "WILL be stripped of certificates right now.\n" +