sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'development' into feature/take_picture

This commit is contained in:
Daniel Gultsch 2014-05-14 00:09:38 +02:00
parent a1a90a03e0 ebae779d73
commit 65e7294802
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

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

4
CHANGELOG.md
View File

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

2
res/values-de/strings.xml
View File

@ -127,5 +127,5 @@
<string name="keys">Schlüssel</string> <string name="keys">Schlüssel</string>
<string name="send_presence_updates">Sende Online Status</string> <string name="send_presence_updates">Sende Online Status</string>
<string name="receive_presence_updates">Empfange 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> </resources>

1
res/values/strings.xml
View File

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