am dc81c6d0: am 214dbb45: Fix bug2123514 and a handful of other string edits.

Merge commit 'dc81c6d014bba6392730ed00e36518fb812946dc'

* commit 'dc81c6d014bba6392730ed00e36518fb812946dc':
  Fix bug2123514 and a handful of other string edits.

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5ec3c66..f733096 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_label">Calendar</string>
     <!-- This is the welcome message when a user starts Calendar for the first time -->
     <string name="calendar_plug"><font fgcolor="#ffffffff">Welcome to Google Calendar!</font>
-    \nA Google approach to managing your schedule built on the idea that scheduling events can be more intuitive, efficient and accessible.
+    \nA Google approach to managing your schedule built on the idea that scheduling events can be more intuitive, efficient, and accessible.
     </string>
 
     <!-- Shared Labels. These labels are shared among the activities. -->
@@ -358,7 +358,7 @@
     <!-- Title of ringtone selector dialog -->
     <string name="preferences_alerts_ringtone_title">Select ringtone</string>
     <!-- List item label for setting the default number of reminder minutes -->
-    <string name="preferences_default_reminder_title">Set default reminder</string>
+    <string name="preferences_default_reminder_title">Default reminder time</string>
     <!-- Title of dialog for setting the default number of reminder minutes -->
     <string name="preferences_default_reminder_dialog">Default reminder time</string>
     <!-- Default value for the number of reminder minutes -->