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

Side by Side Diff: chrome/app/generated_resources.grd

Issue 8383036: Adding parameter to GetStatusLabels to indicate if links are acceptable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Self-review fix. Created 9 years, 2 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
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 10040 matching lines...) Expand 10 before | Expand all | Expand 10 after
10051 <message name="IDS_SYNC_SETUP_ERROR" desc="The message displayed when an u nspecified but unrecoverable error occurs during sync setup."> 10051 <message name="IDS_SYNC_SETUP_ERROR" desc="The message displayed when an u nspecified but unrecoverable error occurs during sync setup.">
10052 An error occurred while trying to set up sync. 10052 An error occurred while trying to set up sync.
10053 </message> 10053 </message>
10054 <message name="IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR" desc="The error me ssage displayed to the user when setup was aborted because the server reported t hat a pending clear private data operation is in progress"> 10054 <message name="IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR" desc="The error me ssage displayed to the user when setup was aborted because the server reported t hat a pending clear private data operation is in progress">
10055 The sync server is busy, please try again later. 10055 The sync server is busy, please try again later.
10056 </message> 10056 </message>
10057 <message name="IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME" desc="The messag e that appears in the options dialog indicating that account is synced to a user with the given email address. The last sync also appears in the message."> 10057 <message name="IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME" desc="The messag e that appears in the options dialog indicating that account is synced to a user with the given email address. The last sync also appears in the message.">
10058 Synced as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. L ast synced: <ph name="LAST_SYNC_TIME">$2<ex>12 seconds ago</ex></ph> 10058 Synced as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. L ast synced: <ph name="LAST_SYNC_TIME">$2<ex>12 seconds ago</ex></ph>
10059 </message> 10059 </message>
10060 <message name="IDS_SYNC_ACCOUNT_SYNCING_TO_USER" desc="The message that ap pears in the options dialog indicating that account is syncing to a user with th e given email address."> 10060 <message name="IDS_SYNC_ACCOUNT_SYNCING_TO_USER" desc="The message that ap pears in the options dialog indicating that account is syncing to a user with th e given email address.">
10061 Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph> .
10062 </message>
10063 <message name="IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK" desc="Th e message that appears in the options dialog indicating that account is syncing to a user with the given email address, together with a link to manage their dat a (where supported, or not possible through the application)">
10061 Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph> . Manage your synced data on <ph name="BEGIN_LINK">&lt;a href="$2"&gt;</ph>Googl e Dashboard<ph name="END_LINK">&lt;/a&gt;.</ph> 10064 Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph> . Manage your synced data on <ph name="BEGIN_LINK">&lt;a href="$2"&gt;</ph>Googl e Dashboard<ph name="END_LINK">&lt;/a&gt;.</ph>
10062 </message> 10065 </message>
10063 <message name="IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED" desc="The sync setup is underway and the user has not yet entered credentials."> 10066 <message name="IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED" desc="The sync setup is underway and the user has not yet entered credentials.">
10064 Account sign-in details are not yet entered. 10067 Account sign-in details are not yet entered.
10065 </message> 10068 </message>
10066 <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display while the user is being authenticated to use sync."> 10069 <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display while the user is being authenticated to use sync.">
10067 Authenticating... 10070 Authenticating...
10068 </message> 10071 </message>
10069 <message name="IDS_SYNC_INVALID_USER_CREDENTIALS" desc="Error message to d isplay when the user name or password entered by the user are invalid."> 10072 <message name="IDS_SYNC_INVALID_USER_CREDENTIALS" desc="Error message to d isplay when the user name or password entered by the user are invalid.">
10070 Invalid user name or password. 10073 Invalid user name or password.
(...skipping 4410 matching lines...) Expand 10 before | Expand all | Expand 10 after
14481 </messages> 14484 </messages>
14482 <structures fallback_to_english="true"> 14485 <structures fallback_to_english="true">
14483 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14486 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14484 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14487 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14485 </structure> 14488 </structure>
14486 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14489 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14487 </structure> 14490 </structure>
14488 </structures> 14491 </structures>
14489 </release> 14492 </release>
14490 </grit> 14493 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service.h » ('j') | chrome/browser/sync/sync_ui_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698