diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-11-03 21:33:14 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-11-03 21:33:14 +0100 |
| commit | 0575767152abc391fd1d0241d9cbae154236df70 (patch) | |
| tree | d4530ebbdb2de9ed0f0c41eb008a712edba6d7f6 /src/main/res/values | |
| parent | 389e3d4f0f5116f5ea22cc7c5e8cec1e6c791e3a (diff) | |
| parent | b22d863c362bb6492240700c0f69f1a5d926f46b (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/arrays.xml | 11 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 9 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index c555d4ba..24f8790c 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -69,5 +69,14 @@ <item>1</item> <item>2</item> </string-array> - + <string-array name="resize_picture_setting_entries"> + <item>@string/pref_resize_picture_ask</item> + <item>@string/pref_resize_picture_always</item> + <item>@string/pref_resize_picture_never</item> + </string-array> + <string-array name="resize_picture_setting_values"> + <item>ASK</item> + <item>ALWAYS</item> + <item>NEVER</item> + </string-array> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 277d4790..33f89e7a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -520,4 +520,13 @@ <string name="dlg_msg_details_msg_status_unsend">Unsend</string> <string name="dlg_msg_details_msg_status_offered">Offered</string> <string name="dlg_msg_details_msg_status_failed">Failed</string> + <string name="pref_resize_picture_ask">ask</string> + <string name="pref_resize_picture_always">always</string> + <string name="pref_resize_picture_never">never</string> + <string name="pref_resize_picture_summary">Whether pictures shall be resized or not</string> + <string name="pref_resize_picture">Resize pictures</string> + <string name="cplus_yes">Yes</string> + <string name="cplus_no">No</string> + <string name="cplus_remember_userdecision">Remember this decision</string> + <string name="userdecision_question_resize_picture">Shall the picture be resized?</string> </resources> |