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

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

Issue 2614973002: [Signin] Update order of buttons in dialog for merging data (Closed)
Patch Set: Created 3 years, 11 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 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after
1174 </message> 1174 </message>
1175 <message name="IDS_SYNC_PASSPHRASE_INCORRECT" desc="Inform the user that t he passphrase they entered for sync is incorrect. [CHAR-LIMIT=40]"> 1175 <message name="IDS_SYNC_PASSPHRASE_INCORRECT" desc="Inform the user that t he passphrase they entered for sync is incorrect. [CHAR-LIMIT=40]">
1176 Incorrect passphrase 1176 Incorrect passphrase
1177 </message> 1177 </message>
1178 <message name="IDS_SYNC_VERIFYING" desc="Inform the user that their sync e ncryption information is being verified. [CHAR-LIMIT=20]"> 1178 <message name="IDS_SYNC_VERIFYING" desc="Inform the user that their sync e ncryption information is being verified. [CHAR-LIMIT=20]">
1179 Verifying… 1179 Verifying…
1180 </message> 1180 </message>
1181 <message name="IDS_SYNC_LOADING" desc="Preference title to let the user ch ange their encryption password. [CHAR-LIMIT=20]"> 1181 <message name="IDS_SYNC_LOADING" desc="Preference title to let the user ch ange their encryption password. [CHAR-LIMIT=20]">
1182 Loading… 1182 Loading…
1183 </message> 1183 </message>
1184 <message name="IDS_SYNC_IMPORT_DATA_TITLE" desc="Preference title of scree n to let user choose to switch sync accounts. [CHAR-LIMIT=24]">
1185 Import data?
1186 </message>
1187 <message name="IDS_SYNC_IMPORT_DATA_PROMPT" desc="Prompt for the user to c hoose how they want to handle their existing sync data"> 1184 <message name="IDS_SYNC_IMPORT_DATA_PROMPT" desc="Prompt for the user to c hoose how they want to handle their existing sync data">
1188 You have bookmarks, history, passwords, and other settings from <ph nam e ="FROM_ACCOUNT">%1$s<ex>johndoe@old.com</ex></ph>. 1185 You have bookmarks, history, passwords, and other settings from <ph nam e ="FROM_ACCOUNT">%1$s<ex>johndoe@old.com</ex></ph>.
1189 </message> 1186 </message>
1190 <message name="IDS_SYNC_IMPORT_EXISTING_DATA" desc="Option to import exist ing data to the newly selected sync account"> 1187 <message name="IDS_SYNC_IMPORT_EXISTING_DATA" desc="Option to import exist ing data to the newly selected sync account">
1191 Combine my data 1188 Combine my data
1192 </message> 1189 </message>
1193 <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"> 1190 <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">
1194 Add existing data to <ph name="TO_ACCOUNT">%1$s<ex>johndoe@new.com</ex>< /ph>. 1191 Add existing data to <ph name="TO_ACCOUNT">%1$s<ex>johndoe@new.com</ex>< /ph>.
1195 </message> 1192 </message>
1196 <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE" desc="Option to keep the existing data separate from the newly selected sync account"> 1193 <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE" desc="Option to keep the existing data separate from the newly selected sync account">
(...skipping 1670 matching lines...) Expand 10 before | Expand all | Expand 10 after
2867 </message> 2864 </message>
2868 <message name="IDS_KEYBOARD_SHORTCUT_CHROME_FEATURE_GROUP_HEADER" desc="A text label that appears above a list of shortcuts that are related to the Chrome app features. This group is part of several groups of keyboard shortcuts all sh own in a dialog."> 2865 <message name="IDS_KEYBOARD_SHORTCUT_CHROME_FEATURE_GROUP_HEADER" desc="A text label that appears above a list of shortcuts that are related to the Chrome app features. This group is part of several groups of keyboard shortcuts all sh own in a dialog.">
2869 Google Chrome feature shortcuts 2866 Google Chrome feature shortcuts
2870 </message> 2867 </message>
2871 <message name="IDS_KEYBOARD_SHORTCUT_WEBPAGE_GROUP_HEADER" desc="A text la bel that appears above a list of shortcuts that are related to manipulation of t he current tab window. This group is part of several groups of keyboard shortcut s all shown in a dialog."> 2868 <message name="IDS_KEYBOARD_SHORTCUT_WEBPAGE_GROUP_HEADER" desc="A text la bel that appears above a list of shortcuts that are related to manipulation of t he current tab window. This group is part of several groups of keyboard shortcut s all shown in a dialog.">
2872 Webpage shortcuts 2869 Webpage shortcuts
2873 </message> 2870 </message>
2874 </messages> 2871 </messages>
2875 </release> 2872 </release>
2876 </grit> 2873 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698