diff options
| author | lookshe <github@lookshe.org> | 2016-05-26 17:46:58 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-05-26 17:46:58 +0200 |
| commit | 327cfb8ae52443c3cb7ff7f09a753300365a306c (patch) | |
| tree | 02ed62c978685ce7f481d98ed4d2bd3c508587a6 /src/main/res/values/arrays.xml | |
| parent | 2860088f0ea1cd5753756861c71cc7c118094f32 (diff) | |
| parent | 33218ec32a47292a46d574e5107164b8e8a72e40 (diff) | |
Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4
Conflicts:
README.md
art/render.rb
build.gradle
src/main/java/eu/siacs/conversations/Config.java
src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java
src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
src/main/java/eu/siacs/conversations/entities/Bookmark.java
src/main/java/eu/siacs/conversations/entities/Contact.java
src/main/java/eu/siacs/conversations/entities/ListItem.java
src/main/java/eu/siacs/conversations/entities/Message.java
src/main/java/eu/siacs/conversations/parser/IqParser.java
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
src/main/java/eu/siacs/conversations/utils/DNSHelper.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
src/main/res/layout/activity_contact_details.xml
src/main/res/layout/message_received.xml
src/main/res/layout/message_sent.xml
src/main/res/values-bg/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-eu/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pt-rBR/strings.xml
src/main/res/values-pt/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sr/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-tr-rTR/strings.xml
Diffstat (limited to 'src/main/res/values/arrays.xml')
| -rw-r--r-- | src/main/res/values/arrays.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index f8028ea3..bf9b11a1 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -5,7 +5,7 @@ <item>Mobile</item> <item>Phone</item> <item>Tablet</item> - <item>Conversations</item> + <item>@string/app_name</item> <item>Android</item> </string-array> <string-array name="filesizes"> @@ -85,4 +85,12 @@ <item>@string/contacts</item> <item>@string/always</item> </string-array> + + <string-array name="presence_show_options"> + <item>@string/presence_chat</item> + <item>@string/presence_online</item> + <item>@string/presence_away</item> + <item>@string/presence_xa</item> + <item>@string/presence_dnd</item> + </string-array> </resources> |