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

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: Fix following try test. Created 9 years, 1 month 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 10117 matching lines...) Expand 10 before | Expand all | Expand 10 after
10128 <message name="IDS_SYNC_SETUP_ERROR" desc="The message displayed when an u nspecified but unrecoverable error occurs during sync setup."> 10128 <message name="IDS_SYNC_SETUP_ERROR" desc="The message displayed when an u nspecified but unrecoverable error occurs during sync setup.">
10129 An error occurred while trying to set up sync. 10129 An error occurred while trying to set up sync.
10130 </message> 10130 </message>
10131 <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"> 10131 <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">
10132 The sync server is busy, please try again later. 10132 The sync server is busy, please try again later.
10133 </message> 10133 </message>
10134 <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."> 10134 <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.">
10135 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> 10135 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>
10136 </message> 10136 </message>
10137 <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."> 10137 <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.">
10138 Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph> .
10139 </message>
10140 <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)">
10138 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> 10141 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>
10139 </message> 10142 </message>
10140 <message name="IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED" desc="The sync setup is underway and the user has not yet entered credentials."> 10143 <message name="IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED" desc="The sync setup is underway and the user has not yet entered credentials.">
10141 Account sign-in details are not yet entered. 10144 Account sign-in details are not yet entered.
10142 </message> 10145 </message>
10143 <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display while the user is being authenticated to use sync."> 10146 <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display while the user is being authenticated to use sync.">
10144 Authenticating... 10147 Authenticating...
10145 </message> 10148 </message>
10146 <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."> 10149 <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.">
10147 Invalid user name or password. 10150 Invalid user name or password.
(...skipping 4404 matching lines...) Expand 10 before | Expand all | Expand 10 after
14552 </messages> 14555 </messages>
14553 <structures fallback_to_english="true"> 14556 <structures fallback_to_english="true">
14554 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14557 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14555 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14558 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14556 </structure> 14559 </structure>
14557 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14560 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14558 </structure> 14561 </structure>
14559 </structures> 14562 </structures>
14560 </release> 14563 </release>
14561 </grit> 14564 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service.h » ('j') | chrome/browser/sync/sync_ui_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698