16.0: sync suite with en-US rev13004:f5417d9241fe (comm-beta)
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Sat, 15 Sep 2012 22:07:38 +0900
changeset 825 90942eea2d5a2ea7eb99754e5d11652251b01538
parent 824 1eaf551d1eb35c0f84e06369db7bb2f8bb037a80
child 826 4575dc7ad6f92323c3bb9453dece2d2d2e3c317b
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
16.0: sync suite with en-US rev13004:f5417d9241fe (comm-beta)
extensions/irc/chrome/chatzilla.properties
suite/chrome/common/dataman/dataman.properties
suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/chrome/common/permissions/permissionsManager.properties
suite/chrome/common/pref/pref-offlineapps.dtd
suite/chrome/common/pref/pref-scripts.dtd
suite/chrome/common/pref/preferences.dtd
suite/chrome/common/pref/prefutilities.properties
suite/chrome/mailnews/addressbook/abCardOverlay.dtd
suite/chrome/mailnews/addressbook/abCardViewOverlay.dtd
suite/chrome/mailnews/addressbook/abMainWindow.dtd
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/junkLog.dtd
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/msgHdrViewPopup.dtd
suite/chrome/mailnews/pgpmime.properties
suite/chrome/mailnews/pref/pref-offline.dtd
--- a/extensions/irc/chrome/chatzilla.properties
+++ b/extensions/irc/chrome/chatzilla.properties
@@ -1,47 +1,11 @@
-# ***** 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 ChatZilla i18n strings, english
-#
-# The Initial Developer of the Original Code is
-# Chiaki Koufugata.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Chiaki Koufugata, original author
-#   Robert Ginda, rginda@netscape.com, owner/maintainer
-#   James Ross, twpol@aol.com, pref pages code
-#   Nyozlla (Japanize)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either 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 *****
+# 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/.
 
 # (^a^) 先頭や末尾の " については http://mxr.mozilla.org/mozilla/source/extensions/venkman/locales/en-US/chrome/venkman.properties の冒頭にあるコメントを見ること。
 # bug 485692 , bug 485871 対応のため、*.accesskey を一時的にコメントアウトしています。
 
 ### Notes for localizers ###
 #
 # The following version number is the "localisation version number", and MUST
 # match the locale.version in the original locale this is based on. In other
@@ -1803,25 +1767,25 @@ pref.group.global.sounds.help          =
 pref.group.global.soundEvts.label      = 音声イベント
 pref.group.global.soundEvts.help       = クライアントイベントに音声を鳴らします。この設定では、"beep" (ビープ音) または file: URL をスペース区切りのリストにします。
 
 # These are the prefs that get grouped #
 
 pref.autoperform.label          = 自動実行
 pref.autoperform.help           = サーバに接続するたびに毎回送信するコマンドを、いちいち入力しなくても済みます。それぞれのコマンドを、"/" を付けずにパラメータとともにこのリストに追加しておけば、ChatZilla が自動的に実行します。コマンドはリストの順に実行されます。
 
-pref.autoperform.help           = このネットワークに接続した時、またはチャンネルに参加した時、ユーザのプライベートチャットを開いた時に実行するコマンドを入力してください。コマンドは記述順に実行されます。
+pref.autoperform.help           = このネットワークの接続時、またはチャンネル参加時、ユーザのプライベートチャットを開く時に実行するコマンドを入力してください。コマンドは記述順に実行されます。
 pref.autoperform.channel.label  = チャンネル
-pref.autoperform.channel.help   = チャンネルに参加した時に実行するコマンドを入力してください。
+pref.autoperform.channel.help   = チャンネル参加時に実行するコマンドを入力してください。
 pref.autoperform.client.label   = クライアント
-pref.autoperform.client.help    = ChatZilla を起動した時に実行するコマンドを入力してください。
+pref.autoperform.client.help    = ChatZilla 起動時に実行するコマンドを入力してください。
 pref.autoperform.network.label  = ネットワーク
-pref.autoperform.network.help   = ネットワークに接続した時に実行するコマンドを入力してください。
+pref.autoperform.network.help   = ネットワーク接続時に実行するコマンドを入力してください。
 pref.autoperform.user.label     = ユーザ
-pref.autoperform.user.help      = ユーザのプライベートチャットを開いた時に実行するコマンドを入力してください。
+pref.autoperform.user.help      = ユーザのプライベートチャットを開く時に実行するコマンドを入力してください。
 
 pref.networkHeader.label        = ネットワーク
 pref.networkHeader.help         = 
 pref.channelHeader.label        = チャンネル
 pref.channelHeader.help         = 
 pref.userHeader.label           = ユーザ
 pref.userHeader.help            = 
 pref.dccUserHeader.label        = DCC
--- a/suite/chrome/common/dataman/dataman.properties
+++ b/suite/chrome/common/dataman/dataman.properties
@@ -1,44 +1,11 @@
-# ***** 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 KaiRo's data manager.
-#
-# The Initial Developer of the Original Code is
-# Robert Kaiser <kairo@kairo.at>.
-# Portions created by the Initial Developer are Copyright (C) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Kaiser <kairo@kairo.at> (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either 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 *****
+# 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/.
 
 # cookies
 cookies.expireAtEndOfSession=セッションの有効期限切れ
 
 #(^m^) "Send For:" (dataman.dtd の cookies.info.sendtype.label) に表示される
 cookies.secureOnly.httponly=暗号化された接続のみ、スクリプトのアクセスなし
 cookies.secureOnly.all=暗号化された接続のみ
 cookies.anyConnection.httponly=任意の接続方式、スクリプトのアクセスなし
@@ -49,17 +16,18 @@ cookies.deleteSelectedTitle=選択した Cookie の削除
 cookies.deleteSelectedYes=削除(&R)
 
 # permissions
 perm.allowXULXBL.label=XUL/XBL マークアップの使用
 perm.cookie.label=Cookie データの保存
 perm.geo.label=位置情報の共有
 perm.image.label=画像の読み込み
 perm.install.label=アドオンのインストール
-perm.object.label=プラグインを実行
+perm.offline-app.label=オフラインの Web アプリケーション
+perm.object.label=プラグインの実行
 perm.password.label=パスワードの保存
 perm.plugins.label=プラグインの有効化
 perm.popup.label=ポップアップウィンドウを開く
 perm.script.label=スクリプトの実行
 perm.stylesheet.label=スタイルシートの読込
 
 perm.type.default=(許可設定を選択)
 
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -1,9 +1,13 @@
 <?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://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -115,22 +119,33 @@
   <li><strong>Enable Plugins for</strong>: Use these checkboxes to control how
     plugins are used:
     <ul>
       <li><strong>Suite</strong>: Globally enables or disables plugins.</li>
       <li><strong>Mail &amp; Newsgroups</strong>: Allows plugins to be used in
         Mail &amp; Newsgroups.</li>
     </ul>
   </li>
-  <li><strong>When additional plugins are required</strong>: Check this
-    checkbox if you want to be informed whenever a website requires additional
+  <li><strong>When a page requires plugins</strong>: Select these
+    checkboxes to control what &brandShortName; should do if a web page requires
     plugins:
     <ul>
-      <li><strong>Display a notification bar at the top of the content
-        area</strong>: When a website requires a plugin which is not installed,
+      <li><strong>Activate all plugins by default</strong>: If you select this,
+        &brandShortName; will load and run all plugins found on the web page.
+        Otherwise, if the page requires plugins, &brandShortName; will show a
+        notification (plugin icon in the location bar or notification bar), plus
+        a placeholder for every plugin instance found on the page (unless the
+        website is whitelisted, see below).
+        You can activate individual visible plugin instances with a left mouse
+        click or use the notification to activate all the plugins on the page.
+        From the notification you have the option to either temporarily activate
+        the plugins or remember the choice for the current website. Remembered
+        choices can be edited using the Data Manager (Permissions tab).</li>
+      <li><strong>Warn me if additional plugins need to be installed</strong>:
+        When a website requires a plugin which is not installed,
         a notification bar will be displayed above the website content area.
         From the bar you will be able to download and install the missing
         plugin.</li>
     </ul>
   </li>
 </ul>
 
 <p>For more information about plugins, see
--- a/suite/chrome/common/permissions/permissionsManager.properties
+++ b/suite/chrome/common/permissions/permissionsManager.properties
@@ -1,16 +1,24 @@
-#Translated with MozillaTranslator version 5.03
-#Thu Apr 06 23:23:35 JST 2006
+# 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/.
+
+## **help= は翻訳しない
+installpermissionstext=拡張機能や更新をインストールを許可する Web サイトを指定できます。Web サイトのアドレスを入力して、[許可] をクリックしてください。
+installpermissionstitle=許可されたサイト - ソフトウェアのインストール
 installpermissionshelp=advanced_pref_installation
-imagepermissionstext=画像を表示する Web サイトを指定できます。Web サイトのアドレスを入力して、[許可] あるいは [拒否] をクリックしてください。
-alertInvalid=%S は無効です。
-imagepermissionstitle=例外 - 画像
+popuppermissionstext=ポップアップウィンドウの表示を許可する Web サイトを指定できます。Web サイトのアドレスを入力して、[許可] をクリックしてください。
+popuppermissionstitle=許可されたサイト - ポップアップ
 popuppermissionshelp=pop_up_blocking
-canSession=受け入れるが、ブラウザ終了時にリセット
-installpermissionstitle=許可されたサイト - ソフトウェアのインストール
-cannot=拒否
+imagepermissionstext=画像の読み込みを許可する Web サイトを指定できます。Web サイトのアドレスを入力して、[許可] あるいは [拒否] をクリックしてください。
+imagepermissionstitle=例外 - 画像
 imagepermissionshelp=images-help-managing
-installpermissionstext=拡張機能や更新をインストールする Web サイトを指定できます。Web サイトのアドレスを入力して、[許可] をクリックしてください。
-popuppermissionstitle=許可されたサイト - ポップアップ
+offline-apppermissionstext=オフラインで使用するためにデータの格納を許可する Web サイトを指定できます。管理したい Web サイトのアドレスを入力して、[許可] あるいは [拒否] をクリックしてください。
+offline-apppermissionstitle=オフラインデータ
+offline-apppermissionshelp=offline_apps
+
+can=許可
+canSession=セッションの間のみ許可
+cannot=拒否
+
 alertInvalidTitle=アドレスの形式が間違っています
-popuppermissionstext=ポップアップウィンドウを表示する Web サイトを指定できます。Web サイトのアドレスを入力して、[許可] をクリックしてください。
-can=許可
+alertInvalid=%S は無効です。
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/pref-offlineapps.dtd
@@ -0,0 +1,19 @@
+<!-- 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/. -->
+
+<!--LOCALIZATION NOTE : FILE Offline Apps prefs dialog -->
+<!ENTITY pref.offlineapps.title             "オフライン Web アプリケーション">
+<!ENTITY pref.offlineCache.caption          "オフラインの Web コンテンツとユーザデータ">
+
+<!ENTITY clearOfflineAppCache.label         "消去">
+<!ENTITY clearOfflineAppCache.accesskey     "C">
+
+<!ENTITY offlineNotify.label                "Web サイトがオフラインで使用するデータの格納を求めてきたときに通知する">
+<!ENTITY offlineNotify.accesskey            "N">
+<!ENTITY offlineNotifyPermissions.label     "許可設定を管理">
+<!ENTITY offlineNotifyPermissions.accesskey "P">
+
+<!ENTITY offlineAppsList.label              "以下の Web サイトにオフラインで使用するデータの格納を許可します:">
+<!ENTITY offlineAppsListRemove.label        "データ消去...">
+<!ENTITY offlineAppsListRemove.accesskey    "d">
--- a/suite/chrome/common/pref/pref-scripts.dtd
+++ b/suite/chrome/common/pref/pref-scripts.dtd
@@ -1,8 +1,12 @@
+<!-- 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/. -->
+
 <!-- extracted from content/pref-scripts.xul -->
 
 <!--LOCALIZATION NOTE : FILE The 'Scripts & Plugins' preferences dialog -->
 <!ENTITY pref.scripts.title              "スクリプトとプラグイン">
 
 <!ENTITY navigator.label                 "ブラウザ">
 <!ENTITY navigator.accesskey             "B">
 
@@ -12,15 +16,17 @@
 <!ENTITY allowScripts.accesskey          "s">
 <!ENTITY allowWindowMoveResize.label     "ウィンドウの移動または大きさを変更する">
 <!ENTITY allowWindowFlip.label           "ウィンドウのフォーカス (前面か背面か) を切り換える">
 <!ENTITY allowWindowStatusChange.label   "ステータスバーのテキストを変更する">
 <!ENTITY allowWindowImageSrcChange.label "画像を変更する">
 <!ENTITY allowContextmenuDisable.label   "コンテキストメニューを無効化または変更する">
 <!ENTITY allowHideStatusBar.label        "ステータスバーを隠す">
 
-<!ENTITY enablePlugin.label              "プラグインを有効にする:">
+<!ENTITY enablePlugins.label             "プラグインを有効にする">
 <!ENTITY enablePluginForSuite.label      "Suite">
 <!ENTITY enablePluginForSuite.accesskey  "u">
 
-<!ENTITY whenPluginsRequired.label       "プラグインの読み込みを要求されたとき">
-<!ENTITY displayNotification.label       "コンテンツ領域の上部に通知バーを表示する">
-<!ENTITY displayNotification.accesskey   "N">
+<!ENTITY whenPageRequiresPlugins.label   "プラグインの読み込みを要求されたとき">
+<!ENTITY activateAllPlugins.label        "既定ですべてのプラグインを有効化">
+<!ENTITY activateAllPlugins.accesskey    "d">
+<!ENTITY warnPluginsRequired.label       "プラグインを追加する必要があるときは警告する">
+<!ENTITY warnPluginsRequired.accesskey   "W">
--- a/suite/chrome/common/pref/preferences.dtd
+++ b/suite/chrome/common/pref/preferences.dtd
@@ -1,8 +1,12 @@
+<!-- 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/. -->
+
 <!--LOCALIZATION NOTE (.label): Preferences categories that appear on the left of the preferences dialog -->
 <!ENTITY prefWindow.title "設定">
 <!ENTITY categoryHeader "カテゴリ">
 <!ENTITY appear.label "表示">
 <!ENTITY content.label "コンテンツ">
 <!ENTITY fonts.label "フォント">
 <!ENTITY colors.label "配色">
 <!ENTITY navigator.label "ブラウザ">
@@ -22,20 +26,20 @@
 <!ENTITY masterpass.label "マスターパスワード">
 <!ENTITY ssl.label "SSL">
 <!ENTITY certs.label "証明書">
 <!ENTITY validation.label "検証">
 <!ENTITY sync.label "Sync">
 <!ENTITY advance.label "詳細">
 <!ENTITY down.label "ダウンロード">
 <!ENTITY cache.label "キャッシュ">
+<!ENTITY offlineApps.label "オフラインアプリケーション">
 <!ENTITY proxies.label "プロキシ">
 <!ENTITY httpnetworking.label "HTTP ネットワーク">
 <!ENTITY smart.label "ソフトウェアのインストール">
 <!ENTITY download.label "ダウンロード">
 <!ENTITY keynav.label "キーボードナビゲーション">
 <!ENTITY search.label "インターネット検索">
 <!ENTITY policies.label "セキュリティポリシー">
 <!ENTITY mousewheel.label "マウスホイール">
 <!ENTITY scriptsAndWindows.label "スクリプトとプラグイン">
 <!ENTITY spellingPane.label  "スペルチェック">
-
 <!ENTITY focusSearch.key "f">
--- a/suite/chrome/common/pref/prefutilities.properties
+++ b/suite/chrome/common/pref/prefutilities.properties
@@ -1,11 +1,29 @@
+# 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/.
+
 cachefolder=キャッシュフォルダを選択
 #LOCALIZATION NOTE (%1$S) is the size and (%2$S) is the unit of disk space.
 cacheSizeInfo=現在のディスクキャッシュ量は %1$S %2$S です。
+
+# Offline apps
+appCacheSizeInfo=アプリケーションキャッシュは現在、ディスク領域を %1$S %2$S 使用しています。
+offlineAppRemoveTitle=オフライン Web サイトデータの削除
+offlineAppRemovePrompt=このデータを削除すると、%S をオフラインで利用できなくなります。この Web サイトのオフラインデータを削除してもよろしいですか?
+offlineAppRemoveConfirm=オフラインデータを削除
+
+# LOCALIZATION NOTE: The next string is for the disk usage of the
+# offline application
+#   e.g. offlineAppUsage : "50.23 MB"
+#   %1$S = size (in bytes or megabytes, ...)
+#   %2$S = unit of measure (bytes, KB, MB, ...)
+offlineAppUsage=%1$S %2$S
+
 choosehomepage=ホームページを選択
 downloadfolder=ダウンロードフォルダを選択
 desktopFolderName=デスクトップ
 downloadsFolderName=ダウンロード
 choosesound=サウンドファイルを選択
 
 SoundFiles=サウンドファイル
 
--- a/suite/chrome/mailnews/addressbook/abCardOverlay.dtd
+++ b/suite/chrome/mailnews/addressbook/abCardOverlay.dtd
@@ -1,44 +1,11 @@
-<!-- ***** 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 Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- 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 ***** -->
+<!-- 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 Contact.tab                     "連絡先">
 <!ENTITY Contact.accesskey               "C">
 <!ENTITY Name.box                        "名前">
 
 <!-- LOCALIZATION NOTE:
  NameField1, NameField2, PhoneticField1, PhoneticField2
  those fields are either LN or FN depends on the target country.
@@ -59,16 +26,18 @@
 <!ENTITY NameField1.label               "姓:">
 <!ENTITY NameField1.accesskey           "F">
 <!ENTITY NameField2.label               "名:">
 <!ENTITY NameField2.accesskey           "L">
 <!ENTITY PhoneticField1.label           "よみがな:">
 <!ENTITY PhoneticField2.label           "よみがな:">
 <!ENTITY DisplayName.label              "表示名:">
 <!ENTITY DisplayName.accesskey          "D">
+<!ENTITY preferDisplayName.label        "メッセージヘッダでは常に表示名を優先する">
+<!ENTITY preferDisplayName.accesskey    "A">
 <!ENTITY NickName.label                 "ニックネーム:">
 <!ENTITY NickName.accesskey             "N">
 
 <!ENTITY PrimaryEmail.label             "メールアドレス:">
 <!ENTITY PrimaryEmail.accesskey         "E">
 <!ENTITY SecondEmail.label              "別のメールアドレス:">
 <!ENTITY SecondEmail.accesskey          "i">
 <!ENTITY PreferMailFormat.label         "使用メール形式:">
@@ -92,17 +61,17 @@
 <!ENTITY PagerNumber.label              "ポケットベル:">
 <!ENTITY PagerNumber.accesskey          "g">
 <!ENTITY CellularNumber.label           "携帯電話:">
 <!ENTITY CellularNumber.accesskey       "b">
 
 <!ENTITY Home.tab                       "自宅">
 <!ENTITY Home.accesskey                 "P">
 <!ENTITY HomeAddress.label              "番地:">
-<!ENTITY HomeAddress.accesskey          "A">
+<!ENTITY HomeAddress.accesskey          "d">
 <!ENTITY HomeAddress2.label             "">
 <!ENTITY HomeAddress2.accesskey         "">
 <!ENTITY HomeCity.label                 "市区町村:">
 <!ENTITY HomeCity.accesskey             "y">
 <!ENTITY HomeState.label                "都道府県:">
 <!ENTITY HomeState.accesskey            "S">
 <!ENTITY HomeZipCode.label              "郵便番号:">
 <!ENTITY HomeZipCode.accesskey          "Z">
@@ -122,17 +91,17 @@
 <!ENTITY Work.accesskey                 "W">
 <!ENTITY JobTitle.label                 "役職:">
 <!ENTITY JobTitle.accesskey             "i">
 <!ENTITY Department.label               "部門:">
 <!ENTITY Department.accesskey           "m">
 <!ENTITY Company.label                  "組織:">
 <!ENTITY Company.accesskey              "n">
 <!ENTITY WorkAddress.label              "番地:">
-<!ENTITY WorkAddress.accesskey          "A">
+<!ENTITY WorkAddress.accesskey          "d">
 <!ENTITY WorkAddress2.label             "">
 <!ENTITY WorkAddress2.accesskey         "">
 <!ENTITY WorkCity.label                 "市区町村:">
 <!ENTITY WorkCity.accesskey             "y">
 <!ENTITY WorkState.label                "都道府県:">
 <!ENTITY WorkState.accesskey            "S">
 <!ENTITY WorkZipCode.label              "郵便番号:">
 <!ENTITY WorkZipCode.accesskey          "Z">
deleted file mode 100644
--- a/suite/chrome/mailnews/addressbook/abCardViewOverlay.dtd
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- ***** 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 Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either 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 ***** -->
-
-<!-- Box Headings -->
-<!ENTITY contact.heading             "連絡先">
-<!ENTITY home.heading                "自宅">
-<!ENTITY other.heading               "その他">
-<!ENTITY phone.heading               "電話番号">
-<!ENTITY work.heading                "勤務先">
-<!-- Special Box Headings, for mailing lists -->
-<!ENTITY description.heading         "説明">
-<!ENTITY addresses.heading           "メールアドレス">
-<!-- For Map It! -->
-<!ENTITY mapItButton.label           "地図">
-<!ENTITY mapIt.tooltip               "Web でこの場所の地図を表示します">
--- a/suite/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/suite/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -1,44 +1,11 @@
-<!-- ***** 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 Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- 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 ***** -->
+<!-- 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/. -->
 
 <!-- Title -->
 <!ENTITY addressbookWindow.title                        "アドレス帳">
 
 <!-- Menus:  the . means that the menu item isn't implemented yet -->
 
 <!-- File Menu -->
 <!ENTITY newContact.label                               "連絡先...">
@@ -76,20 +43,22 @@
 <!ENTITY propertiesCmd.label                            "プロパティ...">
 <!-- LOCALIZATION NOTE (propertiesCmd.accesskey) : DONT_TRANSLATE -->
 <!ENTITY propertiesCmd.accesskey                        "i">
 <!ENTITY propertiesCmd.key                              "i">
 
 <!-- View Menu -->
 <!ENTITY showAbToolbarCmd.label                         "アドレス帳ツールバー">
 <!ENTITY showAbToolbarCmd.accesskey                     "o">
-
-<!ENTITY showCardPane.label                             "連絡先要約ペイン">
-<!ENTITY showCardPane.accesskey                         "C">
-
+<!ENTITY layoutMenu.label                               "レイアウト">
+<!ENTITY layoutMenu.accesskey                           "L">
+<!ENTITY showDirectoryPane.label                        "アドレス帳ペイン">
+<!ENTITY showDirectoryPane.accesskey                    "D">
+<!ENTITY showContactPane2.label                         "連絡先ペイン">
+<!ENTITY showContactPane2.accesskey                     "C">
 <!ENTITY menu_ShowNameAs.label                          "名前の表示">
 <!ENTITY menu_ShowNameAs.accesskey                      "n">
 <!ENTITY firstLastCmd.label                             "名前 姓">
 <!ENTITY firstLastCmd.accesskey                         "f">
 <!ENTITY lastFirstCmd.label                             "姓 名前">
 <!ENTITY lastFirstCmd.accesskey                         "l">
 <!ENTITY displayNameCmd.label                           "表示名">
 <!ENTITY displayNameCmd.accesskey                       "d">
@@ -125,14 +94,28 @@
 <!ENTITY newIM.tooltip                                  "インスタントメッセージを送信またはチャットをします">
 <!ENTITY deleteItemButton.tooltip                       "選択した連絡先またはアドレス帳を削除します">
 <!ENTITY throbber.tooltip                               "&vendorShortName; ホームページを表示します">
 <!ENTITY advancedButton.tooltip                         "アドレスを検索します">
 
 <!-- Dir Tree header -->
 <!ENTITY dirTreeHeader.label                            "アドレス帳">
 
+<!-- Card Summary Pane -->
+<!-- Box Headings -->
+<!ENTITY contact.heading                                "連絡先">
+<!ENTITY home.heading                                   "自宅">
+<!ENTITY other.heading                                  "その他">
+<!ENTITY phone.heading                                  "電話番号">
+<!ENTITY work.heading                                   "勤務先">
+<!-- Special Box Headings, for mailing lists -->
+<!ENTITY description.heading                            "説明">
+<!ENTITY addresses.heading                              "メールアドレス">
+<!-- For Map It! -->
+<!ENTITY mapItButton.label                              "地図">
+<!ENTITY mapIt.tooltip                                  "Web でこの場所の地図を表示します">
+
 <!-- Status Bar -->  
 <!ENTITY statusText.label                               "">
 
 <!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
 <!ENTITY  hideSwapFnLnUI                                "false">
--- a/suite/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/chrome/mailnews/compose/messengercompose.dtd
@@ -1,8 +1,12 @@
+<!-- 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/. -->
+
 <!--LOCALIZATION NOTE messengercompose.dtd Main UI for message composition -->
 <!ENTITY msgComposeWindow.title "作成: (件名なし)">
 
 <!ENTITY fromAddr.label "差出人:">
 <!ENTITY fromAddr.accesskey "r">
 <!ENTITY subject.label  "件名:">
 <!ENTITY subject.accesskey "S">
 <!ENTITY attachments.label "添付:">
@@ -74,16 +78,19 @@
 <!ENTITY normalPriorityCmd.accesskey "n">
 <!ENTITY highPriorityCmd.label "高">
 <!ENTITY highPriorityCmd.accesskey "i">
 <!ENTITY highestPriorityCmd.label "最高">
 <!ENTITY highestPriorityCmd.accesskey "H">
 
 <!ENTITY returnReceiptMenu.label "開封確認の返送を求める">
 <!ENTITY returnReceiptMenu.accesskey "t">
+<!ENTITY dsnMenu.label "配信状態通知の返送を求める">
+<!ENTITY dsnMenu.accesskey "N">
+
 <!ENTITY outputFormatMenu.label "送信形式">
 <!ENTITY outputFormatMenu.accesskey  "f">
 <!ENTITY autoFormatCmd.label "自動判別">
 <!ENTITY autoFormatCmd.accesskey "a">
 <!ENTITY plainTextFormatCmd.label "プレーンテキスト">
 <!ENTITY plainTextFormatCmd.accesskey "p">
 <!ENTITY htmlFormatCmd.label "リッチテキスト (HTML) のみ">
 <!ENTITY htmlFormatCmd.accesskey "r">
--- a/suite/chrome/mailnews/junkLog.dtd
+++ b/suite/chrome/mailnews/junkLog.dtd
@@ -1,45 +1,10 @@
-<!-- ***** 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 Communicator.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Seth Spitzer <sspitzer@netscape.com>
-   -   Mark Banner <mark@standard8.demon.co.uk>
-   -   Scott MacGregor <mscott@mozilla.org> (original Thunderbird parts)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either 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 LGPL or the GPL. 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 ***** -->
+<!-- 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 junkLog.title "迷惑メールログ">
-<!ENTITY junkLogInfo.label "迷惑メールフィルタの動作を記録したログ。">
+<!ENTITY adaptiveJunkLog.title "迷惑メールログ"><!-- en-US: "Adaptive Junk Mail Log" -->
+<!ENTITY adaptiveJunkLogInfo.label "迷惑メール適応フィルタの動作を記録したログです。">
 <!ENTITY clearLog.label "ログを消去">
 <!ENTITY clearLog.accesskey "C">
 <!ENTITY closeLog.label "閉じる">
 <!ENTITY closeLog.accesskey "o">
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -1,47 +1,11 @@
-<!-- ***** 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 Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-    Karsten Düsterloh <mnyromyr@tprac.de>
-    Jeremy Morton <bugzilla@game-point.net>
-    Ian Neal <iann_bugzilla@blueyonder.co.uk>
-
- 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 ***** -->
+<!-- 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 messengerWindow.title                 "メールとニュースグループ">
 <!ENTITY titleModifier.label                   "&brandShortName;">
 <!ENTITY titleSeparator.label                  " - ">
 
 <!-- tabmail -->
 <!ENTITY tabmailClose.label                    "タブを閉じる">
 <!ENTITY tabmailClose.tooltip                  "タブを閉じます">
@@ -571,11 +535,12 @@
 <!ENTITY remoteContentMessage.label       "プライバシー保護のため、このメッセージ内のリモートコンテンツをブロックしました。">
 <!ENTITY loadRemoteContentButton.label    "リモートコンテンツを表示">
 
 <!-- Phishing Bar -->
 <!ENTITY phishingBarMessage.label         "このメールは詐欺メールの可能性があります。">
 <!ENTITY removePhishingBarButton.label    "詐欺メールではありません">
 
 <!-- MDN Bar -->
-<!ENTITY mdnBarMessage.label              "送信者はこのメッセージの開封確認を送付するように求めています。送信者に開封確認を送付してもよろしいですか?">
 <!ENTITY mdnBarIgnoreButton.label         "無視する">
+<!ENTITY mdnBarIgnoreButton.accesskey     "I">
 <!ENTITY mdnBarSendButton.label           "開封確認を送付する">
+<!ENTITY mdnBarSendButton.accesskey       "S">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -1,46 +1,11 @@
-# ***** 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):
-#   Seth Spitzer <sspitzer@netscape.com>
-#   Lorenzo Colitti <lorenzo@colitti.com>
-#   Karsten Düsterloh <mnyromyr@tprac.de>
-#
-# 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 *****
+# 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/.
 
 # The following are used by the messenger application
 renameFolder=フォルダの名前変更...
 compactFolder=このフォルダを最適化
 removeAccount=アカウントの削除...
 removeFolder=フォルダの削除
 newFolderMenuItem=フォルダ...
 newSubfolderMenuItem=サブフォルダ...
@@ -414,16 +379,21 @@ confirmPhishingTitle=詐欺メールの警告
 #LOCALIZATION NOTE %1$S is the brand name, %2$S is the host name of the url being visited
 # (^^; %1$0.S is a special replacement to generate nothing for %1$S without error
 confirmPhishingUrl1=%1$0.S不審なサイトを開こうとしています。このサイトは別のサイトになりすましている可能性があります。多くの正当なサイトは URL に数値 (IP アドレス) の代わりにドメイン名を使用しています。%2$S を開いてもよろしいですか?
 confirmPhishingUrl2=%1$0.S不審なサイトを開こうとしています。このサイトは別のサイトになりすましている可能性があります。%2$S を開いてもよろしいですか?
 
 #LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
 alwaysLoadRemoteContentForSender=%1$S からのメールで常にリモートコンテンツを読み込むには、ここをクリックしてください。
 
+#LOCALIZATION NOTE(mdnBarMessageNormal) %1$S is the name of the sender
+mdnBarMessageNormal=%1$S がこのメッセージの開封確認を送付するように求めています。
+#LOCALIZATION NOTE(mdnBarMessageAddressDiffers) %1$S is the name of the sender, %2$S is the address(es) to send return receipt to
+mdnBarMessageAddressDiffers=%1$S がこのメッセージの開封確認を %2$S に送付するように求めています。
+
 # Strings for growl notifications on Mac OS X
 growlNotification=新着メール
 
 # mailCommands.js
 emptyJunkTitle=確認
 emptyJunkMessage=迷惑メールフォルダから削除されたメッセージおよびサブフォルダは一切元に戻せません。本当に削除してもよろしいですか?
 emptyJunkDontAsk=次回からは確認しない
 emptyTrashTitle=確認
--- a/suite/chrome/mailnews/msgHdrViewPopup.dtd
+++ b/suite/chrome/mailnews/msgHdrViewPopup.dtd
@@ -1,48 +1,19 @@
-<!-- ***** 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 Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- 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 ***** -->
+<!-- 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/. -->
 
 <!-- Message Header View Popup -->
 <!ENTITY AddToAddressBook.label            "アドレス帳に追加...">
 <!ENTITY AddToAddressBook.accesskey        "B">
+<!ENTITY EditContact.label                 "連絡先を編集...">
+<!ENTITY EditContact.accesskey             "E">
+<!ENTITY ViewContact.label                 "連絡先を表示">
+<!ENTITY ViewContact.accesskey             "V">
 <!ENTITY SendMailTo.label                  "メッセージを作成...">
 <!ENTITY SendMailTo.accesskey              "s">
 <!ENTITY CopyEmailAddress.label            "メールアドレスをコピー">
 <!ENTITY CopyEmailAddress.accesskey        "C">
 <!ENTITY CreateFilterFrom.label            "フィルタを作成...">
 <!ENTITY CreateFilterFrom.accesskey        "F">
 <!ENTITY openInBrowser.label               "ブラウザで開く">
 <!ENTITY openInBrowser.accesskey           "O">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/pgpmime.properties
@@ -0,0 +1,13 @@
+# 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/.
+
+#
+# The following are used by the pgpmime content type handler
+#
+
+# LOCALIZATION NOTE(pgpMimeNeedsAddon): The text can contain HTML tags.
+# %S is the url to Enigmail on AMO supplied from preferences.
+pgpMimeNeedsAddon	=これは暗号化された OpenPGP メッセージです。<br>このメールを復号するには <a href="%S">OpenPGP アドオン</a> をインストールする必要があります。
+## (^m^) リンク先設定 mail.pgpmime.addon_url
+
--- a/suite/chrome/mailnews/pref/pref-offline.dtd
+++ b/suite/chrome/mailnews/pref/pref-offline.dtd
@@ -1,8 +1,12 @@
+<!-- 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/. -->
+
 <!-- extracted from content/pref-offline.xul -->
 
 <!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
 <!ENTITY pref.network.title               "ネットワークとディスク領域">
 <!ENTITY pref.offline.caption             "オフライン">
 <!ENTITY textStartUp                      "起動したとき:">
 <!ENTITY textStartUp.accesskey            "W">
 <!ENTITY menuitemRememberPrevState        "前回終了時と同じ">
@@ -24,11 +28,11 @@
 <!ENTITY radioNotDownload.accesskey       "o">
 <!ENTITY radioAskDownload                 "確認する">
 <!ENTITY radioAskDownload.accesskey       "k">
 <!ENTITY mailConnections.caption          "メールの接続">
 <!ENTITY mailnewsTimeout.label            "以下の秒数を経過した場合、接続をタイムアウトと判定します:">
 <!ENTITY mailnewsTimeout.accesskey        "m">
 <!ENTITY mailnewsTimeoutSeconds.label     "秒">
 <!ENTITY Diskspace                        "ディスク領域">
-<!ENTITY offlineCompact.label             "ディスク領域を"><!-- en-US: "Compact folders when it will save over" -->
-<!ENTITY offlineCompact.accesskey         "C">
-<!ENTITY mb.label                         "MB 以上節約できる場合は最適化する"><!-- en-US: "MB" -->
+<!ENTITY offlineCompactFolders.label      "ディスク領域を合計"><!-- offlineCompactFolders.label [ ] offlineCompactFoldersMB.label -->
+<!ENTITY offlineCompactFolders.accesskey  "C">
+<!ENTITY offlineCompactFoldersMB.label    "MB 以上節約できるときはフォルダを最適化する">