17.0: sync mail with en-US rev12140:d3a7e5bec562
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Sun, 30 Sep 2012 18:10:01 +0900
changeset 838 940f35292706009b0001bd666172a1ea75410d16
parent 837 bfbe43b895907ea70d44ac74b2a8493ce4511226
child 839 96a5e3fd954928556bce4c058ac793b050a932cf
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs17
17.0: sync mail with en-US rev12140:d3a7e5bec562
mail/chrome/communicator/utilityOverlay.dtd
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/am-addressing.dtd
mail/chrome/messenger/am-copies.dtd
mail/chrome/messenger/am-mdn.dtd
mail/chrome/messenger/cloudfile/Box/auth.dtd
mail/chrome/messenger/cloudfile/Box/settings.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/messengercompose/sendProgress.dtd
mail/chrome/messenger/messengercompose/sendProgress.properties
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/preferences/display.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/sanitize.dtd
mail/chrome/messenger/searchTermOverlay.dtd
--- a/mail/chrome/communicator/utilityOverlay.dtd
+++ b/mail/chrome/communicator/utilityOverlay.dtd
@@ -2,62 +2,62 @@
    - 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/. -->
 
 <!-- these things need to move into utilityOverlay.xul -->
 
 <!-- LOCALIZATION NOTE : FILE This file contains the global menu items -->
 
 <!ENTITY fileMenu.label			"ファイル">
-<!ENTITY fileMenu.accesskey		"f">
+<!ENTITY fileMenu.accesskey		"F">
 <!ENTITY newMenu.label			"新規作成">
 <!ENTITY newMenu.accesskey		"N">
 
 <!ENTITY editMenu.label			"編集">
-<!ENTITY editMenu.accesskey		"e">
+<!ENTITY editMenu.accesskey		"E">
 <!ENTITY undoCmd.label			"元に戻す">
 <!ENTITY undoCmd.key			"Z">
-<!ENTITY undoCmd.accesskey		"u">
+<!ENTITY undoCmd.accesskey		"U">
 <!ENTITY redoCmd.label			"やり直し">
 <!ENTITY redoCmd.key			"Y">
-<!ENTITY redoCmd.accesskey		"r">
+<!ENTITY redoCmd.accesskey		"R">
 <!ENTITY cutCmd.label			"切り取り">
 <!ENTITY cutCmd.key			"X">
 <!ENTITY cutCmd.accesskey		"t">
 <!ENTITY copyCmd.label			"コピー">
 <!ENTITY copyCmd.key			"C">
-<!ENTITY copyCmd.accesskey		"c">
+<!ENTITY copyCmd.accesskey		"C">
 <!ENTITY pasteCmd.label			"貼り付け">
 <!ENTITY pasteCmd.key			"V">
-<!ENTITY pasteCmd.accesskey		"p">
+<!ENTITY pasteCmd.accesskey		"P">
 <!ENTITY deleteCmd.label		"削除">
-<!ENTITY deleteCmd.accesskey		"d">
+<!ENTITY deleteCmd.accesskey		"D">
 <!ENTITY selectAllCmd.label		"すべて選択">
 <!ENTITY selectAllCmd.key		"A">
-<!ENTITY selectAllCmd.accesskey		"a">
+<!ENTITY selectAllCmd.accesskey		"A">
 <!ENTITY preferencesCmd.label		"オプション...">
 <!ENTITY preferencesCmd.accesskey	"O">
 <!ENTITY preferencesCmdUnix.label	"設定">
 <!ENTITY preferencesCmdUnix.accesskey	"n">
 
 <!ENTITY viewMenu.label			"表示">
-<!ENTITY viewMenu.accesskey		"v">
+<!ENTITY viewMenu.accesskey		"V">
 <!ENTITY viewToolbarsMenu.label		"ツールバー">
 <!ENTITY viewToolbarsMenu.accesskey	"T">
 <!ENTITY showTaskbarCmd.label		"ステータスバー">
 <!ENTITY showTaskbarCmd.accesskey	"u">
 
 <!ENTITY proxy.label			"プロキシ設定...">
 <!ENTITY proxy.accesskey		"C">
 
 <!ENTITY closeCmd.label			"閉じる">
 <!ENTITY closeCmd.key			"W">
-<!ENTITY closeCmd.accesskey		"c">
+<!ENTITY closeCmd.accesskey		"C">
 
 <!ENTITY quitApplicationCmd.label	"終了">
 <!ENTITY quitApplicationCmd.key		"Q">
 <!ENTITY quitApplicationCmd.accesskey	"x">
 
 <!ENTITY quitApplicationCmdUnix.label	"終了">
-<!ENTITY quitApplicationCmdUnix.accesskey	"q">
+<!ENTITY quitApplicationCmdUnix.accesskey	"Q">
 
 <!ENTITY quitApplicationCmdMac.label		"&brandShortName; を終了">
-<!ENTITY quitApplicationCmdMac.accesskey	"q">
+<!ENTITY quitApplicationCmdMac.accesskey	"Q">
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -43,8 +43,17 @@
 <!ENTITY fetchFromPOP.label		"POP サーバから本文を取得する">
 <!ENTITY ignoreThread.label		"スレッドを無視する">
 <!ENTITY ignoreSubthread.label		"サブスレッドを無視する">
 <!ENTITY watchThread.label		"注目スレッドに設定する"><!-- (^^; 要チェック -->
 <!ENTITY stopExecution.label		"フィルタの実行を中止する">
 
 <!ENTITY addAction.tooltip		"新しい動作を追加します">
 <!ENTITY removeAction.tooltip		"この動作を削除します">
+
+<!-- LOCALIZATION NOTE
+  The values below are used to control the widths of the filter action widgets.
+  Change the values only when the localized strings in the popup menus
+  are truncated in the widgets.
+ -->
+<!-- Bug 743974 参照 -->
+<!ENTITY filterActionTypeFlexValue	"1">
+<!ENTITY filterActionTargetFlexValue	"4">
--- a/mail/chrome/messenger/FilterListDialog.dtd
+++ b/mail/chrome/messenger/FilterListDialog.dtd
@@ -6,28 +6,35 @@
 <!ENTITY nameColumn.label		"フィルタ名">
 <!ENTITY activeColumn.label		"有効">
 <!ENTITY newButton.label		"新規...">
 <!ENTITY newButton.accesskey		"N">
 <!ENTITY editButton.label		"編集...">
 <!ENTITY editButton.accesskey		"E">
 <!ENTITY deleteButton.label		"削除">
 <!ENTITY deleteButton.accesskey		"t">
-<!ENTITY reorderUpButton.label		"上に移動">
+<!ENTITY reorderTopButton		"一番上へ移動">
+<!ENTITY reorderTopButton.accessKey	"o">
+<!ENTITY reorderTopButton.toolTip	"フィルタを並べ替えて一番最初に実行します">
+<!ENTITY reorderUpButton.label		"上へ移動">
 <!ENTITY reorderUpButton.accesskey	"U">
-<!ENTITY reorderDownButton.label	"下に移動">
+<!ENTITY reorderDownButton.label	"下へ移動">
 <!ENTITY reorderDownButton.accesskey	"D">
+<!ENTITY reorderBottomButton		"一番下へ移動">
+<!ENTITY reorderBottomButton.accessKey	"B">
+<!ENTITY reorderBottomButton.toolTip	"フィルタを並べ替えて一番最後に実行します">
 <!ENTITY filterHeader.label		"自動的にこれらのフィルタが上から順に評価されます。">
 <!ENTITY filtersForPrefix.label		"対象アカウント:">
 <!ENTITY filtersForPrefix.accesskey	"F">
 <!ENTITY viewLogButton.label		"フィルタログ">
 <!ENTITY viewLogButton.accesskey	"L">
 <!ENTITY runFilters.label		"今すぐ実行">
 <!ENTITY runFilters.accesskey		"R">
 <!ENTITY stopFilters.label		"停止">
 <!ENTITY stopFilters.accesskey		"S">
 <!ENTITY folderPickerPrefix.label	"フィルタを使用するフォルダ:">
 <!ENTITY folderPickerPrefix.accesskey	"c">
 <!ENTITY choosethis.label		"このフォルダを選択">
 <!ENTITY choosethisnewsserver.label	"このニュースサーバを選択">
 <!ENTITY helpButton.label		"Help">
 <!ENTITY helpButton.accesskey		"H">
-<!ENTITY closeCmd.key			"W"> 
+<!ENTITY closeCmd.key			"W">
+<!ENTITY searchBox.emptyText		"フィルタ名を検索...">
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -51,15 +51,17 @@
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 <!ENTITY update.downloading.start	"更新をダウンロード中 — ">
 <!ENTITY update.downloading.end		"">
 
+<!ENTITY update.applying		"更新を適用中...">
+
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
 <!ENTITY channel.description.start	"現在の更新チャンネルは ">
 <!ENTITY channel.description.end	" です。">
 
 <!ENTITY cmdCloseMac.commandKey		"w">
--- a/mail/chrome/messenger/am-addressing.dtd
+++ b/mail/chrome/messenger/am-addressing.dtd
@@ -31,11 +31,11 @@
 <!ENTITY aboveQuote.label		"引用部の上">
 <!ENTITY belowQuote.label		"引用部の下">
 <!ENTITY selectAndQuote.label		"引用部を選択">
 <!ENTITY place.label			"署名を挿入する位置:">
 <!ENTITY place.accesskey		"s">
 <!ENTITY belowText.label		"引用部の下 (推奨)">
 <!ENTITY aboveText.label		"返信部の下 (引用部の上)">
 <!ENTITY includeSigOnReply.label	"返信メッセージに自分の署名を挿入する">
-<!ENTITY includeSigOnReply.accesskey	"s">
+<!ENTITY includeSigOnReply.accesskey	"I">
 <!ENTITY includeSigOnForward.label	"転送メッセージに自分の署名を挿入する">
 <!ENTITY includeSigOnForward.accesskey	"w">
--- a/mail/chrome/messenger/am-copies.dtd
+++ b/mail/chrome/messenger/am-copies.dtd
@@ -1,20 +1,20 @@
 <!-- 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 am-copies.xul -->
 
-<!ENTITY copyAndFolderTitle.label	"送信控えと特別なフォルダ"><!-- (^^; Copies &amp; Folders -->
+<!ENTITY copyAndFolderTitle.label	"送信控えと特別なフォルダ"><!-- en-US: "Copies &amp; Folders" -->
 <!ENTITY sendingPrefix.label		"送信控え">
 <!ENTITY fccMailFolder.label		"メッセージ送信時に自動的にコピーを作成する">
 <!ENTITY fccMailFolder.accesskey	"P">
 <!ENTITY fccReplyFollowsParent.label	"返信元のメッセージと同じフォルダに返信を保存する">
-<!ENTITY fccReplyFollowsParent.accesskey "c">
+<!ENTITY fccReplyFollowsParent.accesskey	"R">
 <!-- LOCALIZATION NOTE (ccAddress.label): do not translate "Cc" in below line -->
 <!ENTITY ccAddress.label		"次のメールアドレスを Cc に追加する:">
 <!ENTITY ccAddress.accesskey		"C">
 <!ENTITY ccAddressList.placeholder 	"カンマ区切りで複数入力できます">
 <!-- LOCALIZATION NOTE (bccAddress.label): do not translate "Bcc" in below line -->
 <!ENTITY bccAddress.label		"次のメールアドレスを Bcc に追加する:">
 <!ENTITY bccAddress.accesskey		"B">
 <!ENTITY bccAddressList.placeholder	"カンマ区切りで複数入力できます">
--- a/mail/chrome/messenger/am-mdn.dtd
+++ b/mail/chrome/messenger/am-mdn.dtd
@@ -1,15 +1,17 @@
 <!-- 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 pane.title			"開封確認">
 <!ENTITY useGlobalPrefs.label		"このアカウントでは共通の開封確認設定に従う">
 <!ENTITY useGlobalPrefs.accesskey	"U">
+<!ENTITY globalReceipts.label		"共通の開封確認設定...">
+<!ENTITY globalReceipts.accesskey	"G">
 <!ENTITY useCustomPrefs.label		"このアカウントでは開封確認の設定を個別に指定する">
 <!ENTITY useCustomPrefs.accesskey	"C">
 <!ENTITY requestReceipt.label		"送信メッセージについて、毎回開封確認の返送を求める">
 <!ENTITY requestReceipt.accesskey	"W">
 <!ENTITY receiptArrive.label		"開封確認が届いたとき:">
 <!ENTITY leaveIt.label			"受信トレイに残す">
 <!ENTITY leaveIt.accesskey		"I">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
--- a/mail/chrome/messenger/cloudfile/Box/auth.dtd
+++ b/mail/chrome/messenger/cloudfile/Box/auth.dtd
@@ -1,5 +1,6 @@
 <!-- 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/.  -->
 
+<!-- Note to localizers, Box is a brand from box.com -->
 <!ENTITY auth.title	"Box 認証">
--- a/mail/chrome/messenger/cloudfile/Box/settings.dtd
+++ b/mail/chrome/messenger/cloudfile/Box/settings.dtd
@@ -1,5 +1,6 @@
 <!-- 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/.  -->
 
+<!-- Note to localizers, Box is a brand from box.com -->
 <!ENTITY boxSettings.needAnAccount	"Box アカウントを取得...">
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -20,16 +20,21 @@ promptTitle			= フィルタ処理をしています
 promptMsg			= メッセージのフィルタ処理を実行中です。\nフィルタの評価を続けますか?
 stopButtonLabel			= 停止
 continueButtonLabel		= 継続
 # (^^; 表現変更 This filter was probably created by future version of mozilla/netscape. You cannot enable this filter because we don't know how to apply it.
 cannotEnableFilter		= このフィルタはご利用のバージョンのソフトウェアでサポートされていないため、有効にすることができません。
 dontWarnAboutDeleteCheckbox	= 次回からは確認しない
 searchTermsInvalidTitle		= 無効な検索条件
 searchTermsInvalidMessage	= 無効な検索条件が含まれているためフィルタを保存できません。
+filterCountVisibleOfTotal	= %1$S / %2$S
+## LOCALIZATION NOTE(filterCountItems): Semi-colon list of plural forms.
+## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## #1 is the count of items in the list.# filterCountItems is a pluralForm - see 
+filterCountItems		= #1 項目
 
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
 junkLogDetectStr		= 迷惑メールを検出しました。差出人: %1$S 題名: %2$S 日時: %3$S
 # LOCALIZATION NOTE(logMoveStr)
 # %1$S=message id, %2$S=folder URI
 logMoveStr			= メッセージを移動しました。メッセージ ID: %1$S 移動先: %2$S
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -60,8 +60,15 @@
 <!ENTITY privileges.button.accesskey		"P">
 <!ENTITY permissionsDesc.label			"以下のアクセス権限があります:">
 <!ENTITY folderType.label			"フォルダの種類:">
 
 <!ENTITY folderQuotaTab.label			"クォータ"><!-- (^^; RFC 2087 -->
 <!ENTITY folderQuotaRoot.label			"クォータルート:">
 <!ENTITY folderQuotaUsage.label			"使用容量:">
 <!ENTITY folderQuotaStatus.label		"状態割合:">
+
+<!ENTITY numberOfMessages.label			"メッセージ数:">
+<!-- LOCALIZATION NOTE: When the number of messages can't be determined, this string is displayed as the number -->
+<!ENTITY numberUnknown.label			"不明">
+<!ENTITY sizeOnDisk.label			"ディスク上のサイズ:">
+<!-- LOCALIZATION NOTE: When the size can't be determined, this string is displayed as the size -->
+<!ENTITY sizeUnknown.label			"不明">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -89,18 +89,16 @@
 <!ENTITY printSetupCmd.label			"ページ設定...">
 <!ENTITY printSetupCmd.accesskey		"u">
 
 <!-- Edit Menu -->
 <!ENTITY deleteMsgCmd.label			"メッセージを削除">
 <!ENTITY deleteMsgCmd.accesskey			"D">
 <!ENTITY undeleteMsgCmd.label			"メッセージを削除しない">
 <!ENTITY undeleteMsgCmd.accesskey		"d">
-<!ENTITY cancelNewsMsgCmd.label			"メッセージをキャンセル">
-<!ENTITY cancelNewsMsgCmd.accesskey		"M">
 <!ENTITY deleteMsgsCmd.label			"選択したメッセージを削除">
 <!ENTITY deleteMsgsCmd.accesskey		"D">
 <!ENTITY undeleteMsgsCmd.label			"選択したメッセージを削除しない">
 <!ENTITY undeleteMsgsCmd.accesskey		"d">
 <!ENTITY deleteFolderCmd.label			"フォルダを削除">
 <!ENTITY deleteFolderCmd.accesskey		"D">
 <!ENTITY unsubscribeNewsgroupCmd.label		"購読を解除">
 <!ENTITY unsubscribeNewsgroupCmd.accesskey	"b">
@@ -357,16 +355,18 @@ you can use these alternative items. Oth
 <!ENTITY msgMenu.accesskey		"M">
 <!ENTITY newMsgCmd.label		"新しいメッセージ">
 <!ENTITY newMsgCmd.accesskey		"N">
 <!ENTITY newNewMsgCmd.label		"メッセージ">
 <!ENTITY newNewMsgCmd.accesskey		"M">
 <!ENTITY archiveMsgCmd.label		"アーカイブ">
 <!ENTITY archiveMsgCmd.accesskey	"A">
 <!ENTITY archiveMsgCmd.key		"a">
+<!ENTITY cancelNewsMsgCmd.label		"メッセージをキャンセル">
+<!ENTITY cancelNewsMsgCmd.accesskey	"C">
 <!ENTITY replyMsgCmd.label		"返信">
 <!ENTITY replyMsgCmd.accesskey		"R">
 <!ENTITY replyMsgCmd.key		"r">
 <!ENTITY replySenderCmd.label		"送信者にだけ返信">
 <!ENTITY replySenderCmd.accesskey	"R">
 <!-- (^m^) 下の contextReplyNewsgroup2.label も同じ -->
 <!ENTITY replyNewsgroupCmd2.label	"ニュースグループをフォローアップ">
 <!ENTITY replyNewsgroupCmd2.accesskey	"u">
@@ -505,16 +505,18 @@ you can use these alternative items. Oth
 <!ENTITY runJunkControls.accesskey	"C">
 <!ENTITY deleteJunk.label		"迷惑メールとマークされたメールを削除">
 <!ENTITY deleteJunk.accesskey		"D">
 <!ENTITY importCmd.label		"設定とデータのインポート...">
 <!ENTITY importCmd.accesskey		"m">
 <!ENTITY errorConsoleCmd.label		"エラーコンソール">
 <!ENTITY errorConsoleCmd.accesskey	"E">
 <!ENTITY errorConsoleCmd.commandkey	"j">
+<!ENTITY clearRecentHistory.label	"最近の履歴を消去...">
+<!ENTITY clearRecentHistory.accesskey	"H">
 <!ENTITY accountManagerCmd.label	"アカウント設定...">
 <!ENTITY accountManagerCmd.accesskey	"S">
 <!-- LOCALIZATION NOTE (accountManagerCmdUnix.accesskey): belongs to accountManagerCmd.label,
         which is placed under the Edit menu on Unix systems -->
 <!ENTITY accountManagerCmdUnix.accesskey	"A">
 
 <!-- Mail Toolbar -->
 <!ENTITY getMsgButton.label		"受信">
@@ -546,16 +548,17 @@ you can use these alternative items. Oth
 <!ENTITY addressBookButton.label	"アドレス帳">
 <!ENTITY chatButton.label		"チャット">
 <!ENTITY glodaSearch.title		"グローバル検索">
 <!ENTITY searchItem.title		"簡易検索">
 <!ENTITY mailViewsToolbarItem.title	"絞り込みバー">
 <!ENTITY folderLocationToolbarItem.title "フォルダバー">
 <!ENTITY tagButton.label		"タグ">
 <!ENTITY compactButton.label		"最適化">
+<!ENTITY appmenuButton.label		"アプリメニュー">
 
 <!-- Mail Toolbar Tooltips -->
 <!ENTITY advancedButton.tooltip		"メッセージを詳細に検索します">
 <!ENTITY getMsgButton.tooltip		"メッセージを受信します">
 <!ENTITY getAllNewMsgCmd.label		"新着メッセージをすべて受信">
 <!ENTITY getAllNewMsgCmd.accesskey	"G">
 <!ENTITY newMsgButton.tooltip		"新しいメッセージを作成します">
 <!ENTITY replyButton.tooltip		"メッセージに返信します">
@@ -576,16 +579,24 @@ you can use these alternative items. Oth
 <!ENTITY printButton.tooltip		"メッセージを印刷します">
 <!ENTITY stopButton.tooltip		"送受信処理を中止します">
 <!ENTITY junkButton.tooltip		"メッセージに迷惑マークを付けます">
 <!ENTITY notJunkButton.tooltip		"メッセージの迷惑マークを外します">
 <!ENTITY addressBookButton.tooltip	"アドレス帳を開きます">
 <!ENTITY chatButton.tooltip		"チャットタブを開きます">
 <!ENTITY tagButton.tooltip		"メッセージにタグを付けます">
 <!ENTITY compactButton.tooltip		"削除したメッセージをフォルダから消去します"><!-- (^^; わかりにくい... -->
+<!ENTITY appmenuButton.tooltip		"アプリケーションのメニューを表示します">
+
+<!-- AppMenu Popup -->
+<!ENTITY appmenuNewMsgCmd.label		"新規作成"><!-- en-US: "New Message" -->
+<!ENTITY appmenuNewContactCmd.label	"アドレス帳の連絡先...">
+<!ENTITY appmenuEditMenu.label		"編集">
+<!ENTITY appmenuQFBMenu.label		"クイックフィルタバー">
+<!ENTITY appmenuToolbarLayout.label	"ツールバーのカスタマイズ...">
 
 <!-- Tags Menu Popup -->
 <!ENTITY addNewTag.label		"新しいタグ...">
 <!ENTITY addNewTag.accesskey		"N">
 <!ENTITY manageTags.label		"タグを管理...">
 <!ENTITY manageTags.accesskey		"M">
 <!-- Folder Pane -->
 <!ENTITY folderColumn.label		"名前">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -675,16 +675,18 @@ safeModeRestartButton		= 再起動
 update.checkInsideButton.label			= ソフトウェアの更新を確認
 update.checkInsideButton.accesskey		= C
 update.resumeButton.label			= ダウンロードを再開: %S...
 update.resumeButton.accesskey			= D
 update.openUpdateUI.applyButton.label		= ダウンロードした更新を適用...
 update.openUpdateUI.applyButton.accesskey	= A
 update.restart.updateButton.label		= 再起動して更新
 update.restart.updateButton.accesskey		= R
+update.restart.restartButton.label		= 再起動して更新を完了
+update.restart.restartButton.accesskey		= R
 update.openUpdateUI.upgradeButton.label		= 今すぐアップグレード...
 update.openUpdateUI.upgradeButton.accesskey	= U
 update.restart.upgradeButton.label		= 今すぐアップグレード
 update.restart.upgradeButton.accesskey		= U
 
 websearch.setDefault				= この検索エンジンを既定に設定する
 websearch.isDefault				= この検索エンジンは既定に設定されています
 
@@ -704,8 +706,23 @@ crashedpluginsMessage.title			= %S プラグインがクラッシュしました。
 crashedpluginsMessage.reloadButton.label	= ページを再読み込み
 crashedpluginsMessage.reloadButton.accesskey	= R
 crashedpluginsMessage.submitButton.label	= クラッシュレポートを送信
 crashedpluginsMessage.submitButton.accesskey	= S
 crashedpluginsMessage.learnMore			= 詳細を確認...
 carbonFailurePluginsMessage.message		= このページを表示するにはプラグインが 32 ビットモードである必要があります。
 carbonFailurePluginsMessage.restartButton.label	= 32 ビットモードで再起動
 carbonFailurePluginsMessage.restartButton.accesskey	= R
+
+# Sanitize
+# LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
+# clear" is set to "Everything", the Clear Recent History dialog's title is
+# changed to this.  See UI mockup and comment 11 at bug 480169 -->
+sanitizeDialog2.everything.title		= すべての履歴を消去
+sanitizeButtonOK				= 今すぐ消去
+# LOCALIZATION NOTE (sanitizeEverythingWarning2): Warning that appears when
+# "Time range to clear" is set to "Everything" in Clear Recent History dialog,
+# provided that the user has not modified the default set of history items to clear.
+sanitizeEverythingWarning2			= すべての履歴が消去されます。
+# LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
+# "Time range to clear" is set to "Everything" in Clear Recent History dialog,
+# provided that the user has modified the default set of history items to clear.
+sanitizeSelectedWarning				= 選択した項目の履歴がすべて消去されます。
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -172,18 +172,18 @@
 <!ENTITY tasksMenu.accesskey		"T">
 <!ENTITY messengerCmd.label		"メールとニュースグループ">
 <!ENTITY messengerCmd.accesskey		"m">
 <!ENTITY messengerCmd.commandkey	"1">
 <!ENTITY addressBookCmd.label		"アドレス帳">
 <!ENTITY addressBookCmd.accesskey	"a">
 <!ENTITY addressBookCmd.key		"B">
 <!ENTITY accountManagerCmd.label	"アカウント設定...">
-<!ENTITY accountManagerCmd.accesskey	"c">
-<!ENTITY accountManagerCmdUnix.accesskey "S">
+<!ENTITY accountManagerCmd.accesskey	"S">
+<!ENTITY accountManagerCmdUnix.accesskey	"S">
 <!ENTITY preferencesCmd.label		"オプション...">
 <!ENTITY preferencesCmd.accesskey	"O">
 <!ENTITY preferencesCmdUnix.label	"設定">
 <!ENTITY preferencesCmdUnix.accesskey	"n">
 
 <!--  Mac OS X Window Menu -->
 <!ENTITY minimizeWindow.key		"m">
 <!ENTITY minimizeWindow.label		"最小化">
--- a/mail/chrome/messenger/messengercompose/sendProgress.dtd
+++ b/mail/chrome/messenger/messengercompose/sendProgress.dtd
@@ -1,8 +1,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/. -->
 
 <!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
-<!ENTITY sendWindow.title	"メッセージを送信しています">
+<!ENTITY sendDialog.title	"メッセージを処理しています">
 <!ENTITY status.label		"状態:">
 <!ENTITY progress.label		"進行状況:">
--- a/mail/chrome/messenger/messengercompose/sendProgress.properties
+++ b/mail/chrome/messenger/messengercompose/sendProgress.properties
@@ -1,14 +1,20 @@
 # 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/.
 
-titlePrefixSave		= メッセージを保存しています -
-titlePrefixSend		= メッセージを送信しています -
+# LOCALIZATION NOTE (titleSendMsgSubject):
+# %S will be replaced by the message subject.
+titleSendMsgSubject	=メッセージを送信しています - %S
+titleSendMsg		=メッセージを送信しています
+# LOCALIZATION NOTE (titleSaveMsgSubject):
+# %S will be replaced by the message subject.
+titleSaveMsgSubject	=メッセージを保存しています - %S
+titleSaveMsg		=メッセージを保存しています
 
 # LOCALIZATION NOTE (percentMsg):
 # This string is used to format the text to the right of the progress meter.
 # %S% will be replaced by the percentage of the file that has been saved
 percentMsg		= %S%%
 
 messageSent		= メッセージを送信しました
 messageSaved		= メッセージを保存しました
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -63,16 +63,20 @@
 <!ENTITY markAsUnreadMenuItem1.accesskey	"r">
 <!ENTITY saveAsMenuItem1.label			"名前を付けて保存...">
 <!ENTITY saveAsMenuItem1.accesskey		"S">
 <!ENTITY viewSourceMenuItem1.label		"ソースを表示">
 <!ENTITY viewSourceMenuItem1.accesskey		"V">
 <!ENTITY otherActionsPrint1.label		"印刷...">
 <!ENTITY otherActionsPrint1.accesskey		"P">
 
+<!-- Attachment bar context menu items -->
+<!ENTITY startExpandedCmd.label			"添付ペインを初めから表示する">
+<!ENTITY startExpandedCmd.accesskey		"S">
+
 <!-- Attachment context menu items -->
 <!ENTITY openAttachmentCmd.label		"開く">
 <!ENTITY openAttachmentCmd.accesskey		"O">
 <!ENTITY saveAsAttachmentCmd.label		"名前を付けて保存...">
 <!ENTITY saveAsAttachmentCmd.accesskey		"S">
 <!ENTITY detachAttachmentCmd.label		"添付ファイルを分離...">
 <!ENTITY detachAttachmentCmd.accesskey		"D">
 <!ENTITY deleteAttachmentCmd.label		"削除">
--- a/mail/chrome/messenger/preferences/display.dtd
+++ b/mail/chrome/messenger/preferences/display.dtd
@@ -7,34 +7,34 @@
 
 <!ENTITY style.label			"書式:">
 <!ENTITY style.accesskey		"y">
 <!ENTITY regularStyle.label		"標準">
 <!ENTITY bold.label			"太字">
 <!ENTITY italic.label			"斜体">
 <!ENTITY boldItalic.label		"太字斜体">
 <!ENTITY size.label			"サイズ:">
-<!ENTITY size.accesskey			"s">
+<!ENTITY size.accesskey			"z">
 <!ENTITY regularSize.label		"標準">
 <!ENTITY bigger.label			"大きく">
 <!ENTITY smaller.label			"小さく">
 <!ENTITY color.label			"色:"><!-- (^^;何の色? -->
 <!ENTITY color.accesskey		"c">
 <!ENTITY displayWidth.label		"プレーンテキストメッセージ">
 <!ENTITY displayText.label		"引用されたテキストメッセージの表示:">
 <!ENTITY colors.label			"配色">
 <!ENTITY overrideColors.label		"メッセージの表示時に次の配色を使用します:">
 <!ENTITY textColor.label		"文字色:">
 <!ENTITY textColor.accesskey		"T">
 <!ENTITY backgroundColor.label		"背景色:">
 <!ENTITY backgroundColor.accesskey	"b">
 
 <!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
 <!ENTITY convertEmoticons.label		"顔文字をアイコンで表示する">
-<!ENTITY convertEmoticons.accesskey	"D">
+<!ENTITY convertEmoticons.accesskey	"e">
 
 <!-- labels -->
 <!ENTITY displayTagsText.label		"タグを使ってメッセージを分類したり印を付けたりできます。">
 <!ENTITY addTagButton.label		"追加">
 <!ENTITY addTagButton.accesskey		"A">
 <!ENTITY editTagButton.label		"編集">
 <!ENTITY editTagButton.accesskey	"E">
 <!ENTITY removeTagButton.label		"削除">
--- a/mail/chrome/messenger/preferences/general.dtd
+++ b/mail/chrome/messenger/preferences/general.dtd
@@ -26,14 +26,8 @@
 <!ENTITY systemsound.label		"システムの新着メール通知音">
 <!ENTITY systemsoundMac.label		"システムの警告音">
 <!ENTITY systemsoundMac.accesskey	"y">
 <!ENTITY systemsound.accesskey		"y">
 <!ENTITY customsound.label		"次のサウンドファイルを使用する:">
 <!ENTITY customsound.accesskey		"U">
 <!ENTITY browse.label			"参照...">
 <!ENTITY browse.accesskey		"B">
-
-<!ENTITY addonsMgr.label		"アドオン">
-<!ENTITY manageAddonsDescWin.label	"アドオンの設定を変更できます。">
-<!ENTITY manageAddonsDescUnix2.label	"アドオンの設定を変更できます。">
-<!ENTITY manageAddons.label		"アドオンを管理...">
-<!ENTITY manageAddons.accesskey		"M">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -51,17 +51,24 @@ prefPanel-copies		= 送信控えと特別なフォルダ
 prefPanel-synchronization	= 同期とディスク領域
 prefPanel-diskspace		= ディスク領域
 prefPanel-addressing		= 編集とアドレス入力
 prefPanel-junk			= 迷惑メール
 ## LOCALIZATION NOTE (prefPanel-smtp): Don't translate "SMTP"
 prefPanel-smtp			= 送信 (SMTP) サーバ
 
 # account manager multiple identity support
-#LOCALIZATION NOTE: accountName: %1$S 
+#LOCALIZATION NOTE: accountName: %1$S
 identity-list-title		= %1$S の差出人情報
 
 identity-edit-req		= 正しいメールアドレスを入力してください。
 identity-edit-req-title		= 差出人情報を作成できませんでした
 
+## LOCALIZATION NOTE (identity-delete-confirm): %S is the identity name
+# and should be put on a new line. The new line is produced with the "\n" string.
+identity-delete-confirm		= この差出人情報を削除してもよろしいですか?\n%S
+## LOCALIZATION NOTE (identity-delete-confirm-title): %S is the account name
+identity-delete-confirm-title	= 差出人情報の削除: %S
+identity-delete-confirm-button	= 削除
+
 choosefile			= ファイルを選択
 
 forAccount			= "%S" アカウントの設定です。
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/sanitize.dtd
@@ -0,0 +1,50 @@
+<!-- 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 sanitizePrefs2.title		"履歴の消去設定">
+<!ENTITY sanitizeDialog2.title		"最近の履歴を消去">
+
+<!ENTITY sanitizeItems.label		"次のプライバシー情報を今すぐ消去:">
+<!ENTITY clearDataSettings2.label	"&brandShortName; の終了時に次のデータを自動消去する:">
+
+<!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
+<!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
+     See UI mockup at bug 480169 -->
+<!ENTITY clearTimeDuration.label	"消去する履歴の期間:">
+<!ENTITY clearTimeDuration.accesskey	"T">
+<!ENTITY clearTimeDuration.lastHour	"1 時間以内の履歴">
+<!ENTITY clearTimeDuration.last2Hours	"2 時間以内の履歴">
+<!ENTITY clearTimeDuration.last4Hours	"4 時間以内の履歴">
+<!ENTITY clearTimeDuration.today	"今日の履歴">
+<!ENTITY clearTimeDuration.everything	"すべての履歴">
+<!-- Localization note (clearTimeDuration.suffix) - trailing entity for languages
+that require it.  -->
+<!ENTITY clearTimeDuration.suffix	"">
+<!ENTITY clearTimeDuration.dateColumn	"アクセス日時">
+<!ENTITY clearTimeDuration.nameColumn	"名前">
+
+<!-- LOCALIZATION NOTE (detailsProgressiveDisclosure.*): Labels and accesskeys
+     of the "Details" progressive disclosure button.  See UI mockup at bug
+     480169 -->
+<!ENTITY detailsProgressiveDisclosure.label	"消去する項目">
+<!ENTITY detailsProgressiveDisclosure.accesskey	"e">
+
+<!ENTITY historySection.label		"履歴">
+<!ENTITY dataSection.label		"データ">
+
+<!-- LOCALIZATION NOTE (item*): itemHistoryAndDownloads.* and
+     itemBrowsingHistory.* will never be used at the same time, so they can
+     have the same accesskey. -->
+<!ENTITY itemCookies.label		"Cookie">
+<!ENTITY itemCookies.accesskey		"C">
+<!ENTITY itemCache.label		"キャッシュ">
+<!ENTITY itemCache.accesskey		"A">
+
+<!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
+     that appears when "Time range to clear" is set to "Everything".  See UI
+     mockup at bug 480169 -->
+<!ENTITY sanitizeEverythingUndoWarning	"この操作は取り消せません。">
+
+<!ENTITY dialog.width			"34em"><!-- en-US: 28em -->
+<!ENTITY column.width			"16.5em"><!-- en-US: 14em -->
--- a/mail/chrome/messenger/searchTermOverlay.dtd
+++ b/mail/chrome/messenger/searchTermOverlay.dtd
@@ -4,17 +4,17 @@
 
 <!ENTITY matchAll.label		"すべての条件に一致">
 <!ENTITY matchAll.accesskey	"a">
 <!ENTITY matchAny.label		"いずれかの条件に一致">
 <!ENTITY matchAny.accesskey	"o">
 <!ENTITY matchAllMsgs.label	"条件なし"><!-- 条件を設定しない場合の選択肢 -->
 <!ENTITY matchAllMsgs.accesskey	"m">
 
-<!-- LOCALIZATION NOTE  
+<!-- LOCALIZATION NOTE
   The values below are used to control the widths of the search widgets.
   Change the values only when the localized strings in the popup menus
   are truncated in the widgets.
  -->
-<!ENTITY searchTermListAttributesFlexValue	"5">
-<!ENTITY searchTermListOperatorsFlexValue	"5">
-<!ENTITY searchTermListValueFlexValue		"5">
-<!ENTITY searchTermListButtonsFlexValue		"2">
+<!-- Bug 743974 参照  -->
+<!ENTITY searchTermListAttributesFlexValue	"1">
+<!ENTITY searchTermListOperatorsFlexValue	"1">
+<!ENTITY searchTermListValueFlexValue		"3">