35.0: sync suite with en-US rev18901:6d2d158a7f3e
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Wed, 19 Nov 2014 22:57:33 +0900
changeset 1605 f3081fb0bdd8590cdceb17fb4bf3dfcbc3137c10
parent 1604 95f6958a875fa8a87996e72df1f4ccdf4a835c26
child 1606 d5c8ac384c243b19b0cea3ebd1791e2aa3bd8b0b
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs35
35.0: sync suite with en-US rev18901:6d2d158a7f3e
suite/chrome/common/help/shortcuts_composer.xhtml
suite/chrome/common/help/shortcuts_mailnews.xhtml
suite/chrome/common/mac/platformCommunicatorOverlay.dtd
suite/chrome/common/unix/platformCommunicatorOverlay.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/common/win/platformCommunicatorOverlay.dtd
--- a/suite/chrome/common/help/shortcuts_composer.xhtml
+++ b/suite/chrome/common/help/shortcuts_composer.xhtml
@@ -63,19 +63,19 @@
     <tr>
     <td>Publish</td>
     <td>Ctrl+Shift+S</td>
     <td>Cmd+Shift+S</td>
     <td>Ctrl+Shift+S</td>
   </tr>
   <tr>
     <td>Find and Replace</td>
-    <td>Ctrl+F</td>
-    <td>Cmd+F</td>
-    <td>Ctrl+F</td>
+    <td>Ctrl+H</td>
+    <td>Cmd+Opt+F</td>
+    <td>Ctrl+H</td>
   </tr>
   <tr>
     <td>Find Again</td>
     <td>Ctrl+G</td>
     <td>Cmd+G</td>
     <td>Ctrl+G</td>
   </tr>
   <tr>
--- a/suite/chrome/common/help/shortcuts_mailnews.xhtml
+++ b/suite/chrome/common/help/shortcuts_mailnews.xhtml
@@ -336,16 +336,22 @@
   </tr>
   <tr>
     <td>Rewrap</td>
     <td>Ctrl+R</td>
     <td>Cmd+R</td>
     <td>Ctrl+R</td>
   </tr>
   <tr>
+    <td>Find and Replace</td>
+    <td>Ctrl+H</td>
+    <td>Cmd+Opt+F</td>
+    <td>Ctrl+H</td>
+  </tr>
+  <tr>
     <td>Send Message Now</td>
     <td>Ctrl+Enter</td>
     <td>Cmd+Return</td>
     <td>Ctrl+Enter</td>
   </tr>
   <tr>
     <td>Send Message Later</td>
     <td>Ctrl+Shift+Enter</td>
--- a/suite/chrome/common/mac/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/mac/platformCommunicatorOverlay.dtd
@@ -26,16 +26,17 @@
 <!-- End of Application menu -->
 
 <!ENTITY closeCmd.label                 "閉じる">
 <!ENTITY closeCmd.key                   "W">
 
 <!ENTITY printSetupCmd.label            "ページ設定...">
 <!ENTITY printSetupCmd.accesskey        "u">
 
+<!ENTITY findReplaceCmd.key             "F">
 <!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">
 
--- a/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
@@ -11,16 +11,17 @@
 
 <!ENTITY quitApplicationCmd.label       "終了">
 <!ENTITY quitApplicationCmd.key         "Q">
 <!ENTITY quitApplicationCmd.accesskey   "q">
 
 <!ENTITY redoCmd.key                    "Y">
 
 <!ENTITY findCmd.key2                   "VK_F19">
+<!ENTITY findReplaceCmd.key             "H">
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
 
 <!ENTITY accel.emacs_conflict           "accel,shift">
 
 <!-- Help viewer -->
 <!ENTITY openHelpCmd.label              "ヘルプコンテンツ">
 <!ENTITY openHelpCmd.accesskey          "H">
--- a/suite/chrome/common/utilityOverlay.dtd
+++ b/suite/chrome/common/utilityOverlay.dtd
@@ -1,158 +1,157 @@
 <!-- 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/. -->
 
 <!-- these things need to move into utilityOverlay.xul -->
-<!ENTITY  offlineGoOfflineCmd.label                 "オフラインにする">
-<!ENTITY  offlineGoOfflineCmd.accesskey             "k">
+<!ENTITY  offlineGoOfflineCmd.label	"オフラインにする">
+<!ENTITY  offlineGoOfflineCmd.accesskey	"k">
 
 <!-- LOCALIZATION NOTE : FILE This file contains the global menu items --> 
 
-<!ENTITY fileMenu.label                   "ファイル">
-<!ENTITY fileMenu.accesskey               "F">
-<!ENTITY newMenu.label                    "新規作成">
-<!ENTITY newMenu.accesskey                "N">
-<!ENTITY newBlankPageCmd.label            "ページを作成">
-<!ENTITY newBlankPageCmd.accesskey        "P">
-<!ENTITY newBlankPageCmd.key              "n">
-<!ENTITY newPageFromTemplateCmd.label     "テンプレートからページを作成">
-<!ENTITY newPageFromTemplateCmd.accesskey "t">
-<!ENTITY newPageFromDraftCmd.label        "下書きからページを作成">
-<!ENTITY newPageFromDraftCmd.accesskey    "d">
-<!ENTITY newNavigatorCmd.label            "ブラウザウィンドウ">
-<!ENTITY newNavigatorCmd.key              "N">
-<!ENTITY newNavigatorCmd.accesskey        "B">
-<!ENTITY newPrivateWindowCmd.label        "プライベートウィンドウ">
-<!ENTITY newPrivateWindowCmd.key          "B">
-<!ENTITY newPrivateWindowCmd.accesskey    "W">
-<!ENTITY printSetupCmd.label              "ページ設定...">
-<!ENTITY printSetupCmd.accesskey          "u">
-<!ENTITY printPreviewCmd.label            "印刷プレビュー">
-<!ENTITY printPreviewCmd.accesskey        "v">
-<!ENTITY printCmd.label                   "印刷">
-<!ENTITY printCmd.accesskey               "P">
-<!ENTITY printCmd.key                     "P">
+<!ENTITY fileMenu.label			"ファイル">
+<!ENTITY fileMenu.accesskey		"F">
+<!ENTITY newMenu.label			"新規作成">
+<!ENTITY newMenu.accesskey		"N">
+<!ENTITY newBlankPageCmd.label		"ページを作成">
+<!ENTITY newBlankPageCmd.accesskey	"P">
+<!ENTITY newBlankPageCmd.key		"n">
+<!ENTITY newPageFromTemplateCmd.label	"テンプレートからページを作成">
+<!ENTITY newPageFromTemplateCmd.accesskey	"t">
+<!ENTITY newPageFromDraftCmd.label	"下書きからページを作成">
+<!ENTITY newPageFromDraftCmd.accesskey	"d">
+<!ENTITY newNavigatorCmd.label		"ブラウザウィンドウ">
+<!ENTITY newNavigatorCmd.key		"N">
+<!ENTITY newNavigatorCmd.accesskey	"B">
+<!ENTITY newPrivateWindowCmd.label	"プライベートウィンドウ">
+<!ENTITY newPrivateWindowCmd.key	"B">
+<!ENTITY newPrivateWindowCmd.accesskey	"W">
+<!ENTITY printSetupCmd.label		"ページ設定...">
+<!ENTITY printSetupCmd.accesskey	"u">
+<!ENTITY printPreviewCmd.label		"印刷プレビュー">
+<!ENTITY printPreviewCmd.accesskey	"v">
+<!ENTITY printCmd.label			"印刷">
+<!ENTITY printCmd.accesskey		"P">
+<!ENTITY printCmd.key			"P">
 
-<!ENTITY editMenu.label                   "編集">
-<!ENTITY editMenu.accesskey               "E">
-<!ENTITY undoCmd.label                    "元に戻す">
-<!ENTITY undoCmd.key                      "Z">
-<!ENTITY undoCmd.accesskey                "U">
-<!ENTITY redoCmd.label                    "やり直し">
-<!ENTITY redoCmd.key                      "Y">
-<!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 pasteCmd.label                   "貼り付け">
-<!ENTITY pasteCmd.key                     "V">
-<!ENTITY pasteCmd.accesskey               "P">
-<!ENTITY pasteGoCmd.label                 "貼り付けて移動">
-<!ENTITY pasteGoCmd.accesskey             "G">
+<!ENTITY editMenu.label			"編集">
+<!ENTITY editMenu.accesskey		"E">
+<!ENTITY undoCmd.label			"元に戻す">
+<!ENTITY undoCmd.key			"Z">
+<!ENTITY undoCmd.accesskey		"U">
+<!ENTITY redoCmd.label			"やり直し">
+<!ENTITY redoCmd.key			"Y">
+<!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 pasteCmd.label			"貼り付け">
+<!ENTITY pasteCmd.key			"V">
+<!ENTITY pasteCmd.accesskey		"P">
+<!ENTITY pasteGoCmd.label		"貼り付けて移動">
+<!ENTITY pasteGoCmd.accesskey		"G">
 
 <!-- LOCALIZATION NOTE (pasteSearchCmd): "Search" is a verb, this is the
      search bar equivalent to the url bar's "Paste & Go"  -->
-<!ENTITY pasteSearchCmd.label             "貼り付けて検索">
-<!ENTITY pasteSearchCmd.accesskey         "e">
-<!ENTITY deleteCmd.label                  "削除">
-<!ENTITY deleteCmd.accesskey              "D">
-<!ENTITY selectAllCmd.label               "すべて選択">
-<!ENTITY selectAllCmd.key                 "A">
-<!ENTITY selectAllCmd.accesskey           "A">
-<!ENTITY clearHistoryCmd.label            "検索履歴を消去">
-<!ENTITY clearHistoryCmd.accesskey        "H">
-<!ENTITY showSuggestionsCmd.label         "検索候補を表示">
-<!ENTITY showSuggestionsCmd.accesskey     "S">
-<!ENTITY preferencesCmd.label             "設定...">
-<!ENTITY preferencesCmd.key               "E">
-<!ENTITY preferencesCmd.accesskey         "e">
-<!ENTITY findBarCmd.key                   "F">
+<!ENTITY pasteSearchCmd.label		"貼り付けて検索">
+<!ENTITY pasteSearchCmd.accesskey	"e">
+<!ENTITY deleteCmd.label		"削除">
+<!ENTITY deleteCmd.accesskey		"D">
+<!ENTITY selectAllCmd.label		"すべて選択">
+<!ENTITY selectAllCmd.key		"A">
+<!ENTITY selectAllCmd.accesskey		"A">
+<!ENTITY clearHistoryCmd.label		"検索履歴を消去">
+<!ENTITY clearHistoryCmd.accesskey	"H">
+<!ENTITY showSuggestionsCmd.label	"検索候補を表示">
+<!ENTITY showSuggestionsCmd.accesskey	"S">
+<!ENTITY preferencesCmd.label		"設定...">
+<!ENTITY preferencesCmd.key		"E">
+<!ENTITY preferencesCmd.accesskey	"e">
+<!ENTITY findBarCmd.key			"F">
 <!-- LOCALIZATION NOTE (findBarCmd.accesskey): This accesskey should be within
      findBarCmd.label found in editorOverlay.dtd, findCmd.label in messenger.dtd
      and messengercompose.dtd and findOnCmd.label found in navigatorOverlay.dtd -->
-<!ENTITY findBarCmd.accesskey             "F">
-<!ENTITY findReplaceCmd.key               "H">
-<!ENTITY findReplaceCmd.accesskey         "l">
-<!ENTITY findAgainCmd.label               "次を検索">
-<!ENTITY findAgainCmd.key                 "G">
-<!ENTITY findAgainCmd.accesskey           "g">
-<!ENTITY findAgainCmd.key2                "VK_F3">
-<!ENTITY findPrevCmd.label                "前を検索">
-<!ENTITY findPrevCmd.key                  "G">
-<!ENTITY findPrevCmd.key2                 "VK_F3">
-<!ENTITY findPrevCmd.accesskey            "v">
-<!ENTITY findTypeTextCmd.label            "テキストをタイプ検索">
-<!ENTITY findTypeTextCmd.accesskey        "x">
-<!ENTITY findTypeLinksCmd.label           "リンクをタイプ検索">
-<!ENTITY findTypeLinksCmd.accesskey       "k">
+<!ENTITY findBarCmd.accesskey		"F">
+<!ENTITY findReplaceCmd.accesskey	"l">
+<!ENTITY findAgainCmd.label		"次を検索">
+<!ENTITY findAgainCmd.key		"G">
+<!ENTITY findAgainCmd.accesskey		"g">
+<!ENTITY findAgainCmd.key2		"VK_F3">
+<!ENTITY findPrevCmd.label		"前を検索">
+<!ENTITY findPrevCmd.key		"G">
+<!ENTITY findPrevCmd.key2		"VK_F3">
+<!ENTITY findPrevCmd.accesskey		"v">
+<!ENTITY findTypeTextCmd.label		"テキストをタイプ検索">
+<!ENTITY findTypeTextCmd.accesskey	"x">
+<!ENTITY findTypeLinksCmd.label		"リンクをタイプ検索">
+<!ENTITY findTypeLinksCmd.accesskey	"k">
 
-<!ENTITY viewMenu.label                   "表示">
-<!ENTITY viewMenu.accesskey               "V">
-<!ENTITY viewToolbarsMenu.label           "表示/隠す">
-<!ENTITY viewToolbarsMenu.accesskey       "w">
-<!ENTITY showTaskbarCmd.label             "ステータスバー">
-<!ENTITY showTaskbarCmd.accesskey         "S">
+<!ENTITY viewMenu.label			"表示">
+<!ENTITY viewMenu.accesskey		"V">
+<!ENTITY viewToolbarsMenu.label		"表示/隠す">
+<!ENTITY viewToolbarsMenu.accesskey	"w">
+<!ENTITY showTaskbarCmd.label		"ステータスバー">
+<!ENTITY showTaskbarCmd.accesskey	"S">
 
-<!ENTITY helpMenu.label                   "ヘルプ">
-<!ENTITY helpMenu.accesskey               "h">
+<!ENTITY helpMenu.label			"ヘルプ">
+<!ENTITY helpMenu.accesskey		"h">
 
-<!ENTITY helpTroubleshootingInfo.label      "トラブルシューティング情報">
-<!ENTITY helpTroubleshootingInfo.accesskey  "T">
-<!ENTITY releaseCmd.label                   "リリースノート">
-<!ENTITY releaseCmd.accesskey               "N">
-<!ENTITY helpSafeMode.label                 "アドオンを無効にして再起動">
-<!ENTITY helpSafeMode.accesskey             "R">
-<!ENTITY updateCmd.label                    "&brandShortName; の更新を確認...">
-<!ENTITY updateCmd.accesskey                "C">
-<!ENTITY aboutCmd.label                     "&brandShortName; について">
-<!ENTITY aboutCmd.accesskey                 "A">
-<!ENTITY aboutCommPluginsCmd.label          "プラグインについて">
-<!ENTITY aboutCommPluginsCmd.accesskey      "p">
+<!ENTITY helpTroubleshootingInfo.label		"トラブルシューティング情報">
+<!ENTITY helpTroubleshootingInfo.accesskey	"T">
+<!ENTITY releaseCmd.label			"リリースノート">
+<!ENTITY releaseCmd.accesskey			"N">
+<!ENTITY helpSafeMode.label			"アドオンを無効にして再起動">
+<!ENTITY helpSafeMode.accesskey			"R">
+<!ENTITY updateCmd.label			"&brandShortName; の更新を確認...">
+<!ENTITY updateCmd.accesskey			"C">
+<!ENTITY aboutCmd.label				"&brandShortName; について">
+<!ENTITY aboutCmd.accesskey			"A">
+<!ENTITY aboutCommPluginsCmd.label		"プラグインについて">
+<!ENTITY aboutCommPluginsCmd.accesskey		"p">
 
-<!ENTITY direct.label                                   "オンライン (プロキシ: なし)">
-<!ENTITY direct.accesskey                               "N">
-<!ENTITY manual.label                                   "オンライン (プロキシ: 手動設定)">
-<!ENTITY manual.accesskey                               "M">
-<!ENTITY pac.label                                      "オンライン (プロキシ: 設定ファイルの URL を指定)">
-<!ENTITY pac.accesskey                                  "A">
-<!ENTITY wpad.label                                     "オンライン (プロキシ: 自動検出)">
-<!ENTITY wpad.accesskey                                 "D">
-<!ENTITY system.label                                   "オンライン (プロキシ: システムの設定)">
-<!ENTITY system.accesskey                               "S">
+<!ENTITY direct.label			"オンライン (プロキシ: なし)">
+<!ENTITY direct.accesskey		"N">
+<!ENTITY manual.label			"オンライン (プロキシ: 手動設定)">
+<!ENTITY manual.accesskey		"M">
+<!ENTITY pac.label			"オンライン (プロキシ: 設定ファイルの URL を指定)">
+<!ENTITY pac.accesskey			"A">
+<!ENTITY wpad.label			"オンライン (プロキシ: 自動検出)">
+<!ENTITY wpad.accesskey			"D">
+<!ENTITY system.label			"オンライン (プロキシ: システムの設定)">
+<!ENTITY system.accesskey		"S">
 
-<!ENTITY proxy.label                                    "プロキシ設定...">
-<!ENTITY proxy.accesskey                                "C">
+<!ENTITY proxy.label			"プロキシ設定...">
+<!ENTITY proxy.accesskey		"C">
 
-<!ENTITY bidiSwitchTextDirectionItem.label        "テキストの書記方向を切り換え">
-<!ENTITY bidiSwitchTextDirectionItem.accesskey    "w">
-<!ENTITY bidiSwitchTextDirectionItem.commandkey   "X">
+<!ENTITY bidiSwitchTextDirectionItem.label		"テキストの書記方向を切り換え">
+<!ENTITY bidiSwitchTextDirectionItem.accesskey		"w">
+<!ENTITY bidiSwitchTextDirectionItem.commandkey		"X">
 
-<!ENTITY customizeToolbarContext.label            "カスタマイズ...">
-<!ENTITY customizeToolbarContext.accesskey        "C">
+<!ENTITY customizeToolbarContext.label			"カスタマイズ...">
+<!ENTITY customizeToolbarContext.accesskey		"C">
 
-<!ENTITY customizeToolbar.toolbarmode.label       "このツールバーの設定">
-<!ENTITY customizeToolbar.toolbarmode.accesskey   "e">
-<!ENTITY customizeToolbar.iconsAndText.label      "アイコンとテキスト">
-<!ENTITY customizeToolbar.iconsAndText.accesskey  "a">
-<!ENTITY customizeToolbar.icons.label             "アイコンのみ">
-<!ENTITY customizeToolbar.icons.accesskey         "o">
-<!ENTITY customizeToolbar.text.label              "テキストのみ">
-<!ENTITY customizeToolbar.text.accesskey          "T">
-<!ENTITY customizeToolbar.useSmallIcons.label     "小さいアイコンを使用">
-<!ENTITY customizeToolbar.useSmallIcons.accesskey "s">
-<!ENTITY customizeToolbar.labelAlignEnd.label     "アイコンの横にテキストを表示">
-<!ENTITY customizeToolbar.labelAlignEnd.accesskey "b">
-<!ENTITY customizeToolbar.useDefault.label        "初期設定に戻す">
-<!ENTITY customizeToolbar.useDefault.accesskey    "U">
+<!ENTITY customizeToolbar.toolbarmode.label		"このツールバーの設定">
+<!ENTITY customizeToolbar.toolbarmode.accesskey		"e">
+<!ENTITY customizeToolbar.iconsAndText.label		"アイコンとテキスト">
+<!ENTITY customizeToolbar.iconsAndText.accesskey	"a">
+<!ENTITY customizeToolbar.icons.label			"アイコンのみ">
+<!ENTITY customizeToolbar.icons.accesskey		"o">
+<!ENTITY customizeToolbar.text.label			"テキストのみ">
+<!ENTITY customizeToolbar.text.accesskey		"T">
+<!ENTITY customizeToolbar.useSmallIcons.label		"小さいアイコンを使用">
+<!ENTITY customizeToolbar.useSmallIcons.accesskey	"s">
+<!ENTITY customizeToolbar.labelAlignEnd.label		"アイコンの横にテキストを表示">
+<!ENTITY customizeToolbar.labelAlignEnd.accesskey	"b">
+<!ENTITY customizeToolbar.useDefault.label		"初期設定に戻す">
+<!ENTITY customizeToolbar.useDefault.accesskey		"U">
 
 <!-- Popup Blocked notification menu -->
-<!ENTITY allowPopups.accesskey        "p">
-<!ENTITY showPopupManager.label       "ポップアップの管理">
-<!ENTITY showPopupManager.accesskey   "M">
-<!ENTITY dontShowMessage.label        "ポップアップをブロックしたときにこのメッセージを表示しない">
-<!ENTITY dontShowMessage.accesskey    "D">
+<!ENTITY allowPopups.accesskey			"p">
+<!ENTITY showPopupManager.label			"ポップアップの管理">
+<!ENTITY showPopupManager.accesskey		"M">
+<!ENTITY dontShowMessage.label			"ポップアップをブロックしたときにこのメッセージを表示しない">
+<!ENTITY dontShowMessage.accesskey		"D">
 
-<!ENTITY syncToolbarButton.label	"Sync">
+<!ENTITY syncToolbarButton.label		"Sync">
--- a/suite/chrome/common/win/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/win/platformCommunicatorOverlay.dtd
@@ -10,17 +10,17 @@
 <!ENTITY closeCmd.key                   "W">
 <!ENTITY closeCmd.accesskey             "c">
 
 <!ENTITY quitApplicationCmd.label       "終了">
 <!ENTITY quitApplicationCmd.key         "Q">
 <!ENTITY quitApplicationCmd.accesskey   "x">
 
 <!ENTITY redoCmd.key                    "Y">
-
+<!ENTITY findReplaceCmd.key             "H">
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
 
 <!ENTITY accel.emacs_conflict           "accel">
 
 <!-- Help viewer -->
 <!ENTITY openHelpCmd.label              "ヘルプコンテンツ">
 <!ENTITY openHelpCmd.accesskey          "H">