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

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

Issue 2920853004: [sync] Display an error when sync settings aren't confirmed (Closed)
Patch Set: Reformat, remove browser_options change Created 3 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/people_page.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. 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 9299 matching lines...) Expand 10 before | Expand all | Expand 10 after
9310 </message> 9310 </message>
9311 <message name="IDS_SYNC_ERROR_USER_MENU_SIGNIN_AGAIN_BUTTON" desc="Button in the header of desktop user menu that signs out and signs back in in an attemp t to resolve an unrecoverable error."> 9311 <message name="IDS_SYNC_ERROR_USER_MENU_SIGNIN_AGAIN_BUTTON" desc="Button in the header of desktop user menu that signs out and signs back in in an attemp t to resolve an unrecoverable error.">
9312 Sign in again 9312 Sign in again
9313 </message> 9313 </message>
9314 <message name="IDS_SYNC_ERROR_USER_MENU_SIGNOUT_MESSAGE" desc="Message of the unrecoverable error in the header of desktop user menu for managed users."> 9314 <message name="IDS_SYNC_ERROR_USER_MENU_SIGNOUT_MESSAGE" desc="Message of the unrecoverable error in the header of desktop user menu for managed users.">
9315 Try signing out and back in again 9315 Try signing out and back in again
9316 </message> 9316 </message>
9317 <message name="IDS_SYNC_ERROR_USER_MENU_SIGNOUT_BUTTON" desc="Button in th e header of desktop user menu for managed users to sign out in an attempt to res olve an unrecoverable error."> 9317 <message name="IDS_SYNC_ERROR_USER_MENU_SIGNOUT_BUTTON" desc="Button in th e header of desktop user menu for managed users to sign out in an attempt to res olve an unrecoverable error.">
9318 Sign out 9318 Sign out
9319 </message> 9319 </message>
9320 <message name="IDS_SYNC_ERROR_USER_MENU_CONFIRM_SYNC_SETTINGS_BUTTON" desc ="Button in the header of desktop user menu prompting users to confirm their syn c settings.">
9321 Open settings
9322 </message>
9320 <if expr="use_ash"> 9323 <if expr="use_ash">
9321 <message name="IDS_SYNC_NOTIFICATION_ACCEPT" desc="A button label shown in the sync error notification when the passphrase needs to be updated."> 9324 <message name="IDS_SYNC_NOTIFICATION_ACCEPT" desc="A button label shown in the sync error notification when the passphrase needs to be updated.">
9322 Update sync passphrase 9325 Update sync passphrase
9323 </message> 9326 </message>
9324 </if> 9327 </if>
9325 9328
9326 <if expr="not use_titlecase"> 9329 <if expr="not use_titlecase">
9327 <message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_ACCEPT" desc="The a ccept button in the sync error bubble view when the user needs to update the pas sphrase."> 9330 <message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_ACCEPT" desc="The a ccept button in the sync error bubble view when the user needs to update the pas sphrase.">
9328 Update... 9331 Update...
9329 </message> 9332 </message>
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
9387 </message> 9390 </message>
9388 <message name="IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR" desc="The error message displayed to the user when setup was aborted because the server reported that a pending clear private data operation is in progress"> 9391 <message name="IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR" desc="The error message displayed to the user when setup was aborted because the server reported that a pending clear private data operation is in progress">
9389 The sync server is busy, please try again later. 9392 The sync server is busy, please try again later.
9390 </message> 9393 </message>
9391 <message name="IDS_SIGNED_IN_WITH_SYNC_DISABLED" desc="The message that appears in the settings page indicating that user is signed in, but sync is not enabled."> 9394 <message name="IDS_SIGNED_IN_WITH_SYNC_DISABLED" desc="The message that appears in the settings page indicating that user is signed in, but sync is not enabled.">
9392 Sync is disabled by your administrator. 9395 Sync is disabled by your administrator.
9393 </message> 9396 </message>
9394 <message name="IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED" desc="The message tha t appears in the settings page indicating that user is signed in, but sync has b een stopped."> 9397 <message name="IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED" desc="The message tha t appears in the settings page indicating that user is signed in, but sync has b een stopped.">
9395 Sync has been stopped via the Google Dashboard. 9398 Sync has been stopped via the Google Dashboard.
9396 </message> 9399 </message>
9400 <message name="IDS_SYNC_SETTINGS_NOT_CONFIRMED" desc="The message that a ppears in the settings page indicating that user is signed in, but sync hasn't s tarted because the sync settings haven't been confirmed.">
9401 Confirm sync settings to start sync.
9402 </message>
9397 <message name="IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK" desc="The mess age that appears in the options dialog indicating that account is syncing along with a link to manage their data (where supported, or not possible through the a pplication)"> 9403 <message name="IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK" desc="The mess age that appears in the options dialog indicating that account is syncing along with a link to manage their data (where supported, or not possible through the a pplication)">
9398 Manage your synced data on <ph name="BEGIN_LINK">&lt;a href="$1" targe t=&quot;_blank&quot;&gt;<ex>&lt;a href="$1" target=&quot;_blank&quot;&gt;</ex></ ph>Google Dashboard<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>. 9404 Manage your synced data on <ph name="BEGIN_LINK">&lt;a href="$1" targe t=&quot;_blank&quot;&gt;<ex>&lt;a href="$1" target=&quot;_blank&quot;&gt;</ex></ ph>Google Dashboard<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
9399 </message> 9405 </message>
9400 <message name="IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK_NEW" desc="The message that appears in the options dialog indicating that account is syncing al ong with a link to manage their data (where supported, or not possible through t he application)"> 9406 <message name="IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK_NEW" desc="The message that appears in the options dialog indicating that account is syncing al ong with a link to manage their data (where supported, or not possible through t he application)">
9401 Manage your synced data and devices on <ph name="BEGIN_LINK">&lt;a hre f="$1" target=&quot;_blank&quot;&gt;<ex>&lt;a href="$1" target=&quot;_blank&quot ;&gt;</ex></ph>Chrome Dashboard<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex> </ph>. 9407 Manage your synced data and devices on <ph name="BEGIN_LINK">&lt;a hre f="$1" target=&quot;_blank&quot;&gt;<ex>&lt;a href="$1" target=&quot;_blank&quot ;&gt;</ex></ph>Chrome Dashboard<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex> </ph>.
9402 </message> 9408 </message>
9403 <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display whi le the user is being authenticated to use sync."> 9409 <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display whi le the user is being authenticated to use sync.">
9404 Authenticating... 9410 Authenticating...
9405 </message> 9411 </message>
9406 <message name="IDS_SYNC_ERROR_SIGNING_IN" desc="An error was encountered while signing the user in."> 9412 <message name="IDS_SYNC_ERROR_SIGNING_IN" desc="An error was encountered while signing the user in.">
(...skipping 2928 matching lines...) Expand 10 before | Expand all | Expand 10 after
12335 <message name="IDS_VIDEO_AUDIO_CALL_NOTIFICATION_TEXT_2" desc="Text to be shown as a notification when a WebRTC video and audio call is in progress" forma tter_data="android_java"> 12341 <message name="IDS_VIDEO_AUDIO_CALL_NOTIFICATION_TEXT_2" desc="Text to be shown as a notification when a WebRTC video and audio call is in progress" forma tter_data="android_java">
12336 Accessing audio and video input 12342 Accessing audio and video input
12337 </message> 12343 </message>
12338 <message name="IDS_SCREEN_CAPTURE_NOTIFICATION_TEXT_2" desc="Text to be sh own as a notification when screen capture is in progress."> 12344 <message name="IDS_SCREEN_CAPTURE_NOTIFICATION_TEXT_2" desc="Text to be sh own as a notification when screen capture is in progress.">
12339 Sharing screen 12345 Sharing screen
12340 </message> 12346 </message>
12341 </if> 12347 </if>
12342 </messages> 12348 </messages>
12343 </release> 12349 </release>
12344 </grit> 12350 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/people_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698