update from bug 599677
authorToni Hermoso Pulido <toniher@softcatala.org>
Sun, 26 Sep 2010 03:48:40 +0200
changeset 293 c716a59d6ab8689107c946242c5781a18bb5b552
parent 292 a03f1918fc698fc81aff1a8c507dff260d68d8cc
child 294 34893d2edc405ace961972c9d67b75b339df44fe
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:43:21 +0000
bugs599677
update from bug 599677
browser/searchplugins/bing.xml
browser/searchplugins/list.txt
services/sync/sync.properties
new file mode 100644
--- /dev/null
+++ b/browser/searchplugins/bing.xml
@@ -0,0 +1,17 @@
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>Bing</ShortName>
+<Description>Bing. Search by Microsoft.</Description>
+<Contact>msosa@microsoft.com</Contact>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAVpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8ysf97zf+24//F6f/F6f/F6f+K0/9QvP8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8krP+Z2P/////////w+f/F6f/F6f/i9P/////////T7v9Bt/8Vpv8Vpv8Vpv8Vpv/T7v/////w+f97zf8Vpv8Vpv8Vpv8Vpv9QvP/T7v/////w+f9Bt/8Vpv8Vpv97zf////////9QvP8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8krP/i9P/////i9P8Vpv8Vpv+24//////i9P8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv+K0/////////8Vpv8Vpv/F6f////////8krP8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv+n3v/////w+f8Vpv8Vpv/F6f////////+n3v8krP8Vpv8Vpv8Vpv8Vpv8Vpv9tx/////////+Z2P8Vpv8Vpv/F6f/////////////i9P+K0/9QvP9QvP9tx//F6f////////+n3v8Vpv8Vpv8Vpv/F6f/////T7v+Z2P/i9P////////////////////+24/9QvP8Vpv8Vpv8Vpv8Vpv/F6f/////F6f8Vpv8Vpv8krP9QvP9QvP9Bt/8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv/F6f/////F6f8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv9Bt/9QvP9Bt/8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8Vpv8AAHBsAABhdAAAbiAAAHJ0AABsaQAAdGkAACBDAABlbgAAUEEAAEVYAAAuQwAAOy4AAEU7AABBVAAAQ00AAC5W</Image>
+<Url type="text/html" template="http://www.bing.com/search">
+  <Param name="q" value="{searchTerms}"/>
+  <Param name="form" value="OSDSRC"/>
+</Url>
+<Url type="application/x-suggestions+json" template="http://api.bing.com/osjson.aspx">
+  <Param name="query" value="{searchTerms}"/>
+  <Param name="language" value="{language}"/>
+  <Param name="form" value="OSDJAS"/>
+</Url>
+<SearchForm>http://www.bing.com/</SearchForm>
+</SearchPlugin>
--- a/browser/searchplugins/list.txt
+++ b/browser/searchplugins/list.txt
@@ -1,5 +1,6 @@
 google
+bing
 huubs
 diec2
 wikipedia-ca
 llibres
--- a/services/sync/sync.properties
+++ b/services/sync/sync.properties
@@ -1,10 +1,9 @@
-# %1: the user name (Ed), %2: the app name (Firefox), %3: the operating system (Android
-)
+# %1: the user name (Ed), %2: the app name (Firefox), %3: the operating system (Android)
 client.name2 = El %2$S de %1$S — %3$S
 
 # %S is the date and time at which the last sync successfully completed
 lastSync.label = Darrera actualització: %S
 lastSyncInProgress.label = Darrera actualització: en curs…
 
 # %S is the username logged in
 connected.label = Connectat: %S