|
@@ -1,469 +0,0 @@
|
|
-# HG changeset patch
|
|
|
|
-# User Frank-Rainer Grahl <frgrahl@gmx.net>
|
|
|
|
-# Date 1590066890 -7200
|
|
|
|
-# Node ID 52cfcb2c361f894dc017fe316d3fa33ff01074ab
|
|
|
|
-# Parent e8897a3e653176cf1764c3c6a9756c1b052b8b79
|
|
|
|
-Bug 1639866 - Part 1: Port Bug 1437942 "Remove search engines from langpacks" to SeaMonkey. r=IanN
|
|
|
|
-Packaging updates.
|
|
|
|
-
|
|
|
|
-diff --git a/suite/components/search/jar.mn b/suite/components/search/jar.mn
|
|
|
|
---- a/suite/components/search/jar.mn
|
|
|
|
-+++ b/suite/components/search/jar.mn
|
|
|
|
-@@ -6,10 +6,11 @@ comm.jar:
|
|
|
|
- % content communicator %content/communicator/ contentaccessible=yes
|
|
|
|
- content/communicator/search/engineManager.js (content/engineManager.js)
|
|
|
|
- content/communicator/search/engineManager.xul (content/engineManager.xul)
|
|
|
|
- content/communicator/search/search.xml (content/search.xml)
|
|
|
|
- content/communicator/search/searchbarBindings.css (content/searchbarBindings.css)
|
|
|
|
- content/communicator/search/search-panel.js (content/search-panel.js)
|
|
|
|
- content/communicator/search/search-panel.xul (content/search-panel.xul)
|
|
|
|
-
|
|
|
|
--# L10n resource overrides
|
|
|
|
--% resource search-plugins chrome://communicator/locale/searchplugins/
|
|
|
|
-+ searchplugins/ (searchplugins/**)
|
|
|
|
-+
|
|
|
|
-+% resource search-plugins %searchplugins/
|
|
|
|
-diff --git a/suite/locales/searchplugins/allegro-pl.xml b/suite/components/search/searchplugins/allegro-pl.xml
|
|
|
|
-rename from suite/locales/searchplugins/allegro-pl.xml
|
|
|
|
-rename to suite/components/search/searchplugins/allegro-pl.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/amazon-br.xml b/suite/components/search/searchplugins/amazon-br.xml
|
|
|
|
-rename from suite/locales/searchplugins/amazon-br.xml
|
|
|
|
-rename to suite/components/search/searchplugins/amazon-br.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/amazon-de.xml b/suite/components/search/searchplugins/amazon-de.xml
|
|
|
|
-rename from suite/locales/searchplugins/amazon-de.xml
|
|
|
|
-rename to suite/components/search/searchplugins/amazon-de.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/amazon-en-GB.xml b/suite/components/search/searchplugins/amazon-en-GB.xml
|
|
|
|
-rename from suite/locales/searchplugins/amazon-en-GB.xml
|
|
|
|
-rename to suite/components/search/searchplugins/amazon-en-GB.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/amazon-es.xml b/suite/components/search/searchplugins/amazon-es.xml
|
|
|
|
-rename from suite/locales/searchplugins/amazon-es.xml
|
|
|
|
-rename to suite/components/search/searchplugins/amazon-es.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/amazon-fr.xml b/suite/components/search/searchplugins/amazon-fr.xml
|
|
|
|
-rename from suite/locales/searchplugins/amazon-fr.xml
|
|
|
|
-rename to suite/components/search/searchplugins/amazon-fr.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/amazon-it.xml b/suite/components/search/searchplugins/amazon-it.xml
|
|
|
|
-rename from suite/locales/searchplugins/amazon-it.xml
|
|
|
|
-rename to suite/components/search/searchplugins/amazon-it.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/amazon-jp.xml b/suite/components/search/searchplugins/amazon-jp.xml
|
|
|
|
-rename from suite/locales/searchplugins/amazon-jp.xml
|
|
|
|
-rename to suite/components/search/searchplugins/amazon-jp.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/amazon-zh-CN.xml b/suite/components/search/searchplugins/amazon-zh-CN.xml
|
|
|
|
-rename from suite/locales/searchplugins/amazon-zh-CN.xml
|
|
|
|
-rename to suite/components/search/searchplugins/amazon-zh-CN.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/amazon.xml b/suite/components/search/searchplugins/amazon.xml
|
|
|
|
-rename from suite/locales/searchplugins/amazon.xml
|
|
|
|
-rename to suite/components/search/searchplugins/amazon.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/atlas-sk.xml b/suite/components/search/searchplugins/atlas-sk.xml
|
|
|
|
-rename from suite/locales/searchplugins/atlas-sk.xml
|
|
|
|
-rename to suite/components/search/searchplugins/atlas-sk.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/azet-sk.xml b/suite/components/search/searchplugins/azet-sk.xml
|
|
|
|
-rename from suite/locales/searchplugins/azet-sk.xml
|
|
|
|
-rename to suite/components/search/searchplugins/azet-sk.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/bing.xml b/suite/components/search/searchplugins/bing.xml
|
|
|
|
-rename from suite/locales/searchplugins/bing.xml
|
|
|
|
-rename to suite/components/search/searchplugins/bing.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/bolcom-nl.xml b/suite/components/search/searchplugins/bolcom-nl.xml
|
|
|
|
-rename from suite/locales/searchplugins/bolcom-nl.xml
|
|
|
|
-rename to suite/components/search/searchplugins/bolcom-nl.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/chambers-en-GB.xml b/suite/components/search/searchplugins/chambers-en-GB.xml
|
|
|
|
-rename from suite/locales/searchplugins/chambers-en-GB.xml
|
|
|
|
-rename to suite/components/search/searchplugins/chambers-en-GB.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/cnrtl-tlfi-fr.xml b/suite/components/search/searchplugins/cnrtl-tlfi-fr.xml
|
|
|
|
-rename from suite/locales/searchplugins/cnrtl-tlfi-fr.xml
|
|
|
|
-rename to suite/components/search/searchplugins/cnrtl-tlfi-fr.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/drae.xml b/suite/components/search/searchplugins/drae.xml
|
|
|
|
-rename from suite/locales/searchplugins/drae.xml
|
|
|
|
-rename to suite/components/search/searchplugins/drae.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-cs-CZ.xml b/suite/components/search/searchplugins/duckduckgo-cs-CZ.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-cs-CZ.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-cs-CZ.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-de-DE.xml b/suite/components/search/searchplugins/duckduckgo-de-DE.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-de-DE.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-de-DE.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-el-GR.xml b/suite/components/search/searchplugins/duckduckgo-el-GR.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-el-GR.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-el-GR.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-en-GB.xml b/suite/components/search/searchplugins/duckduckgo-en-GB.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-en-GB.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-en-GB.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-en-US.xml b/suite/components/search/searchplugins/duckduckgo-en-US.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-en-US.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-en-US.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-es-AR.xml b/suite/components/search/searchplugins/duckduckgo-es-AR.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-es-AR.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-es-AR.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-es-ES.xml b/suite/components/search/searchplugins/duckduckgo-es-ES.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-es-ES.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-es-ES.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-fi-FI.xml b/suite/components/search/searchplugins/duckduckgo-fi-FI.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-fi-FI.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-fi-FI.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-fr-FR.xml b/suite/components/search/searchplugins/duckduckgo-fr-FR.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-fr-FR.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-fr-FR.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-hu-HU.xml b/suite/components/search/searchplugins/duckduckgo-hu-HU.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-hu-HU.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-hu-HU.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-it-IT.xml b/suite/components/search/searchplugins/duckduckgo-it-IT.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-it-IT.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-it-IT.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-ja-JP.xml b/suite/components/search/searchplugins/duckduckgo-ja-JP.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-ja-JP.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-ja-JP.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-nb-NO.xml b/suite/components/search/searchplugins/duckduckgo-nb-NO.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-nb-NO.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-nb-NO.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-nl-NL.xml b/suite/components/search/searchplugins/duckduckgo-nl-NL.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-nl-NL.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-nl-NL.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-pl-PL.xml b/suite/components/search/searchplugins/duckduckgo-pl-PL.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-pl-PL.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-pl-PL.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-pt-BR.xml b/suite/components/search/searchplugins/duckduckgo-pt-BR.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-pt-BR.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-pt-BR.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-pt-PT.xml b/suite/components/search/searchplugins/duckduckgo-pt-PT.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-pt-PT.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-pt-PT.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-ru-RU.xml b/suite/components/search/searchplugins/duckduckgo-ru-RU.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-ru-RU.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-ru-RU.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-sk-SK.xml b/suite/components/search/searchplugins/duckduckgo-sk-SK.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-sk-SK.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-sk-SK.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-sv-SE.xml b/suite/components/search/searchplugins/duckduckgo-sv-SE.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-sv-SE.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-sv-SE.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-zh-CN.xml b/suite/components/search/searchplugins/duckduckgo-zh-CN.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-zh-CN.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-zh-CN.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo-zh-TW.xml b/suite/components/search/searchplugins/duckduckgo-zh-TW.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo-zh-TW.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo-zh-TW.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/duckduckgo.xml b/suite/components/search/searchplugins/duckduckgo.xml
|
|
|
|
-rename from suite/locales/searchplugins/duckduckgo.xml
|
|
|
|
-rename to suite/components/search/searchplugins/duckduckgo.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/ebay-de.xml b/suite/components/search/searchplugins/ebay-de.xml
|
|
|
|
-rename from suite/locales/searchplugins/ebay-de.xml
|
|
|
|
-rename to suite/components/search/searchplugins/ebay-de.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/ebay-en-GB.xml b/suite/components/search/searchplugins/ebay-en-GB.xml
|
|
|
|
-rename from suite/locales/searchplugins/ebay-en-GB.xml
|
|
|
|
-rename to suite/components/search/searchplugins/ebay-en-GB.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/ebay-es.xml b/suite/components/search/searchplugins/ebay-es.xml
|
|
|
|
-rename from suite/locales/searchplugins/ebay-es.xml
|
|
|
|
-rename to suite/components/search/searchplugins/ebay-es.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/ebay-fr.xml b/suite/components/search/searchplugins/ebay-fr.xml
|
|
|
|
-rename from suite/locales/searchplugins/ebay-fr.xml
|
|
|
|
-rename to suite/components/search/searchplugins/ebay-fr.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/ebay-it.xml b/suite/components/search/searchplugins/ebay-it.xml
|
|
|
|
-rename from suite/locales/searchplugins/ebay-it.xml
|
|
|
|
-rename to suite/components/search/searchplugins/ebay-it.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/ebay-nl.xml b/suite/components/search/searchplugins/ebay-nl.xml
|
|
|
|
-rename from suite/locales/searchplugins/ebay-nl.xml
|
|
|
|
-rename to suite/components/search/searchplugins/ebay-nl.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/ebay.xml b/suite/components/search/searchplugins/ebay.xml
|
|
|
|
-rename from suite/locales/searchplugins/ebay.xml
|
|
|
|
-rename to suite/components/search/searchplugins/ebay.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/google-jp.xml b/suite/components/search/searchplugins/google-jp.xml
|
|
|
|
-rename from suite/locales/searchplugins/google-jp.xml
|
|
|
|
-rename to suite/components/search/searchplugins/google-jp.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/google.xml b/suite/components/search/searchplugins/google.xml
|
|
|
|
-rename from suite/locales/searchplugins/google.xml
|
|
|
|
-rename to suite/components/search/searchplugins/google.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/heureka-cz.xml b/suite/components/search/searchplugins/heureka-cz.xml
|
|
|
|
-rename from suite/locales/searchplugins/heureka-cz.xml
|
|
|
|
-rename to suite/components/search/searchplugins/heureka-cz.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/hoepli.xml b/suite/components/search/searchplugins/hoepli.xml
|
|
|
|
-rename from suite/locales/searchplugins/hoepli.xml
|
|
|
|
-rename to suite/components/search/searchplugins/hoepli.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/huuto-fi.xml b/suite/components/search/searchplugins/huuto-fi.xml
|
|
|
|
-rename from suite/locales/searchplugins/huuto-fi.xml
|
|
|
|
-rename to suite/components/search/searchplugins/huuto-fi.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/images/amazon.ico b/suite/components/search/searchplugins/images/amazon.ico
|
|
|
|
-rename from suite/locales/searchplugins/images/amazon.ico
|
|
|
|
-rename to suite/components/search/searchplugins/images/amazon.ico
|
|
|
|
-diff --git a/suite/locales/searchplugins/images/duckduckgo.ico b/suite/components/search/searchplugins/images/duckduckgo.ico
|
|
|
|
-rename from suite/locales/searchplugins/images/duckduckgo.ico
|
|
|
|
-rename to suite/components/search/searchplugins/images/duckduckgo.ico
|
|
|
|
-diff --git a/suite/locales/searchplugins/images/ebay.ico b/suite/components/search/searchplugins/images/ebay.ico
|
|
|
|
-rename from suite/locales/searchplugins/images/ebay.ico
|
|
|
|
-rename to suite/components/search/searchplugins/images/ebay.ico
|
|
|
|
-diff --git a/suite/locales/searchplugins/images/google.ico b/suite/components/search/searchplugins/images/google.ico
|
|
|
|
-rename from suite/locales/searchplugins/images/google.ico
|
|
|
|
-rename to suite/components/search/searchplugins/images/google.ico
|
|
|
|
-diff --git a/suite/locales/searchplugins/images/startpage.ico b/suite/components/search/searchplugins/images/startpage.ico
|
|
|
|
-rename from suite/locales/searchplugins/images/startpage.ico
|
|
|
|
-rename to suite/components/search/searchplugins/images/startpage.ico
|
|
|
|
-diff --git a/suite/locales/searchplugins/images/wikipedia.ico b/suite/components/search/searchplugins/images/wikipedia.ico
|
|
|
|
-rename from suite/locales/searchplugins/images/wikipedia.ico
|
|
|
|
-rename to suite/components/search/searchplugins/images/wikipedia.ico
|
|
|
|
-diff --git a/suite/locales/searchplugins/images/yahoo.ico b/suite/components/search/searchplugins/images/yahoo.ico
|
|
|
|
-rename from suite/locales/searchplugins/images/yahoo.ico
|
|
|
|
-rename to suite/components/search/searchplugins/images/yahoo.ico
|
|
|
|
-diff --git a/suite/locales/search/list.json b/suite/components/search/searchplugins/list.json
|
|
|
|
-rename from suite/locales/search/list.json
|
|
|
|
-rename to suite/components/search/searchplugins/list.json
|
|
|
|
---- a/suite/locales/search/list.json
|
|
|
|
-+++ b/suite/components/search/searchplugins/list.json
|
|
|
|
-@@ -94,17 +94,17 @@
|
|
|
|
- "default": {
|
|
|
|
- "searchDefault": "Google",
|
|
|
|
- "searchOrder": ["Google", "DuckDuckGo", "Yahoo"],
|
|
|
|
- "visibleDefaultEngines": [
|
|
|
|
- "amazon-it", "bing", "duckduckgo", "duckduckgo-it-IT", "ebay-it", "google", "hoepli", "startpage", "wikipedia-it", "yahoo-it"
|
|
|
|
- ]
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
-- "ja-JP-mac": {
|
|
|
|
-+ "ja-JP-macos": {
|
|
|
|
- "default": {
|
|
|
|
- "searchDefault": "Google",
|
|
|
|
- "searchOrder": ["Google", "DuckDuckGo", "Yahoo! JAPAN"],
|
|
|
|
- "visibleDefaultEngines": [
|
|
|
|
- "amazon-jp", "duckduckgo", "duckduckgo-ja-JP", "google-jp", "startpage", "wikipedia-ja", "yahoo-jp"
|
|
|
|
- ]
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
-diff --git a/suite/locales/searchplugins/mapy-cz.xml b/suite/components/search/searchplugins/mapy-cz.xml
|
|
|
|
-rename from suite/locales/searchplugins/mapy-cz.xml
|
|
|
|
-rename to suite/components/search/searchplugins/mapy-cz.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/marktplaats-nl.xml b/suite/components/search/searchplugins/marktplaats-nl.xml
|
|
|
|
-rename from suite/locales/searchplugins/marktplaats-nl.xml
|
|
|
|
-rename to suite/components/search/searchplugins/marktplaats-nl.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/priberam.xml b/suite/components/search/searchplugins/priberam.xml
|
|
|
|
-rename from suite/locales/searchplugins/priberam.xml
|
|
|
|
-rename to suite/components/search/searchplugins/priberam.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/prisjakt-sv-SE.xml b/suite/components/search/searchplugins/prisjakt-sv-SE.xml
|
|
|
|
-rename from suite/locales/searchplugins/prisjakt-sv-SE.xml
|
|
|
|
-rename to suite/components/search/searchplugins/prisjakt-sv-SE.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/pwn-pl.xml b/suite/components/search/searchplugins/pwn-pl.xml
|
|
|
|
-rename from suite/locales/searchplugins/pwn-pl.xml
|
|
|
|
-rename to suite/components/search/searchplugins/pwn-pl.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/sapo.xml b/suite/components/search/searchplugins/sapo.xml
|
|
|
|
-rename from suite/locales/searchplugins/sapo.xml
|
|
|
|
-rename to suite/components/search/searchplugins/sapo.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/seznam-cz.xml b/suite/components/search/searchplugins/seznam-cz.xml
|
|
|
|
-rename from suite/locales/searchplugins/seznam-cz.xml
|
|
|
|
-rename to suite/components/search/searchplugins/seznam-cz.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/startpage-pl.xml b/suite/components/search/searchplugins/startpage-pl.xml
|
|
|
|
-rename from suite/locales/searchplugins/startpage-pl.xml
|
|
|
|
-rename to suite/components/search/searchplugins/startpage-pl.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/startpage.xml b/suite/components/search/searchplugins/startpage.xml
|
|
|
|
-rename from suite/locales/searchplugins/startpage.xml
|
|
|
|
-rename to suite/components/search/searchplugins/startpage.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/tyda-sv-SE.xml b/suite/components/search/searchplugins/tyda-sv-SE.xml
|
|
|
|
-rename from suite/locales/searchplugins/tyda-sv-SE.xml
|
|
|
|
-rename to suite/components/search/searchplugins/tyda-sv-SE.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/vatera.xml b/suite/components/search/searchplugins/vatera.xml
|
|
|
|
-rename from suite/locales/searchplugins/vatera.xml
|
|
|
|
-rename to suite/components/search/searchplugins/vatera.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-NO.xml b/suite/components/search/searchplugins/wikipedia-NO.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-NO.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-NO.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-cz.xml b/suite/components/search/searchplugins/wikipedia-cz.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-cz.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-cz.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-de.xml b/suite/components/search/searchplugins/wikipedia-de.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-de.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-de.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-el.xml b/suite/components/search/searchplugins/wikipedia-el.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-el.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-el.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-es.xml b/suite/components/search/searchplugins/wikipedia-es.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-es.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-es.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-fi.xml b/suite/components/search/searchplugins/wikipedia-fi.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-fi.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-fi.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-fr.xml b/suite/components/search/searchplugins/wikipedia-fr.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-fr.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-fr.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-hu.xml b/suite/components/search/searchplugins/wikipedia-hu.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-hu.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-hu.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-it.xml b/suite/components/search/searchplugins/wikipedia-it.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-it.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-it.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-ja.xml b/suite/components/search/searchplugins/wikipedia-ja.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-ja.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-ja.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-ka.xml b/suite/components/search/searchplugins/wikipedia-ka.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-ka.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-ka.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-nl.xml b/suite/components/search/searchplugins/wikipedia-nl.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-nl.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-nl.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-pl.xml b/suite/components/search/searchplugins/wikipedia-pl.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-pl.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-pl.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-pt.xml b/suite/components/search/searchplugins/wikipedia-pt.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-pt.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-pt.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-ru.xml b/suite/components/search/searchplugins/wikipedia-ru.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-ru.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-ru.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-sk.xml b/suite/components/search/searchplugins/wikipedia-sk.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-sk.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-sk.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-sv-SE.xml b/suite/components/search/searchplugins/wikipedia-sv-SE.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-sv-SE.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-sv-SE.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-zh-CN.xml b/suite/components/search/searchplugins/wikipedia-zh-CN.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-zh-CN.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-zh-CN.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia-zh-TW.xml b/suite/components/search/searchplugins/wikipedia-zh-TW.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia-zh-TW.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia-zh-TW.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wikipedia.xml b/suite/components/search/searchplugins/wikipedia.xml
|
|
|
|
-rename from suite/locales/searchplugins/wikipedia.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wikipedia.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/wolnelektury-pl.xml b/suite/components/search/searchplugins/wolnelektury-pl.xml
|
|
|
|
-rename from suite/locales/searchplugins/wolnelektury-pl.xml
|
|
|
|
-rename to suite/components/search/searchplugins/wolnelektury-pl.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-NO.xml b/suite/components/search/searchplugins/yahoo-NO.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-NO.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-NO.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-ar.xml b/suite/components/search/searchplugins/yahoo-ar.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-ar.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-ar.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-bid-zh-TW.xml b/suite/components/search/searchplugins/yahoo-bid-zh-TW.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-bid-zh-TW.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-bid-zh-TW.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-br.xml b/suite/components/search/searchplugins/yahoo-br.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-br.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-br.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-de.xml b/suite/components/search/searchplugins/yahoo-de.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-de.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-de.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-en-GB.xml b/suite/components/search/searchplugins/yahoo-en-GB.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-en-GB.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-en-GB.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-es.xml b/suite/components/search/searchplugins/yahoo-es.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-es.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-es.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-fi.xml b/suite/components/search/searchplugins/yahoo-fi.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-fi.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-fi.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-fr.xml b/suite/components/search/searchplugins/yahoo-fr.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-fr.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-fr.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-it.xml b/suite/components/search/searchplugins/yahoo-it.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-it.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-it.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-jp.xml b/suite/components/search/searchplugins/yahoo-jp.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-jp.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-jp.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-nl.xml b/suite/components/search/searchplugins/yahoo-nl.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-nl.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-nl.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-sv-SE.xml b/suite/components/search/searchplugins/yahoo-sv-SE.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-sv-SE.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-sv-SE.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-zh-CN.xml b/suite/components/search/searchplugins/yahoo-zh-CN.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-zh-CN.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-zh-CN.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo-zh-TW.xml b/suite/components/search/searchplugins/yahoo-zh-TW.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo-zh-TW.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo-zh-TW.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/yahoo.xml b/suite/components/search/searchplugins/yahoo.xml
|
|
|
|
-rename from suite/locales/searchplugins/yahoo.xml
|
|
|
|
-rename to suite/components/search/searchplugins/yahoo.xml
|
|
|
|
-diff --git a/suite/locales/searchplugins/zoznam-sk.xml b/suite/components/search/searchplugins/zoznam-sk.xml
|
|
|
|
-rename from suite/locales/searchplugins/zoznam-sk.xml
|
|
|
|
-rename to suite/components/search/searchplugins/zoznam-sk.xml
|
|
|
|
-diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
|
|
|
|
---- a/suite/locales/Makefile.in
|
|
|
|
-+++ b/suite/locales/Makefile.in
|
|
|
|
-@@ -42,45 +42,27 @@ MOZ_SFX_PACKAGE=$(topsrcdir)/comm/other-
|
|
|
|
- NON_OMNIJAR_FILES = \
|
|
|
|
- defaults/messenger/mailViews.dat \
|
|
|
|
- defaults/profile/panels.rdf \
|
|
|
|
- defaults/profile/mimeTypes.rdf \
|
|
|
|
- defaults/profile/chrome/userChrome-example.css \
|
|
|
|
- defaults/profile/chrome/userContent-example.css \
|
|
|
|
- $(NULL)
|
|
|
|
-
|
|
|
|
--SEARCHPLUGINS_FILENAMES := $(or $(shell $(call py_action,output_searchplugins_list,$(srcdir)/search/list.json $(AB_CD))), $(error Missing search plugins))
|
|
|
|
--SEARCHPLUGINS_PATH := .deps/generated_$(AB_CD)
|
|
|
|
--SEARCHPLUGINS_TARGET := libs searchplugins
|
|
|
|
--SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_FILENAMES)),$(or $(wildcard $(srcdir)/searchplugins/$(plugin)),$(error Missing searchplugin: $(plugin))))
|
|
|
|
--# Some locale-specific search plugins may have preprocessor directives, but the
|
|
|
|
--# default en-US ones do not.
|
|
|
|
--SEARCHPLUGINS_FLAGS := --silence-missing-directive-warnings
|
|
|
|
--PP_TARGETS += SEARCHPLUGINS
|
|
|
|
--
|
|
|
|
--list-json = $(SEARCHPLUGINS_PATH)/list.json
|
|
|
|
--GARBAGE += $(list-json)
|
|
|
|
--
|
|
|
|
--libs:: searchplugins
|
|
|
|
--
|
|
|
|
- # Required for l10n.mk - defines a list of app sub dirs that should
|
|
|
|
- # be included in langpack xpis.
|
|
|
|
- # Currently not set in SeaMonkey.
|
|
|
|
- DIST_SUBDIRS = $(DIST_SUBDIR)
|
|
|
|
-
|
|
|
|
- include $(topsrcdir)/config/rules.mk
|
|
|
|
-
|
|
|
|
- COMPARE_LOCALES_DEFINES += -Dmozilla=..
|
|
|
|
-
|
|
|
|
- include $(topsrcdir)/toolkit/locales/l10n.mk
|
|
|
|
-
|
|
|
|
--$(list-json): $(call mkdir_deps,$(SEARCHPLUGINS_PATH)) $(if $(IS_LANGUAGE_REPACK),FORCE)
|
|
|
|
-- $(call py_action,generate_searchjson,$(srcdir)/search/list.json $(AB_CD) $(list-json))
|
|
|
|
--searchplugins:: $(list-json)
|
|
|
|
--
|
|
|
|
- PROFILE_CHROME = userChrome-example.css userContent-example.css
|
|
|
|
-
|
|
|
|
- NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
|
|
|
|
-
|
|
|
|
- BOOKMARKS_INC_FILE = $(call MERGE_FILE,profile/bookmarks.inc)
|
|
|
|
- BOOKMARKS_XTRA_FILE = $(call MERGE_FILE,profile/bookmarks.extra)
|
|
|
|
-
|
|
|
|
- # the #include in the .in file requires all to be in the same dir, sadly.
|
|
|
|
-@@ -130,17 +112,16 @@ libs-%:
|
|
|
|
- @$(MAKE) -C ../../calendar/locales AB_CD=$* XPI_NAME=locale-$*
|
|
|
|
- ifdef MOZ_IRC
|
|
|
|
- @$(MAKE) -C ../extensions/irc/locales libs-$*
|
|
|
|
- endif
|
|
|
|
- ifdef MOZ_DEBUGQA
|
|
|
|
- @$(MAKE) -C ../extensions/debugQA/locales AB_CD=$* XPI_NAME=locale-$*
|
|
|
|
- endif
|
|
|
|
- @$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
|
|
|
|
-- @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
|
|
|
|
- @$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$*
|
|
|
|
- @$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$*
|
|
|
|
- @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
|
|
|
|
- @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
|
|
|
|
-
|
|
|
|
- package-win32-installer: $(SUBMAKEFILES)
|
|
|
|
- $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
|
|
|
|
-
|
|
|
|
-diff --git a/suite/locales/jar.mn b/suite/locales/jar.mn
|
|
|
|
---- a/suite/locales/jar.mn
|
|
|
|
-+++ b/suite/locales/jar.mn
|
|
|
|
-@@ -194,25 +194,16 @@
|
|
|
|
- locale/@AB_CD@/communicator/profile/profileSelection.dtd (%chrome/common/profile/profileSelection.dtd)
|
|
|
|
- locale/@AB_CD@/communicator/profile/profileSelection.properties (%chrome/common/profile/profileSelection.properties)
|
|
|
|
- locale/@AB_CD@/communicator/safeMode.dtd (%chrome/common/safeMode.dtd)
|
|
|
|
- locale/@AB_CD@/communicator/search/engineManager.dtd (%chrome/common/search/engineManager.dtd)
|
|
|
|
- locale/@AB_CD@/communicator/search/engineManager.properties (%chrome/common/search/engineManager.properties)
|
|
|
|
- locale/@AB_CD@/communicator/search/search.properties (%chrome/common/search/search.properties)
|
|
|
|
- locale/@AB_CD@/communicator/search/searchbar.dtd (%chrome/common/search/searchbar.dtd)
|
|
|
|
- locale/@AB_CD@/communicator/search/search-panel.dtd (%chrome/common/search/search-panel.dtd)
|
|
|
|
-- locale/@AB_CD@/communicator/searchplugins/ (.deps/generated_@AB_CD@/*.xml)
|
|
|
|
-- locale/@AB_CD@/communicator/searchplugins/list.json (.deps/generated_@AB_CD@/list.json)
|
|
|
|
-- locale/@AB_CD@/communicator/searchplugins/images/amazon.ico (searchplugins/images/amazon.ico)
|
|
|
|
-- locale/@AB_CD@/communicator/searchplugins/images/duckduckgo.ico (searchplugins/images/duckduckgo.ico)
|
|
|
|
-- locale/@AB_CD@/communicator/searchplugins/images/ebay.ico (searchplugins/images/ebay.ico)
|
|
|
|
-- locale/@AB_CD@/communicator/searchplugins/images/google.ico (searchplugins/images/google.ico)
|
|
|
|
-- locale/@AB_CD@/communicator/searchplugins/images/startpage.ico (searchplugins/images/startpage.ico)
|
|
|
|
-- locale/@AB_CD@/communicator/searchplugins/images/wikipedia.ico (searchplugins/images/wikipedia.ico)
|
|
|
|
-- locale/@AB_CD@/communicator/searchplugins/images/yahoo.ico (searchplugins/images/yahoo.ico)
|
|
|
|
- locale/@AB_CD@/communicator/sidebar/customize.dtd (%chrome/common/sidebar/customize.dtd)
|
|
|
|
- locale/@AB_CD@/communicator/sidebar/preview.dtd (%chrome/common/sidebar/preview.dtd)
|
|
|
|
- locale/@AB_CD@/communicator/sidebar/sidebar.properties (%chrome/common/sidebar/sidebar.properties)
|
|
|
|
- locale/@AB_CD@/communicator/sidebar/sidebarOverlay.dtd (%chrome/common/sidebar/sidebarOverlay.dtd)
|
|
|
|
- locale/@AB_CD@/editor/editingOverlay.dtd (%chrome/editor/editingOverlay.dtd)
|
|
|
|
- locale/@AB_CD@/editor/editor.dtd (%chrome/editor/editor.dtd)
|
|
|
|
- locale/@AB_CD@/editor/editor.properties (%chrome/editor/editor.properties)
|
|
|
|
- locale/@AB_CD@/editor/editorOverlay.dtd (%chrome/editor/editorOverlay.dtd)
|
|
|