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

Side by Side Diff: chrome/app/chromium_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 | « no previous file | chrome/app/generated_resources.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 These strings will not be translated and only english versions will 3 These strings will not be translated and only english versions will
4 be available for now. --> 4 be available for now. -->
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/chromium_strings.h" type="rc_header"> 9 <output filename="grit/chromium_strings.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 <file path="../../third_party/launchpad_translations/chromium_strings_sr.x tb" lang="sr" /> 204 <file path="../../third_party/launchpad_translations/chromium_strings_sr.x tb" lang="sr" />
205 <file path="../../third_party/launchpad_translations/chromium_strings_sv.x tb" lang="sv" /> 205 <file path="../../third_party/launchpad_translations/chromium_strings_sv.x tb" lang="sv" />
206 <file path="../../third_party/launchpad_translations/chromium_strings_ug.x tb" lang="ug" /> 206 <file path="../../third_party/launchpad_translations/chromium_strings_ug.x tb" lang="ug" />
207 <file path="../../third_party/launchpad_translations/chromium_strings_vi.x tb" lang="vi" /> 207 <file path="../../third_party/launchpad_translations/chromium_strings_vi.x tb" lang="vi" />
208 <file path="../../third_party/launchpad_translations/chromium_strings_zh-C N.xtb" lang="zh-CN" /> 208 <file path="../../third_party/launchpad_translations/chromium_strings_zh-C N.xtb" lang="zh-CN" />
209 <file path="../../third_party/launchpad_translations/chromium_strings_zh-T W.xtb" lang="zh-TW" /> 209 <file path="../../third_party/launchpad_translations/chromium_strings_zh-T W.xtb" lang="zh-TW" />
210 </if> 210 </if>
211 </translations> 211 </translations>
212 <release seq="1" allow_pseudo="false"> 212 <release seq="1" allow_pseudo="false">
213 <messages fallback_to_english="true"> 213 <messages fallback_to_english="true">
214 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TITLE" desc="Title of the disconnect managed profile dialog.">
215 Delete managed Chromium user
216 </message>
217 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TEXT" desc="Message explaining to the user what will happen if they disconnect the managed profile. "> 214 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_TEXT" desc="Message explaining to the user what will happen if they disconnect the managed profile. ">
218 You are signed in with a managed account which is controlled by an admin istrator. If you disconnect from this account, this Chromium user and all associ ated Chromium data, such as apps, bookmarks, history, passwords, and other setti ngs will be removed from this computer. 215 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>.
219 </message>
220 <message name="IDS_PROFILES_DISCONNECT_MANAGED_PROFILE_OK_BUTTON_LABEL" de sc="The text to display on the button to confirm deleting the Chromium user prof ile.">
221 Delete Chromium user
222 </message> 216 </message>
223 <message name="IDS_PRODUCT_NAME" desc="The Chrome application name"> 217 <message name="IDS_PRODUCT_NAME" desc="The Chrome application name">
224 Chromium 218 Chromium
225 </message> 219 </message>
226 <message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name."> 220 <message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name.">
227 Chromium 221 Chromium
228 </message> 222 </message>
229 <message name="IDS_SHORT_PRODUCT_NAME_LOWER" desc="The Chrome application short name all lowercase"> 223 <message name="IDS_SHORT_PRODUCT_NAME_LOWER" desc="The Chrome application short name all lowercase">
230 chromium 224 chromium
231 </message> 225 </message>
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
1197 <message name="IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE" 1191 <message name="IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE"
1198 desc="Explanation in a new OTR window that extensions have been disabled while in OTR."> 1192 desc="Explanation in a new OTR window that extensions have been disabled while in OTR.">
1199 Because Chromium does not control how extensions handle your personal data, all extensions have been disabled for incognito windows. You can reenable them individually in the 1193 Because Chromium does not control how extensions handle your personal data, all extensions have been disabled for incognito windows. You can reenable them individually in the
1200 <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>. 1194 <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>.
1201 </message> 1195 </message>
1202 </if> 1196 </if>
1203 1197
1204 </messages> 1198 </messages>
1205 </release> 1199 </release>
1206 </grit> 1200 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698