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

Side by Side Diff: chrome/android/java/strings/android_chrome_strings.grd

Issue 1698043006: Created the dialog offering the user to merge their account data or keep it (Closed) Base URL: maybelle.lon.corp.google.com:/usr/local/google/code/clankium/src@sync_settings
Patch Set: Created 4 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
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- android_chrome_strings.grd contains strings for Chrome for Android. 3 <!-- android_chrome_strings.grd contains strings for Chrome for Android.
4 4
5 FAQ: 5 FAQ:
6 - How do I add, change, or remove a string? 6 - How do I add, change, or remove a string?
7 Just update this file. 7 Just update this file.
8 - Translations will happen automatically?? 8 - Translations will happen automatically??
9 Yes, indeed. Just add your string before the branch point and 9 Yes, indeed. Just add your string before the branch point and
10 make the description good. 10 make the description good.
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 </message> 163 </message>
164 <message name="IDS_NO_THANKS" desc="Generic label to say no thanks for a f eature. [CHAR-LIMIT=32]"> 164 <message name="IDS_NO_THANKS" desc="Generic label to say no thanks for a f eature. [CHAR-LIMIT=32]">
165 No Thanks 165 No Thanks
166 </message> 166 </message>
167 <message name="IDS_ENABLE" desc="Generic label to enable a feature. [CHAR- LIMIT=32]"> 167 <message name="IDS_ENABLE" desc="Generic label to enable a feature. [CHAR- LIMIT=32]">
168 Enable 168 Enable
169 </message> 169 </message>
170 <message name="IDS_NEXT" desc="Generic label for a button to advance to th e next item. [CHAR-LIMIT=20]"> 170 <message name="IDS_NEXT" desc="Generic label for a button to advance to th e next item. [CHAR-LIMIT=20]">
171 Next 171 Next
172 </message> 172 </message>
173 <message name="IDS_CONT" desc="Generic label for a continue prompt. Used i n multiple contexts. [CHAR-LIMIT=20]">
174 Continue
175 </message>
173 <message name="IDS_SUBMIT" desc="Generic label for a button to submit data . Used in multiple contexts. [CHAR-LIMIT=20]"> 176 <message name="IDS_SUBMIT" desc="Generic label for a button to submit data . Used in multiple contexts. [CHAR-LIMIT=20]">
174 Submit 177 Submit
175 </message> 178 </message>
176 <message name="IDS_UNDO" desc="Generic label for a button to undo the prev ious action."> 179 <message name="IDS_UNDO" desc="Generic label for a button to undo the prev ious action.">
177 Undo 180 Undo
178 </message> 181 </message>
179 182
180 <!-- Main Preferences --> 183 <!-- Main Preferences -->
181 <message name="IDS_PREFERENCES" desc="Title for Chrome's Settings."> 184 <message name="IDS_PREFERENCES" desc="Title for Chrome's Settings.">
182 Settings 185 Settings
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 </message> 1043 </message>
1041 <message name="IDS_SYNC_PASSPHRASE_INCORRECT" desc="Inform the user that t he passphrase they entered for sync is incorrect. [CHAR-LIMIT=40]"> 1044 <message name="IDS_SYNC_PASSPHRASE_INCORRECT" desc="Inform the user that t he passphrase they entered for sync is incorrect. [CHAR-LIMIT=40]">
1042 Incorrect passphrase 1045 Incorrect passphrase
1043 </message> 1046 </message>
1044 <message name="IDS_SYNC_VERIFYING" desc="Inform the user that their sync e ncryption information is being verified. [CHAR-LIMIT=20]"> 1047 <message name="IDS_SYNC_VERIFYING" desc="Inform the user that their sync e ncryption information is being verified. [CHAR-LIMIT=20]">
1045 Verifying… 1048 Verifying…
1046 </message> 1049 </message>
1047 <message name="IDS_SYNC_LOADING" desc="Preference title to let the user ch ange their encryption password. [CHAR-LIMIT=20]"> 1050 <message name="IDS_SYNC_LOADING" desc="Preference title to let the user ch ange their encryption password. [CHAR-LIMIT=20]">
1048 Loading… 1051 Loading…
1049 </message> 1052 </message>
1053 <message name="IDS_SYNC_IMPORT_DATA_TITLE" desc="Preference title of scree n to let user choose to switch sync accounts. [CHAR-LIMIT=24]">
1054 Import data?
1055 </message>
1056 <message name="IDS_SYNC_IMPORT_DATA_PROMPT" desc="Prompt for the user to c hoose how they want to handle their existing sync data">
1057 You are signing in to <ph name="TO_ACCOUNT">%1$s<ex>johndoe@new.com</ex> </ph>. Some of your existing bookmarks, history, passwords, and other settings w ere previously synced to <ph name="FROM_ACCOUNT">%2$s<ex>johndoe@old.com</ex></p h>. What do you want to do with your existing data?
1058 </message>
1059 <message name="IDS_SYNC_IMPORT_EXISTING_DATA" desc="Option to import exist ing data to the newly selected sync account">
1060 Import existing data
1061 </message>
1062 <message name="IDS_SYNC_IMPORT_EXISTING_DATA_SUBTEXT" desc="Subtext descri bing what happens if the user elects to import existing data to the newly select ed sync account">
1063 Keep existing data on your device and permanently import the data to <ph name="TO_ACCOUNT">%1$s<ex>johndoe@new.com</ex></ph>.
1064 </message>
1065 <message name="IDS_SYNC_IMPORT_EXISTING_DATA_VALUE" desc="Internal value f or import data preference" translateable="false">
1066 import_existing_data
1067 </message>
1050 <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE" desc="Option to keep the existing data separate from the newly selected sync account"> 1068 <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE" desc="Option to keep the existing data separate from the newly selected sync account">
1051 Keep existing data separate 1069 Keep existing data separate
1052 </message> 1070 </message>
1053 <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE_SUBTEXT" desc="Subtext describing what happens if the user elects to keep the existing data separate"> 1071 <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE_SUBTEXT" desc="Subtext describing what happens if the user elects to keep the existing data separate">
1054 Replace this device’s data with <ph name="ACCOUNT">%1$s<ex>john@doe.com< /ex></ph>'s data. You can retrieve your existing data by switching back to <ph n ame="ACCOUNT">%1$s<ex>johndoe@gmail.com</ex></ph> 1072 Replace this device’s data with <ph name="TO_ACCOUNT">%1$s<ex>johndoe@ne w.com</ex></ph>'s data. You can retrieve your existing data by switching back to <ph name="FROM_ACCOUNT">%2$s<ex>johndoe@old.com</ex></ph>, but data created sin ce you signed out will be lost.
1055 </message> 1073 </message>
1056 <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE_VALUE" desc="Internal value for keep existing data preference" translateable="false"> 1074 <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE_VALUE" desc="Internal value for keep existing data preference" translateable="false">
1057 keep_existing_data 1075 keep_existing_data
1058 </message> 1076 </message>
1059 1077
1060 <!-- Bluetooth Picker UI strings --> 1078 <!-- Bluetooth Picker UI strings -->
1061 <message name="IDS_BLUETOOTH_DIALOG_TITLE" desc="The header message shown on top of the dialog that lets the user pick a Bluetooth device for the site to pair with. Shown above a list of Bluetooth devices discovered. "> 1079 <message name="IDS_BLUETOOTH_DIALOG_TITLE" desc="The header message shown on top of the dialog that lets the user pick a Bluetooth device for the site to pair with. Shown above a list of Bluetooth devices discovered. ">
1062 <ph name="SITE">%1$s<ex>https://www.google.com</ex></ph> wants to <ph na me="BEGIN_LINK">&lt;link&gt;</ph>pair with<ph name="END_LINK">&lt;/link&gt;</ph> :</message> 1080 <ph name="SITE">%1$s<ex>https://www.google.com</ex></ph> wants to <ph na me="BEGIN_LINK">&lt;link&gt;</ph>pair with<ph name="END_LINK">&lt;/link&gt;</ph> :</message>
1063 <message name="IDS_BLUETOOTH_SEARCHING" desc="The message shown in the Blu etooth picker dialog while scanning for devices."> 1081 <message name="IDS_BLUETOOTH_SEARCHING" desc="The message shown in the Blu etooth picker dialog while scanning for devices.">
1064 Searching for devices… 1082 Searching for devices…
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
1596 Critical functionality required to run Chrome is missing; either your Ch rome installation is incomplete, or not compatible with this version of Android. 1614 Critical functionality required to run Chrome is missing; either your Ch rome installation is incomplete, or not compatible with this version of Android.
1597 </message> 1615 </message>
1598 <message name="IDS_INCOMPATIBLE_LIBRARIES" desc="Error message shown when Chrome fails to start due to having the wrong version of the native library"> 1616 <message name="IDS_INCOMPATIBLE_LIBRARIES" desc="Error message shown when Chrome fails to start due to having the wrong version of the native library">
1599 Chrome’s components are incompatible with one another. Chrome may be upg rading, please try again in a few minutes. If the problem continues, try uninsta lling and re-installing Chrome. 1617 Chrome’s components are incompatible with one another. Chrome may be upg rading, please try again in a few minutes. If the problem continues, try uninsta lling and re-installing Chrome.
1600 </message> 1618 </message>
1601 <message name="IDS_NATIVE_STARTUP_FAILED" desc="Error message shown when C hrome fails to start for other (unknown) reasons"> 1619 <message name="IDS_NATIVE_STARTUP_FAILED" desc="Error message shown when C hrome fails to start for other (unknown) reasons">
1602 Chrome failed during startup with an unexpected error. 1620 Chrome failed during startup with an unexpected error.
1603 </message> 1621 </message>
1604 1622
1605 <!-- First Run strings --> 1623 <!-- First Run strings -->
1606 <message name="IDS_FRE_SET_UP_CHROME" desc="Header text shown when the use r is first setting up Chrome">
1607 Set up Chrome
1608 </message>
1609 <message name="IDS_FRE_ACCOUNT_CHOICE_DESCRIPTION" desc="Text for account chooser page">
1610 Sign in to get your bookmarks, history, passwords, and other settings on all your devices.
1611 </message>
1612 <message name="IDS_FRE_ACCEPT" desc="Text for button to accept being signe d in">
1613 OK, got it
1614 </message>
1615 <message name="IDS_FRE_SKIP_TEXT" desc="Text for second page skip button"> 1624 <message name="IDS_FRE_SKIP_TEXT" desc="Text for second page skip button">
1616 No thanks 1625 No thanks
1617 </message> 1626 </message>
1618 <message name="IDS_CHOOSE_ACCOUNT_SIGN_IN" desc="Sign in button for choose google account dialog [CHAR-LIMIT=20]">
1619 Sign in
1620 </message>
1621 <message name="IDS_FRE_DONE" desc="Button to dismiss the sign-in screen on ce the user is done"> 1627 <message name="IDS_FRE_DONE" desc="Button to dismiss the sign-in screen on ce the user is done">
1622 Done 1628 Done
1623 </message> 1629 </message>
1624 <message name="IDS_FRE_SETTINGS" desc="Button that opens Chrome settings"> 1630 <message name="IDS_FRE_SETTINGS" desc="Button that opens Chrome settings">
1625 Settings 1631 Settings
1626 </message> 1632 </message>
1627 <message name="IDS_FRE_ADD_ACCOUNT" desc="Text for adding another Google A ccount">
1628 Add account
1629 </message>
1630 <message name="IDS_MAKE_CHROME_YOURS" desc="Title for the signin promo tha t prompts the user to sign in to Chrome to have a personalized experirence. [CHA R-LIMIT=24]">
1631 Make Chrome yours
1632 </message>
1633 <message name="IDS_FRE_NO_ACCOUNT_CHOICE_DESCRIPTION" desc="Text for accou nt chooser page when there are no accounts on the device.">
1634 Add an account to get your bookmarks, history, passwords, and other sett ings on all your devices.
1635 </message>
1636 <message name="IDS_SIGN_IN_TO_CHROME_SUMMARY_VARIANT" desc="A variant of s ummary for the signin promo; lists reasons to sign in to Chrome.">
1637 Sign in to access all your web stuff from any device
1638 </message>
1639 <message name="IDS_FRE_NO_ACCOUNTS" desc="Text for spinner when there is n o google accounts [CHAR-LIMIT=40]">
1640 Add an account
1641 </message>
1642 <message name="IDS_FRE_HI_NAME" desc="Title welcoming the user by their na me after they have signed in.">
1643 Hi, <ph name="FULL_NAME">%1$s<ex>John Smith</ex></ph>
1644 </message>
1645 <message name="IDS_FRE_SIGNED_IN_DESCRIPTION" desc="Explanation of what ge ts synced after the user signed in">
1646 Your bookmarks, history, passwords, and other settings will be synced to your Google Account so you can use them on all your devices. You can choose wha t to sync in <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Settings<ph name="END_LINK 1">&lt;/LINK1&gt;</ph>.
1647 </message>
1648 <message name="IDS_FRE_SIGNED_IN_DESCRIPTION_UCA_ADDENDUM" desc="Additiona l explanation for child accounts that synced settings are managed by parents.">
1649 Your parents help manage these settings.
1650 </message>
1651 <message name="IDS_FRE_TOS_AND_PRIVACY" desc="Message explaining that use of Chrome is governed by Chrome's terms of service and privacy notice."> 1633 <message name="IDS_FRE_TOS_AND_PRIVACY" desc="Message explaining that use of Chrome is governed by Chrome's terms of service and privacy notice.">
1652 By using this application, you agree to Chrome’s <ph name="BEGIN_LINK1"> &lt;LINK1&gt;</ph>Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph> and < ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Privacy Notice<ph name="END_LINK2">&lt;/ LINK2&gt;</ph>. 1634 By using this application, you agree to Chrome’s <ph name="BEGIN_LINK1"> &lt;LINK1&gt;</ph>Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph> and < ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Privacy Notice<ph name="END_LINK2">&lt;/ LINK2&gt;</ph>.
1653 </message> 1635 </message>
1654 <message name="IDS_FRE_SEND_REPORT_CHECK" desc="Text for asking the user t o allow sending stats and crash reports"> 1636 <message name="IDS_FRE_SEND_REPORT_CHECK" desc="Text for asking the user t o allow sending stats and crash reports">
1655 Help make Chrome better by sending usage statistics and crash reports to Google. 1637 Help make Chrome better by sending usage statistics and crash reports to Google.
1656 </message> 1638 </message>
1657 <message name="IDS_FRE_ACCEPT_CONTINUE" desc="Text for first page accept a nd continue button [CHAR-LIMIT=20]"> 1639 <message name="IDS_FRE_ACCEPT_CONTINUE" desc="Text for first page accept a nd continue button [CHAR-LIMIT=20]">
1658 Accept &amp; continue 1640 Accept &amp; continue
1659 </message> 1641 </message>
1660 <message name="IDS_FRE_WELCOME" desc="Text for greeting the user on Chrome First Run"> 1642 <message name="IDS_FRE_WELCOME" desc="Text for greeting the user on Chrome First Run">
1661 Welcome to Chrome 1643 Welcome to Chrome
1662 </message> 1644 </message>
1663 <message name="IDS_ACCESSIBILITY_FRE_ACCOUNT_SPINNER" desc="Content descri ption for the first run account drop down spinner."> 1645
1646 <!-- Account Signin Strings -->
1647 <message name="IDS_SIGNIN_SET_UP_CHROME" desc="Header text shown when the user is first setting up Chrome">
1648 Set up Chrome
1649 </message>
1650 <message name="IDS_CHOOSE_ACCOUNT_SIGN_IN" desc="Sign in button for choose google account dialog [CHAR-LIMIT=20]">
1651 Sign in
1652 </message>
1653 <message name="IDS_SIGNIN_ACCOUNT_CHOICE_DESCRIPTION" desc="Text for accou nt chooser page">
1654 Sign in to get your bookmarks, history, passwords, and other settings on all your devices.
1655 </message>
1656 <message name="IDS_SIGNIN_ACCEPT" desc="Text for button to accept being si gned in">
1657 OK, got it
1658 </message>
1659 <message name="IDS_SIGNIN_ADD_ACCOUNT" desc="Text for adding another Googl e Account">
1660 Add account
1661 </message>
1662 <message name="IDS_MAKE_CHROME_YOURS" desc="Title for the signin promo tha t prompts the user to sign in to Chrome to have a personalized experirence. [CHA R-LIMIT=24]">
1663 Make Chrome yours
1664 </message>
1665 <message name="IDS_SIGNIN_NO_ACCOUNT_CHOICE_DESCRIPTION" desc="Text for ac count chooser page when there are no accounts on the device.">
1666 Add an account to get your bookmarks, history, passwords, and other sett ings on all your devices
1667 </message>
1668 <message name="IDS_SIGNIN_SIGN_IN_TO_CHROME_SUMMARY_VARIANT" desc="A varia nt of summary for the signin promo; lists reasons to sign in to Chrome.">
1669 Sign in to access all your web stuff from any device
1670 </message>
1671 <message name="IDS_SIGNIN_NO_ACCOUNTS" desc="Text for spinner when there i s no google accounts [CHAR-LIMIT=40]">
1672 Add an account
1673 </message>
1674 <message name="IDS_SIGNIN_HI_NAME" desc="Title welcoming the user by their name after they have signed in.">
1675 Hi, <ph name="FULL_NAME">%1$s<ex>John Smith</ex></ph>
1676 </message>
1677 <message name="IDS_SIGNIN_SIGNED_IN_DESCRIPTION" desc="Explanation of what gets synced after the user signed in">
1678 Your bookmarks, history, passwords, and other settings will be synced to your Google Account so you can use them on all your devices. You can choose wha t to sync in <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Settings<ph name="END_LINK 1">&lt;/LINK1&gt;</ph>.
1679 </message>
1680 <message name="IDS_SIGNIN_SIGNED_IN_DESCRIPTION_UCA_ADDENDUM" desc="Additi onal explanation for child accounts that synced settings are managed by parents. ">
1681 Your parents help manage these settings.
1682 </message>
1683 <message name="IDS_ACCESSIBILITY_SIGNIN_ACCOUNT_SPINNER" desc="Content des cription for the first run account drop down spinner.">
1664 Choose account 1684 Choose account
1665 </message> 1685 </message>
1666 1686
1667 <!-- External Navigation Strings --> 1687 <!-- External Navigation Strings -->
1668 <message name="IDS_EXTERNAL_APP_LEAVE_INCOGNITO_WARNING" desc="Alert dialo g text warning that user that incognito mode does not continue into external app s."> 1688 <message name="IDS_EXTERNAL_APP_LEAVE_INCOGNITO_WARNING" desc="Alert dialo g text warning that user that incognito mode does not continue into external app s.">
1669 Leaving incognito mode if this link is opened in an external application . Continue? 1689 Leaving incognito mode if this link is opened in an external application . Continue?
1670 </message> 1690 </message>
1671 <message name="IDS_EXTERNAL_APP_LEAVE_INCOGNITO_WARNING_TITLE" desc="Title for incognito external intent. [CHAR-LIMIT=24]"> 1691 <message name="IDS_EXTERNAL_APP_LEAVE_INCOGNITO_WARNING_TITLE" desc="Title for incognito external intent. [CHAR-LIMIT=24]">
1672 Warning 1692 Warning
1673 </message> 1693 </message>
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
2354 </message> 2374 </message>
2355 <message name="IDS_PHYSICAL_WEB_LAUNCH_BUTTON" desc="The label for a butto n that opens a list of nearby URLs"> 2375 <message name="IDS_PHYSICAL_WEB_LAUNCH_BUTTON" desc="The label for a butto n that opens a list of nearby URLs">
2356 See what's nearby 2376 See what's nearby
2357 </message> 2377 </message>
2358 <message name="IDS_PHYSICAL_WEB_BOTTOM_BAR" desc="A message displayed in t he nearby URLs list activity informing the user that a notification will appear whenever devices broadcasting URLs are nearby"> 2378 <message name="IDS_PHYSICAL_WEB_BOTTOM_BAR" desc="A message displayed in t he nearby URLs list activity informing the user that a notification will appear whenever devices broadcasting URLs are nearby">
2359 Future nearby Physical Web pages will show up in your notifications list 2379 Future nearby Physical Web pages will show up in your notifications list
2360 </message> 2380 </message>
2361 </messages> 2381 </messages>
2362 </release> 2382 </release>
2363 </grit> 2383 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698