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

Side by Side Diff: chrome/app/chromium_strings.grd

Issue 2834973002: Revert of Enable side-by-side beta and dev channels. (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « chrome/app/chrome_exe.rc ('k') | chrome/app/google_chrome_strings.grd » ('j') | 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 <!-- This file contains definitions of strings that are distribution specific. 2 <!-- This file contains definitions of strings that are distribution specific.
3 If you update this file, be sure also to update google_chrome_strings.grd. --> 3 If you update this file, be sure also to update google_chrome_strings.grd. -->
4 4
5 <grit base_dir="." latest_public_release="0" current_release="1" 5 <grit base_dir="." latest_public_release="0" current_release="1"
6 output_all_resource_defines="false" source_lang_id="en" enc_check="möl"> 6 output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
7 <outputs> 7 <outputs>
8 <output filename="grit/chromium_strings.h" type="rc_header"> 8 <output filename="grit/chromium_strings.h" type="rc_header">
9 <emit emit_type='prepend'></emit> 9 <emit emit_type='prepend'></emit>
10 </output> 10 </output>
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TEXT" desc="Message explaining to the user what will happen if they disconnect the managed profile. "> 129 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TEXT" desc="Message explaining to the user what will happen if they disconnect the managed profile. ">
130 Disconnecting <ph name="USERNAME">$1<ex>someone@example.com</ex></ph> wi ll clear your history, bookmarks, settings, and other Chromium data stored on th is device. Data stored in your Google Account will not be cleared and can be man aged on <ph name="GOOGLE_DASHBOARD_LINK">&lt;a target="_blank" href="$2"&gt;</ph >Google Dashboard<ph name="END_GOOGLE_DASHBOARD_LINK">&lt;/a&gt;</ph>. 130 Disconnecting <ph name="USERNAME">$1<ex>someone@example.com</ex></ph> wi ll clear your history, bookmarks, settings, and other Chromium data stored on th is device. Data stored in your Google Account will not be cleared and can be man aged on <ph name="GOOGLE_DASHBOARD_LINK">&lt;a target="_blank" href="$2"&gt;</ph >Google Dashboard<ph name="END_GOOGLE_DASHBOARD_LINK">&lt;/a&gt;</ph>.
131 </message> 131 </message>
132 <message name="IDS_PRODUCT_NAME" desc="The Chrome application name"> 132 <message name="IDS_PRODUCT_NAME" desc="The Chrome application name">
133 Chromium 133 Chromium
134 </message> 134 </message>
135 <message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name."> 135 <message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name.">
136 Chromium 136 Chromium
137 </message> 137 </message>
138 <if expr="is_win"> 138 <if expr="is_win">
139 <message name="IDS_SXS_SHORTCUT_NAME" desc="Unused in Chromium builds" t ranslateable="false"> 139 <message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome short cut name fo r SxS channel">
140 </message> 140 Chromium
141 <message name="IDS_SHORTCUT_NAME_BETA" desc="Unused in Chromium builds" translateable="false">
142 </message>
143 <message name="IDS_SHORTCUT_NAME_DEV" desc="Unused in Chromium builds" t ranslateable="false">
144 </message> 141 </message>
145 <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description"> 142 <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description">
146 Chromium is a web browser that runs webpages and applications with lig htning speed. It's fast, stable, and easy to use. Browse the web more safely wit h malware and phishing protection built into Chromium. 143 Chromium is a web browser that runs webpages and applications with lig htning speed. It's fast, stable, and easy to use. Browse the web more safely wit h malware and phishing protection built into Chromium.
147 </message> 144 </message>
148 </if> 145 </if>
149 <if expr="chromeos"> 146 <if expr="chromeos">
150 <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name "> 147 <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name ">
151 Chromium OS 148 Chromium OS
152 </message> 149 </message>
153 <message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS applicatio n short name"> 150 <message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS applicatio n short name">
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 </if> 852 </if>
856 </if> 853 </if>
857 854
858 <!-- App shortcuts --> 855 <!-- App shortcuts -->
859 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chromium Apps Start Menu folder name."> 856 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chromium Apps Start Menu folder name.">
860 Chromium Apps 857 Chromium Apps
861 </message> 858 </message>
862 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Ch rome Apps Start Menu folder name."> 859 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Ch rome Apps Start Menu folder name.">
863 Chromium Apps 860 Chromium Apps
864 </message> 861 </message>
865 <if expr="is_win">
866 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_BETA" desc="Unused in Chrom ium builds" translateable="false">
867 </message>
868 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_DEV" desc="Unused in Chromi um builds" translateable="false">
869 </message>
870 </if>
871 862
872 <!-- Chrome Conflicts bubble --> 863 <!-- Chrome Conflicts bubble -->
873 <if expr="is_win"> 864 <if expr="is_win">
874 <message name="IDS_OPTIONS_CONFLICTING_MODULE" desc="Shown in a bubble w hen a conflict has been detected."> 865 <message name="IDS_OPTIONS_CONFLICTING_MODULE" desc="Shown in a bubble w hen a conflict has been detected.">
875 Software running on your computer is incompatible with Chromium. 866 Software running on your computer is incompatible with Chromium.
876 </message> 867 </message>
877 </if> 868 </if>
878 869
879 <!-- Chrome OS OOBE Terms of Service screen--> 870 <!-- Chrome OS OOBE Terms of Service screen-->
880 <if expr="chromeos"> 871 <if expr="chromeos">
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 <!-- Webstore strings --> 990 <!-- Webstore strings -->
1000 <message name="IDS_WEBSTORE_APP_DESCRIPTION" desc="Description for the Web Store app."> 991 <message name="IDS_WEBSTORE_APP_DESCRIPTION" desc="Description for the Web Store app.">
1001 Discover great apps, games, extensions and themes for Chromium. 992 Discover great apps, games, extensions and themes for Chromium.
1002 </message> 993 </message>
1003 994
1004 <!-- Windows firewall rule strings. --> 995 <!-- Windows firewall rule strings. -->
1005 <if expr="is_win"> 996 <if expr="is_win">
1006 <message name="IDS_INBOUND_MDNS_RULE_NAME" desc="The name of the firewal l rule allowing inbound mDNS traffic."> 997 <message name="IDS_INBOUND_MDNS_RULE_NAME" desc="The name of the firewal l rule allowing inbound mDNS traffic.">
1007 Chromium (mDNS-In) 998 Chromium (mDNS-In)
1008 </message> 999 </message>
1009 <message name="IDS_INBOUND_MDNS_RULE_NAME_BETA" desc="Unused in Chromium builds" translateable="false"> 1000 <message name="IDS_INBOUND_MDNS_RULE_NAME_CANARY" desc="The name of the firewall rule allowing inbound mDNS traffic for canary.">
1010 </message> 1001 Chromium (mDNS-In)
1011 <message name="IDS_INBOUND_MDNS_RULE_NAME_CANARY" desc="Unused in Chromi um builds" translateable="false">
1012 </message>
1013 <message name="IDS_INBOUND_MDNS_RULE_NAME_DEV" desc="Unused in Chromium builds" translateable="false">
1014 </message> 1002 </message>
1015 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION" desc="The description of the firewall rule allowing inbound mDNS traffic."> 1003 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION" desc="The description of the firewall rule allowing inbound mDNS traffic.">
1016 Inbound rule for Chromium to allow mDNS traffic. 1004 Inbound rule for Chromium to allow mDNS traffic.
1017 </message> 1005 </message>
1018 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_BETA" desc="Unused in C hromium builds" translateable="false"> 1006 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY" desc="The descr iption of the firewall rule allowing inbound mDNS traffic canary.">
1019 </message> 1007 Inbound rule for Chromium to allow mDNS traffic.
1020 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY" desc="Unused in Chromium builds" translateable="false">
1021 </message>
1022 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_DEV" desc="Unused in Ch romium builds" translateable="false">
1023 </message> 1008 </message>
1024 </if> 1009 </if>
1025 1010
1026 <if expr="not is_android"> 1011 <if expr="not is_android">
1027 <message name="IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT" desc="The text of a bubble that confirms users allows integrating the spelling service of Googl e to Chrome."> 1012 <message name="IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT" desc="The text of a bubble that confirms users allows integrating the spelling service of Googl e to Chrome.">
1028 Chromium can provide smarter spell-checking by sending what you type i n the browser to Google servers, allowing you to use the same spell-checking tec hnology used by Google search. 1013 Chromium can provide smarter spell-checking by sending what you type i n the browser to Google servers, allowing you to use the same spell-checking tec hnology used by Google search.
1029 </message> 1014 </message>
1030 <message name="IDS_RESET_PROFILE_SETTINGS_FEEDBACK" desc="Feedback label in the Reset Profile Settings dialog"> 1015 <message name="IDS_RESET_PROFILE_SETTINGS_FEEDBACK" desc="Feedback label in the Reset Profile Settings dialog">
1031 Help make Chromium better by reporting the current settings 1016 Help make Chromium better by reporting the current settings
1032 </message> 1017 </message>
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1261 <message name="IDS_WIN10_WELCOME_PIN_SUBHEADING" desc="A subheading on a section which gives instructions on how to pin Chromium to the Windows 10 taskb ar."> 1246 <message name="IDS_WIN10_WELCOME_PIN_SUBHEADING" desc="A subheading on a section which gives instructions on how to pin Chromium to the Windows 10 taskb ar.">
1262 Pin Chromium to your taskbar 1247 Pin Chromium to your taskbar
1263 </message> 1248 </message>
1264 <message name="IDS_WIN10_WELCOME_SELECT" desc="An instruction asking the user to select Chromium from an external list of apps."> 1249 <message name="IDS_WIN10_WELCOME_SELECT" desc="An instruction asking the user to select Chromium from an external list of apps.">
1265 Select <ph name="SMALL_PRODUCT_LOGO">&lt;div class="logo-small"&gt;&lt ;/div&gt;</ph> <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Chromium<ph name="END_BO LD">&lt;/strong&gt;</ph> 1250 Select <ph name="SMALL_PRODUCT_LOGO">&lt;div class="logo-small"&gt;&lt ;/div&gt;</ph> <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Chromium<ph name="END_BO LD">&lt;/strong&gt;</ph>
1266 </message> 1251 </message>
1267 </if> 1252 </if>
1268 </messages> 1253 </messages>
1269 </release> 1254 </release>
1270 </grit> 1255 </grit>
OLDNEW
« no previous file with comments | « chrome/app/chrome_exe.rc ('k') | chrome/app/google_chrome_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698