diff options
| author | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
| commit | 1515d31682ad75a50c5c06b9569ac21dbd15070c (patch) | |
| tree | ad068c0b693b7b02f786729b08ee59840570fc4e /src/main/res/values | |
| parent | 5d0c80ee5bef204b1bdefcb45adc9f2cb283553e (diff) | |
| parent | 95db6db935ff58ce2731ab535e3758a13dd5b68b (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/arrays.xml | 12 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 13 |
2 files changed, 21 insertions, 4 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index cc68ca424..0f2dbb1a4 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -57,4 +57,16 @@ <item>voice</item> <item>location</item> </string-array> + + <string-array name="picture_compression_values"> + <item>never</item> + <item>auto</item> + <item>always</item> + </string-array> + + <string-array name="picture_compression_entries"> + <item>@string/never</item> + <item>@string/automatically</item> + <item>@string/always</item> + </string-array> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index bbbc41534..50ec686e5 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -111,8 +111,6 @@ <string name="pref_vibrate_summary">Also vibrate when a new message arrives</string> <string name="pref_sound">Sound</string> <string name="pref_sound_summary">Play ringtone with notification</string> - <string name="pref_conference_notifications">Notifications in Public Conferences</string> - <string name="pref_conference_notifications_summary">Always notify when a message arrives in a public conference instead of only when highlighted</string> <string name="pref_notification_grace_period">Notification grace period</string> <string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string> <string name="pref_advanced_options">Advanced Options</string> @@ -268,7 +266,6 @@ <string name="skip">Skip</string> <string name="disable_notifications">Disable notifications</string> <string name="disable_notifications_for_this_conversation">Disable notifications for this conversation</string> - <string name="notifications_disabled">Notifications are disabled</string> <string name="enable">Enable</string> <string name="conference_requires_password">Conference requires password</string> <string name="enter_password">Enter password</string> @@ -290,7 +287,7 @@ <string name="pref_about_conversations_summary">Build and licensing information</string> <string name="pref_about_message" translatable="false">Pix-Art Messenger is a fork of Conversations. \n\nConversations • the very last word in instant messaging. - \n\nCopyright © 2014 Daniel Gultsch + \n\nCopyright © 2014-2016 Daniel Gultsch \n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or @@ -590,4 +587,12 @@ <string name="certificate_sha1">SHA1</string> <string name="certicate_info_not_available">(Not available)</string> <string name="certificate_not_found">No certificate found</string> + <string name="notify_on_all_messages">Notify on all messages</string> + <string name="notify_only_when_highlighted">Notify only when highlighted</string> + <string name="notify_never">Notifications disabled</string> + <string name="notify_paused">Notifications paused</string> + <string name="pref_picture_compression">Compress Pictures</string> + <string name="pref_picture_compression_summary">Resize and compressed pictures</string> + <string name="always">Always</string> + <string name="automatically">Automatically</string> </resources> |