aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/arrays.xml
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-02-20 22:19:31 +0100
committersteckbrief <steckbrief@chefmail.de>2015-02-20 22:19:31 +0100
commit20eae3955700341188bc1907a506970f5817a153 (patch)
tree6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/values/arrays.xml
parent980a84a6ce4358e8662addf203695e01d9f931dc (diff)
parentecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff)
Merge master-origin
Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.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/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
Diffstat (limited to 'src/main/res/values/arrays.xml')
-rw-r--r--src/main/res/values/arrays.xml70
1 files changed, 37 insertions, 33 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 4acc9e62..c413a3c4 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -1,39 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string-array name="resources">
- <item>Mobile</item>
- <item>Phone</item>
- <item>Tablet</item>
- <item>Conversations</item>
- <item>Android</item>
- </string-array>
- <string-array name="filesizes">
- <item>never</item>
- <item>256 KB</item>
- <item>512 KB</item>
- <item>1 MB</item>
- </string-array>
- <string-array name="filesizes_values">
- <item>0</item>
- <item>262144</item>
- <item>524288</item>
- <item>1048576</item>
- </string-array>
- <string-array name="mute_options_descriptions">
- <item>30 minutes</item>
- <item>1 hour</item>
- <item>2 hours</item>
- <item>8 hours</item>
- <item>until further notice</item>
- </string-array>
+ <string-array name="resources">
+ <item>Mobile</item>
+ <item>Phone</item>
+ <item>Tablet</item>
+ <item>Conversations</item>
+ <item>Android</item>
+ </string-array>
+ <string-array name="filesizes">
+ <item>@string/never</item>
+ <item>256 KiB</item>
+ <item>512 KiB</item>
+ <item>1 MiB</item>
+ <item>5 MiB</item>
+ <item>10 MiB</item>
+ </string-array>
+ <string-array name="filesizes_values">
+ <item>0</item>
+ <item>262144</item>
+ <item>524288</item>
+ <item>1048576</item>
+ <item>5242880</item>
+ <item>10485760</item>
+ </string-array>
+ <string-array name="mute_options_descriptions">
+ <item>@string/thirty_minutes</item>
+ <item>@string/one_hour</item>
+ <item>@string/two_hours</item>
+ <item>@string/eight_hours</item>
+ <item>@string/until_further_notice</item>
+ </string-array>
- <integer-array name="mute_options_durations">
- <item>1800</item>
- <item>3600</item>
- <item>7200</item>
- <item>28800</item>
- <item>-1</item>
- </integer-array>
+ <integer-array name="mute_options_durations">
+ <item>1800</item>
+ <item>3600</item>
+ <item>7200</item>
+ <item>28800</item>
+ <item>-1</item>
+ </integer-array>
</resources>