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

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

Issue 2920853004: [sync] Display an error when sync settings aren't confirmed (Closed)
Patch Set: initialize button to nullptr 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
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 9288 matching lines...) Expand 10 before | Expand all | Expand 10 after
9299 </message> 9299 </message>
9300 <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."> 9300 <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.">
9301 Sign in again 9301 Sign in again
9302 </message> 9302 </message>
9303 <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."> 9303 <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.">
9304 Try signing out and back in again 9304 Try signing out and back in again
9305 </message> 9305 </message>
9306 <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."> 9306 <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.">
9307 Sign out 9307 Sign out
9308 </message> 9308 </message>
9309 <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.">
9310 Open settings
9311 </message>
9309 <if expr="use_ash"> 9312 <if expr="use_ash">
9310 <message name="IDS_SYNC_NOTIFICATION_ACCEPT" desc="A button label shown in the sync error notification when the passphrase needs to be updated."> 9313 <message name="IDS_SYNC_NOTIFICATION_ACCEPT" desc="A button label shown in the sync error notification when the passphrase needs to be updated.">
9311 Update sync passphrase 9314 Update sync passphrase
9312 </message> 9315 </message>
9313 </if> 9316 </if>
9314 9317
9315 <if expr="not use_titlecase"> 9318 <if expr="not use_titlecase">
9316 <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."> 9319 <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.">
9317 Update... 9320 Update...
9318 </message> 9321 </message>
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
9376 </message> 9379 </message>
9377 <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"> 9380 <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">
9378 The sync server is busy, please try again later. 9381 The sync server is busy, please try again later.
9379 </message> 9382 </message>
9380 <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."> 9383 <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.">
9381 Sync is disabled by your administrator. 9384 Sync is disabled by your administrator.
9382 </message> 9385 </message>
9383 <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."> 9386 <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.">
9384 Sync has been stopped via the Google Dashboard. 9387 Sync has been stopped via the Google Dashboard.
9385 </message> 9388 </message>
9389 <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.">
9390 Confirm sync settings to start sync.
9391 </message>
9386 <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)"> 9392 <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)">
9387 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>. 9393 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>.
9388 </message> 9394 </message>
9389 <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)"> 9395 <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)">
9390 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>. 9396 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>.
9391 </message> 9397 </message>
9392 <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display whi le the user is being authenticated to use sync."> 9398 <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display whi le the user is being authenticated to use sync.">
9393 Authenticating... 9399 Authenticating...
9394 </message> 9400 </message>
9395 <message name="IDS_SYNC_ERROR_SIGNING_IN" desc="An error was encountered while signing the user in."> 9401 <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
12324 <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"> 12330 <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">
12325 Accessing audio and video input 12331 Accessing audio and video input
12326 </message> 12332 </message>
12327 <message name="IDS_SCREEN_CAPTURE_NOTIFICATION_TEXT_2" desc="Text to be sh own as a notification when screen capture is in progress."> 12333 <message name="IDS_SCREEN_CAPTURE_NOTIFICATION_TEXT_2" desc="Text to be sh own as a notification when screen capture is in progress.">
12328 Sharing screen 12334 Sharing screen
12329 </message> 12335 </message>
12330 </if> 12336 </if>
12331 </messages> 12337 </messages>
12332 </release> 12338 </release>
12333 </grit> 12339 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698