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

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 devices 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.
May 2016/02/17 14:22:11 Keep the curly apostrophes
PEConn 2016/02/18 17:20:48 Done.
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 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
1624 <message name="IDS_FRE_SETTINGS" desc="Button that opens Chrome settings"> 1642 <message name="IDS_FRE_SETTINGS" desc="Button that opens Chrome settings">
1625 Settings 1643 Settings
1626 </message> 1644 </message>
1627 <message name="IDS_FRE_ADD_ACCOUNT" desc="Text for adding another Google A ccount"> 1645 <message name="IDS_FRE_ADD_ACCOUNT" desc="Text for adding another Google A ccount">
1628 Add account 1646 Add account
1629 </message> 1647 </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]"> 1648 <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 1649 Make Chrome yours
1632 </message> 1650 </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."> 1651 <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. 1652 Add an account to get your bookmarks, history, passwords, and other sett ings on all your devices
1635 </message> 1653 </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."> 1654 <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 1655 Sign in to access all your web stuff from any device
1638 </message> 1656 </message>
1639 <message name="IDS_FRE_NO_ACCOUNTS" desc="Text for spinner when there is n o google accounts [CHAR-LIMIT=40]"> 1657 <message name="IDS_FRE_NO_ACCOUNTS" desc="Text for spinner when there is n o google accounts [CHAR-LIMIT=40]">
1640 Add an account 1658 Add an account
1641 </message> 1659 </message>
1642 <message name="IDS_FRE_HI_NAME" desc="Title welcoming the user by their na me after they have signed in."> 1660 <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> 1661 Hi, <ph name="FULL_NAME">%1$s<ex>John Smith</ex></ph>
1644 </message> 1662 </message>
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
2354 </message> 2372 </message>
2355 <message name="IDS_PHYSICAL_WEB_LAUNCH_BUTTON" desc="The label for a butto n that opens a list of nearby URLs"> 2373 <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 2374 See what's nearby
2357 </message> 2375 </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"> 2376 <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 2377 Future nearby Physical Web pages will show up in your notifications list
2360 </message> 2378 </message>
2361 </messages> 2379 </messages>
2362 </release> 2380 </release>
2363 </grit> 2381 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698