[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] -->

[Yaron, 2013/02/23 01:38:49]

Please re-use native strings wherever possible.

[nyquist, 2013/02/27 05:19:16]

I have commented below on the different native strings available in native
today. Some of them are much longer.

Do you want me to use some from native, and some from strings.xml? Or should I
move all these Java/Android-strings to generated_resources.grd?

Otherwise I vote for keeping as is until strings.xml is auto-generated instead.

+    <string name="sync_error_generic">Sync error</string>

[nyquist, 2013/02/27 05:19:16]

IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE =
Sync Error

+    <!-- 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>

[nyquist, 2013/02/27 05:19:16]

IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE =
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> could not sync your data
because your account sign in details are out of date.

+    <!-- 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>

[nyquist, 2013/02/27 05:19:16]

Perfect match
IDS_SYNC_PASSWORD_SYNC_ATTENTION = IDS_SYNC_CONFIGURE_ENCRYPTION =
Please update your sync passphrase.

+    <!-- Sync error string for network connection. [CHAR-LIMIT=80] -->
+    <string name="sync_error_connection">Could not connect to the sync server.</string>

[nyquist, 2013/02/27 05:19:16]

IDS_SYNC_SERVER_IS_UNREACHABLE =
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> could not sync your data
because it could not connect to the sync server. Retrying...

+    <!-- Sync error string for domain not supported. [CHAR-LIMIT=80] -->
+    <string name="sync_error_domain">Sync is not available for your domain.</string>

[nyquist, 2013/02/27 05:19:16]

IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE =
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> could not sync your data
because Sync is not available for your domain.

+    <!-- 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>

[nyquist, 2013/02/27 05:19:16]

IDS_INCORRECT_PASSPHRASE_WARNING =
The passphrase you entered is incorrect.

+    <!-- 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>

[nyquist, 2013/02/27 05:19:16]

Text matches, but native adds a breakline.
IDS_SYNC_ASP_PASSWORD_WARNING_TEXT =
Enter your Google Account password first,
<ph name="LINE_BREAK">&lt;br /&gt;<ex>&lt;br /&gt;</ex></ph>
not an application specific password.

+    <!-- Sync error string for service unavailable. [CHAR-LIMIT=80] -->
+    <string name="sync_error_service_unavailable">The service is not available; try again later.</string>

[nyquist, 2013/02/27 05:19:16]

IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR =
The sync server is busy, please try again later.

+    <!-- 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>