commit 6b858fc6f8afad95a075595016c5c22547924886
author Erik <roboerik@android.com> Wed Sep 15 18:59:04 2010 -0700
committer Erik <roboerik@android.com> Tue Sep 21 13:47:09 2010 -0700
tree 5d99912b5667c5ca5800cb060d2f1f4e34de1c36
parent 57e0bf4285419d9aca9d1949fd46889f852c0d09

Moves per calendar sync settings into Settings

This makes calendar sync settings show up on a per account basis
in the Calendar Settings activity and also displays a message to
the user if the account is not being auto-synced.

Change-Id: I2326922f518ae3bc8d1db70ae5c1d5b07b251ca3

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e55a61c..a7fdfed 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -150,6 +150,18 @@
     <string name="synced_not_visible">synced, not visible</string>
     <!-- not Synced or visible status message -->
     <string name="not_synced_not_visible">not synced, not visible</string>
+    <!-- Synced status message displayed when the given calendar is stored/synced on the device
+        [CHAR LIMIT=60] -->
+    <string name="synced"> synced</string>
+    <!-- Not synced status message displayed when the given calendar is not stored/synced on the
+        device [CHAR LIMIT=60] -->
+    <string name="not_synced"> not synced</string>
+    <!-- Message displayed to user when an account with Calendars is not being auto-synced
+        [CHAR LIMIT=120]-->
+    <string name="acct_not_synced">This account is not being synced and your calendars may
+        not update correctly.</string>
+    <!-- Label on button that takes user to the Accounts and Sync settings page [CHAR LIMIT=60] -->
+    <string name="accounts">Accounts &amp; sync</string>
 
     <!-- Event edit activity -->
     <skip />