[sync] Upstream the Android ProfileSyncService

chrome/android/java/res/values/strings.xml

Index: chrome/android/java/res/values/strings.xml
diff --git a/chrome/android/java/res/values/strings.xml b/chrome/android/java/res/values/strings.xml
index 10cbb3acdaca9e988519a49528a2f19322cba256..4e000e10be632fb21156243c20a71a7fe0bb9d52 100644
--- a/chrome/android/java/res/values/strings.xml
+++ b/chrome/android/java/res/values/strings.xml
@@ -38,4 +38,27 @@
     <!-- Certificate Viewer -->
     <!-- Dialog box title for viewing security certificates. [CHAR-LIMIT=32] -->
     <string name="certtitle">Certificate Viewer</string>
+
+    <!-- Sync error strings -->
+    <!-- Sync error string for generic error. [CHAR-LIMIT=80] -->
+    <string name="sync_error_generic">Sync error</string>
+    <!-- Sync error string for when the needs to update the sign in details [CHAR-LIMIT=80] -->
+    <string name="sync_error_ga">Please update your sign in details.</string>
+    <!-- Sync error string for when the needs to update the sync passphrase. [CHAR-LIMIT=80] -->
+    <string name="sync_error_passphrase">Please update your sync passphrase.</string>
+    <!-- Sync error string for network connection. [CHAR-LIMIT=80] -->
+    <string name="sync_error_connection">Could not connect to the sync server.</string>
+    <!-- Sync error string for domain not supported. [CHAR-LIMIT=80] -->
+    <string name="sync_error_domain">Sync is not available for your domain.</string>
+    <!-- Sync error string for when the user enters an incorrect password. [CHAR-LIMIT=80] -->
+    <string name="sync_error_password_incorrect">The password you entered is incorrect.</string>
+    <!-- Sync error string for when user entered an application specific password instead of a Google Account password. [CHAR-LIMIT=80] -->
+    <string name="sync_error_asp_error">Enter your Google Account password first, not an application specific password.</string>
+    <!-- Sync error string for service unavailable. [CHAR-LIMIT=80] -->
+    <string name="sync_error_service_unavailable">The service is not available; try again later.</string>
+    <!-- Sync error string for service unavailable, but Chrome will try again later. [CHAR-LIMIT=80] -->
+    <string name="sync_error_service_unavailable_auto_retry">The service is not available; waiting to retry.</string>
+    <!-- Sync error string for service unavailable. [CHAR-LIMIT=80] -->
+    <string name="sync_error_service_unavailable_no_retry">The service is not available.</string>
+
 </resources>