Merge branch 'development' into feature/take_picture

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="eu.siacs.conversations"
-    android:versionCode="11"
-    android:versionName="0.2" >
+    android:versionCode="12"
+    android:versionName="0.2.1" >
 
     <uses-sdk
         android:minSdkVersion="14"

CHANGELOG.md

@@ -1,5 +1,9 @@
 ###Changelog
 
+####Version 0.2.1
+* Various bug fixes
+* Updated Translations
+
 ####Version 0.2
 * Image file transfer
 * Better integration with OpenKeychain (PGP encryption)

res/values-de/strings.xml

@@ -127,5 +127,5 @@
     <string name="keys">Schlüssel</string>
     <string name="send_presence_updates">Sende Online Status</string>
     <string name="receive_presence_updates">Empfange Online Status</string>
-    <string name="preemptively_grant">Preemptively grant subscription request</string>
+    <string name="preemptively_grant">Erlaube Statusanfrage vorab</string>
 </resources>

res/values/strings.xml

@@ -130,4 +130,5 @@
     <string name="ask_for_presence_updates">Ask for presence updates</string>
     <string name="attach_choose_picture">Choose picture</string>
     <string name="attach_take_picture">Take picture</string>
+    <string name="preemptively_grant">Preemptively grant subscription request</string>
 </resources>