Merge Beta to Aurora default FENNEC_35_0b1_BUILD1 FENNEC_35_0b1_BUILD2 FENNEC_35_0b1_RELEASE FIREFOX_35_0b1_BUILD1 FIREFOX_35_0b1_RELEASE
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Wed, 26 Nov 2014 07:15:27 +0100
changeset 3175 46c96827c2248c34e876fc8ef4b0291f78464d4b
parent 3174 d31da4a584d504df9ded2996b7729a31cf51bf62 (current diff)
parent 3150 b479fc31251fea796b2395e05f6bc5d0bb8ad1d8 (diff)
child 3176 f5a20e37d2da92dd5af9deed44cf3ca5dcb67448
child 3177 2f305f0d4f9faf129d15c49abb0400f876a87b94
child 3178 ac5ff1de3050335695cfcbe58b6f248e9f703ee1
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 22:07:11 +0000
Merge Beta to Aurora
--- a/browser/searchplugins/yandex.xml
+++ b/browser/searchplugins/yandex.xml
@@ -4,23 +4,21 @@
 
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Яндекс</ShortName>
 <Description>Воспользуйтесь Яндексом для поиска в Интернете.</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAB50lEQVQ4T43SvWsacRgH8OcPCITSLRQ6BSRL1gxZTNZQsgYC3QKunVoMnTKFhBQSnDqIUa5gxNbBCgriC4pv50sJ1lIR5SROpRVbz+O4b5/flbvedekJH+557nvfH8chdbvdIFMYPAgBICdqt9uKpmnw8huNRuDnX8J5QKvVgmEYnqiqClmWwZ113kmger0OXdf/Wv6EIb0BTo+AgB94ceDKJ5MJuHPOMwlUqVSwWq1sevQaxqvn0O5l6HdvgaMdV75cLtFoNMC9Xd6JisWiedNiPNuB9l4yZ+1jEvBvuXJBURRwL8YzUT6fx2KxsGHrKdQPCXNW794Bvieu3CLegrsnlM1mMZ/PbfqeH6vToDkvb2+Bx49cuWU2m4G7bUqn0xiPx7ZpqYRf29v4cXyMxf4+tLU1V24ZDAbgbptSqRSGw6HL9OwM37n4bXPTvP6bC7lcDtw9oWQyiX6/b/vMH1XZ2MAoEMDXqytM+QBnLtRqNXAvxjNRPB5Hr9ez9Q8PMfD50OM/2P3FBb7wAc680+mIMri3yzuRJEloNpsmORTCJy7INzd/9stLc7dyIZPJgDvnPJNA0WgU1WrVkxJ/4FgsBu6s804CRSKRh0KhgHK5/F+JRAL8fJBnslA4HH7NHhg8CDnLwm8IYz560xw92AAAAABJRU5ErkJggg==</Image>
 <Image width="65" height="26">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAAAaCAYAAADovjFxAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAABJhJREFUWEflmH2onmMcx489ZzLvjFp5WTOSl1G0P6X8Iy9LeQllEmnLyoiECGmKP0ZqtVBC3iN/idqQty3kpTR5yzBphpFtzGbH53Pfv9/ZtWvPc54/ziN1zrc+Pff1vZ77Puf3ve/7un/3M1RqpNOZCotgNWyBkYLv4msTVxQ5HSw+i94Gm2BrjH+Mr05MUeAUWBnF/g7zYa+YWxz+hA/hoihUzg27EeNJE8KrUeh7I8PD4bbCm/ghUNww5CJ4d9ijwpsUIcyMIuWKsEeFNylCmBNFyqVhjwqvVwjz4So4qhm12geuBP2DNAp5n+VczfFQ60h4EFbAQ3AM1Dof3H9OM2o1DfJ/O06jkMd8AFbCc+B3plnk7ChSFmHuIrxeIfwJI3B5M2o1G/TkVI1CB0DO1VwHpQzlZyi/8yvURX0Jzt3ajFq5rbcZDtMIzQWPUR5TllmkDdLmKPRRzF2EN6gQDoScewTugz9iXIawB3wA+s/DyfBajL0qStUh7A3rQW+JRmhf+Bb0nwWvnBvAoL06mOl0XoxC7REObcwQ40GFcAjkXN5CP4DjMoQzQW8ruI86BfR2wNEaoTqEa8HxBvDKS90E+v49b5fU/vHJbKczF7ZHsStg9ABsDyqEwyHnsrhuITwMem82o1ZeHRtB/2qNUBnCnmBr73gxlFoD+vc2o16iyOujWFkPy+EueCW88Ybg/az/D2Qz0i2Ez0BvWTPaqY9A//5m1KoMwUXO7a/BQFJHgL6cpdFTNkkUeiGsi6JreoXgCu4qLdeEJ3UIp4H+T82oVR3CVNgGerfBdPAKktWg/ySkMoTb4YvYrp9w80BfZmr0FcUujaJdH26El2LcK4Re1CFcAvrvN6NWdQiu5rm/939ul7wAqQzhq/h0UZwCpXzi5b7letBdFDoL/oqim+6Rz35rwuvgc1yeCU/qEDyz+k80o1Z1CMdC7v8xePY/qVgKqQzh5fiU+pK/BXKuozGmKPTpKHgjNM0On4NaGG1O9MtFqw7Bhij3t+Hpp3JNsAFy28erC2mqDGHn06CbKNInxI4o+I6wBxnC96Bfdnd1CAdD7l+v8N1UhnBGbMsFkFoA6Z+o0VUUKG9Esb/AoB+R/nE9F6/yLNUhqGx2Hm9GY6sMQb0Ljj+FvPRPBz1ZqNFVFDgvCpU8YCPGgwjhHtCzaSnVLYSnQM9ucobGGKpDOAccy2UayMUwO1Mfs7uvCxTnq/SaKHQD7BdTjRiPN4RsZW1Ryy5OZQhl8OWZWwWzIOU65Utaqg7Bq+xD0HPOR66y58hj2ozZRiu/P8MiF0SRUp+p8YZgX/53jG2SbIVL8jHo53JIPQZ5HPf7BtbFtvd4qg5BuR7kvtld2qHmu4NsAR+rv8Fai/wc/FFlLZQpN8JbGPPuVMqmZxNc3Ixa2YzoyUngWcw/nH6NYThfvrzZ8Xn2tkPuL++Ab4MpH6Mew5ehlH3CW6Bvu5yXv+8rb0N5PENY0naKQTf1m++jDMEz3Ut3gt/Z7Q0WuSZ4n58Ntr+D0AlwHtjBNj8m/9cabwgTQp49L0sXxl66GfyOv/j8Dxoa+hd7zqsonuznrwAAAABJRU5ErkJggg==</Image>
 <Image width="130" height="52">data:image/png;base64,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</Image>
-<Url type="application/x-suggestions+json" method="GET" template="http://suggest.yandex.net/suggest-ff.cgi">
+<Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.net/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="http://yandex.ru/yandsearch" resultdomain="yandex.ru">
-  <Param name="text" value="{searchTerms}"/>
-  <Param name="from" value="fx3"/>
-  <Param name="clid" value="1909644"/>
+<Url type="text/html" method="GET" template="https://yandex.ru/yandsearch" resultdomain="yandex.ru">
+  <MozParam name="clid" condition="purpose" purpose="searchbar"   value="2186618"/>
+  <MozParam name="clid" condition="purpose" purpose="keyword"     value="2186621"/>
+  <MozParam name="clid" condition="purpose" purpose="contextmenu" value="2186623"/>
+  <MozParam name="clid" condition="purpose" purpose="homepage"    value="2186617"/>
+  <MozParam name="clid" condition="purpose" purpose="newtab"      value="2186620"/>
+  <Param    name="text" value="{searchTerms}"/>
 </Url>
-<Url type="application/x-moz-keywordsearch" method="GET" template="http://yandex.ru/yandsearch">
-  <Param name="stype" value="first"/>
-  <Param name="clid" value="1909644"/>
-  <Param name="text" value="{searchTerms}"/>
-</Url>
-<SearchForm>http://www.yandex.ru/</SearchForm>
+<SearchForm>https://www.yandex.ru/</SearchForm>
 </SearchPlugin>
--- a/mobile/searchplugins/yandex-ru.xml
+++ b/mobile/searchplugins/yandex-ru.xml
@@ -1,23 +1,21 @@
 <!-- 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 http://mozilla.org/MPL/2.0/. -->
 
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Яндекс</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABRtJREFUeNqsV11oFFcU/mZ2dvNjtrWk0ZTSgha0Wq1JrX0x0paSipIYCCqtBh+k+hYKQpqHEigWBAUf8iBIElDbPhRarKTUotjYmDQqbRMbac1DoVDSVteNibvJ7s7O3Hv73dldf7O7E9kLH3Nn9u45Z77z3XPPGABMYiPxOlGG0o1bRD8xVWiRRWzq7u7ubG1t3VjGUSrvw8PDY7SpOP2cEPnWGcRHk5OTXeFwuAolHj09Pd91dHR8wukv+dZo+gPBYDCklEKp0dzcrNP6JlFVKACVHf6NkzhpBiADVhZBSMN8bN1SjpMnTzbTx1uFNAAppYeiwzCggmUwHBvm3ah3pScPqqIKctHTnD9sZ+vWrZt4+YEYJ/6eN4BcxEWd823Lro+g/PL3sP79E8ZcjBwGPKf2hncR3/khjFTiYYo5zp07t2Pz5s3/8PYzwn00BfcYyAsGJ+i8fOA0wn2fIjhxDWLZq0i/8x7cl+qAuRRUyvbWzff/+vr6tYcPH26lq/r5NFA439oInVs3xlD5VS+dWJjd+zFm2jows+0DJFduAGJzUGm3oJ0tW7ZsyAoyvDAG9FsJgfLzZ2DciiC1sQnxV96Ak0zCTc5BJFKQszYZcAraqampWdLX16cF+faCAhBUvDEVgXV9DEIGkXj5Ncg0HUpB8O3SDhBnEMl03hTkQB000B1zhhf9pyBgwoywqt6MQlqLIBaFochIZjsqj3p5NwmVdDL3BWwZhmH29/dvp8tGXX98p0AlElAzpDslIHUNeDA9OvcxMpDSDMiigq6rq1t76NAhLcj1/gJw6bS8ApJMY/ImA5lh0ckGoR0yBTKezKRAquI7imhsbNSC1PXhqaIBKCcN57nn4YafgZr8D4ErlyFDofv5dhhgwvGY8MOARnV1dc3x48db9K7wwYALJxyG3bSNzhTKe/tgjYxQC9RDFaufyVLMs84LQErfaGho0OfEal+lWGsg/v4uBEbHQBWhau9epHbsgLtyJcyrV72zVoqMDcNPSc/69H8WUPV2MIiZI0dQtXw5AidOoOLYsUxwfO5SEyJrx28Ag4ODP/Pyu+9SrGwbiYoKxFpaIOjUWbwYqaNHkd69G0KpBdEfiURut7e3625p0F8AGvptHQeB7m6IaBROUxOm9+1DYvVq7zfh1w5x4cIF/fZDRNz3cawqKxEcHoZ19ixEdTUSu3bBicVg6ZKsA8iyUCwF4+Pj1w8ePPgNp7/6P46ZY1CIod5eiDT3O9OQWrGC9T+VOSmzDKhsb1BAeLKtre1rTs/n+sR7ARTcBdxyodOngStXIGpqYO/cCZeBgFrIBSB9MHDx4sURXq492JgUT4FlwYhEEDh1ipuBrlpbYS9bBjU7y3Mi4Dn2k4JoNBo5cOCAJ7wFdUSK9AfpXN64ASxZAmf7djik3sz+R6fEC4DPdO+QLwUDAwNaeD8SdxfWE1JkZayEFkXnrl8Pe+lS75l3HvAaWrUKIW5FuWaNF4Q5j52JiYk/2BGd4XTsiXrCxP79MJhv7UDE4/pYzbwp7+116yAaGngaptgZxaBM8zHh7dmz58tsY+o+UVds37nzwIYwHgpW6G2YSNz/7RE7ly5d+omX34i/8rXl+uvIKNoV5zRRYN2jv01PT091dnZ+m8193u8CYdt22rKsUKk/zYaGhnIVL5ZvjW6LrNra2hf4EfOsbplc1xWlwOjo6FhXV9cXtH9WZ7nQx2nu81z37JUlJOA2oemPFFr0vwADAAEglbyXj6GOAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET" template="http://suggest.yandex.net/suggest-ff.cgi">
+<Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.net/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="http://yandex.ru/yandsearch">
-  <Param name="text" value="{searchTerms}"/>
-  <Param name="from" value="fx3"/>
-  <Param name="clid" value="1924261"/>
-</Url>
-<Url type="application/x-moz-keywordsearch" method="GET" template="http://yandex.ru/yandsearch">
-  <Param name="stype" value="first"/>
-  <Param name="clid" value="1924261"/>
+<Url type="text/html" method="GET" template="https://yandex.ru/yandsearch">
+  <Param name="clid" value="2186727"/>
   <Param name="text" value="{searchTerms}"/>
 </Url>
-<SearchForm>http://www.yandex.ru/</SearchForm>
+<Url type="application/x-moz-tabletsearch" method="GET" template="https://yandex.ru/yandsearch">
+  <Param name="clid" value="2186733"/>
+  <Param name="text" value="{searchTerms}"/>
+</Url>
+<SearchForm>https://www.yandex.ru/</SearchForm>
 </SearchPlugin>