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

Side by Side Diff: components/policy_strings.grdp

Issue 1312693005: Remove migration of obsolete value for "session.restore_on_startup". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@url-to-restore-on-startup
Patch Set: Address comments by bartfab & rebase Created 5 years, 3 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
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <grit-part> 2 <grit-part>
3 3
4 <message name="IDS_POLICY_DM_STATUS_SUCCESS" desc="Message indicating a succes sful device management server call."> 4 <message name="IDS_POLICY_DM_STATUS_SUCCESS" desc="Message indicating a succes sful device management server call.">
5 Request succeeded 5 Request succeeded
6 </message> 6 </message>
7 <message name="IDS_POLICY_DM_STATUS_REQUEST_INVALID" desc="Message indicating a bad request to the enterprise server."> 7 <message name="IDS_POLICY_DM_STATUS_REQUEST_INVALID" desc="Message indicating a bad request to the enterprise server.">
8 Invalid request or request parameters 8 Invalid request or request parameters
9 </message> 9 </message>
10 <message name="IDS_POLICY_DM_STATUS_REQUEST_FAILED" desc="Message indicating t he request to the enterprise server failed in the network."> 10 <message name="IDS_POLICY_DM_STATUS_REQUEST_FAILED" desc="Message indicating t he request to the enterprise server failed in the network.">
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 </message> 181 </message>
182 <message name="IDS_POLICY_PROXY_NEITHER_SPECIFIED_ERROR" desc="The text displa yed in the status column when neither a fixed proxy servers or a .pac url are sp ecified."> 182 <message name="IDS_POLICY_PROXY_NEITHER_SPECIFIED_ERROR" desc="The text displa yed in the status column when neither a fixed proxy servers or a .pac url are sp ecified.">
183 Neither fixed proxy servers nor a .pac script URL are specified. 183 Neither fixed proxy servers nor a .pac script URL are specified.
184 </message> 184 </message>
185 <message name="IDS_POLICY_OVERRIDDEN" desc="The text displayed in the status c olumn when the corresponding policy is being ignored because another policy is o verriding it."> 185 <message name="IDS_POLICY_OVERRIDDEN" desc="The text displayed in the status c olumn when the corresponding policy is being ignored because another policy is o verriding it.">
186 Ignored because it was overridden by <ph name="POLICY_NAME">$1<ex>ProxyMode< /ex></ph>. 186 Ignored because it was overridden by <ph name="POLICY_NAME">$1<ex>ProxyMode< /ex></ph>.
187 </message> 187 </message>
188 <message name="IDS_POLICY_DEPRECATED" desc="The text displayed in the status c olumn when the corresponding policy is deprecated."> 188 <message name="IDS_POLICY_DEPRECATED" desc="The text displayed in the status c olumn when the corresponding policy is deprecated.">
189 This policy has been deprecated. 189 This policy has been deprecated.
190 </message> 190 </message>
191 <message name="IDS_POLICY_VALUE_DEPRECATED" desc="The text displayed in the st atus column when a specific value for a policy is deprecated.">
192 This value is deprecated for this policy.
193 </message>
194 <if expr="chromeos"> 191 <if expr="chromeos">
195 <message name="IDS_POLICY_NETWORK_CONFIG_PARSE_FAILED" desc="The text displa yed in the status column when the corresponding network configuration policy fai led to parse."> 192 <message name="IDS_POLICY_NETWORK_CONFIG_PARSE_FAILED" desc="The text displa yed in the status column when the corresponding network configuration policy fai led to parse.">
196 Network configuration failed to be parsed. 193 Network configuration failed to be parsed.
197 </message> 194 </message>
198 <message name="IDS_POLICY_NETWORK_CONFIG_IMPORT_PARTIAL" desc="The text disp layed in the status column when the corresponding network configuration policy i s not standard conform and was imported partially."> 195 <message name="IDS_POLICY_NETWORK_CONFIG_IMPORT_PARTIAL" desc="The text disp layed in the status column when the corresponding network configuration policy i s not standard conform and was imported partially.">
199 The network configuration doesn't comply to the ONC standard. Parts of the configuration may not be imported. 196 The network configuration doesn't comply to the ONC standard. Parts of the configuration may not be imported.
200 </message> 197 </message>
201 <message name="IDS_POLICY_NETWORK_CONFIG_IMPORT_FAILED" desc="The text displ ayed in the status column when the corresponding network configuration policy is invalid."> 198 <message name="IDS_POLICY_NETWORK_CONFIG_IMPORT_FAILED" desc="The text displ ayed in the status column when the corresponding network configuration policy is invalid.">
202 The network configuration is invalid and couldn't be imported. 199 The network configuration is invalid and couldn't be imported.
203 </message> 200 </message>
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 <message name="IDS_POLICY_LEVEL_RECOMMENDED" desc="Text displayed in the Level column when a policy is recommended."> 310 <message name="IDS_POLICY_LEVEL_RECOMMENDED" desc="Text displayed in the Level column when a policy is recommended.">
314 Recommended 311 Recommended
315 </message> 312 </message>
316 <message name="IDS_POLICY_LEVEL_MANDATORY" desc="Text displayed in the Level c olumn when a policy is mandatory."> 313 <message name="IDS_POLICY_LEVEL_MANDATORY" desc="Text displayed in the Level c olumn when a policy is mandatory.">
317 Mandatory 314 Mandatory
318 </message> 315 </message>
319 <message name="IDS_POLICY_INVALID_BOOKMARK" desc="Text displayed in the status column when an entry of the ManagedBookmarks policy is not a valid bookmark."> 316 <message name="IDS_POLICY_INVALID_BOOKMARK" desc="Text displayed in the status column when an entry of the ManagedBookmarks policy is not a valid bookmark.">
320 Ignored invalid bookmark at index <ph name="ENTRY_INDEX">$1<ex>3</ex></ph> 317 Ignored invalid bookmark at index <ph name="ENTRY_INDEX">$1<ex>3</ex></ph>
321 </message> 318 </message>
322 </grit-part> 319 </grit-part>
OLDNEW
« chrome/browser/prefs/session_startup_pref.cc ('K') | « chrome/common/pref_names.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698