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

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

Issue 779463007: Add "meaning" attribute to conflicting string. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 <message name="IDS_TAB_LOADING_DEFAULT_TITLE" desc="The title of a tab whe n we are still waiting for either the URL or the real title. This generally show s when the page is first loading."> 239 <message name="IDS_TAB_LOADING_DEFAULT_TITLE" desc="The title of a tab whe n we are still waiting for either the URL or the real title. This generally show s when the page is first loading.">
240 Loading… 240 Loading…
241 </message> 241 </message>
242 242
243 <!-- InfoBar --> 243 <!-- InfoBar -->
244 <message desc="Accessibility label for the dismiss infobar Button" name="I DS_INFOBAR_CLOSE"> 244 <message desc="Accessibility label for the dismiss infobar Button" name="I DS_INFOBAR_CLOSE">
245 Close 245 Close
246 </message> 246 </message>
247 247
248 <!-- TranslateInfoBar --> 248 <!-- TranslateInfoBar -->
249 <message name="IDS_TRANSLATE_INFOBAR_TEXT" desc="Text to display on the tr anslate infobar to offer a translate. [CHAR-LIMIT=64]"> 249 <message name="IDS_TRANSLATE_INFOBAR_TEXT" desc="Text to display on the tr anslate infobar to offer a translate. [CHAR-LIMIT=64]" meaning="Android">
250 This page is in <ph name="SOURCE_LANGUAGE">^1<ex>English</ex></ph>. Tran slate it to <ph name="TARGET_LANGUAGE">^2<ex>FRENCH</ex></ph>? 250 This page is in <ph name="SOURCE_LANGUAGE">^1<ex>English</ex></ph>. Tran slate it to <ph name="TARGET_LANGUAGE">^2<ex>FRENCH</ex></ph>?
251 </message> 251 </message>
252 <message name="IDS_TRANSLATE_INFOBAR_CHANGE_LANGUAGES" desc="link text to offer to change languages."> 252 <message name="IDS_TRANSLATE_INFOBAR_CHANGE_LANGUAGES" desc="link text to offer to change languages.">
253 Change languages 253 Change languages
254 </message> 254 </message>
255 <message name="IDS_TRANSLATE_INFOBAR_TRANSLATION_DONE"> 255 <message name="IDS_TRANSLATE_INFOBAR_TRANSLATION_DONE">
256 Translated to <ph name="TARGET_LANGUAGE">%1$s<ex>FRENCH</ex></ph>. 256 Translated to <ph name="TARGET_LANGUAGE">%1$s<ex>FRENCH</ex></ph>.
257 </message> 257 </message>
258 <message name="IDS_TRANSLATE_INFOBAR_TRANSLATION_MORE_OPTIONS" desc="Text link that will provide more options after a translate [CHAR-LIMIT=24]"> 258 <message name="IDS_TRANSLATE_INFOBAR_TRANSLATION_MORE_OPTIONS" desc="Text link that will provide more options after a translate [CHAR-LIMIT=24]">
259 More 259 More
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 <message name="IDS_WIFI_PREFETCH_BANDWIDTH_ENTRY" desc="Option that enable s the prefetching of web pages when connected via wi-fi. [CHAR-LIMIT=16]"> 513 <message name="IDS_WIFI_PREFETCH_BANDWIDTH_ENTRY" desc="Option that enable s the prefetching of web pages when connected via wi-fi. [CHAR-LIMIT=16]">
514 Only on Wi-Fi 514 Only on Wi-Fi
515 </message> 515 </message>
516 <message name="IDS_ALWAYS_PREFETCH_BANDWIDTH_ENTRY" desc="Option to always prefetch web pages regardless of connection. [CHAR-LIMIT=16]"> 516 <message name="IDS_ALWAYS_PREFETCH_BANDWIDTH_ENTRY" desc="Option to always prefetch web pages regardless of connection. [CHAR-LIMIT=16]">
517 Always 517 Always
518 </message> 518 </message>
519 519
520 </messages> 520 </messages>
521 </release> 521 </release>
522 </grit> 522 </grit>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698