42.0: sync suite with en-US rev20607:53f8ab1d339d SEAMONKEY_2_39b1_BUILD1 SEAMONKEY_2_39b1_RELEASE
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Thu, 17 Sep 2015 18:47:56 +0900
changeset 1874 c9b0b88ac7c6c464c2c46ced726b8256683885b2
parent 1873 e69d142f257366c3bc3a3f9ef935c7d1d500a9d2
child 1875 643d7c87d9f60313f7e99ea1d1cddfb296facf6c
child 1900 aea4279aa8e2ba7b13305ecb91fc87922ecee699
push id996
push useraxel@mozilla.com
push dateMon, 21 Sep 2015 14:19:14 +0000
bugs42
42.0: sync suite with en-US rev20607:53f8ab1d339d
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/unix/platformCommunicatorOverlay.dtd
suite/chrome/common/win/platformCommunicatorOverlay.dtd
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/messenger.properties
--- a/suite/chrome/common/help/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -1026,20 +1026,20 @@
 </div>
 
 <h2 id="selecting_text_encodings_and_fonts">Selecting Text Encodings and
   Fonts</h2>
 
 <p>If you browse, compose, or send and receive email in more than one language,
   you need to select the appropriate text encodings and fonts.</p>
 
-<p>A text encoding method is the way how characters in a document or message
-  are converted to data to be used by your computer. All web documents and
-  mail or news messages use a text encoding method (also known as a character
-  set, character coding, or charset).</p>
+<p>A text encoding method is the way characters in a document or message are
+  converted to data to be used by your computer. All web documents and mail or
+  news messages use a text encoding method (also known as a character set,
+  character coding, or charset).</p>
 
 <p>The text encoding method for a document may depend on its language.
   Some languages e.g. most West European languages, share the same encoding
   method. Others such as Chinese, Japanese, and Russian use different methods.
   In contrast, Unicode provides language-independent encoding methods. UTF-8,
   for example, can be used for any language document.</p>
 
 <p>Your version of &brandShortName; is set to a default text encoding which is
--- a/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
@@ -26,8 +26,11 @@
 <!ENTITY openHelpCmd.label              "ヘルプコンテンツ">
 <!ENTITY openHelpCmd.accesskey          "H">
 <!ENTITY openHelpCmd.key                "VK_F1">
 
 <!-- Key labels, for mousewheel prefs -->
 <!ENTITY ctrlKey.label                  "Ctrl">
 <!ENTITY altKey.label                   "Alt">
 <!ENTITY shiftKey.label                 "Shift">
+
+<!ENTITY menubarCmd.label               "メニューバー">
+<!ENTITY menubarCmd.accesskey           "e">
--- a/suite/chrome/common/win/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/win/platformCommunicatorOverlay.dtd
@@ -31,8 +31,11 @@
                        "Help" menu label on Windows -->
 <!ENTITY helpMenu.label                 "ヘルプ">
 <!ENTITY helpMenu.accesskey             "H">
 
 <!-- Key labels, for mousewheel prefs -->
 <!ENTITY ctrlKey.label                  "Ctrl">
 <!ENTITY altKey.label                   "Alt">
 <!ENTITY shiftKey.label                 "Shift">
+
+<!ENTITY menubarCmd.label               "メニューバー">
+<!ENTITY menubarCmd.accesskey           "e">
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -110,17 +110,17 @@
 <!ENTITY redoMarkAllCmd.label                  "やり直し - すべてを既読にする">
 <!ENTITY undoDefaultCmd.label                  "元に戻す">
 <!ENTITY redoDefaultCmd.label                  "やり直し">
 
 <!-- View Menu -->
 <!ENTITY showMessengerToolbarCmd.label         "メールツールバー">
 <!ENTITY showMessengerToolbarCmd.accesskey     "M">
 <!ENTITY showSearchToolbarCmd.label            "検索バー">
-<!ENTITY showSearchToolbarCmd.accesskey        "e">
+<!ENTITY showSearchToolbarCmd.accesskey        "a">
 <!ENTITY showTabsToolbarCmd.label              "タブツールバー">
 <!ENTITY showTabsToolbarCmd.accesskey          "T">
 
 <!ENTITY messagePaneLayoutStyle.label          "レイアウト">
 <!ENTITY messagePaneLayoutStyle.accesskey      "L">
 <!ENTITY messagePaneClassic.label              "クラシック表示">
 <!ENTITY messagePaneClassic.accesskey          "C">
 <!ENTITY messagePaneWide.label                 "横長表示">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -385,16 +385,18 @@ tagExists			=この名前のタグはすでに存在します。
 
 # for checking if the user really wants to delete the adaptive filter training set
 confirmResetJunkTrainingTitle	=確認
 confirmResetJunkTrainingText	=本当に迷惑メールフィルタの学習データをリセットしてもよろしいですか?
 
 # for the virtual folder list dialog title
 # %S is the name of the saved search folder
 editVirtualFolderPropertiesTitle	=検索フォルダ %S のプロパティを変更
+# LOCALIZATION NOTE (foldersChosen): #1 number of chosen folders
+virtualFolderSourcesChosen		=#1 個のフォルダを選択しています
 
 #alert to inform the user to choose one or more folders to search for a saved search folder
 alertNoSearchFoldersSelected	=検索対象フォルダを 1 つ以上選択してください。
 
 # These are displayed in the message and folder pane windows
 # LOCALIZATION NOTE %.*f is the abbreviated size in the appropriate units
 byteAbbreviation2		=%.*f バイト
 kiloByteAbbreviation2		=%.*f KB