17.0: sync suite with en-US rev12143:5bb30d69b276
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Mon, 01 Oct 2012 03:02:54 +0900
changeset 839 96a5e3fd954928556bce4c058ac793b050a932cf
parent 838 940f35292706009b0001bd666172a1ea75410d16
child 840 a6da7e7adcc09d433bfa976614548ab6bc14bc65
push id360
push useraxel@mozilla.com
push dateMon, 08 Oct 2012 19:33:38 +0000
bugs17
17.0: sync suite with en-US rev12143:5bb30d69b276
suite/chrome/browser/linkToolbar.dtd
suite/chrome/common/contentAreaCommands.dtd
suite/chrome/common/pref/pref-mousewheel.dtd
suite/chrome/common/setDesktopBackground.dtd
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/compose/sendProgress.dtd
suite/chrome/mailnews/compose/sendProgress.properties
suite/chrome/mailnews/folderProps.dtd
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/pref/am-mdn.dtd
suite/chrome/mailnews/pref/prefs.properties
suite/chrome/mailnews/search.properties
suite/chrome/mailnews/searchTermOverlay.dtd
--- a/suite/chrome/browser/linkToolbar.dtd
+++ b/suite/chrome/browser/linkToolbar.dtd
@@ -1,15 +1,16 @@
 <!-- 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/. -->
 
 <!-- Link Toolbar Title -->
 <!ENTITY linkToolbar.label "サイトナビゲーションバー">
 <!ENTITY linkToolbar.accesskey "a">
+<!ENTITY linkToolbar.tooltip "サイトナビゲーションバー">
 
 <!-- Link Toolbar visibility options -->
 <!ENTITY linkToolbarAlways.label "常に表示">
 <!ENTITY linkToolbarAlways.accesskey "S">
 <!ENTITY linkToolbarAsNeeded.label "必要なときだけ表示">
 <!ENTITY linkToolbarAsNeeded.accesskey "O">
 <!ENTITY linkToolbarNever.label "常に隠す">
 <!ENTITY linkToolbarNever.accesskey "H">
--- a/suite/chrome/common/contentAreaCommands.dtd
+++ b/suite/chrome/common/contentAreaCommands.dtd
@@ -50,18 +50,18 @@
 <!ENTITY reloadImageCmd.label         "画像を再読み込み">
 <!ENTITY reloadImageCmd.accesskey     "R">
 <!ENTITY viewImageCmd.label           "画像を表示">
 <!ENTITY viewImageCmd.accesskey       "I">
 <!ENTITY viewVideoCmd.label           "動画を表示">
 <!ENTITY viewVideoCmd.accesskey       "i">
 <!ENTITY viewBGImageCmd.label         "背景画像を表示">
 <!ENTITY viewBGImageCmd.accesskey     "w">
-<!ENTITY setWallpaperCmd.label        "壁紙に設定">
-<!ENTITY setWallpaperCmd.accesskey    "A">
+<!ENTITY setDesktopBackgroundCmd.label     "デスクトップの背景に設定...">
+<!ENTITY setDesktopBackgroundCmd.accesskey "a">
 <!ENTITY bookmarkPageCmd.label        "ページをブックマーク">
 <!ENTITY bookmarkPageCmd.accesskey    "m">
 <!ENTITY bookmarkLinkCmd.label        "リンクをブックマーク">
 <!ENTITY bookmarkLinkCmd.accesskey    "B">
 <!ENTITY bookmarkFrameCmd.label       "フレームをブックマーク">
 <!ENTITY bookmarkFrameCmd.accesskey   "m">
 <!ENTITY savePageAsCmd.label          "名前を付けてページを保存...">
 <!ENTITY savePageCmd.label            "ページを保存">
--- a/suite/chrome/common/pref/pref-mousewheel.dtd
+++ b/suite/chrome/common/pref/pref-mousewheel.dtd
@@ -5,28 +5,26 @@
 <!-- LOCALIZATION NOTE : FILE Mouse-wheel management prefs, for those lucky OSes that support mouse wheels -->
 
 <!ENTITY pref.mouseWheel.title           "マウスホイール">
 <!ENTITY mouseWheelPanel.label           "この装飾キーを使用した際のマウスホイールの動きを指定:">
 <!ENTITY usingJustTheWheel.label         "装飾キーなし">
 <!ENTITY usingWheelAndAlt.label          "&altKey.label;">
 <!ENTITY usingWheelAndCtrl.label         "&ctrlKey.label;">
 <!ENTITY usingWheelAndShft.label         "&shiftKey.label;">
-<!ENTITY mousewheelGroup.label           "垂直スクロール">
-<!ENTITY mousewheelHorizGroup.label      "水平スクロール">
-<!ENTITY scroll.label                    "ドキュメントを">
-<!ENTITY scroll.accesskey                "S">
-<!ENTITY scrollHoriz.accesskey           "c">
-<!ENTITY scrollLines.label               "行ずつスクロールする">
-<!ENTITY scrollChars.label               "文字ずつスクロールする">
-<!ENTITY useSystemDefault.label          "システムの標準設定を使用する">
-<!ENTITY useSystemDefault.accesskey      "U">
-<!ENTITY useSystemDefaultHoriz.accesskey "d">
-<!ENTITY scrollPgUpPgDn.label            "1 ページ単位で上下にスクロールする">
-<!ENTITY scrollPgUpPgDn.accesskey        "p">
-<!ENTITY scrollPgLtPgRt.label            "1 ページ単位で左右にスクロールする">
-<!ENTITY scrollPgLtPgRt.accesskey        "r">
+<!ENTITY mouseWheelAction.label          "マウスホイールの動作を指定">
+<!ENTITY doNothing.label                 "何もしない">
+<!ENTITY doNothing.accesskey             "D">
+<!ENTITY scrollDocument.label            "ドキュメントのスクロール">
+<!ENTITY scrollDocument.accesskey        "S">
 <!ENTITY history.label                   "訪問履歴を移動する (戻る/進む)">
 <!ENTITY history.accesskey               "M">
-<!ENTITY historyHoriz.accesskey          "b">
 <!ENTITY zoom.label                      "ページの表示をズームする">
 <!ENTITY zoom.accesskey                  "Z">
-<!ENTITY zoomHoriz.accesskey             "e">
+<!ENTITY mouseWheelSpeed.label           "マウスホイールの速度">
+<!ENTITY verticalSpeed.label             "垂直スクロール:">
+<!ENTITY verticalSpeed.accesskey         "V">
+<!ENTITY verticalReverse.label           "方向を反転する">
+<!ENTITY verticalReverse.accesskey       "R">
+<!ENTITY horizontalSpeed.label           "水平スクロール:">
+<!ENTITY horizontalSpeed.accesskey       "o">
+<!ENTITY horizontalReverse.label         "方向を反転する">
+<!ENTITY horizontalReverse.accesskey     "e">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/setDesktopBackground.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/. -->
+
+<!ENTITY setDesktopBackground.title "デスクトップの背景に設定">
+
+<!ENTITY position.label             "位置:">
+<!ENTITY position.accesskey         "P">
+<!ENTITY position.tile.label        "並べて表示">
+<!ENTITY position.stretch.label     "拡大して表示">
+<!ENTITY position.center.label      "中央に表示">
+<!ENTITY position.fill.label        "ページ幅に合わせる">
+<!ENTITY position.fit.label         "画面サイズに合わせる">
+<!ENTITY picker.label               "背景色:">
+<!ENTITY picker.accesskey           "C">
+<!ENTITY preview.caption            "プレビュー">
+<!ENTITY apply.label                "設定">
+<!ENTITY apply.accesskey            "A">
+<!ENTITY close.label                "閉じる">
--- a/suite/chrome/mailnews/FilterEditor.dtd
+++ b/suite/chrome/mailnews/FilterEditor.dtd
@@ -43,8 +43,15 @@
 <!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.
+ -->
+<!ENTITY filterActionTypeFlexValue "1">
+<!ENTITY filterActionTargetFlexValue "4">
--- a/suite/chrome/mailnews/compose/sendProgress.dtd
+++ b/suite/chrome/mailnews/compose/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/suite/chrome/mailnews/compose/sendProgress.properties
+++ b/suite/chrome/mailnews/compose/sendProgress.properties
@@ -1,14 +1,21 @@
 # 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
+# %S will be replaced by the percentage of the file that has been saved.
+# %% will be replaced a single % sign.
 percentMsg=%S%%
 
 messageSent=メッセージは送信されました。
 messageSaved=メッセージは保存されました。
--- a/suite/chrome/mailnews/folderProps.dtd
+++ b/suite/chrome/mailnews/folderProps.dtd
@@ -59,8 +59,15 @@
 <!ENTITY privileges.button.accesskey             "P">
 <!ENTITY permissionsDesc.label                   "以下のアクセス権限があります:">
 <!ENTITY folderType.label                        "フォルダの種類:">
 
 <!ENTITY folderQuotaTab.label                    "クォータ">
 <!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/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -219,17 +219,17 @@
 <!ENTITY viewFeedWebPage.label                  "Web ページ">
 <!ENTITY viewFeedWebPage.accesskey              "W">
 <!ENTITY viewFeedSummary.label                  "要約">
 <!ENTITY viewFeedSummary.accesskey              "m">
 <!ENTITY viewFeedSummaryFeedPropsPref.label     "既定の形式">
 <!ENTITY viewFeedSummaryFeedPropsPref.accesskey "D">
 
 <!ENTITY viewAttachmentsInlineCmd.label         "添付をインラインで表示">
-<!ENTITY viewAttachmentsInlineCmd.accesskey     "A">
+<!ENTITY viewAttachmentsInlineCmd.accesskey     "D">
 <!ENTITY reloadCmd.label                        "再読み込み">
 <!ENTITY reloadCmd.accesskey                    "R">
 <!ENTITY stopCmd.label                          "中止">
 <!ENTITY stopCmd.accesskey                      "S">
 <!ENTITY pageSourceCmd.label                    "メッセージのソース">
 <!ENTITY pageSourceCmd.accesskey                "o">
 <!ENTITY pageSourceCmd.key                      "u">
 
--- a/suite/chrome/mailnews/pref/am-mdn.dtd
+++ b/suite/chrome/mailnews/pref/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/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -37,17 +37,16 @@ confirmDeferAccountTitle= 本当に変更しますか?
 
 directoryUsedByOtherAccount= このディレクトリはすでに %S アカウントに使用されています。別のディレクトリを選択してください。
 #Provide default example values for sample email address
 exampleEmailUserName= user
 exampleEmailDomain= example.net
 emailFieldText= メールアドレス:
 #LOCALIZATION NOTE: defaultEmailText: %1$S is user name, %2$S is domain
 defaultEmailText= このアカウントで使用するメールアドレスを入力してください。(例: "%1$S@%2$S")
-
 #LOCALIZATION NOTE: customizedEmailText: %1$S is provider, %2$S is email username, %3$S is sample email, %4$S is sample username
 customizedEmailText= %1$S %2$S を入力してください。(例: %1$S のメールアドレスが "%3$S" であれば %2$S は "%4$S" になります) 
 
 # account manager stuff
 prefPanel-server= サーバ設定
 prefPanel-copies= コピーと特別なフォルダ
 prefPanel-synchronization= 同期とディスク領域
 prefPanel-diskspace= ディスク領域
@@ -58,11 +57,18 @@ prefPanel-smtp= 送信 (SMTP) サーバ
 
 # account manager multiple identity support
 #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" について
--- a/suite/chrome/mailnews/search.properties
+++ b/suite/chrome/mailnews/search.properties
@@ -11,18 +11,18 @@
 #
 # for example, in english this looks like:
 # and the [Sender ] [doesn't contain] [John]
 #
 # TODO: need to special-case the first line (filterindex==0)
 
 # filter stuff
 searchingMessage=検索しています...
-searchSuccessMessage=1 件見つかりました
-searchSuccessMessages=%S 件見つかりました
-searchFailureMessage=見つかりませんでした
+# LOCALIZATION NOTE (matchesFound): #1 number of matches found
+matchesFound=#1 件見つかりました
+noMatchesFound=見つかりませんでした
 labelForStopButton=停止
 labelForSearchButton=検索
 labelForStopButton.accesskey=S
 labelForSearchButton.accesskey=S
 
 moreButtonTooltipText=新しいルールを追加
 lessButtonTooltipText=このルールを削除
--- a/suite/chrome/mailnews/searchTermOverlay.dtd
+++ b/suite/chrome/mailnews/searchTermOverlay.dtd
@@ -3,17 +3,16 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY matchAll.label     "すべての条件に一致">
 <!ENTITY matchAll.accesskey "M">
 <!ENTITY matchAny.label     "いずれかの条件に一致">
 <!ENTITY matchAny.accesskey "a">
 <!ENTITY matchAllMsgs.label     "すべてのメッセージに一致">
 <!ENTITY matchAllMsgs.accesskey "t">
-<!-- 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">
+<!ENTITY searchTermListAttributesFlexValue "1">
+<!ENTITY searchTermListOperatorsFlexValue "1">
+<!ENTITY searchTermListValueFlexValue "3">