From bc87f596006fb25ca9457268b1a3290ca733df89 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 13 May 2014 17:57:10 +0200
Subject: [PATCH 1/2] version bump

---
 AndroidManifest.xml | 4 ++--
 CHANGELOG.md        | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8c90d0929..3d1d6a4fc 100644
--- a/AndroidManifest.xml
+++ b/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"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecfd13f51..116cc3077 100644
--- a/CHANGELOG.md
+++ b/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)

From ebae779d735661d9e1091bb88dc378fd01ef794b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 13 May 2014 18:06:56 +0200
Subject: [PATCH 2/2] one more entry to strings file

---
 res/values-de/strings.xml | 2 +-
 res/values/strings.xml    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 719d769cb..a87932485 100644
--- a/res/values-de/strings.xml
+++ b/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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 10dfb5924..e7f5ca746 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -128,4 +128,5 @@
     <string name="send_presence_updates">Send presence updates</string>
     <string name="receive_presence_updates">Receive presence updates</string>
     <string name="ask_for_presence_updates">Ask for presence updates</string>
+    <string name="preemptively_grant">Preemptively grant subscription request</string>
 </resources>