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

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

Issue 2701313002: Adds a modal dialog implementation of the settings reset prompt. (Closed)
Patch Set: Fix constness in mock test class Created 3 years, 10 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/app/generated_resources.grd » ('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 <!-- This file contains definitions of strings that are distribution specific. 2 <!-- This file contains definitions of strings that are distribution specific.
3 If you update this file, be sure also to update google_chrome_strings.grd. --> 3 If you update this file, be sure also to update google_chrome_strings.grd. -->
4 4
5 <grit base_dir="." latest_public_release="0" current_release="1" 5 <grit base_dir="." latest_public_release="0" current_release="1"
6 output_all_resource_defines="false" source_lang_id="en" enc_check="möl"> 6 output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
7 <outputs> 7 <outputs>
8 <output filename="grit/chromium_strings.h" type="rc_header"> 8 <output filename="grit/chromium_strings.h" type="rc_header">
9 <emit emit_type='prepend'></emit> 9 <emit emit_type='prepend'></emit>
10 </output> 10 </output>
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 </message> 770 </message>
771 </if> 771 </if>
772 772
773 <!-- Settings reset prompt dialog messages --> 773 <!-- Settings reset prompt dialog messages -->
774 <message name="IDS_SETTINGS_RESET_PROMPT_TITLE" desc="The title for the se ttings reset dialog. The dialog alerts users that some of their settings may be unwanted and asks if they want to restore some of their settings to their origin al default values."> 774 <message name="IDS_SETTINGS_RESET_PROMPT_TITLE" desc="The title for the se ttings reset dialog. The dialog alerts users that some of their settings may be unwanted and asks if they want to restore some of their settings to their origin al default values.">
775 Chromium has detected potentially unwanted settings 775 Chromium has detected potentially unwanted settings
776 </message> 776 </message>
777 <message name="IDS_SETTINGS_RESET_PROMPT_EXPLANATION_FOR_MULTIPLE_SETTINGS " desc="Text shown in the settings reset dialog explaining that some of the user 's settings may have been modified by unwanted software or extensions."> 777 <message name="IDS_SETTINGS_RESET_PROMPT_EXPLANATION_FOR_MULTIPLE_SETTINGS " desc="Text shown in the settings reset dialog explaining that some of the user 's settings may have been modified by unwanted software or extensions.">
778 The following Chromium settings may have been modified by unwanted softw are or extensions: 778 The following Chromium settings may have been modified by unwanted softw are or extensions:
779 </message> 779 </message>
780 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENG INE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the botto m of the dialog when asking if the user wants to reset their search engine."> 780 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENG INE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to re store some of their settings to their original default values. This text is show n at the bottom of the dialog when asking if the user wants to reset their searc h engine.">
781 Do you want to restore Chromium's default search engine? 781 Do you want to restore Chromium's default search engine?
782 </message> 782 </message>
783 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PA GE" desc="The settings reset dialog asks users if they want to restore some of t heir settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page."> 783 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENG INE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to re store some of their settings to their original default values. This text is show n at the bottom of the dialog when asking if the user wants to reset their searc h engine.">
784 Do you want to restore Chromium's default search engine? This will also disable one extension.
785 </message>
786 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENG INE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text i s shown at the bottom of the dialog when asking if the user wants to reset their search engine.">
787 Do you want to restore Chromium's default search engine? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
788 </message>
789 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PA GE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to res tore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startu p page.">
784 Do you want to restore Chromium's default startup page? 790 Do you want to restore Chromium's default startup page?
785 </message> 791 </message>
786 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage."> 792 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PA GE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to res tore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startu p page.">
793 Do you want to restore Chromium's default startup page? This will also d isable one extension.
794 </message>
795 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PA GE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page.">
796 Do you want to restore Chromium's default startup page? This will also d isable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
797 </message>
798 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_N O_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage." >
787 Do you want to restore Chromium's default homepage? 799 Do you want to restore Chromium's default homepage?
788 </message> 800 </message>
801 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_O NE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage." >
802 Do you want to restore Chromium's default homepage? This will also disab le one extension.
803 </message>
804 <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_M ULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to r estore some of their settings to their original default values. This text is sho wn at the bottom of the dialog when asking if the user wants to reset their home page.">
805 Do you want to restore Chromium's default homepage? This will also disab le <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
806 </message>
789 807
790 <!-- Sync/sign-in error messages --> 808 <!-- Sync/sign-in error messages -->
791 <if expr="not chromeos"> 809 <if expr="not chromeos">
792 <message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Mess age in the sync error bubble view when the user needs to update their sync passp hrase."> 810 <message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Mess age in the sync error bubble view when the user needs to update their sync passp hrase.">
793 Chromium could not sync your data. Please update your Sync passphrase. 811 Chromium could not sync your data. Please update your Sync passphrase.
794 </message> 812 </message>
795 <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sign-in error bubble view when the user's sign-in credentials are out of date."> 813 <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sign-in error bubble view when the user's sign-in credentials are out of date.">
796 Chromium could not sync your data because your account sign-in details are out of date. 814 Chromium could not sync your data because your account sign-in details are out of date.
797 </message> 815 </message>
798 <message name="IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Mes sage in the sign-in error bubble view when sync is not available for their domai n."> 816 <message name="IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Mes sage in the sign-in error bubble view when sync is not available for their domai n.">
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
1256 <message name="IDS_WIN10_WELCOME_PIN_SUBHEADING" desc="A subheading on a section which gives instructions on how to pin Chromium to the Windows 10 taskb ar."> 1274 <message name="IDS_WIN10_WELCOME_PIN_SUBHEADING" desc="A subheading on a section which gives instructions on how to pin Chromium to the Windows 10 taskb ar.">
1257 Pin Chromium to your taskbar 1275 Pin Chromium to your taskbar
1258 </message> 1276 </message>
1259 <message name="IDS_WIN10_WELCOME_SELECT" desc="An instruction asking the user to select Chromium from an external list of apps."> 1277 <message name="IDS_WIN10_WELCOME_SELECT" desc="An instruction asking the user to select Chromium from an external list of apps.">
1260 Select <ph name="SMALL_PRODUCT_LOGO">&lt;div class="logo-small"&gt;&lt ;/div&gt;</ph> <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Chromium<ph name="END_BO LD">&lt;/strong&gt;</ph> 1278 Select <ph name="SMALL_PRODUCT_LOGO">&lt;div class="logo-small"&gt;&lt ;/div&gt;</ph> <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Chromium<ph name="END_BO LD">&lt;/strong&gt;</ph>
1261 </message> 1279 </message>
1262 </if> 1280 </if>
1263 </messages> 1281 </messages>
1264 </release> 1282 </release>
1265 </grit> 1283 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698