From 4ff9c1dfc6f4fb60fdef2a2bfe8c6e7ffd4f32b9 Mon Sep 17 00:00:00 2001
From: Arne Jans <arne.jans@gmail.com>
Date: Fri, 27 May 2011 15:15:13 +0200
Subject: [PATCH] Clarified reminder-settings descriptions (quiet hours dont
 stop notifications to appear, Astrid Reminders-setting doesnt turn off
 notifications, either).

---
 astrid/res/values-de/strings.xml        | 8 ++++----
 astrid/res/values/strings-reminders.xml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 2dace1ff9..5dca45070 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -1026,14 +1026,14 @@
   <!-- Reminder Preference: Quiet Hours Start Title -->
   <string name="rmd_EPr_quiet_hours_start_title">Ruhestunden beginnen</string>
   <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Keine Erinnerungen werden nach %s erscheinen</string>
+  <string name="rmd_EPr_quiet_hours_start_desc">Erinnerungen sind stumm nach %s Uhr.\Hinweis: der Vibrationsalarm wird durch die entsprechende Einstellung weiter unten kontrolliert! </string>
   <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Stille Stunden sind deaktiviert</string>
+  <string name="rmd_EPr_quiet_hours_desc_none">Ruhestunden sind deaktiviert</string>
   
   <!-- Reminder Preference: Quiet Hours End Title -->
   <string name="rmd_EPr_quiet_hours_end_title">Ruhestunden beenden</string>
   <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Erinnerungen werden angezeigt ab: %s</string>
+  <string name="rmd_EPr_quiet_hours_end_desc">Erinnerungen ertönen ab %s Uhr.</string>
 
   <!-- Reminder Preference: Default Reminder Title -->
   <string name="rmd_EPr_rmd_time_title">Standarderinnerungszeit</string>
@@ -1069,7 +1069,7 @@
   <string name="rmd_EPr_vibrate_desc_false">Astrid wird bei Erinnerungen nicht vibrieren</string>
 
   <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid Erinnerungen</string>
+  <string name="rmd_EPr_nagging_title">Astrid Ermutigungen</string>
   <!-- Reminder Preference: Nagging Description (true) -->
   <string name="rmd_EPr_nagging_desc_true">Astrid soll Ermutigungen zu den Erinnerungen hinzufügen</string>
   <!-- Reminder Preference: Nagging Description (false) -->
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index 40c7d89e5..bcf053aae 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -66,14 +66,14 @@
   <!-- Reminder Preference: Quiet Hours Start Title -->
   <string name="rmd_EPr_quiet_hours_start_title">Quiet Hours Start</string>
   <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">No notifications will appear after %s</string>
+  <string name="rmd_EPr_quiet_hours_start_desc">Notifications will be silent after %s.\nNote: vibrations are controlled by the setting below! </string>
   <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
   <string name="rmd_EPr_quiet_hours_desc_none">Quiet hours is disabled</string>
   
   <!-- Reminder Preference: Quiet Hours End Title -->
   <string name="rmd_EPr_quiet_hours_end_title">Quiet Hours End</string>
   <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Notifications will begin appearing starting at %s</string>
+  <string name="rmd_EPr_quiet_hours_end_desc">Notifications will stop being silent starting at %s</string>
 
   <!-- Reminder Preference: Default Reminder Title -->
   <string name="rmd_EPr_rmd_time_title">Default Reminder</string>
@@ -109,11 +109,11 @@
   <string name="rmd_EPr_vibrate_desc_false">Astrid will not vibrate when sending notifications</string>
 
   <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid Reminders</string>
+  <string name="rmd_EPr_nagging_title">Astrid Encouragements</string>
   <!-- Reminder Preference: Nagging Description (true) -->
   <string name="rmd_EPr_nagging_desc_true">Astrid will show up to give you an encouragement during reminders</string>
   <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid not give you any encouragement messages</string>
+  <string name="rmd_EPr_nagging_desc_false">Astrid will not give you any encouragement messages</string>
 
   <!-- Reminder Preference: Snooze Dialog Title -->  
   <string name="rmd_EPr_snooze_dialog_title">Snooze Dialog HH:MM</string>