diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-10-10 10:52:21 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-10-10 10:52:21 +0200 |
commit | 15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (patch) | |
tree | 9a2152390f39c4a9c79490a0938f57fe728140f2 /res/values-eu | |
parent | ae3ff5757d5d6e6e4359ecdefb6e98a9bd69c4a1 (diff) | |
parent | 331be08859d68fa6a034b39c674fd7bb929c4a5c (diff) |
Merge branch 'development'
Diffstat (limited to '')
-rw-r--r-- | res/values-eu/arrays.xml | 7 | ||||
-rw-r--r-- | res/values-eu/strings.xml | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml index cb1c20fd..a34d3c6a 100644 --- a/res/values-eu/arrays.xml +++ b/res/values-eu/arrays.xml @@ -26,8 +26,9 @@ <item>2 ordu</item> <item>8 ordu</item> <item>abisatu arte</item> - </string-array> - <integer-array name="mute_options_durations"> + </string-array> + + <integer-array name="mute_options_durations"> <item>1800</item> <item>3600</item> <item>7200</item> @@ -35,4 +36,4 @@ <item>-1</item> </integer-array> -</resources> +</resources>
\ No newline at end of file diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 72737284..4d3522fd 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -256,5 +256,5 @@ <string name="pref_use_larger_font_summary">Letra tamaina handiagoa erabili aplikazio osoan zehar</string> <string name="pref_use_send_button_to_indicate_status">Bidaltze botoiak egoera adierazten du</string> <string name="pref_use_send_button_to_indicate_status_summary">Bidaltze botoia koloreztatu kontaktu baten egoera adierazteko</string> - -</resources> + +</resources>
\ No newline at end of file |