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

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

Issue 6961014: Modify settings page text when syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix string description and don't use local var for error. Created 9 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/resources/options/personal_options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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. OS values are passed through from Python's sys.platform: 5 locale. OS values are passed through from Python's sys.platform:
6 6
7 win32 - Windows 7 win32 - Windows
8 darwin - Mac 8 darwin - Mac
9 linux2 - Linux (both Views and GTK+) 9 linux2 - Linux (both Views and GTK+)
10 10
(...skipping 7936 matching lines...) Expand 10 before | Expand all | Expand 10 after
7947 Create New Profile 7947 Create New Profile
7948 </message> 7948 </message>
7949 </if> 7949 </if>
7950 <message name="IDS_PROFILES_SYNCED_TO_USER_WITH_TIME" desc="The message th at appears in the options dialog indicating that account is synced to a user wit h the given email address. The last sync also appears in the message."> 7950 <message name="IDS_PROFILES_SYNCED_TO_USER_WITH_TIME" desc="The message th at appears in the options dialog indicating that account is synced to a user wit h the given email address. The last sync also appears in the message.">
7951 Using Chrome profile <ph name="USER_EMAIL_ADDRESS"> 7951 Using Chrome profile <ph name="USER_EMAIL_ADDRESS">
7952 $1<ex>foo@gmail.com</ex> 7952 $1<ex>foo@gmail.com</ex>
7953 </ph>. Last synced: <ph name="LAST_SYNC_TIME"> 7953 </ph>. Last synced: <ph name="LAST_SYNC_TIME">
7954 $2<ex>12 seconds ago</ex> 7954 $2<ex>12 seconds ago</ex>
7955 </ph> 7955 </ph>
7956 </message> 7956 </message>
7957 <message name="IDS_PROFILES_SYNCING_TO_USER" desc="The message that appear s in the options dialog indicating that account is synced to a user with the giv en email address.">
7958 Syncing Chrome profile <ph name="USER_EMAIL_ADDRESS">
James Hawkins 2011/05/20 22:33:06 You should ask mirandac, but I think we should use
Miranda Callahan 2011/05/21 10:51:30 Yes, that sounds good -- thanks.
Sheridan Rawlins 2011/05/22 02:29:11 Done.
7959 $1<ex>foo@gmail.com</ex>
7960 </ph>. Manage sync data on <ph name="BEGIN_LINK">&lt;a href="$2"&gt;</ph >Google Dashboard<ph name="END_LINK">&lt;/a&gt;</ph>
7961
7962 </message>
7957 <if expr="not pp_ifdef('use_titlecase')"> 7963 <if expr="not pp_ifdef('use_titlecase')">
7958 <message name="IDS_PROFILES_DISCONNECT_BUTTON_LABEL" desc="The text to d isplay on the button to indicate profile disconnect (i.e., stop syncing) functio nality."> 7964 <message name="IDS_PROFILES_DISCONNECT_BUTTON_LABEL" desc="The text to d isplay on the button to indicate profile disconnect (i.e., stop syncing) functio nality.">
7959 Disconnect this account... 7965 Disconnect this account...
7960 </message> 7966 </message>
7961 </if> 7967 </if>
7962 <if expr="pp_ifdef('use_titlecase')"> 7968 <if expr="pp_ifdef('use_titlecase')">
7963 <message name="IDS_PROFILES_DISCONNECT_BUTTON_LABEL" desc="The text to d isplay on the button to indicate profile disconnect (i.e., stop syncing) functio nality."> 7969 <message name="IDS_PROFILES_DISCONNECT_BUTTON_LABEL" desc="The text to d isplay on the button to indicate profile disconnect (i.e., stop syncing) functio nality.">
7964 Disconnect This Account... 7970 Disconnect This Account...
7965 </message> 7971 </message>
7966 </if> 7972 </if>
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
8672 </if> 8678 </if>
8673 <message name="IDS_SYNC_SETUP_ERROR" desc="The message displayed when an u nspecified but unrecoverable error occurs during sync setup."> 8679 <message name="IDS_SYNC_SETUP_ERROR" desc="The message displayed when an u nspecified but unrecoverable error occurs during sync setup.">
8674 An error occurred while trying to set up sync. 8680 An error occurred while trying to set up sync.
8675 </message> 8681 </message>
8676 <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"> 8682 <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">
8677 The sync server is busy, please try again later. 8683 The sync server is busy, please try again later.
8678 </message> 8684 </message>
8679 <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."> 8685 <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.">
8680 Synced to <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> 8686 Synced to <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>
8681 </message> 8687 </message>
8688 <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.">
8689 Syncing to <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>.
8690 Manage sync data on <ph name="BEGIN_LINK">&lt;a href="$2"&gt;</ph>Google Dashboard<ph name="END_LINK">&lt;/a&gt;</ph>
8691 </message>
8682 <message name="IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED" desc="The sync setup is underway and the user has not yet entered credentials."> 8692 <message name="IDS_SYNC_ACCOUNT_DETAILS_NOT_ENTERED" desc="The sync setup is underway and the user has not yet entered credentials.">
8683 Account sign-in details are not yet entered. 8693 Account sign-in details are not yet entered.
8684 </message> 8694 </message>
8685 <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display while the user is being authenticated to use sync."> 8695 <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display while the user is being authenticated to use sync.">
8686 Authenticating... 8696 Authenticating...
8687 </message> 8697 </message>
8688 <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."> 8698 <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.">
8689 Invalid user name or password. 8699 Invalid user name or password.
8690 </message> 8700 </message>
8691 <message name="IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS" desc="Explanatory messa ge shown when the user must type letters shown in a captcha image to reauthentic ate."> 8701 <message name="IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS" desc="Explanatory messa ge shown when the user must type letters shown in a captcha image to reauthentic ate.">
(...skipping 3714 matching lines...) Expand 10 before | Expand all | Expand 10 after
12406 </includes> 12416 </includes>
12407 <structures fallback_to_english="true"> 12417 <structures fallback_to_english="true">
12408 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 12418 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
12409 </structure> 12419 </structure>
12410 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 12420 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
12411 </structure> 12421 </structure>
12412 </structures> 12422 </structures>
12413 12423
12414 </release> 12424 </release>
12415 </grit> 12425 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/personal_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698