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

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

Issue 974463002: Respect prefs::kAllowDeletingBrowserHistory in the Clear History UI on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 </message> 350 </message>
351 <message name="IDS_CLEAR_BROWSING_DATA_PROGRESS_TITLE" desc='Title for the progress dialog used when waiting for "clear browsing data" to complete.'> 351 <message name="IDS_CLEAR_BROWSING_DATA_PROGRESS_TITLE" desc='Title for the progress dialog used when waiting for "clear browsing data" to complete.'>
352 Clearing browsing data 352 Clearing browsing data
353 </message> 353 </message>
354 <message name="IDS_CLEAR_DATA_DELETE" desc="Button that allows the user to clear their browsing data. [CHAR-LIMIT=20]"> 354 <message name="IDS_CLEAR_DATA_DELETE" desc="Button that allows the user to clear their browsing data. [CHAR-LIMIT=20]">
355 Clear 355 Clear
356 </message> 356 </message>
357 <message name="IDS_CLEAR_BROWSING_DATA_PROGRESS_MESSAGE" desc='Message on the progress dialog used when waiting for "clear browsing data" to complete.'> 357 <message name="IDS_CLEAR_BROWSING_DATA_PROGRESS_MESSAGE" desc='Message on the progress dialog used when waiting for "clear browsing data" to complete.'>
358 Please wait… 358 Please wait…
359 </message> 359 </message>
360 <message name="IDS_CAN_NOT_CLEAR_BROWSING_HISTORY_TOAST" desc='Message on the toast explaining that the user cannot "clear browsing history".'>
Bernhard Bauer 2015/03/03 14:26:21 No quotes for "clear browsing history". We should
knn 2015/03/03 15:03:43 You mean quotes around "clear browsing data" in th
Bernhard Bauer 2015/03/03 15:25:29 In the other strings, "clear browsing data" names
knn 2015/03/03 15:55:57 Thanks for explaining. I think this inconsistency
361 You can not delete your browsing history.
362 </message>
360 363
361 <!-- Accessibility preferences --> 364 <!-- Accessibility preferences -->
362 <message name="IDS_PREFS_ACCESSIBILITY" desc="Title of Accessibility setti ngs, which allows the user to change webpage font sizes. [CHAR-LIMIT=32]"> 365 <message name="IDS_PREFS_ACCESSIBILITY" desc="Title of Accessibility setti ngs, which allows the user to change webpage font sizes. [CHAR-LIMIT=32]">
363 Accessibility 366 Accessibility
364 </message> 367 </message>
365 <message name="IDS_FONT_SIZE" desc="Title for font size preference."> 368 <message name="IDS_FONT_SIZE" desc="Title for font size preference.">
366 Text scaling 369 Text scaling
367 </message> 370 </message>
368 <message name="IDS_FONT_SIZE_PREVIEW_TEXT" desc="Preview text for font-siz e slider."> 371 <message name="IDS_FONT_SIZE_PREVIEW_TEXT" desc="Preview text for font-siz e slider.">
369 Drag the slider until you can read this comfortably. Text should look at least this big after double-tapping on a paragraph. 372 Drag the slider until you can read this comfortably. Text should look at least this big after double-tapping on a paragraph.
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 <message name="IDS_FRE_SIGNED_IN_DESCRIPTION_UCA_ADDENDUM" desc="Additiona l explanation for child accounts that synced settings are managed by parents."> 1305 <message name="IDS_FRE_SIGNED_IN_DESCRIPTION_UCA_ADDENDUM" desc="Additiona l explanation for child accounts that synced settings are managed by parents.">
1303 Your parents help manage these settings. 1306 Your parents help manage these settings.
1304 </message> 1307 </message>
1305 <message name="IDS_ACCESSIBILITY_FRE_ACCOUNT_SPINNER" desc="Content descri ption for the first run account drop down spinner."> 1308 <message name="IDS_ACCESSIBILITY_FRE_ACCOUNT_SPINNER" desc="Content descri ption for the first run account drop down spinner.">
1306 Choose account 1309 Choose account
1307 </message> 1310 </message>
1308 1311
1309 </messages> 1312 </messages>
1310 </release> 1313 </release>
1311 </grit> 1314 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698