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

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

Issue 991543003: Upstream ChromeMobileApplication bits about sync browser initialization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added findbugs_exclusion Created 5 years, 9 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 <grit current_release="1" latest_public_release="0"> 2 <grit current_release="1" latest_public_release="0">
3 <outputs> 3 <outputs>
4 <output filename="values-am/android_chrome_strings.xml" lang="am" type="andr oid" /> 4 <output filename="values-am/android_chrome_strings.xml" lang="am" type="andr oid" />
5 <output filename="values-ar/android_chrome_strings.xml" lang="ar" type="andr oid" /> 5 <output filename="values-ar/android_chrome_strings.xml" lang="ar" type="andr oid" />
6 <output filename="values-bg/android_chrome_strings.xml" lang="bg" type="andr oid" /> 6 <output filename="values-bg/android_chrome_strings.xml" lang="bg" type="andr oid" />
7 <output filename="values-ca/android_chrome_strings.xml" lang="ca" type="andr oid" /> 7 <output filename="values-ca/android_chrome_strings.xml" lang="ca" type="andr oid" />
8 <output filename="values-cs/android_chrome_strings.xml" lang="cs" type="andr oid" /> 8 <output filename="values-cs/android_chrome_strings.xml" lang="cs" type="andr oid" />
9 <output filename="values-da/android_chrome_strings.xml" lang="da" type="andr oid" /> 9 <output filename="values-da/android_chrome_strings.xml" lang="da" type="andr oid" />
10 <output filename="values-de/android_chrome_strings.xml" lang="de" type="andr oid" /> 10 <output filename="values-de/android_chrome_strings.xml" lang="de" type="andr oid" />
(...skipping 1249 matching lines...) Expand 10 before | Expand all | Expand 10 after
1260 <message name="IDS_CARD_UNMASK_MONTH_HINT" desc="Hint text for an input fi eld containing a credit card expiration month in two digit format."> 1260 <message name="IDS_CARD_UNMASK_MONTH_HINT" desc="Hint text for an input fi eld containing a credit card expiration month in two digit format.">
1261 MM 1261 MM
1262 </message> 1262 </message>
1263 <message name="IDS_CARD_UNMASK_YEAR_HINT" desc="Hint text for an input fie ld containing a credit card expiration year in two digit format."> 1263 <message name="IDS_CARD_UNMASK_YEAR_HINT" desc="Hint text for an input fie ld containing a credit card expiration year in two digit format.">
1264 YY 1264 YY
1265 </message> 1265 </message>
1266 <message name="IDS_CARD_UNMASK_EXPIRATION_DATE_SEPARATOR" desc="Separator for a credit card expiration date, e.g. the slash in 05/16."> 1266 <message name="IDS_CARD_UNMASK_EXPIRATION_DATE_SEPARATOR" desc="Separator for a credit card expiration date, e.g. the slash in 05/16.">
1267 / 1267 /
1268 </message> 1268 </message>
1269 1269
1270 <!-- Startup errors -->
1271 <message name="IDS_OS_VERSION_MISSING_FEATURES" desc="Error message shown when Chrome fails to run due to an incomplete version of Android.">
1272 Critical functionality required to run Chrome is missing; either your Ch rome installation is incomplete, or not compatible with this version of Android.
1273 </message>
1274 <message name="IDS_INCOMPATIBLE_LIBRARIES" desc="Error message shown when Chrome fails to start due to having the wrong version of the native library">
1275 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.
1276 </message>
1277 <message name="IDS_NATIVE_STARTUP_FAILED" desc="Error message shown when C hrome fails to start for other (unknown) reasons">
1278 Chrome failed during startup with an unexpected error.
1279 </message>
1280
1270 <!-- First Run strings --> 1281 <!-- First Run strings -->
1271 <message name="IDS_FRE_SET_UP_CHROME" desc="Header text shown when the use r is first setting up Chrome"> 1282 <message name="IDS_FRE_SET_UP_CHROME" desc="Header text shown when the use r is first setting up Chrome">
1272 Set up Chrome 1283 Set up Chrome
1273 </message> 1284 </message>
1274 <message name="IDS_FRE_ACCOUNT_CHOICE_DESCRIPTION" desc="Text for account chooser page"> 1285 <message name="IDS_FRE_ACCOUNT_CHOICE_DESCRIPTION" desc="Text for account chooser page">
1275 Select an account to get your tabs, bookmarks, history, and other settin gs on all your devices. 1286 Select an account to get your tabs, bookmarks, history, and other settin gs on all your devices.
1276 </message> 1287 </message>
1277 <message name="IDS_FRE_SKIP_TEXT" desc="Text for second page skip button"> 1288 <message name="IDS_FRE_SKIP_TEXT" desc="Text for second page skip button">
1278 No thanks 1289 No thanks
1279 </message> 1290 </message>
(...skipping 30 matching lines...) Expand all
1310 <message name="IDS_FRE_SIGNED_IN_DESCRIPTION_UCA_ADDENDUM" desc="Additiona l explanation for child accounts that synced settings are managed by parents."> 1321 <message name="IDS_FRE_SIGNED_IN_DESCRIPTION_UCA_ADDENDUM" desc="Additiona l explanation for child accounts that synced settings are managed by parents.">
1311 Your parents help manage these settings. 1322 Your parents help manage these settings.
1312 </message> 1323 </message>
1313 <message name="IDS_ACCESSIBILITY_FRE_ACCOUNT_SPINNER" desc="Content descri ption for the first run account drop down spinner."> 1324 <message name="IDS_ACCESSIBILITY_FRE_ACCOUNT_SPINNER" desc="Content descri ption for the first run account drop down spinner.">
1314 Choose account 1325 Choose account
1315 </message> 1326 </message>
1316 1327
1317 </messages> 1328 </messages>
1318 </release> 1329 </release>
1319 </grit> 1330 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698