Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
firefox-multilocale-chrome.patch
changeset 791 215db725bd82
parent 787 f4578fb6fcc3
child 804 c64eecb7772c 
--- a/firefox-multilocale-chrome.patch	Thu Oct 30 23:09:49 2014 +0100
+++ b/firefox-multilocale-chrome.patch	Thu Oct 30 23:13:55 2014 +0100
@@ -1,12 +1,12 @@
 # HG changeset patch
-# Parent 9e20873aca55242f18dd1b93e863eded6d1d08bd
+# Parent 839ad2a7997b5b64edf2454b42c733a0fc729270
 # User Wolfgang Rosenauer <wr@rosenauer.org>
 Add searchplugins to chrome packaging for proper localization
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -375,16 +375,20 @@ pref("browser.helperApps.deleteTempFileO
+@@ -386,16 +386,20 @@ pref("browser.helperApps.deleteTempFileO
  #endif
  
  // search engines URL
@@ -41,8 +41,8 @@
  else
 -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt))
 +SEARCHPLUGINS_NAMES = $(shell cat \
-+    $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
-+    @srcdir@/en-US/searchplugins/list.txt ) )
++  $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
++  @srcdir@/en-US/searchplugins/list.txt ) ) ddg
  endif
  SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
  SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES))
@@ -128,7 +128,7 @@
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -133,14 +133,15 @@
+@@ -139,14 +139,15 @@
      locale/browser/syncQuota.properties         (%chrome/browser/syncQuota.properties)
  #endif
  % locale browser-region @AB_CD@ %locale/browser-region/
mozilla