sync with en-US 11-28
authorShaohua Wen <shaohua.wen@gmail.com>
Sat, 28 Nov 2009 20:20:09 +0800
changeset 144 3f20541558485aafaae3951d8f101ec35cfb31c8
parent 143 e6e975c4b4f0cfa17c804a5564ca58ff65411c57
child 145 7f8ba56864568c9738e56cf6b8567192e74faec3
push id131
push usershaohua.wen@gmail.com
push dateSat, 28 Nov 2009 12:20:56 +0000
sync with en-US 11-28
browser/chrome/browser/baseMenuOverlay.dtd
mobile/chrome/browser.dtd
mobile/chrome/browser.properties
mobile/chrome/firstrun.dtd
mobile/chrome/overrides/appstrings.properties
mobile/chrome/overrides/netError.dtd
mobile/chrome/preferences.dtd
mobile/chrome/search.properties
mobile/installer/setup.ini
mobile/profile/bookmarks.inc
mobile/searchplugins/answers.xml
mobile/searchplugins/google.xml
mobile/searchplugins/list.txt
mobile/searchplugins/wikipedia.xml
mobile/searchplugins/yahoo.xml
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -17,18 +17,18 @@
 <!ENTITY helpForIEUsers.label     "致 Internet Explorer 用户">
 <!ENTITY helpForIEUsers.accesskey "I">
 <!ENTITY openHelp.commandkey      "VK_F1">
 <!ENTITY helpMac.commandkey       "?">
 
 <!ENTITY helpReleaseNotes.label         "发行说明">
 <!ENTITY helpReleaseNotes.accesskey     "N">
 
-<!ENTITY helpTroubleshooting.label      "疑难排解信息…">
-<!ENTITY helpTroubleshooting.accesskey  "T">
+<!ENTITY helpTroubleshootingInfo.label      "疑难解答信息">
+<!ENTITY helpTroubleshootingInfo.accesskey  "T">
 
 <!ENTITY updateCmd.label                "检查更新…">
 
 <!ENTITY preferencesCmdMac.label        "首选项…">
 <!ENTITY preferencesCmdMac.commandkey   ",">
 
 <!ENTITY servicesMenuMac.label          "服务">
 
--- a/mobile/chrome/browser.dtd
+++ b/mobile/chrome/browser.dtd
@@ -1,13 +1,12 @@
 <!ENTITY back.label            "后退">
 <!ENTITY forward.label         "前进">
 <!ENTITY reload.label          "重新载入">
 <!ENTITY stop.label            "停止">
-<!ENTITY search.label          "搜索">
 <!ENTITY go.label              "转到">
 <!ENTITY openLocation.label    "打开位置">
 <!ENTITY star.label            "星标">
 
 <!ENTITY newtab.label          "新建标签页">
 <!ENTITY closetab.label        "关闭标签页">
 
 <!ENTITY cut.label             "剪切">
--- a/mobile/chrome/browser.properties
+++ b/mobile/chrome/browser.properties
@@ -4,16 +4,18 @@ addonsSearchStart.label=搜索附加组件...
 addonsSearchStart.button=取消
 addonsSearchNone.search=无法找到符合条件的结果
 addonsSearchNone.recommended=无被推荐的附加组件
 addonsSearchNone.button=重试
 addonsSearchFail.label=%S 无法取得附加组件
 addonsSearchFail.button=确定
 addonsSearchSuccess2.button=清空搜索
 
+addonsSearchEngine.description=综合搜索
+
 addonsConfirmInstall.title=正在安装附加组件
 addonsConfirmInstall.install=安装
 
 addonType.2=扩展
 addonType.4=主题
 addonType.8=本地化
 addonType.1024=搜索
 
@@ -31,21 +33,22 @@ addonUpdate.error=发生了一个错误
 # #1 download size for FINISHED or download state; #2 host (e.g., eTLD + 1, IP)
 downloadsStatus=#1 — #2
 downloadsUnknownSize=未知大小
 # LOCALIZATION NOTE (KnownSize): #1 size number; #2 size unit
 downloadsKnownSize=#1 #2
 donwloadsYesterday=昨天
 # LOCALIZATION NOTE (MonthDate): #1 month name; #2 date number; e.g., January 22
 downloadsMonthDate=#1 #2
+downloadsEmpty=没有下载
 
 # Alerts
 alertAddons=附加组件
-alertAddonsStart=正在安装附件组件
-alertAddonsDone=安装完成
+alertAddonsInstalling=安装附加组件
+alertAddonsInstalled=安装已完成,需要重新启动。
 alertAddonsFail=安装失败
 
 # LOCALIZATION NOTE (alertAddonsDisabled): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of add-ons
 alertAddonsDisabled=已经禁用 #1 个不兼容的附加组件; 已经禁用 #1 个不兼容的附加组件
 
 alertDownloads=下载
@@ -96,8 +99,10 @@ typeError=错误:
 typeWarning=警告:
 
 # Offline web applications
 offlineApps.available=%S 需要在您计算机保存数据以供脱机使用。
 offlineApps.allow=允许
 offlineApps.never=不允许
 offlineApps.notNow=暂不
 
+# Bookmark List
+bookmarkList.desktop=桌面书签
--- a/mobile/chrome/firstrun.dtd
+++ b/mobile/chrome/firstrun.dtd
@@ -1,8 +1,8 @@
 <!ENTITY welcome.title                      "欢迎使用 &brandShortName;">
-<!ENTITY overview.description               "使用 Weave 在 PC 和移动设备之间同步,通过附加组件定制,在智能地址栏和其他许多许多功能的帮助下驰骋于网络中。">
-<!ENTITY sync.title                         "准备好开始">
-<!ENTITY sync.description                   "获取 Weave 帮助改进您的 &brandShortName; 。在 PC 和移动设备之间共享设置、书签、浏览历史记录和更多信息。">
-<!ENTITY sync.linkLabel                     "获取附加组件 Weave 。">
+<!ENTITY intro.description                  "通过 Weave Sync 同步您的电脑和手机。通过附加组件进行定制。使用智能地址栏畅游互联网,还有更多更多更多。">
+<!ENTITY weave.title                        "准备好开始">
+<!ENTITY weave.description                  "在您使用 Firefox 浏览器时,遇到暂时的中断,Weave Sync 可以帮助同时保留您的浏览纪录,书签,保存密码和使用界面在您的电脑和手机里。">
+<!ENTITY weave.linkLabel                    "获取附加组件 Weave Sync">
 <!ENTITY getPersonal.title                  "个性化">
 <!ENTITY getPersonal.description            "打造您自己的 &brandShortName; ,通过专供移动设备的附加组件打造一个前所未有的浏览器。">
 <!ENTITY getPersonal.linkLabel              "为您的手机获取附加组件">
new file mode 100755
--- /dev/null
+++ b/mobile/chrome/overrides/appstrings.properties
@@ -0,0 +1,65 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+malformedURI=此 URL 无效,无法载入。
+fileNotFound=Firefox 无法在 %S 找到该文件。
+dnsNotFound=Firefox  无法在 %S 找到该服务器。
+protocolNotFound=Firefox 不知道如何打开此地址,因为协议 (%S) 未和任何程序关联。
+connectionFailure=Firefox  无法建立到 %S 服务器的连接。
+netInterrupt=载入页面时到 %S 的连接被中断。
+netTimeout=位于 %S 的服务器响应时间过长。
+redirectLoop=Firefox 检测到该服务器正在将此地址的请求循环重定向。
+## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
+confirmRepostPrompt=要显示此页面, %S 必须发送将会导致重复之前动作的数据(例如搜索或者下订单)。
+resendButton.label=重新发送
+unknownSocketType=Firefox 不知道如何与服务器通讯。
+netReset=载入页面时到服务器的连接被重置。
+netOffline=Firefox 处于脱机状态,无法浏览网页。
+isprinting=正在打印或者打印预览时文档无法修改。
+deniedPortAccess=此地址使用了一个通常应该用于其他网页浏览的端口。由于安全原因,Firefox 取消了该请求。
+proxyResolveFailure=Firefox 无法找到您指定的代理服务器。
+proxyConnectFailure=Firefox 尝试联系您指定的代理服务器时连接被拒绝。
+contentEncodingError=无法显示您尝试查看的页面,因为它使用了无效或者不支持的压缩格式。
+unsafeContentType=无法显示您尝试查看的页面,因为它被包含于不能安全打开的文件类型中。请联系网站所有者并告知该问题。
+externalProtocolTitle=外部协议请求
+externalProtocolPrompt=您必须启动一个外部程序来处理 %1$S: 链接。请求的链接:\n\n%2$S\n\n应用程序: %3$S\n\n如果您不希望此请求可能会尝试其他程序的缓冲区溢出的漏洞。请取消该操作,除非您确定该链接是无恶意的。\n
+#LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
+externalProtocolUnknown=<未知>
+externalProtocolChkMsg=请记住我为此类型链接所做的选择。
+externalProtocolLaunchBtn=启动应用程序
+malwareBlocked=位于 %S 的此站点已被报告为攻击站点,并已依据您的安全首选项进行了阻止。
+phishingBlocked=此站点 %S 已被报告为用于诱骗用户输入个人或金融信息的欺诈站点。
+
--- a/mobile/chrome/overrides/netError.dtd
+++ b/mobile/chrome/overrides/netError.dtd
@@ -35,16 +35,24 @@
   <li>请确认您使用了正斜杠 (即
     <strong>/</strong>).</li>
 </ul>
 ">
 
 <!ENTITY netInterrupt.title "连接被中断">
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
 
+<!-- LOCALIZATION NOTE (netOffline2.longDesc) - Workaround to allow the l10n tools
+to pickup this string change. Please update netOffline.longDesc too -->
+
+<!ENTITY netOffline2.longDesc "<ul>
+  <li>请重试。 &brandShortName; 将会尝试打开一个链接并重新载入页面。</li>
+</ul>
+ ">
+
 <!ENTITY netOffline.title "脱机模式">
 <!ENTITY netOffline.longDesc "<ul><li>请将 文件 菜单中的 &quot;脱机工作&quot; 反选,然后再试。</li></ul>">
 
 <!ENTITY contentEncodingError.title "内容编码错误">
 <!ENTITY contentEncodingError.longDesc " <ul>   <li>请联系网站所有者并告知该问题。</li> </ul> ">
 
 <!ENTITY unsafeContentType.title "不安全的文件类型">
 <!ENTITY unsafeContentType.longDesc " <ul>   <li>请联系网站所有者并告知该问题。</li> </ul> ">
--- a/mobile/chrome/preferences.dtd
+++ b/mobile/chrome/preferences.dtd
@@ -1,20 +1,14 @@
 <!ENTITY prefsHeader.label                         "首选项">
 <!ENTITY about.title                               "关于 &brandShortName;">
 <!ENTITY about.button                              "转至页面">
-<!ENTITY about.description                         "获取帮助和产品信息">
 <!ENTITY content.title                             "内容">
 <!ENTITY showImages.title                          "显示图片">
 <!ENTITY enableJavaScript.title                    "启用 JavaScript">
-<!ENTITY enableJavaScript.description              "大部分交互性网站使用 JavaScript 语言">
 <!ENTITY enablePlugins.title                       "启用插件">
-<!ENTITY enablePlugins.description                 "插件用于特殊的内容,比如视频">
 <!ENTITY privacy.title                             "隐私 &amp; 安全">
 <!ENTITY allowCookies.title                        "允许 cookies">
-<!ENTITY allowCookies.description                  "网站使用 cookies 来识别您的身份和记住您的设置">
-<!ENTITY clearPrivateData.title                    "清空最近的浏览历史">
+<!ENTITY clearPrivateData2.title                   "清除隐私数据">
 <!ENTITY clearPrivateData.button                   "清空">
-<!ENTITY clearPrivateData.description              "历史信息可以帮助 &brandShortName; 为您更好地提供目的地址的建议">
 <!ENTITY rememberPasswords.title                   "记住密码">
 <!ENTITY language.title                            "语言">
-<!ENTITY language.description                      "请选择 &brandShortName; 首选的语言">
 <!ENTITY language.auto                             "自动检测">
deleted file mode 100644
--- a/mobile/chrome/search.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-searchtip=使用 %S 搜索
-
-cmd_clearHistory=清空搜索历史
-cmd_clearHistory_accesskey=C
-
-cmd_showSuggestions=显示建议
-cmd_showSuggestions_accesskey=S
-
-addEngineConfirmTitle=添加搜索引擎
-addEngineConfirmation=将 “%S” 添加到搜索工具栏中吗?\n\n来自: %S
-addEngineUseNowText=立即启用(&U)
-addEngineAddButtonLabel=添加
-
-error_loading_engine_title=下载错误
-# LOCALIZATION NOTE (error_loading_engine_msg2): %1$S = brandShortName, %2$S = location
-error_loading_engine_msg2=%S 无法从下列地址下载该搜索插件:\n%S
-error_duplicate_engine_msg=%S 无法安装来自 “%S”的搜索插件,因为同名的引擎已经存在。
-
-error_invalid_engine_title=安装错误
-# LOCALIZATION NOTE (error_invalid_engine_msg): %S = brandShortName
-error_invalid_engine_msg=%S 不支持该搜索引擎,无法安装。
-
-cmd_addFoundEngine=添加 "%S"
-
-suggestion_label=建议
new file mode 100755
--- /dev/null
+++ b/mobile/installer/setup.ini
@@ -0,0 +1,17 @@
+; This file is in the UTF-8 encoding
+[Strings]
+AppShortName=Fennec
+AppLongName=Mozilla Fennec
+WindowCaption=安装 Mozilla Fennec
+InstallTo=安装 Fennec 到
+Install=安装
+Cancel=取消
+InstalledSuccessfully=Mozilla Fennec 已经安装成功.
+ExtractionError=存档出现的错误:
+ThereWereErrors=安装过程中出现了错误:
+CreatingUserProfile=正在创建用户配置文件,请稍候…
+UninstallCaption=卸载 Mozilla Fennec
+FilesWillBeRemoved=全部文件将从以下位置删除
+AreYouSure=您确定吗?
+InstallationNotFound=未找到已安装的 Mozilla Fennec 。
+UninstalledSuccessfully=Mozilla Fennec 卸载成功。
--- a/mobile/profile/bookmarks.inc
+++ b/mobile/profile/bookmarks.inc
@@ -10,19 +10,19 @@
 # LOCALIZATION NOTE (bookmarks_title):
 # title for the folder that will contains the default bookmarks
 #define bookmarks_title Mobile
 
 # LOCALIZATION NOTE (bookmarks_welcome):
 # link title for about:firstrun
 #define bookmarks_welcome Firefox:欢迎
 
-# LOCALIZATION NOTE (bookmarks_about):
+# LOCALIZATION NOTE (bookmarks_aboutBrowser):
 # link title for about:fennec
-#define bookmarks_about Firefox:关于
+#define bookmarks_aboutBrowser Firefox :关于您的浏览器
 
 # LOCALIZATION NOTE (bookmarks_weave):
 # link title for https://www.mozilla.com/en-US/mobile/weave
 #define bookmarks_weave Firefox:使用 Weave 同步
 
 # LOCALIZATION NOTE (bookmarks_addons):
 # link title for https://addons.mozilla.org/en-US/mobile
 #define bookmarks_addons Firefox:自定义附加组件
deleted file mode 100644
--- a/mobile/searchplugins/answers.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Answers.com</ShortName>
-<Description>Dictionary Search on Answers.com</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////K////4f////E////5f///+n////P////mv///0EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8E////fv///+//////////////////////7NnP/+LFtv/////+////of///xYAAAAAAAAAAAAAAAD///8D////lf////////////j0//bi1v/OlXf/tGU9/6FCEv/OmH3////////////////D////FgAAAAAAAAAA////avPm4P/evaz/8NbI//7r3//23M3/xYRi/5kzAP/Df1z//u/l//749P/v4dn/+PPw/////6j///8B////GP///+W/f1//smM7//bczf/+69///uvf/9ytlP+ZMwD/5se3/+/f1//AgmP/nj0N/927qv/////+////QP///2z/////8NvQ/8WCYP/+69///uvf//7r3/+7ckz/pUkb/9m1ov+ePQ3/okUW/8+fh//38O3//////////5r///+t//////7y6v/Cflv/58Cr//DRwP/mwKv/okQU/8ODYv/cuqj/yZN4//Tq5f/+9e///vDn///////////Q////yf/////+7+b/05yA/65ZLv+9dVD/sF40/5kzAP/kvKb//vTu//Tr5v/7+Pb//vfz//707f//////////6f///8X//////vDm/+K4ov/KjGz//ure/8uNbf+jRBX/+OTX/+3b0v+jSBr/pk0h/717Wv/Wrpr//Pn4/////+b///+i//////7z7f/02Mj/wn5b//vl2P+uWS7/vXhU//v49//48u//1q6a/717Wv+oUSb/tWxH//jz8P/////K////V///////+/j//ure/8aFZP/fs5v/oEAQ/9q1o/+zaEL/1ayX//718P/+9/P/+PHu//jz8P//////////h////wr////O///////38v/YpYr/tGQ7/6ZLHf/06eX/s2dB/549Df/x49z//vDn//7x6f//////////8////yoAAAAA////R/////v/////7dXI/5kzAP+7cUv//vHp/+vYzv+bNwX/vHlY//38/P///////////////30AAAAAAAAAAAAAAAD///9n////+/z5+P++e1n/3LGc//7w5//++PT/0KKL/8OIa//9/Pv//////////5X///8GAAAAAAAAAAAAAAAAAAAAAP///0n////K///////////////////////////+/v7/////5v///2z///8CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Cv///1f///+g////xP///8n///+r////bP///xoAAAAAAAAAAAAAAAAAAAAA+B////AH///AA///wAH//4AB//+AAP//AAD//wAA//8AAP//AAD//4AA//+AAf//wAP//+AD///wD////D///w==</Image>
-<Url type="text/html" method="GET" template="http://www.answers.com/main/ntquery">
-  <Param name="s" value="{searchTerms}"/>
-  <Param name="gwp" value="13"/>
-</Url>
-<Url type="application/x-suggestions+json" method="GET"
-     template="http://www.answers.com/main/startswith?output=json&amp;client=firefox&amp;s={searchTerms}"/>
-<SearchForm>http://www.answers.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/searchplugins/google.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Google</ShortName>
-<Description>Google Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAaRJREFUeNpiVIg5JRURw0A0YAHio943kYV%2B%2Ff33%2BdvvX7%2F%2FMjEx8nKycrGzwKXOiPKzICvdeezLhCV3jp15%2Bfv%2FX0YGhv8MDDxMX2qKTIw0RK10eYD6QYqATvoPBkt3f5K0W9Ew4fjTFz%2F%2Bw8Dm3W8UPeZxqFa%2BevsFyD0twgfVsOfkRxHrtfV9u5BVQ8Crd98%2FffkGYQM1QJ20%2FfSPv79eNxQGYfpSVJADmcvEAHbr7oOX2dj%2FERNKIA2%2F%2F%2Fz%2FxfCDhYVoDUDw5P6vf9%2B5iY0HVmZGQWm%2BN3fff%2Fn2k4eLHS739x%2FDiRs%2Ff%2F%2F5x8HO%2FOHzN3djfqgNjIwMgc6qzLx%2Fpy47j2zY%2Feff06tXhOUucgxeun33AUZGpHh4%2Bvo7t8EyIJqz%2FhpasD59%2B5dNrqdnznZIsEL9ICXCsWuBCwvTv%2FymS5PWPP32ExEALz%2F%2BB5r848cPCJcRaMP9xaYQzofPPzfuvrnj0Jst%2B5%2F8%2Bc4sLPeDkYlRgJc93VPE18NIXkYUmJYQSQMZ%2FP3379uPH7%2F%2F%2FEETBzqJ0WqLGvFpe2LCC4AAAwAyjg7ENzDDWAAAAABJRU5ErkJggg%3D%3D</Image>
-<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl={moz:locale}&amp;q={searchTerms}"/>
-<Url type="text/html" method="GET" template="http://www.google.com/search">
-  <Param name="q" value="{searchTerms}"/>
-  <Param name="ie" value="utf-8"/>
-  <Param name="oe" value="utf-8"/>
-  <Param name="aq" value="t"/>
-  <!-- Dynamic parameters -->
-  <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
-  <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
-</Url>
-<SearchForm>http://www.google.com/firefox</SearchForm>
-</SearchPlugin>
--- a/mobile/searchplugins/list.txt
+++ b/mobile/searchplugins/list.txt
@@ -1,4 +1,3 @@
-answers
 google
-wikipedia
-yahoo
+twitter
+wikipedia-zh-CN
deleted file mode 100644
--- a/mobile/searchplugins/wikipedia.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Wikipedia (en)</ShortName>
-<Description>Wikipedia, the free encyclopedia</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image>
-<Url type="application/x-suggestions+json" method="GET" template="http://en.wikipedia.org/w/api.php">
-  <Param name="action" value="opensearch"/>
-  <Param name="search" value="{searchTerms}"/>
-</Url>
-<Url type="text/html" method="GET" template="http://en.wikipedia.org/wiki/Special:Search">
-  <Param name="search" value="{searchTerms}"/>
-  <Param name="sourceid" value="Mozilla-search"/>
-</Url>
-<SearchForm>http://en.wikipedia.org/wiki/Special:Search</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/searchplugins/yahoo.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAJECAP8AAAAAAP///wAAACH5BAEAAAIALAAAAAAQABAAAAIplI+py+0NogQuyBDEnEd2kHkfFWUamEzmpZSfmaIHPHrRguUm/fT+UwAAOw==</Image>
-<Url type="application/x-suggestions+json" method="GET"
-     template="http://ff.search.yahoo.com/gossip?output=fxjson&amp;command={searchTerms}" />
-<Url type="text/html" method="GET" template="http://search.yahoo.com/search">
-  <Param name="p" value="{searchTerms}"/>
-  <Param name="ei" value="UTF-8"/>
-  <MozParam name="fr" condition="pref" pref="yahoo-fr" />
-</Url>
-<SearchForm>http://search.yahoo.com/</SearchForm>
-</SearchPlugin>