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

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: Rebase Created 5 years 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 Unmanaged 125 Unmanaged
126 </message> 126 </message>
127 <message name="IDS_POLICY_ASSOCIATION_STATE_DEPROVISIONED" desc="Message indic ating that the server has deprovisioned the client."> 127 <message name="IDS_POLICY_ASSOCIATION_STATE_DEPROVISIONED" desc="Message indic ating that the server has deprovisioned the client.">
128 Deprovisioned 128 Deprovisioned
129 </message> 129 </message>
130 130
131 <message name="IDS_POLICY_TYPE_ERROR" desc="The text displayed in the status c olumn when a policy value has the wrong type."> 131 <message name="IDS_POLICY_TYPE_ERROR" desc="The text displayed in the status c olumn when a policy value has the wrong type.">
132 Expected <ph name="VALUE_TYPE">$1<ex>boolean</ex></ph> value. 132 Expected <ph name="VALUE_TYPE">$1<ex>boolean</ex></ph> value.
133 </message> 133 </message>
134 <message name="IDS_POLICY_OUT_OF_RANGE_ERROR" desc="The text displayed in the status column when a policy value is out of range."> 134 <message name="IDS_POLICY_OUT_OF_RANGE_ERROR" desc="The text displayed in the status column when a policy value is out of range.">
135 Value is out of range <ph name="VALUE">$1<ex>10</ex></ph>. 135 Value is out of range <ph name="VALUE">$1<ex>10</ex></ph>.
gab 2015/12/02 21:27:18 Perhaps this should highlight the possibility of i
sdefresne 2015/12/03 10:28:33 Reverted the value IDS_POLICY_VALUE_DEPRECATED int
136 </message> 136 </message>
137 <message name="IDS_POLICY_VALUE_FORMAT_ERROR" desc="The text displayed in the status column when a policy value doesn't match the expected format."> 137 <message name="IDS_POLICY_VALUE_FORMAT_ERROR" desc="The text displayed in the status column when a policy value doesn't match the expected format.">
138 Value doesn't match format. 138 Value doesn't match format.
139 </message> 139 </message>
140 <message name="IDS_POLICY_DEFAULT_SEARCH_DISABLED" desc="The text displayed in the status column when a policy value has been ignored because default search h as been disabled."> 140 <message name="IDS_POLICY_DEFAULT_SEARCH_DISABLED" desc="The text displayed in the status column when a policy value has been ignored because default search h as been disabled.">
141 Ignored because default search is disabled by policy. 141 Ignored because default search is disabled by policy.
142 </message> 142 </message>
143 <message name="IDS_POLICY_NOT_SPECIFIED_ERROR" desc="The text displayed in the status column when a policy value should have been specified but wasn't."> 143 <message name="IDS_POLICY_NOT_SPECIFIED_ERROR" desc="The text displayed in the status column when a policy value should have been specified but wasn't.">
144 Must be specified. 144 Must be specified.
145 </message> 145 </message>
(...skipping 35 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 <message name="IDS_POLICY_SOURCE_CLOUD" desc="Indicates that the policy origin ates from the cloud."> 325 <message name="IDS_POLICY_SOURCE_CLOUD" desc="Indicates that the policy origin ates from the cloud.">
329 Cloud 326 Cloud
330 </message> 327 </message>
331 <message name="IDS_POLICY_SOURCE_PLATFORM" desc="Indicates that the policy is obtained from the local OS."> 328 <message name="IDS_POLICY_SOURCE_PLATFORM" desc="Indicates that the policy is obtained from the local OS.">
332 Platform 329 Platform
333 </message> 330 </message>
334 <message name="IDS_POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE" desc="Indicates that the policy is set programmatically because of an active public session (for Chr ome OS only). It could have overridden other sources that set this policy."> 331 <message name="IDS_POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE" desc="Indicates that the policy is set programmatically because of an active public session (for Chr ome OS only). It could have overridden other sources that set this policy.">
335 Public session override 332 Public session override
336 </message> 333 </message>
337 </grit-part> 334 </grit-part>
OLDNEW
« chrome/browser/sessions/restore_on_startup_policy_handler.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