# HG changeset patch
# User seabld
# Parent  02ca4c1400c11eb7164d9dc20849af5085a8e37b
Fix missing SeaMonkey strings

diff --git a/suite/chrome/common/helpviewer/help/help-toc.rdf b/suite/chrome/common/helpviewer/help/help-toc.rdf
deleted file mode 100644
--- a/suite/chrome/common/helpviewer/help/help-toc.rdf
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns:nc="http://home.netscape.com/NC-rdf#">
-
-  <rdf:Description about="urn:root">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li> <rdf:Description ID="use-help" nc:name="使用帮助窗口"
-                  nc:link="chrome://help/locale/welcome.xhtml"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
-  <rdf:Description about="#use-help">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li> <rdf:Description ID="use-help-finding-the-topic-you-want" nc:name="查找帮助主题"
-                  nc:link="chrome://help/locale/welcome.xhtml#finding_the_topic_you_want"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="use-help-search" nc:name="搜索提示"
-                  nc:link="chrome://help/locale/welcome.xhtml#search_tips"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
-</rdf:RDF>
diff --git a/suite/chrome/common/helpviewer/help/help.dtd b/suite/chrome/common/helpviewer/help/help.dtd
deleted file mode 100755
--- a/suite/chrome/common/helpviewer/help/help.dtd
+++ /dev/null
@@ -1,57 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY printCmd.commandkey            "p">
-
-<!ENTITY findOnCmd.commandkey           "F">
-<!ENTITY findAgainCmd.commandkey        "G">
-<!ENTITY findAgainCmd.commandkey2       "VK_F3">
-
-<!ENTITY backButton.label               "后退">
-<!ENTITY backButton.accesskey           "B">
-<!ENTITY backButton.tooltip             "转到上一页">
-<!ENTITY forwardButton.label            "前进">
-<!ENTITY forwardButton.accesskey        "F">
-<!ENTITY forwardButton.tooltip          "转到下一页">
-<!ENTITY copyCmd.label                  "复制">
-<!ENTITY copyCmd.accesskey              "C">
-<!ENTITY selectAllCmd.label             "全选">
-<!ENTITY selectAllCmd.accesskey         "A">
-<!ENTITY goBackCmd.commandkey           "[">
-<!ENTITY goForwardCmd.commandkey        "]">
-<!ENTITY homeButton.label               "主页">
-<!ENTITY homeButton.tooltip             "返回帮助开始页">
-<!ENTITY printButton.label              "打印">
-<!ENTITY printButton.tooltip            "打印当前页">
-<!ENTITY closeWindow.commandkey         "W">
-
-<!ENTITY search.emptytext               "搜索">
-<!ENTITY searchHeader.label             "搜索结果">
-<!ENTITY toctab.label                   "内容">
-<!ENTITY toctab.accesskey               "C">
-<!-- LOCALIZATION NOTE :
-fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
-fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
-If shift key is needed with your locale popular keyboard for them,
-you can use these alternative items. Otherwise, their values should be empty.  -->
-
-
-<!ENTITY fullZoomReduceCmd.commandkey   "-">
-<!ENTITY fullZoomReduceCmd.commandkey2  "">
-<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
-<!-- + is above this key on many keyboards -->
-<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
-<!ENTITY fullZoomEnlargeCmd.commandkey3 "">
-<!ENTITY fullZoomResetCmd.commandkey    "0">
-<!ENTITY fullZoomResetCmd.commandkey2   "">
-
-<!ENTITY helpSearch.commandkey          "k">
-
-<!ENTITY zLevel.label                   "总在最前">
-<!ENTITY zLevel.accesskey               "T">
-
-<!ENTITY fullZoomReduceBtn.label        "缩小">
-<!ENTITY fullZoomReduceBtn.accesskey    "O">
-<!ENTITY fullZoomEnlargeBtn.label       "放大">
-<!ENTITY fullZoomEnlargeBtn.accesskey   "I">
diff --git a/suite/chrome/common/helpviewer/help/help.properties b/suite/chrome/common/helpviewer/help/help.properties
deleted file mode 100755
--- a/suite/chrome/common/helpviewer/help/help.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-emptySearchText=无符合条件的项目。
diff --git a/suite/chrome/common/helpviewer/help/welcome.xhtml b/suite/chrome/common/helpviewer/help/welcome.xhtml
deleted file mode 100644
--- a/suite/chrome/common/helpviewer/help/welcome.xhtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
-    <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-    %brandDTD;
-]
->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>使用帮助窗口</title>
-	<link rel="stylesheet" type="text/css" href="chrome://help/skin/helpFileLayout.css"/>
-</head>
-
-<body>
-
-<h1 id="help_window_top">使用帮助窗口</h1>
-
-<p>本节讲解如何使用帮助窗口(包括显示帮助文本以及左边侧栏的整个窗口)。</p>
-
-<div class="contentsBox">本节内容包括：
-  <ul>
-    <li><a href="#finding_the_topic_you_want">查找主题</a></li>
-    <li><a href="#retracing_your_steps">回溯浏览历史</a></li>
-    <li><a href="#search_tips">搜索技巧与提示</a></li>
-  </ul>
-</div>
-
-<h2 id="finding_the_topic_you_want">查找主题</h2>
-
-	<p>当您浏览帮助窗口时，点击左边帧内的标签可以以不同的方式查看帮助内容：</p>
-	<ul>
-		<li><strong>内容</strong> 显示主要的主题列表。<br/>
-		  点击主题，可以阅读此主题的内容。双击它则可以看到其下的子主题。</li>
-		 <li><strong>搜索</strong> 让您可以搜索帮助文件。<br/>
-		  输入一个单词或者词组并按下回车键可以看到相关主题。然后单击您希望阅读的主题。<br/><br/>
-		  如果您的搜索没有返回任何结果，试试输入少一点的单词或者是重新组合搜索词汇。</li>
-		 <li><strong>索引</strong> 按照字母表顺序列出主题。<br/>点击索引条目可以查看相关主题的信息。</li>
-		 <li><strong>术语表</strong> 按照字母表顺序列出术语定义。<br/>点击一个术语可以看到它的定义。</li>
-	</ul>
-
-	<p>要查看您正在阅读的帮助主题的相关信息，在帮助窗口内点击链接，
-这和您浏览普通网页时所做的一样。</p>
-
-<h2 id="search_tips">搜索技巧与提示</h2>
-	<p>如果在搜索时您找不到你想要查找的内容，可以试试以下几招：</p>
-
-	<ul>
-		<li>确定您搜索的内容是和 &brandShortName; 相关的；这并不是通常的因特网搜索。</li>
-        	<li>尽量放宽您的搜索条件 － 不要太具体了。关键字有可能在拼写上和您的搜索不同。</li>
-		<li>避免搜索太过宽泛：像 &quot;&brandShortName;&quot; 以及&quot;&vendorShortName;&quot; 这样的单词有可能返回帮助文件里所有的页面。</li>
-	</ul>
-
-<div class="contentsBox"><em>2004 年 9 月 16 日</em></div>
-<p>&copy; 2003-2008，版权由 Mozilla Help Viewer Project 的贡献者所有。</p>
-
-</body>
-</html>
diff --git a/suite/chrome/common/passwordManager.dtd b/suite/chrome/common/passwordManager.dtd
deleted file mode 100755
--- a/suite/chrome/common/passwordManager.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY      windowtitle.label               "密码管理器">
-<!ENTITY      tab.signonsstored.label         "已保存的密码">
-<!ENTITY      tab.signonsnotstored.label      "不保存密码">
-<!ENTITY      search.placeholder              "搜索">
diff --git a/suite/chrome/common/pref/pref-cookies.dtd b/suite/chrome/common/pref/pref-cookies.dtd
--- a/suite/chrome/common/pref/pref-cookies.dtd
+++ b/suite/chrome/common/pref/pref-cookies.dtd
@@ -27,19 +27,14 @@
 
 <!ENTITY acceptForSession.label         "仅限当前会话">
 <!ENTITY acceptForSession.accesskey     "s">
 
 <!ENTITY acceptforNDays.label           "接受 Cookie 于">
 <!ENTITY acceptforNDays.accesskey       "f">
 <!ENTITY days.label                     "天">
 
-<!ENTITY warnAboutCookies.label         "询问每个 Cookie">
-<!ENTITY warnAboutCookies.accesskey     "A">
-<!ENTITY forCurrentSession.label        "除会话的 Cookie 外">
-<!ENTITY forCurrentSession.accesskey    "e">
-
 <!ENTITY manageCookies.label            "管理 Cookie 和站点">
 <!ENTITY manageCookiesDescription.label "您可以查看和管理已存储的 Cookie 以及各站点接受和拒绝 Cookie 的设置。各站点的设置会覆盖以上设置。">
 
 <!ENTITY viewCookies.label              "Cookie 管理器">
 <!ENTITY viewCookies.accesskey          "M">
 
diff --git a/suite/chrome/common/pref/pref-scripts.dtd b/suite/chrome/common/pref/pref-scripts.dtd
--- a/suite/chrome/common/pref/pref-scripts.dtd
+++ b/suite/chrome/common/pref/pref-scripts.dtd
@@ -12,17 +12,16 @@
 <!--LOCALIZATION NOTE (enableJavaScript.label): 'JavaScript' should never be translated -->
 
 <!ENTITY enableJavaScript.label          "启用JavaScript">
 <!ENTITY allowScripts.label              "脚本程序:">
 <!ENTITY allowScripts.accesskey          "s">
 <!ENTITY allowWindowMoveResize.label     "移动或调整现有的窗口">
 <!ENTITY allowWindowFlip.label           "提高或降低窗口">
 <!ENTITY allowWindowStatusChange.label   "改变状态栏的文本">
-<!ENTITY allowWindowImageSrcChange.label "改变图像">
 <!ENTITY allowContextmenuDisable.label   "禁用或更换快捷菜单">
 <!ENTITY allowHideStatusBar.label        "隐藏状态栏">
 
 <!ENTITY enableDrmMedia.label            "启用数字版权管理（DRM）对">
 <!ENTITY enableEmeForSuite.label         "第三方内容解密模块">
 <!ENTITY enableEmeForSuite.accesskey     "C">
 
 <!ENTITY enablePlugins.label             "允许插件用于">
diff --git a/suite/chrome/mailnews/folderProps.dtd b/suite/chrome/mailnews/folderProps.dtd
--- a/suite/chrome/mailnews/folderProps.dtd
+++ b/suite/chrome/mailnews/folderProps.dtd
@@ -25,18 +25,16 @@
 <!ENTITY retentionCleanupImap.label "保存信件，包括本地副本和在服务器上的原件：">
 <!ENTITY retentionCleanupPop.label "保存信件，包括在服务器上的原件：">
 <!ENTITY retentionDeleteMsg.label "删除超过">
 <!ENTITY retentionDeleteMsg.accesskey "m">
 <!ENTITY retentionKeepAll.label "所有消息">
 <!ENTITY retentionKeepAll.accesskey "A">
 <!ENTITY retentionKeepRecent.label "最新的">
 <!ENTITY retentionKeepRecent.accesskey "n">
-<!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
-<!ENTITY retentionKeepUnreadHidden.label "总是删除已读消息（忽略消息年龄设置）">
 <!ENTITY retentionApplyToFlagged.label "总是保留带标记消息">
 <!ENTITY retentionApplyToFlagged.accesskey "e">
 
 <!ENTITY folderSynchronizationTab.label          "同步">
 <!ENTITY folderCheckForNewMessages2.label        "当获取此帐户的新邮件时，总是检查此文件夹">
 <!ENTITY folderCheckForNewMessages2.accesskey    "c">
 
 <!ENTITY offlineFolder.check.label               "选择此文件夹供脱机使用">
diff --git a/suite/chrome/mailnews/pref/am-offline.dtd b/suite/chrome/mailnews/pref/am-offline.dtd
--- a/suite/chrome/mailnews/pref/am-offline.dtd
+++ b/suite/chrome/mailnews/pref/am-offline.dtd
@@ -22,18 +22,16 @@
 <!ENTITY retentionCleanupImap.label "如果恢复原有磁盘空间，旧的信件，包括本地副本和服务器上的原本，都会永久删除。">
 <!ENTITY retentionCleanupPop.label "永久删除旧信息(包括服务器端原始信息)以便释放磁盘空间.">
 <!ENTITY retentionKeepMsg.label "删除超过">
 <!ENTITY retentionKeepMsg.accesskey "t">
 <!ENTITY retentionKeepAll.label "不要删除任何消息">
 <!ENTITY retentionKeepAll.accesskey "n">
 <!ENTITY retentionKeepRecent.label "除最近使用的全部删除">
 <!ENTITY retentionKeepRecent.accesskey "b">
-<!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
-<!ENTITY retentionKeepUnreadHidden.label "总是删除已读消息（忽略消息年龄设置）">
 <!ENTITY retentionApplyToFlagged.label "总是保留带标记消息">
 <!ENTITY retentionApplyToFlagged.accesskey "k">
 <!ENTITY nntpRemoveMsgBody.label "移除消息体，当消息超过">
 <!ENTITY nntpRemoveMsgBody.accesskey "o">
 <!ENTITY offlineSelectNntp.label "选择用于脱机工作的新闻组…">
 <!ENTITY offlineSelectNntp.accesskey "S">
 <!ENTITY offlineImapAdvancedOffline.label "高级…">
 <!ENTITY offlineImapAdvancedOffline.accesskey "v">
diff --git a/suite/chrome/mailnews/region.properties b/suite/chrome/mailnews/region.properties
--- a/suite/chrome/mailnews/region.properties
+++ b/suite/chrome/mailnews/region.properties
@@ -13,13 +13,19 @@ addressbook.throbber.url=http://www.seam
 # mail.addr_book.mapit_url.format=
 # The format for "mail.addr_book.mapit_url.format" is:
 # @A1 == address, part 1
 # @A2 == address, part 2
 # @CI == city
 # @ST == state
 # @ZI == zip code
 # @CO == country
-mail.addr_book.mapit_url.format=http://ditu.google.cn/maps?q=@CO@ST@CI@A1@A2%A3%AC@ZI
+mail.addr_book.mapit_url.format=https://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
+# List of available map services (up to 5 can be defined here):
+mail.addr_book.mapit_url.1.name=Google 地图
+mail.addr_book.mapit_url.1.format=https://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
+mail.addr_book.mapit_url.2.name=OpenStreetMap
+mail.addr_book.mapit_url.2.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
+
 mailnews.messageid_browser.url=http://groups.google.com/search?hl=zh-CN&as_umsgid=%mid
 # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
 # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
-mailnews.localizedRe=
+mailnews.localizedRe=回复
diff --git a/suite/chrome/mailnews/start.dtd b/suite/chrome/mailnews/start.dtd
--- a/suite/chrome/mailnews/start.dtd
+++ b/suite/chrome/mailnews/start.dtd
@@ -13,14 +13,15 @@
 <!ENTITY feat_filters.label "消息过滤器">
 <!ENTITY feat_htmlmsg.label "支持HTML邮件">
 <!ENTITY feat_abook.label "通讯录">
 <!ENTITY feat_tags.label "可定制的标签和邮件视图">
 <!ENTITY feat_integration.label "和 &brandShortName; 应用程序套件紧密集成">
 <!ENTITY dict.title "字典">
 <!ENTITY dict_intro.label "用于消息的拼写检查的字典.">
 <!--# LOCALIZATION NOTE (dict_info.label): the URL for <a id="dictURL"> is fetched from brand.properties -->
-<!ENTITY dict_info.label '更多的附加的语言可以从<a href="https://addons.mozilla.org/seamonkey/">Mozilla Add-ons</a>的<a id="dictURL" href="">dictionaries</a>部分安装.'>
+<!ENTITY dict_info.label2
+'在 <a href="https://addons.thunderbird.net/seamonkey/">SeaMonkey 与 Thunderbird 附加组件</a>网站的<a id="dictURL" href="">字典</a>板块可以安装更多种语言。'>
 <!ENTITY info.title "更多信息">
 <!--# LOCALIZATION NOTE (info_bugs.label): the URL for <a id="releaseNotesURL"> is fetched from brand.properties -->
 <!ENTITY info_bugs.label '<a href="https://developer.mozilla.org/docs/Mozilla/Projects/MailNews">我们</a>欢迎 Bug 报告、功能请求，
 但请先阅读<a id="releaseNotesURL" href="">发布说明</a>和查询 
 <a href="https://bugzilla.mozilla.org/query.cgi">Bugzilla</a>。'>
diff --git a/suite/extra-jar.mn b/suite/extra-jar.mn
deleted file mode 100755
--- a/suite/extra-jar.mn
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/.
-
-# this is an empty file
-# locales can ship "extra" files from here, to ship a custom set
-# of files for the help system
-# do not put any blank lines in this file
