diff options
| author | Christian S <christian@pix-art.de> | 2016-04-11 19:52:37 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-11 19:52:37 +0200 |
| commit | a096fb7c8bdabc609f0cf9ff3786c159a048d82c (patch) | |
| tree | 7b0a50d4ac6dc713b613898884a9946667b6a16a /src/main/res | |
| parent | ec870c793a3429519cc42971c45a446d946f1dd4 (diff) | |
| parent | 23a0beab43a5f30baf6481afeb9188b86df0b32d (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values-de/strings.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 8 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 8ff58ede1..8fd8cd6ee 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -105,6 +105,8 @@ <string name="pref_notifications_summary">Benachrichtigen bei Erhalt einer neuen Nachricht</string> <string name="pref_vibrate">Vibrieren</string> <string name="pref_vibrate_summary">Vibrieren bei Erhalt einer neuen Nachricht</string> + <string name="pref_led">LED Benachrichtigung</string> + <string name="pref_led_summary">Blinke bei Erhalt einer neuen Nachricht</string> <string name="pref_sound">Benachrichtigungston</string> <string name="pref_sound_summary">Benachrichtigungston wiedergeben</string> <string name="pref_notification_grace_period">Gnadenfrist</string> @@ -607,5 +609,5 @@ <string name="shared_images_with_x">Bilder mit %s geteilt</string> <string name="sharing_files_please_wait">Teile Dateien. Bitte warten…</string> <string name="delete_x_file">%s löschen</string> - + <string name="security_error_invalid_file_access">Sicherheitsfehler: Dateizugriff nicht erlaubt</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 461cf75ae..a11283bd3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -108,9 +108,11 @@ <string name="pref_notifications">Notifications</string> <string name="pref_notifications_summary">Notify when a new message arrives</string> <string name="pref_vibrate">Vibrate</string> - <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_vibrate_summary">Vibrate when a new message arrives</string> + <string name="pref_led">LED Notification</string> + <string name="pref_led_summary">Blink notification light when a new message arrives</string> + <string name="pref_sound">Ringtone</string> + <string name="pref_sound_summary">Play sound when a new message arrives</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</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 734656a84..33a84e1b4 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -72,7 +72,12 @@ android:key="vibrate_on_notification" android:summary="@string/pref_vibrate_summary" android:title="@string/pref_vibrate"/> - + <CheckBoxPreference + android:defaultValue="true" + android:dependency="show_notification" + android:key="led" + android:title="@string/pref_led" + android:summary="@string/pref_led_summary"/> <RingtonePreference android:defaultValue="content://settings/system/notification_sound" android:dependency="show_notification" |