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

Side by Side Diff: chrome/app/google_chrome_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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/BUILD.gn » ('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 specific to 2 <!-- This file contains definitions of strings that are specific to
3 Google Chrome. These strings will be translated for each locale that Google 3 Google Chrome. These strings will be translated for each locale that Google
4 Chrome supports. If you update this file, be sure also to update 4 Chrome supports. If you update this file, be sure also to update
5 chromium_strings.grd. --> 5 chromium_strings.grd. -->
6 6
7 <grit base_dir="." latest_public_release="0" current_release="1" 7 <grit base_dir="." latest_public_release="0" current_release="1"
8 output_all_resource_defines="false" source_lang_id="en" enc_check="möl"> 8 output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
9 <outputs> 9 <outputs>
10 <output filename="grit/google_chrome_strings.h" type="rc_header"> 10 <output filename="grit/google_chrome_strings.h" type="rc_header">
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 </message> 771 </message>
772 </if> 772 </if>
773 773
774 <!-- Settings reset prompt dialog messages --> 774 <!-- Settings reset prompt dialog messages -->
775 <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 <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.">
776 Chrome has detected potentially unwanted settings 776 Chrome has detected potentially unwanted settings
777 </message> 777 </message>
778 <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 <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.">
779 The following Chrome settings may have been modified by unwanted softwar e or extensions: 779 The following Chrome settings may have been modified by unwanted softwar e or extensions:
780 </message> 780 </message>
781 <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."> 781 <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.">
782 Do you want to restore Chrome's default search engine? 782 Do you want to restore Chrome's default search engine?
783 </message> 783 </message>
784 <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."> 784 <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.">
785 Do you want to restore Chrome's default search engine? This will also di sable one extension.
786 </message>
787 <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.">
788 Do you want to restore Chrome's default search engine? This will also di sable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
789 </message>
790 <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.">
785 Do you want to restore Chrome's default startup page? 791 Do you want to restore Chrome's default startup page?
786 </message> 792 </message>
787 <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."> 793 <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.">
794 Do you want to restore Chrome's default startup page? This will also dis able one extension.
795 </message>
796 <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.">
797 Do you want to restore Chrome's default startup page? This will also dis able <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
798 </message>
799 <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." >
788 Do you want to restore Chrome's default homepage? 800 Do you want to restore Chrome's default homepage?
789 </message> 801 </message>
802 <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." >
803 Do you want to restore Chrome's default homepage? This will also disable one extension.
804 </message>
805 <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.">
806 Do you want to restore Chrome's default homepage? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
807 </message>
790 808
791 <!-- Sync/sign-in error messages --> 809 <!-- Sync/sign-in error messages -->
792 <if expr="not chromeos"> 810 <if expr="not chromeos">
793 <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."> 811 <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.">
794 Google Chrome could not sync your data. Please update your Sync passph rase. 812 Google Chrome could not sync your data. Please update your Sync passph rase.
795 </message> 813 </message>
796 <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."> 814 <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.">
797 Google Chrome could not sync your data because your account sign-in de tails are out of date. 815 Google Chrome could not sync your data because your account sign-in de tails are out of date.
798 </message> 816 </message>
799 <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."> 817 <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
1257 <message name="IDS_WIN10_WELCOME_PIN_SUBHEADING" desc="A subheading on a section which gives instructions on how to pin Chrome to the Windows 10 taskbar ."> 1275 <message name="IDS_WIN10_WELCOME_PIN_SUBHEADING" desc="A subheading on a section which gives instructions on how to pin Chrome to the Windows 10 taskbar .">
1258 Pin Chrome to your taskbar 1276 Pin Chrome to your taskbar
1259 </message> 1277 </message>
1260 <message name="IDS_WIN10_WELCOME_SELECT" desc="An instruction asking the user to select Chrome from an external list of apps."> 1278 <message name="IDS_WIN10_WELCOME_SELECT" desc="An instruction asking the user to select Chrome from an external list of apps.">
1261 Select <ph name="SMALL_PRODUCT_LOGO">&lt;div class="logo-small"&gt;&lt ;/div&gt;</ph> <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Google Chrome<ph name="E ND_BOLD">&lt;/strong&gt;</ph> 1279 Select <ph name="SMALL_PRODUCT_LOGO">&lt;div class="logo-small"&gt;&lt ;/div&gt;</ph> <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Google Chrome<ph name="E ND_BOLD">&lt;/strong&gt;</ph>
1262 </message> 1280 </message>
1263 </if> 1281 </if>
1264 </messages> 1282 </messages>
1265 </release> 1283 </release>
1266 </grit> 1284 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698