Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: chrome/android/java/res/values/strings.xml

Issue 12313075: [sync] Upstream the Android ProfileSyncService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 3
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. 5 found in the LICENSE file.
6 --> 6 -->
7 7
8 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xlif f="urn:oasis:names:tc:xliff:document:1.2"> 8 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xlif f="urn:oasis:names:tc:xliff:document:1.2">
9 <!-- Popup button for user to confirm a beforeunload dialog box triggered by a page navigation, 9 <!-- Popup button for user to confirm a beforeunload dialog box triggered by a page navigation,
10 i.e. they want to leave the current page [CHAR-LIMIT=20] --> 10 i.e. they want to leave the current page [CHAR-LIMIT=20] -->
(...skipping 20 matching lines...) Expand all
31 <string name="js_modal_dialog_cancel">Cancel</string> 31 <string name="js_modal_dialog_cancel">Cancel</string>
32 <!-- Checkbox allowing users to forgoe an additional prompts from a web 32 <!-- Checkbox allowing users to forgoe an additional prompts from a web
33 page. [CHAR-LIMIT=None] --> 33 page. [CHAR-LIMIT=None] -->
34 <string name="suppress_js_modal_dialogs">Prevent this page from creating add itional dialogs</string> 34 <string name="suppress_js_modal_dialogs">Prevent this page from creating add itional dialogs</string>
35 <!-- Content description for the input javascript modal dialog prompt. [CHAR -LIMIT=32] --> 35 <!-- Content description for the input javascript modal dialog prompt. [CHAR -LIMIT=32] -->
36 <string name="accessibility_js_modal_dialog_prompt">Prompt</string> 36 <string name="accessibility_js_modal_dialog_prompt">Prompt</string>
37 37
38 <!-- Certificate Viewer --> 38 <!-- Certificate Viewer -->
39 <!-- Dialog box title for viewing security certificates. [CHAR-LIMIT=32] --> 39 <!-- Dialog box title for viewing security certificates. [CHAR-LIMIT=32] -->
40 <string name="certtitle">Certificate Viewer</string> 40 <string name="certtitle">Certificate Viewer</string>
41
42 <!-- Sync error strings -->
43 <!-- 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 str
44 <string name="sync_error_generic">Sync error</string>
nyquist 2013/02/27 05:19:16 IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE = Sync Error
45 <!-- Sync error string for when the needs to update the sign in details [CHA R-LIMIT=80] -->
46 <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 n
47 <!-- Sync error string for when the needs to update the sync passphrase. [CH AR-LIMIT=80] -->
48 <string name="sync_error_passphrase">Please update your sync passphrase.</st ring>
nyquist 2013/02/27 05:19:16 Perfect match IDS_SYNC_PASSWORD_SYNC_ATTENTION = I
49 <!-- Sync error string for network connection. [CHAR-LIMIT=80] -->
50 <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
51 <!-- Sync error string for domain not supported. [CHAR-LIMIT=80] -->
52 <string name="sync_error_domain">Sync is not available for your domain.</str ing>
nyquist 2013/02/27 05:19:16 IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE = <
53 <!-- Sync error string for when the user enters an incorrect password. [CHAR -LIMIT=80] -->
54 <string name="sync_error_password_incorrect">The password you entered is inc orrect.</string>
nyquist 2013/02/27 05:19:16 IDS_INCORRECT_PASSPHRASE_WARNING = The passphrase
55 <!-- Sync error string for when user entered an application specific passwor d instead of a Google Account password. [CHAR-LIMIT=80] -->
56 <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_SYN
57 <!-- Sync error string for service unavailable. [CHAR-LIMIT=80] -->
58 <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
59 <!-- Sync error string for service unavailable, but Chrome will try again la ter. [CHAR-LIMIT=80] -->
60 <string name="sync_error_service_unavailable_auto_retry">The service is not available; waiting to retry.</string>
61 <!-- Sync error string for service unavailable. [CHAR-LIMIT=80] -->
62 <string name="sync_error_service_unavailable_no_retry">The service is not av ailable.</string>
63
41 </resources> 64 </resources>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698