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

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

Issue 225523004: Updates the UI and reenables the fix introduced in commit 256939 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes chromeos_rel test failure and includes a rebase Created 6 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/generated_resources.grd ('k') | chrome/browser/resources/options/browser_options.js » ('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. --> 4 Chrome supports. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/google_chrome_strings.h" type="rc_header"> 9 <output filename="grit/google_chrome_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 <file path="resources/google_chrome_strings_te.xtb" lang="te" /> 127 <file path="resources/google_chrome_strings_te.xtb" lang="te" />
128 <file path="resources/google_chrome_strings_th.xtb" lang="th" /> 128 <file path="resources/google_chrome_strings_th.xtb" lang="th" />
129 <file path="resources/google_chrome_strings_tr.xtb" lang="tr" /> 129 <file path="resources/google_chrome_strings_tr.xtb" lang="tr" />
130 <file path="resources/google_chrome_strings_uk.xtb" lang="uk" /> 130 <file path="resources/google_chrome_strings_uk.xtb" lang="uk" />
131 <file path="resources/google_chrome_strings_vi.xtb" lang="vi" /> 131 <file path="resources/google_chrome_strings_vi.xtb" lang="vi" />
132 <file path="resources/google_chrome_strings_zh-CN.xtb" lang="zh-CN" /> 132 <file path="resources/google_chrome_strings_zh-CN.xtb" lang="zh-CN" />
133 <file path="resources/google_chrome_strings_zh-TW.xtb" lang="zh-TW" /> 133 <file path="resources/google_chrome_strings_zh-TW.xtb" lang="zh-TW" />
134 </translations> 134 </translations>
135 <release seq="1" allow_pseudo="false"> 135 <release seq="1" allow_pseudo="false">
136 <messages fallback_to_english="true"> 136 <messages fallback_to_english="true">
137 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TITLE" desc="Title of the disconnect managed profile dialog.">
138 Delete managed Chrome user
139 </message>
140 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TEXT" desc="Message explaining to the user what will happen if they disconnect the managed profile. "> 137 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TEXT" desc="Message explaining to the user what will happen if they disconnect the managed profile. ">
141 You are signed in with a managed account which is controlled by an admin istrator. If you disconnect from this account, this Chrome user and all associat ed Chrome data, such as apps, bookmarks, history, passwords, and other settings will be removed from this computer. 138 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>.
142 </message>
143 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_OK_BUTTON_LABEL" de sc="The text to display on the button to confirm deleting the Chrome user profil e.">
144 Delete Chrome user
145 </message> 139 </message>
146 <message name="IDS_PRODUCT_NAME" desc="The Chrome application name"> 140 <message name="IDS_PRODUCT_NAME" desc="The Chrome application name">
147 Google Chrome 141 Google Chrome
148 </message> 142 </message>
149 <message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name"> 143 <message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name">
150 Chrome 144 Chrome
151 </message> 145 </message>
152 <message name="IDS_SHORT_PRODUCT_NAME_LOWER" desc="The Chrome application short name all lowercase"> 146 <message name="IDS_SHORT_PRODUCT_NAME_LOWER" desc="The Chrome application short name all lowercase">
153 chrome 147 chrome
154 </message> 148 </message>
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 <message name="IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE" 1115 <message name="IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE"
1122 desc="Explanation in a new OTR window that extensions have been disabled while in OTR."> 1116 desc="Explanation in a new OTR window that extensions have been disabled while in OTR.">
1123 Because Google Chrome does not control how extensions handle your pers onal data, all extensions have been disabled for incognito windows. You can reen able them individually in the 1117 Because Google Chrome does not control how extensions handle your pers onal data, all extensions have been disabled for incognito windows. You can reen able them individually in the
1124 <ph name="BEGIN_LINK">&lt;a href="$1"&gt;</ph>extensions manager<ph na me="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>. 1118 <ph name="BEGIN_LINK">&lt;a href="$1"&gt;</ph>extensions manager<ph na me="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
1125 </message> 1119 </message>
1126 </if> 1120 </if>
1127 1121
1128 </messages> 1122 </messages>
1129 </release> 1123 </release>
1130 </grit> 1124 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698