Bug 906318 - Work - Move productization (p12n) options into a separate region.properties file, r=mbrubeck, f=pike

This commit is contained in:
Francesco Lodolo 2013-08-19 14:43:13 -07:00
parent a399e8b09f
commit 3eb1e3b5f9
4 changed files with 25 additions and 13 deletions

View File

@ -9,16 +9,9 @@
# Buttons (like with contextAppbar2.pin.topSites) refer to actions against
# the specific on-screen sets with similarly-named headings.
# Default search engine
browser.search.defaultenginename=Bing
# Search engine order (order displayed in the search bar dropdown)s
browser.search.order.1=Bing
browser.search.order.2=Google
browser.search.order.3=Yahoo
# LOCALIZATION NOTE (browser.search.contextTextSearchLabel2): search context
# menu item text will be: |Search (browser.search.defaultenginename) for "string"|
# browser.search.defaultenginename is defined in region.properties
browser.search.contextTextSearchLabel2=Search %S for "%S"
# Contextual Appbar - Button Labels

View File

@ -0,0 +1,19 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# LOCALIZATION NOTE: REVIEW_REQUIRED
# For all locales: please do not commit any changes to this file without a
# review from the l10n-drivers team. In order to get one, please file a bug,
# add the "productization" keyword and CC l10n@mozilla.com.
# en-US: if you're changing this file, please CC l10n@mozilla.com in the
# associated bug to help us determine if these changes are relevant for other
# locales and how to localize them.
# Default search engine
browser.search.defaultenginename=Bing
# Search engine order (order displayed in the search bar dropdown)
browser.search.order.1=Bing
browser.search.order.2=Google
browser.search.order.3=Yahoo

View File

@ -12,6 +12,7 @@
locale/browser/aboutCertError.dtd (%chrome/aboutCertError.dtd)
locale/browser/browser.dtd (%chrome/browser.dtd)
locale/browser/browser.properties (%chrome/browser.properties)
locale/browser/region.properties (%chrome/region.properties)
locale/browser/config.dtd (%chrome/config.dtd)
locale/browser/preferences.dtd (%chrome/preferences.dtd)
locale/browser/aboutPanel.dtd (%chrome/aboutPanel.dtd)
@ -34,7 +35,6 @@
@AB_CD@.jar:
relativesrcdir browser/locales:
locale/browser/syncBrand.dtd (%chrome/browser/syncBrand.dtd)
locale/browser/region.properties (%chrome/browser-region/region.properties)
locale/browser/netError.dtd (%chrome/overrides/netError.dtd)
% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties)

View File

@ -231,7 +231,7 @@ pref("accessibility.browsewithcaret", false);
pref("app.update.showInstalledUI", false);
// pointer to the default engine name
pref("browser.search.defaultenginename", "chrome://browser/locale/browser.properties");
pref("browser.search.defaultenginename", "chrome://browser/locale/region.properties");
// SSL error page behaviour
pref("browser.ssl_override_behavior", 2);
@ -241,9 +241,9 @@ pref("browser.xul.error_pages.expert_bad_cert", false);
pref("browser.search.log", false);
// ordering of search engines in the engine list.
pref("browser.search.order.1", "chrome://browser/locale/browser.properties");
pref("browser.search.order.2", "chrome://browser/locale/browser.properties");
pref("browser.search.order.3", "chrome://browser/locale/browser.properties");
pref("browser.search.order.1", "chrome://browser/locale/region.properties");
pref("browser.search.order.2", "chrome://browser/locale/region.properties");
pref("browser.search.order.3", "chrome://browser/locale/region.properties");
// send ping to the server to update
pref("browser.search.update", true);