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

Side by Side Diff: chrome/app/google_chrome_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/chromium_strings.grd ('k') | chrome/common/chrome_icon_resources_win.h » ('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 specific to 2 <!-- This file contains definitions of strings that are specific to
3 Google Chrome. These strings will be translated for each locale that Google 3 Google Chrome. These strings will be translated for each locale that Google
4 Chrome supports. If you update this file, be sure also to update 4 Chrome supports. If you update this file, be sure also to update
5 chromium_strings.grd. --> 5 chromium_strings.grd. -->
6 6
7 <grit base_dir="." latest_public_release="0" current_release="1" 7 <grit base_dir="." latest_public_release="0" current_release="1"
8 output_all_resource_defines="false" source_lang_id="en" enc_check="möl"> 8 output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
9 <outputs> 9 <outputs>
10 <output filename="grit/google_chrome_strings.h" type="rc_header"> 10 <output filename="grit/google_chrome_strings.h" type="rc_header">
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TEXT" desc="Message explaining to the user what will happen if they disconnect the managed profile. "> 131 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TEXT" desc="Message explaining to the user what will happen if they disconnect the managed profile. ">
132 Disconnecting <ph name="USERNAME">$1<ex>someone@example.com</ex></ph> wi ll clear your history, bookmarks, settings, and other Chrome data stored on this device. Data stored in your Google Account will not be cleared and can be manag ed on <ph name="GOOGLE_DASHBOARD_LINK">&lt;a target="_blank" href="$2"&gt;</ph>G oogle Dashboard<ph name="END_GOOGLE_DASHBOARD_LINK">&lt;/a&gt;</ph>. 132 Disconnecting <ph name="USERNAME">$1<ex>someone@example.com</ex></ph> wi ll clear your history, bookmarks, settings, and other Chrome data stored on this device. Data stored in your Google Account will not be cleared and can be manag ed on <ph name="GOOGLE_DASHBOARD_LINK">&lt;a target="_blank" href="$2"&gt;</ph>G oogle Dashboard<ph name="END_GOOGLE_DASHBOARD_LINK">&lt;/a&gt;</ph>.
133 </message> 133 </message>
134 <message name="IDS_PRODUCT_NAME" desc="The Chrome application name"> 134 <message name="IDS_PRODUCT_NAME" desc="The Chrome application name">
135 Google Chrome 135 Google Chrome
136 </message> 136 </message>
137 <message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name"> 137 <message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name">
138 Chrome 138 Chrome
139 </message> 139 </message>
140 <if expr="is_win"> 140 <if expr="is_win">
141 <message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome shortcut name for canary channel"> 141 <message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome short cut name fo r SxS channel">
142 Google Chrome Canary 142 Google Chrome Canary
143 </message> 143 </message>
144 <message name="IDS_SHORTCUT_NAME_BETA" desc="The Chrome shortcut name fo r beta channel">
145 Google Chrome Beta
146 </message>
147 <message name="IDS_SHORTCUT_NAME_DEV" desc="The Chrome shortcut name for dev channel">
148 Google Chrome Dev
149 </message>
150 <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description"> 144 <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description">
151 Google Chrome is a web browser that runs webpages and applications wit h lightning speed. It's fast, stable, and easy to use. Browse the web more safel y with malware and phishing protection built into Google Chrome. 145 Google Chrome is a web browser that runs webpages and applications wit h lightning speed. It's fast, stable, and easy to use. Browse the web more safel y with malware and phishing protection built into Google Chrome.
152 </message> 146 </message>
153 </if> 147 </if>
154 <if expr="chromeos"> 148 <if expr="chromeos">
155 <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name "> 149 <message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name ">
156 Google Chrome OS 150 Google Chrome OS
157 </message> 151 </message>
158 <message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS applicatio n short name"> 152 <message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS applicatio n short name">
159 Chrome OS 153 Chrome OS
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
859 </if> 853 </if>
860 </if> 854 </if>
861 855
862 <!-- App shortcuts --> 856 <!-- App shortcuts -->
863 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chrome Ap ps Start Menu folder name."> 857 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME" desc="Name for the Chrome Ap ps Start Menu folder name.">
864 Chrome Apps 858 Chrome Apps
865 </message> 859 </message>
866 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Ch rome Apps Start Menu folder name for the Canary channel."> 860 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY" desc="Name for the Ch rome Apps Start Menu folder name for the Canary channel.">
867 Chrome Canary Apps 861 Chrome Canary Apps
868 </message> 862 </message>
869 <if expr="is_win">
870 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_BETA" desc="Name for the Ch rome Apps Start Menu folder name for the Beta channel.">
871 Chrome Beta Apps
872 </message>
873 <message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_DEV" desc="Name for the Chr ome Apps Start Menu folder name for the Dev channel.">
874 Chrome Dev Apps
875 </message>
876 </if>
877 863
878 <!-- Chrome Conflicts bubble --> 864 <!-- Chrome Conflicts bubble -->
879 <if expr="is_win"> 865 <if expr="is_win">
880 <message name="IDS_OPTIONS_CONFLICTING_MODULE" desc="Shown in a bubble w hen a conflict has been detected."> 866 <message name="IDS_OPTIONS_CONFLICTING_MODULE" desc="Shown in a bubble w hen a conflict has been detected.">
881 Software running on your computer is incompatible with Google Chrome. 867 Software running on your computer is incompatible with Google Chrome.
882 </message> 868 </message>
883 </if> 869 </if>
884 870
885 <!-- Chrome OS OOBE Terms of Service screen--> 871 <!-- Chrome OS OOBE Terms of Service screen-->
886 <if expr="chromeos"> 872 <if expr="chromeos">
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 <!-- Webstore strings --> 991 <!-- Webstore strings -->
1006 <message name="IDS_WEBSTORE_APP_DESCRIPTION" desc="Description for the Web Store app."> 992 <message name="IDS_WEBSTORE_APP_DESCRIPTION" desc="Description for the Web Store app.">
1007 Discover great apps, games, extensions and themes for Google Chrome. 993 Discover great apps, games, extensions and themes for Google Chrome.
1008 </message> 994 </message>
1009 995
1010 <!-- Windows firewall rule strings. --> 996 <!-- Windows firewall rule strings. -->
1011 <if expr="is_win"> 997 <if expr="is_win">
1012 <message name="IDS_INBOUND_MDNS_RULE_NAME" desc="The name of the firewal l rule allowing inbound mDNS traffic."> 998 <message name="IDS_INBOUND_MDNS_RULE_NAME" desc="The name of the firewal l rule allowing inbound mDNS traffic.">
1013 Google Chrome (mDNS-In) 999 Google Chrome (mDNS-In)
1014 </message> 1000 </message>
1015 <message name="IDS_INBOUND_MDNS_RULE_NAME_BETA" desc="The name of the fi rewall rule allowing inbound mDNS traffic for beta.">
1016 Google Chrome Beta (mDNS-In)
1017 </message>
1018 <message name="IDS_INBOUND_MDNS_RULE_NAME_CANARY" desc="The name of the firewall rule allowing inbound mDNS traffic for canary."> 1001 <message name="IDS_INBOUND_MDNS_RULE_NAME_CANARY" desc="The name of the firewall rule allowing inbound mDNS traffic for canary.">
1019 Google Chrome Canary (mDNS-In) 1002 Google Chrome Canary (mDNS-In)
1020 </message> 1003 </message>
1021 <message name="IDS_INBOUND_MDNS_RULE_NAME_DEV" desc="The name of the fir ewall rule allowing inbound mDNS traffic for dev.">
1022 Google Chrome Dev (mDNS-In)
1023 </message>
1024 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION" desc="The description of the firewall rule allowing inbound mDNS traffic."> 1004 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION" desc="The description of the firewall rule allowing inbound mDNS traffic.">
1025 Inbound rule for Google Chrome to allow mDNS traffic. 1005 Inbound rule for Google Chrome to allow mDNS traffic.
1026 </message> 1006 </message>
1027 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_BETA" desc="The descrip tion of the firewall rule allowing inbound mDNS traffic beta.">
1028 Inbound rule for Google Chrome Beta to allow mDNS traffic.
1029 </message>
1030 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY" desc="The descr iption of the firewall rule allowing inbound mDNS traffic canary."> 1007 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY" desc="The descr iption of the firewall rule allowing inbound mDNS traffic canary.">
1031 Inbound rule for Google Chrome Canary to allow mDNS traffic. 1008 Inbound rule for Google Chrome Canary to allow mDNS traffic.
1032 </message> 1009 </message>
1033 <message name="IDS_INBOUND_MDNS_RULE_DESCRIPTION_DEV" desc="The descript ion of the firewall rule allowing inbound mDNS traffic dev.">
1034 Inbound rule for Google Chrome Dev to allow mDNS traffic.
1035 </message>
1036 </if> 1010 </if>
1037 1011
1038 <if expr="not is_android"> 1012 <if expr="not is_android">
1039 <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."> 1013 <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.">
1040 Google Chrome can provide smarter spell-checking by sending what you t ype in the browser to Google servers, allowing you to use the same spell-checkin g technology used by Google search. 1014 Google Chrome can provide smarter spell-checking by sending what you t ype in the browser to Google servers, allowing you to use the same spell-checkin g technology used by Google search.
1041 </message> 1015 </message>
1042 <message name="IDS_RESET_PROFILE_SETTINGS_FEEDBACK" desc="Feedback label in the Reset Profile Settings dialog"> 1016 <message name="IDS_RESET_PROFILE_SETTINGS_FEEDBACK" desc="Feedback label in the Reset Profile Settings dialog">
1043 Help make Google Chrome better by reporting the current settings 1017 Help make Google Chrome better by reporting the current settings
1044 </message> 1018 </message>
1045 </if> 1019 </if>
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 <message name="IDS_WIN10_WELCOME_PIN_SUBHEADING" desc="A subheading on a section which gives instructions on how to pin Chrome to the Windows 10 taskbar ."> 1248 <message name="IDS_WIN10_WELCOME_PIN_SUBHEADING" desc="A subheading on a section which gives instructions on how to pin Chrome to the Windows 10 taskbar .">
1275 Pin Chrome to your taskbar 1249 Pin Chrome to your taskbar
1276 </message> 1250 </message>
1277 <message name="IDS_WIN10_WELCOME_SELECT" desc="An instruction asking the user to select Chrome from an external list of apps."> 1251 <message name="IDS_WIN10_WELCOME_SELECT" desc="An instruction asking the user to select Chrome from an external list of apps.">
1278 Select <ph name="SMALL_PRODUCT_LOGO">&lt;div class="logo-small"&gt;&lt ;/div&gt;</ph> <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Google Chrome<ph name="E ND_BOLD">&lt;/strong&gt;</ph> 1252 Select <ph name="SMALL_PRODUCT_LOGO">&lt;div class="logo-small"&gt;&lt ;/div&gt;</ph> <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Google Chrome<ph name="E ND_BOLD">&lt;/strong&gt;</ph>
1279 </message> 1253 </message>
1280 </if> 1254 </if>
1281 </messages> 1255 </messages>
1282 </release> 1256 </release>
1283 </grit> 1257 </grit>
OLDNEW
« no previous file with comments | « chrome/app/chromium_strings.grd ('k') | chrome/common/chrome_icon_resources_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698