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

Side by Side Diff: chrome/app/settings_strings.grdp

Issue 2250733003: Settings People Sync: Add 'Reset Sync' message for forgotten passphrase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@244-settings-people-fix-error-message
Patch Set: address comments Created 4 years, 4 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/sync_page.html » ('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 <!-- Settings-specific strings (included from generated_resources.grd). --> 2 <!-- Settings-specific strings (included from generated_resources.grd). -->
3 <grit-part> 3 <grit-part>
4 <!-- About Page --> 4 <!-- About Page -->
5 <if expr="chromeos"> 5 <if expr="chromeos">
6 <message name="IDS_SETTINGS_ABOUT_PAGE_DETAILED_BUILD_INFO" desc="Label desc ribing the section that shows detailed information about the current Chrome buil d."> 6 <message name="IDS_SETTINGS_ABOUT_PAGE_DETAILED_BUILD_INFO" desc="Label desc ribing the section that shows detailed information about the current Chrome buil d.">
7 Detailed build information 7 Detailed build information
8 </message> 8 </message>
9 <message name="IDS_SETTINGS_ABOUT_PAGE_ARC_VERSION" desc="Label for ARC vers ion"> 9 <message name="IDS_SETTINGS_ABOUT_PAGE_ARC_VERSION" desc="Label for ARC vers ion">
10 ARC Version 10 ARC Version
(...skipping 1576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1587 </message> 1587 </message>
1588 <message name="IDS_SETTINGS_EMPTY_PASSPHRASE_ERROR" desc="Error message when t he passphrase is empty."> 1588 <message name="IDS_SETTINGS_EMPTY_PASSPHRASE_ERROR" desc="Error message when t he passphrase is empty.">
1589 Empty passphrase is not allowed. 1589 Empty passphrase is not allowed.
1590 </message> 1590 </message>
1591 <message name="IDS_SETTINGS_MISMATCHED_PASSPHRASE_ERROR" desc="Error message w hen the passphrase and confirmation don't match."> 1591 <message name="IDS_SETTINGS_MISMATCHED_PASSPHRASE_ERROR" desc="Error message w hen the passphrase and confirmation don't match.">
1592 You must enter the same passphrase twice. 1592 You must enter the same passphrase twice.
1593 </message> 1593 </message>
1594 <message name="IDS_SETTINGS_INCORRECT_PASSPHRASE_ERROR" desc="Message when the passphrase is incorrect."> 1594 <message name="IDS_SETTINGS_INCORRECT_PASSPHRASE_ERROR" desc="Message when the passphrase is incorrect.">
1595 The passphrase you entered is incorrect. 1595 The passphrase you entered is incorrect.
1596 </message> 1596 </message>
1597 <message name="IDS_SETTINGS_PASSPHRASE_RECOVER" desc="Message about how to rec over from a lost passphrase.">
1598 If you forgot your passphrase or want to change this setting, <ph name="BEGI N_LINK">&lt;a href="$1" target=&quot;_blank&quot;&gt;<ex>&lt;a href="$1" target= &quot;_blank&quot;&gt;</ex></ph>reset sync<ph name="END_LINK">&lt;/a&gt;<ex>&lt; /a&gt;</ex></ph>.
1599 </message>
1597 <message name="IDS_SETTINGS_PASSPHRASE_PLACEHOLDER" desc="Placeholder for the passphrase field."> 1600 <message name="IDS_SETTINGS_PASSPHRASE_PLACEHOLDER" desc="Placeholder for the passphrase field.">
1598 Passphrase 1601 Passphrase
1599 </message> 1602 </message>
1600 <message name="IDS_SETTINGS_PASSPHRASE_CONFIRMATION_PLACEHOLDER" desc="Placeho lder for the confirm-passphrase field."> 1603 <message name="IDS_SETTINGS_PASSPHRASE_CONFIRMATION_PLACEHOLDER" desc="Placeho lder for the confirm-passphrase field.">
1601 Confirm passphrase 1604 Confirm passphrase
1602 </message> 1605 </message>
1603 <message name="IDS_SETTINGS_SUBMIT_PASSPHRASE" desc="Text for the button which , when clicked, submits a sync password for verification."> 1606 <message name="IDS_SETTINGS_SUBMIT_PASSPHRASE" desc="Text for the button which , when clicked, submits a sync password for verification.">
1604 Submit 1607 Submit
1605 </message> 1608 </message>
1606 <message name="IDS_SETTINGS_USE_DEFAULT_SETTINGS" desc="Text for button which, when clicked, activates the default sync settings."> 1609 <message name="IDS_SETTINGS_USE_DEFAULT_SETTINGS" desc="Text for button which, when clicked, activates the default sync settings.">
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1897 System 1900 System
1898 </message> 1901 </message>
1899 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available."> 1902 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available.">
1900 Use hardware acceleration when available 1903 Use hardware acceleration when available
1901 </message> 1904 </message>
1902 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings."> 1905 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_BUTTON" desc="Text for the button that changes a user's network proxy settings.">
1903 Change proxy settings 1906 Change proxy settings
1904 </message> 1907 </message>
1905 </if> 1908 </if>
1906 </grit-part> 1909 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/sync_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698