Description: Update the URL for Amazon search
Author: Alexander Sack <asac@ubuntu.com>
Forwarded: not-needed
---
 browser/locales/en-US/searchplugins/amazondotcom.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/browser/locales/en-US/searchplugins/amazondotcom.xml
+++ b/browser/locales/en-US/searchplugins/amazondotcom.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.com/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="mozilla-20"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.com/</SearchForm>
--- a/l10n/ar/browser/searchplugins/amazondotcom.xml
+++ b/l10n/ar/browser/searchplugins/amazondotcom.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.com/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="mozilla-20"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.com/</SearchForm>
--- a/l10n/bg/browser/searchplugins/amazondotcom.xml
+++ b/l10n/bg/browser/searchplugins/amazondotcom.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.com/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="mozilla-20"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.com/</SearchForm>
--- a/l10n/br/browser/searchplugins/amazon-france.xml
+++ b/l10n/br/browser/searchplugins/amazon-france.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.fr/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-fr-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.fr/</SearchForm>
--- a/l10n/cy/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/cy/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/da/browser/searchplugins/amazon-co-uk.xml
+++ b/l10n/da/browser/searchplugins/amazon-co-uk.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/de/browser/searchplugins/amazondotcom-de.xml
+++ b/l10n/de/browser/searchplugins/amazondotcom-de.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.de/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-de-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.de/</SearchForm>
--- a/l10n/el/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/el/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/en-GB/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/en-GB/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/eu/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/eu/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/fr/browser/searchplugins/amazon-france.xml
+++ b/l10n/fr/browser/searchplugins/amazon-france.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.fr/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-fr-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.fr/</SearchForm>
--- a/l10n/ga-IE/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/ga-IE/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/gd/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/gd/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/gl/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/gl/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/hr/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/hr/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/ja/browser/searchplugins/amazon-jp.xml
+++ b/l10n/ja/browser/searchplugins/amazon-jp.xml
@@ -11,7 +11,7 @@
   <Param name="mode" value="books-jp"/>
   <Param name="mode" value="books-us"/>
   -->
-  <Param name="tag" value="mozillajapan-fx-22"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
   <!-- 
   <Param name="sz" value="25"/>
--- a/l10n/nb-NO/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/nb-NO/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/nn-NO/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/nn-NO/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/pt-PT/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/pt-PT/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/sq/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/sq/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
 <Param name="field-keywords" value="{searchTerms}"/>
 <Param name="mode" value="blended"/>
-<Param name="tag" value="firefox-uk-21"/>
+<Param name="tag" value="wwwcanoniccom-20"/>
  <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/sr/browser/searchplugins/amazon-en-GB.xml
+++ b/l10n/sr/browser/searchplugins/amazon-en-GB.xml
@@ -6,7 +6,7 @@
 <Url type="text/html" method="GET" template="http://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
-  <Param name="tag" value="firefox-uk-21"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <SearchForm>http://www.amazon.co.uk/</SearchForm>
--- a/l10n/zh-CN/browser/searchplugins/amazondotcn.xml
+++ b/l10n/zh-CN/browser/searchplugins/amazondotcn.xml
@@ -11,6 +11,7 @@
   <Param name="Go.x" value="0"/>
   <Param name="Go.y" value="0"/>
   <Param name="bestSaleNum" value="0"/>
+  <Param name="tag" value="wwwcanoniccom-20"/>
 </Url>
 <SearchForm>http://www.amazon.cn/</SearchForm>
 </SearchPlugin>