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 467 a9baaad57fa4
parent 462 2d86bdb4277f
child 515 0f6539389500 
--- a/firefox-multilocale-chrome.patch	Fri Jun 08 08:05:14 2012 +0200
+++ b/firefox-multilocale-chrome.patch	Sat Jun 09 20:36:56 2012 +0200
@@ -1,12 +1,12 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent dd43958a61127a39cb7e59ba6118a57b685255e2
+# Parent 2f0c475e3ea9ba2309ab4ff7debb8bd0d6850a14
 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
-@@ -356,16 +356,20 @@ pref("browser.download.useToolkitUI", tr
+@@ -332,16 +332,20 @@ pref("browser.download.useToolkitUI", tr
  pref("browser.download.panel.removeFinishedDownloads", false);
  
  // search engines URL
@@ -30,7 +30,7 @@
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -153,39 +153,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr
+@@ -121,39 +121,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr
  install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
  
  install:: $(addprefix generic/profile/,$(PROFILE_FILES))
@@ -95,7 +95,7 @@
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -103,16 +103,17 @@
+@@ -108,16 +108,17 @@
      locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
  # the following files are browser-specific overrides
  *   locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
@@ -108,8 +108,8 @@
  % locale testpilot @AB_CD@ %locale/feedback/
      locale/feedback/main.dtd                       (%feedback/main.dtd)
      locale/feedback/main.properties                (%feedback/main.properties)
+ % locale pdf.js @AB_CD@ %locale/pdfviewer/
+     locale/pdfviewer/viewer.properties             (%pdfviewer/viewer.properties)
+     locale/pdfviewer/chrome.properties             (%pdfviewer/chrome.properties)
  #ifdef MOZ_WEBAPP_RUNTIME
  % locale webapprt @AB_CD@ %locale/webapprt/
-     locale/webapprt/webapp.dtd                     (%webapprt/webapp.dtd)
-     locale/webapprt/webapp.properties              (%webapprt/webapp.properties)
- #endif
mozilla