| Index: chrome/app/policy/policy_templates.grd
|
| diff --git a/chrome/app/policy/policy_templates.grd b/chrome/app/policy/policy_templates.grd
|
| index ba69bffd179b793f699958ce5a46a593b32b0f4d..fbf358144664ee184fd766ea0ee33b539add27a3 100644
|
| --- a/chrome/app/policy/policy_templates.grd
|
| +++ b/chrome/app/policy/policy_templates.grd
|
| @@ -60,6 +60,66 @@ templates and will be translated for each locale. -->
|
| <output filename="app/policy/windows/adm/zh-CN/chrome.adm" type="adm" lang="zh-CN" />
|
| <output filename="app/policy/windows/adm/zh-TW/chrome.adm" type="adm" lang="zh-TW" />
|
|
|
| + <if expr="os == 'darwin'">
|
| + <output filename="app/policy/mac/app-Manifest.plist" type="plist" lang="en" />
|
| + <!-- The following directory names use Mac language codes (en instead of en-US,
|
| + underscores instead of dashes. (As described in build/apply_locales.py -->
|
| + <output filename="app/policy/mac/strings/am.lproj/Localizable.strings" type="plist_strings" lang="am" />
|
| + <output filename="app/policy/mac/strings/ar.lproj/Localizable.strings" type="plist_strings" lang="ar" />
|
| + <output filename="app/policy/mac/strings/bg.lproj/Localizable.strings" type="plist_strings" lang="bg" />
|
| + <output filename="app/policy/mac/strings/bn.lproj/Localizable.strings" type="plist_strings" lang="bn" />
|
| + <output filename="app/policy/mac/strings/ca.lproj/Localizable.strings" type="plist_strings" lang="ca" />
|
| + <output filename="app/policy/mac/strings/cs.lproj/Localizable.strings" type="plist_strings" lang="cs" />
|
| + <output filename="app/policy/mac/strings/da.lproj/Localizable.strings" type="plist_strings" lang="da" />
|
| + <output filename="app/policy/mac/strings/de.lproj/Localizable.strings" type="plist_strings" lang="de" />
|
| + <output filename="app/policy/mac/strings/el.lproj/Localizable.strings" type="plist_strings" lang="el" />
|
| + <output filename="app/policy/mac/strings/en_GB.lproj/Localizable.strings" type="plist_strings" lang="en-GB" />
|
| + <!-- en-US is en on Mac-->
|
| + <output filename="app/policy/mac/strings/en.lproj/Localizable.strings" type="plist_strings" lang="en" />
|
| + <output filename="app/policy/mac/strings/es.lproj/Localizable.strings" type="plist_strings" lang="es" />
|
| + <output filename="app/policy/mac/strings/es_419.lproj/Localizable.strings" type="plist_strings" lang="es-419" />
|
| + <output filename="app/policy/mac/strings/et.lproj/Localizable.strings" type="plist_strings" lang="et" />
|
| + <output filename="app/policy/mac/strings/fi.lproj/Localizable.strings" type="plist_strings" lang="fi" />
|
| + <output filename="app/policy/mac/strings/fil.lproj/Localizable.strings" type="plist_strings" lang="fil" />
|
| + <output filename="app/policy/mac/strings/fr.lproj/Localizable.strings" type="plist_strings" lang="fr" />
|
| + <output filename="app/policy/mac/strings/gu.lproj/Localizable.strings" type="plist_strings" lang="gu" />
|
| + <output filename="app/policy/mac/strings/he.lproj/Localizable.strings" type="plist_strings" lang="he" />
|
| + <output filename="app/policy/mac/strings/hi.lproj/Localizable.strings" type="plist_strings" lang="hi" />
|
| + <output filename="app/policy/mac/strings/hr.lproj/Localizable.strings" type="plist_strings" lang="hr" />
|
| + <output filename="app/policy/mac/strings/hu.lproj/Localizable.strings" type="plist_strings" lang="hu" />
|
| + <output filename="app/policy/mac/strings/id.lproj/Localizable.strings" type="plist_strings" lang="id" />
|
| + <output filename="app/policy/mac/strings/it.lproj/Localizable.strings" type="plist_strings" lang="it" />
|
| + <output filename="app/policy/mac/strings/ja.lproj/Localizable.strings" type="plist_strings" lang="ja" />
|
| + <output filename="app/policy/mac/strings/kn.lproj/Localizable.strings" type="plist_strings" lang="kn" />
|
| + <output filename="app/policy/mac/strings/ko.lproj/Localizable.strings" type="plist_strings" lang="ko" />
|
| + <output filename="app/policy/mac/strings/lt.lproj/Localizable.strings" type="plist_strings" lang="lt" />
|
| + <output filename="app/policy/mac/strings/lv.lproj/Localizable.strings" type="plist_strings" lang="lv" />
|
| + <output filename="app/policy/mac/strings/ml.lproj/Localizable.strings" type="plist_strings" lang="ml" />
|
| + <output filename="app/policy/mac/strings/mr.lproj/Localizable.strings" type="plist_strings" lang="mr" />
|
| + <output filename="app/policy/mac/strings/nl.lproj/Localizable.strings" type="plist_strings" lang="nl" />
|
| + <!-- The translation console uses 'no' for Norwegian Bokmål. It should
|
| + be 'nb'. -->
|
| + <output filename="app/policy/mac/strings/nb.lproj/Localizable.strings" type="plist_strings" lang="no" />
|
| + <output filename="app/policy/mac/strings/pl.lproj/Localizable.strings" type="plist_strings" lang="pl" />
|
| + <output filename="app/policy/mac/strings/pt_BR.lproj/Localizable.strings" type="plist_strings" lang="pt-BR" />
|
| + <output filename="app/policy/mac/strings/pt_PT.lproj/Localizable.strings" type="plist_strings" lang="pt-PT" />
|
| + <output filename="app/policy/mac/strings/ro.lproj/Localizable.strings" type="plist_strings" lang="ro" />
|
| + <output filename="app/policy/mac/strings/ru.lproj/Localizable.strings" type="plist_strings" lang="ru" />
|
| + <output filename="app/policy/mac/strings/sk.lproj/Localizable.strings" type="plist_strings" lang="sk" />
|
| + <output filename="app/policy/mac/strings/sl.lproj/Localizable.strings" type="plist_strings" lang="sl" />
|
| + <output filename="app/policy/mac/strings/sr.lproj/Localizable.strings" type="plist_strings" lang="sr" />
|
| + <output filename="app/policy/mac/strings/sv.lproj/Localizable.strings" type="plist_strings" lang="sv" />
|
| + <output filename="app/policy/mac/strings/sw.lproj/Localizable.strings" type="plist_strings" lang="sw" />
|
| + <output filename="app/policy/mac/strings/ta.lproj/Localizable.strings" type="plist_strings" lang="ta" />
|
| + <output filename="app/policy/mac/strings/te.lproj/Localizable.strings" type="plist_strings" lang="te" />
|
| + <output filename="app/policy/mac/strings/th.lproj/Localizable.strings" type="plist_strings" lang="th" />
|
| + <output filename="app/policy/mac/strings/tr.lproj/Localizable.strings" type="plist_strings" lang="tr" />
|
| + <output filename="app/policy/mac/strings/uk.lproj/Localizable.strings" type="plist_strings" lang="uk" />
|
| + <output filename="app/policy/mac/strings/vi.lproj/Localizable.strings" type="plist_strings" lang="vi" />
|
| + <output filename="app/policy/mac/strings/zh_CN.lproj/Localizable.strings" type="plist_strings" lang="zh-CN" />
|
| + <output filename="app/policy/mac/strings/zh_TW.lproj/Localizable.strings" type="plist_strings" lang="zh-TW" />
|
| + </if>
|
| +
|
| </outputs>
|
| <translations>
|
| <!-- TODO(gfeher): get translations into the following files -->
|
| @@ -117,8 +177,16 @@ templates and will be translated for each locale. -->
|
| </translations>
|
| <!-- TODO(gfeher): set allow_pseudo="false" before release -->
|
| <release seq="1" allow_pseudo="true">
|
| +
|
| + <structures>
|
| + <!-- List of policies and placeholder texts. This item should precede any
|
| + message definitions. -->
|
| + <structure name="IDD_POLICY_SOURCE_FILE" file="policy_templates.json" type="policy_template_metafile" />
|
| + </structures>
|
| +
|
| <messages fallback_to_english="false">
|
| - <!-- Strings for ADM/ADMX/MCX policy templates -->
|
| +
|
| + <!-- Strings for ADM/ADMX/MCX policy templates: -->
|
|
|
| <message name="IDS_POLICY_GROUP_HOMEPAGELOCATION_DESC" desc="Description of the 'homepage' policy settings page.">
|
| Configures the default homepage URL in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing it.
|
| @@ -230,7 +298,7 @@ templates and will be translated for each locale. -->
|
| If you choose to auto detect the proxy server, all other options are ignored.
|
|
|
| For detailed examples, visit:
|
| - http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett
|
| + <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
|
|
|
| If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> ignores all proxy-related options specified from the command line.
|
| </message>
|
| @@ -258,6 +326,44 @@ templates and will be translated for each locale. -->
|
| <message name="IDS_POLICY_PROXYPACURL_CAPTION" desc="The label of the 'proxy pac URL' text field in the 'proxy' policy settings page.">
|
| URL to a proxy .pac file
|
| </message>
|
| + <message name="IDS_POLICY_PROXYSERVERMODE_DESC" desc="The description of the 'proxy bypass rules' policy when displayed in OSX Workgroup Manager.">
|
| + Allows you to specify the proxy server used by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing proxy settings.
|
| +
|
| + If you choose to never use a proxy server and always connect directly, all other options are ignored.
|
| +
|
| + If you choose to use system proxy settings or auto detect the proxy server, all other options are ignored.
|
| +
|
| + If you choose manual proxy settings, you can specify further options in 'Address or URL of proxy server', 'URL to a proxy .pac file' and 'Comma-separated list of proxy bypass rules'.
|
| +
|
| + For detailed examples, visit:
|
| + <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
|
| +
|
| + If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> ignores all proxy-related options specified from the command line.
|
| + </message>
|
| + <message name="IDS_POLICY_PROXYSERVER_DESC" desc="The description of the 'proxy server address' policy when displayed in OSX Workgroup Manager.">
|
| + You can specify the URL of the proxy server here.
|
| +
|
| + This policy only takes effect if you have selected manual proxy settings at 'Choose how to specify proxy server settings'.
|
| +
|
| + For more options and detailed examples, visit:
|
| + <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
|
| + </message>
|
| + <message name="IDS_POLICY_PROXYBYPASSLIST_DESC" desc="The description of the 'proxy bypass rules' policy when displayed in OSX Workgroup Manager.">
|
| + <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will bypass any proxy for the list of hosts given here.
|
| +
|
| + This policy only takes effect if you have selected manual proxy settings at 'Choose how to specify proxy server settings'.
|
| +
|
| + For more detailed examples, visit:
|
| + <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
|
| + </message>
|
| + <message name="IDS_POLICY_PROXYPACURL_DESC" desc="The description of the 'proxy pac URL' policy when displayed in OSX Workgroup Manager.">
|
| + You can specify an URL to a proxy .pac file here.
|
| +
|
| + This policy only takes effect if you have selected manual proxy settings at 'Choose how to specify proxy server settings'.
|
| +
|
| + For detailed examples, visit:
|
| + <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
|
| + </message>
|
|
|
| <message name="IDS_POLICY_GROUP_METRICSREPORTINGENABLED_CAPTION" desc="Caption of the 'crash reporting' policy settings page.">
|
| Enable reporting of usage and crash-related data
|
| @@ -326,10 +432,10 @@ templates and will be translated for each locale. -->
|
| <message name="IDS_POLICY_WIN_SUPPORTED_WINXPSP2" desc="A label specifying the oldest possible compatible version of Windows. This text will appear right next to a label containing the text 'Supported on:'.">
|
| At least Microsoft Windows XP SP2
|
| </message>
|
| + <message name="IDS_POLICY_MAC_CHROME_PREFERENCES" desc="A text indicating in Mac OS X Workgroup Manager, that currently the preferences of Chrome are being edited">
|
| + <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> preferences
|
| + </message>
|
| </messages>
|
|
|
| - <structures>
|
| - <structure name="IDD_POLICY_SOURCE_FILE" file="policy_templates.json" type="policy_template_metafile" />
|
| - </structures>
|
| </release>
|
| </grit>
|
|
|