29.0: sync suite with en-US rev17514:ba9b337ff4c1
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Thu, 13 Mar 2014 22:46:31 +0900
changeset 1341 9027c8c3e10efe34d6353af29a3039c94b15864c
parent 1340 669235db7ded0946cabb7dc8134ef3ab2f4b654d
child 1342 7e6ed4aee391ed9afefb9b0bf530fa7651429205
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs29
29.0: sync suite with en-US rev17514:ba9b337ff4c1
suite/chrome/common/help/shortcuts_mailnews.xhtml
suite/chrome/common/help/shortcuts_navigator.xhtml
suite/chrome/common/mac/platformCommunicatorOverlay.dtd
suite/chrome/mailnews/compose/composeMsgs.properties
suite/chrome/mailnews/folderWidgets.properties
suite/chrome/mailnews/threadpane.dtd
--- a/suite/chrome/common/help/shortcuts_mailnews.xhtml
+++ b/suite/chrome/common/help/shortcuts_mailnews.xhtml
@@ -65,17 +65,17 @@
     <td>Toggle Message Pane Visibility</td>
     <td>F8</td>
     <td>F8</td>
     <td>F8</td>
   </tr>
   <tr>
     <td>Toggle Folder Pane Visibility</td>
     <td>F9</td>
-    <td/>
+    <td>Cmd+Opt+S</td>
     <td>F9</td>
   </tr>
   <tr>
     <td>New Message</td>
     <td>Ctrl+M</td>
     <td>Cmd+Shift+M</td>
     <td>Ctrl+M</td>
   </tr>
--- a/suite/chrome/common/help/shortcuts_navigator.xhtml
+++ b/suite/chrome/common/help/shortcuts_navigator.xhtml
@@ -457,17 +457,17 @@
     <th>Mac OS</th>
     <th>Linux or Unix</th>
   </tr>
 </thead>
 <tbody class="tbody-default">
   <tr>
     <td>Open/Close Sidebar (toggle)</td>
     <td>F9</td>
-    <td/>
+    <td>Cmd+Opt+S</td>
     <td>F9</td>
   </tr>
   <tr>
     <td>Switch to Next Sidebar Panel</td>
     <td>Alt+Page Down</td>
     <td>Opt+Page Down</td>
     <td>Alt+Page Down</td>
   </tr>
@@ -494,17 +494,17 @@
     <th>Command</th>
     <th>Windows</th>
     <th>Mac OS</th>
     <th>Linux or Unix</th>
   </tr>
 </thead>
 <tbody class="tbody-default">
   <tr>
-    <td> Move to Next/Previous Item in Form</td>
+    <td>Move to Next/Previous Item in Form</td>
     <td>Tab/Shift+Tab</td>
     <td>Tab/Shift+Tab</td>
     <td>Tab/Shift+Tab</td>
   </tr>
   <tr>
     <td>Submit Form</td>
     <td>Enter</td>
     <td>Return</td>
--- a/suite/chrome/common/mac/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/mac/platformCommunicatorOverlay.dtd
@@ -28,16 +28,22 @@
 <!ENTITY closeCmd.label                 "閉じる">
 <!ENTITY closeCmd.key                   "W">
 
 <!ENTITY printSetupCmd.label            "ページ設定...">
 <!ENTITY printSetupCmd.accesskey        "u">
 
 <!ENTITY redoCmd.key                    "Z">
 
+<!-- Keys for toggling Sidebar, Folder Pane in mailNews and Directory Pane in
+  Address Book -->
+<!ENTITY showHideSidebarCmd.key         "S">
+<!ENTITY toggleFolderPaneCmd.key        "S">
+<!ENTITY toggleDirectoryPaneCmd.key     "S">
+
 <!ENTITY historyCmd.key                 "H">
 
 <!ENTITY findTypeTextCmd.key            "">
 <!ENTITY findTypeLinksCmd.key           "">
 
 <!ENTITY accel.emacs_conflict           "accel">
 
 <!ENTITY minimizeWindowCmd.label        "しまう">
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -289,19 +289,23 @@ sendMessageCheckLabel=本当にこのメッセージを送信してもよろしいですか?
 sendMessageCheckSendButtonLabel=送信
 
 ## reply header in composeMsg
 ## <author> wrote:
 mailnews.reply_header_authorwrote=%s wrote
 mailnews.reply_header_ondate=On %s
 
 ## reply header in composeMsg
-## user specified 
+## user specified
 mailnews.reply_header_originalmessage=-------- Original Message --------
 
+## forwarded header in composeMsg
+## user specified
+mailnews.forward_header_originalmessage=-------- Forwarded Message --------
+
 ## Strings used by the rename attachment dialog
 renameAttachmentTitle=添付ファイルの名前変更
 renameAttachmentMessage=添付ファイルの新しい名前:
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
 ## word $S. Place the word $S where the host name should appear.
 smtpEnterPasswordPrompt=%S のパスワードを入力してください:
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
--- a/suite/chrome/mailnews/folderWidgets.properties
+++ b/suite/chrome/mailnews/folderWidgets.properties
@@ -1,7 +1,11 @@
 # 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(globalInbox)
 # %S=name of the Local folders account
 globalInbox=共通受信トレイ (%S)
+# LOCALIZATION NOTE(verboseFolderFormat): %1$S is folder name, %2$S is server name
+verboseFolderFormat=%1$S (%2$S)
+chooseFolder=フォルダを選択してください...
+noFolders=フォルダがありません
--- a/suite/chrome/mailnews/threadpane.dtd
+++ b/suite/chrome/mailnews/threadpane.dtd
@@ -18,28 +18,28 @@
 <!ENTITY totalColumn.label "スレッド中の合計">
 <!ENTITY readColumn.label "既読">
 <!ENTITY receivedColumn.label "受信日時">
 <!ENTITY flagColumn.label "フラグ">
 <!ENTITY locationColumn.label "フォルダ">
 <!ENTITY idColumn.label "受信順">
 
 <!--Tooltips-->
-<!ENTITY columnChooser.tooltip "クリックして表示する列を選択">
-<!ENTITY threadColumn.tooltip "スレッドで並べ替え"> 
-<!ENTITY fromColumn.tooltip "差出人で並べ替え">
-<!ENTITY recipientColumn.tooltip "受信者で並べ替え">
-<!ENTITY attachmentColumn.tooltip "添付ファイルの有無で並べ替え">
-<!ENTITY subjectColumn.tooltip "件名で並べ替え">
-<!ENTITY dateColumn.tooltip "日付で並べ替え">
-<!ENTITY priorityColumn.tooltip "重要度で並べ替え">
-<!ENTITY tagsColumn.tooltip "タグで並べ替え">
-<!ENTITY accountColumn.tooltip "アカウントで並べ替え">
-<!ENTITY statusColumn.tooltip "状態で並べ替え">
-<!ENTITY sizeColumn.tooltip "サイズで並べ替え">
-<!ENTITY junkStatusColumn.tooltip "迷惑マークの有無で並べ替え">
-<!ENTITY unreadColumn.tooltip "スレッド中の未読メッセージ数">
-<!ENTITY totalColumn.tooltip "スレッド中のメッセージ総数">
-<!ENTITY readColumn.tooltip "既読かどうかで並べ替え">
-<!ENTITY receivedColumn.tooltip "受信した日付で並べ替え">
-<!ENTITY flagColumn.tooltip "フラグの有無で並べ替え">
-<!ENTITY locationColumn.tooltip "フォルダで並べ替え">
-<!ENTITY idColumn.tooltip "受信順で並べ替え">
+<!ENTITY columnChooser2.tooltip "表示する列を選択します">
+<!ENTITY threadColumn2.tooltip "メッセージをスレッド形式で表示します">
+<!ENTITY fromColumn2.tooltip "差出人で並べ替えます">
+<!ENTITY recipientColumn2.tooltip "受信者で並べ替えます">
+<!ENTITY attachmentColumn2.tooltip "添付ファイルの有無で並べ替えます">
+<!ENTITY subjectColumn2.tooltip "件名で並べ替えます">
+<!ENTITY dateColumn2.tooltip "送信日時で並べ替えます">
+<!ENTITY priorityColumn2.tooltip "重要度で並べ替えます">
+<!ENTITY tagsColumn2.tooltip "タグで並べ替えます">
+<!ENTITY accountColumn2.tooltip "アカウントで並べ替えます">
+<!ENTITY statusColumn2.tooltip "状態で並べ替えます">
+<!ENTITY sizeColumn2.tooltip "サイズで並べ替えます">
+<!ENTITY junkStatusColumn2.tooltip "迷惑マークの有無で並べ替えます">
+<!ENTITY unreadColumn2.tooltip "スレッド中の未読メッセージ数">
+<!ENTITY totalColumn2.tooltip "スレッド中のメッセージ総数">
+<!ENTITY readColumn2.tooltip "既読かどうかで並べ替えます">
+<!ENTITY receivedColumn2.tooltip "受信日時で並べ替えます">
+<!ENTITY flagColumn2.tooltip "フラグの有無で並べ替えます">
+<!ENTITY locationColumn2.tooltip "フォルダで並べ替えます">
+<!ENTITY idColumn2.tooltip "受信順で並べ替えます">