diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-05-14 00:09:38 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-05-14 00:09:38 +0200 |
| commit | 65e729480210982149c83c7fc6881bebd71e2bdb (patch) | |
| tree | 7955efa504390e843c21683b0fc22b156d1703ca | |
| parent | a1a90a03e042656e69d11c9989830ade5d14827d (diff) | |
| parent | ebae779d735661d9e1091bb88dc378fd01ef794b (diff) | |
Merge branch 'development' into feature/take_picture
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | res/values-de/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8c90d092..3d1d6a4f 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 ecfd13f5..116cc307 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) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 719d769c..a8793248 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 ed855467..26af8830 100644 --- a/res/values/strings.xml +++ b/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> |