author Wes Kocher <>
Wed, 08 Oct 2014 16:49:26 -0700
changeset 209460 f0bb13ef0ee488d4ece70467e4e819cb7506f5e3
parent 194596 cadbfcd5e867b6a6c3608e9c779c2a3256326f85
child 229267 32c3529eb076e25892fda4515b5f6497be542aec
child 312653 235a270a4c2acbcc169dbdb98df5df462de023a5
permissions -rw-r--r--
Merge b2g-inbound to m-c a=merge

#filter substitution
# 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

% locale browser @AB_CD@ %locale/@AB_CD@/browser/
  locale/@AB_CD@/browser/        (%chrome/
  locale/@AB_CD@/browser/searchplugins/list.txt   (%searchplugins/list.txt)

# Fennec-specific overrides of generic strings
* locale/@AB_CD@/browser/netError.dtd             (%overrides/netError.dtd)
% override chrome://global/locale/netError.dtd    chrome://browser/locale/netError.dtd
* locale/@AB_CD@/browser/    (%overrides/
% override chrome://global/locale/ chrome://browser/locale/
* locale/@AB_CD@/browser/    (%overrides/
% override chrome://passwordmgr/locale/ chrome://browser/locale/