sync suite with en-US rev8560:bc61f0aededf
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Wed, 21 Sep 2011 22:22:26 +0900
changeset 284 e1346f36470caab04957d8a42a698f8cfc31172e
parent 283 781a7fe75b266ff99c84da7c577673f43eba7c64
child 285 09a0f843119ea4a48de1ab2fac508facb6d4d489
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
sync suite with en-US rev8560:bc61f0aededf
suite/chrome/branding/brand.properties
suite/chrome/browser/navigator.dtd
suite/chrome/browser/navigatorOverlay.dtd
suite/chrome/browser/taskbar.properties
suite/chrome/browser/unix/platformNavigationBindings.dtd
suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/permissions/permissionsNavigatorOverlay.dtd
suite/chrome/common/pref/pref-advanced.dtd
suite/chrome/common/pref/pref-content.dtd
suite/chrome/common/unix/platformCommunicatorOverlay.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/common/viewZoomOverlay.dtd
suite/chrome/common/viewZoomOverlay.properties
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/msgHdrViewPopup.dtd
suite/chrome/mailnews/pref/prefs.properties
--- a/suite/chrome/branding/brand.properties
+++ b/suite/chrome/branding/brand.properties
@@ -1,8 +1,9 @@
 brandFullName=SeaMonkey
 brandShortName=SeaMonkey
 vendorShortName=SeaMonkey
 sidebarName=Sidebar
 extensions.getMoreThemesURL=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/
+extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/personas
 spellchecker.dictionaries.download.url=https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/dictionaries/
 app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
 app.vendorURL=http://www.seamonkey-project.org/
--- a/suite/chrome/browser/navigator.dtd
+++ b/suite/chrome/browser/navigator.dtd
@@ -5,129 +5,39 @@
 
 <!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE --> 
 <!ENTITY mainWindow.title "&brandShortName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE --> 
 <!ENTITY mainWindow.titlemodifier "&brandShortName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 
-<!ENTITY tabCmd.label "ブラウザタブ">
-<!ENTITY tabCmd.accesskey "T">
-<!ENTITY tabCmd.commandkey "t">
-<!ENTITY openCmd.label "URL を開く...">
-<!ENTITY openCmd.accesskey "l">
-<!ENTITY openCmd.commandkey "l">
-<!ENTITY openFileCmd.label "ファイルを開く...">
-<!ENTITY openFileCmd.accesskey "o">
-<!ENTITY openFileCmd.commandkey "o">
-<!ENTITY recentTabs.label "最近閉じたタブ">
-<!ENTITY recentTabs.accesskey "R">
-<!ENTITY recentTabs.commandkey "t">
-<!ENTITY recentWindows.label "最近閉じたウィンドウ">
-<!ENTITY recentWindows.accesskey "y">
-<!ENTITY recentWindows.commandkey "y">
 <!ENTITY editPageCmd.label "ページを編集">
 <!ENTITY editPageCmd.accesskey "E">
 <!ENTITY editPageCmd.commandkey "e">
 
-<!ENTITY uploadFile.label "ファイルをアップロード...">
-<!ENTITY uploadFile.accesskey "F">
-
-<!ENTITY printSetupCmd.label "ページ設定...">
-<!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printPreviewCmd.label "印刷プレビュー">
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printCmd.label "印刷...">
 <!ENTITY printCmd.accesskey "p">
 <!ENTITY printCmd.commandkey "p">
 
-<!ENTITY toolbarsCmd.label "表示/非表示">
-<!ENTITY toolbarsCmd.accesskey "w">
 <!ENTITY navbarCmd.label "ナビゲーションツールバー">
 <!ENTITY navbarCmd.accesskey "N">
 <!ENTITY personalbarCmd.label "パーソナルツールバー">
-<!ENTITY personalbarCmd.accesskey "p">
-<!ENTITY tabbarCmd.label "タブバー">
-<!ENTITY tabbarCmd.accesskey "T">
-<!ENTITY taskbarCmd.label "ステータスバー">
-<!ENTITY taskbarCmd.accesskey "S">
-<!ENTITY componentbarCmd.label "コンポーネントバー">
-<!ENTITY componentbarCmd.accesskey "C">
+<!ENTITY personalbarCmd.accesskey "P">
 
-<!ENTITY useStyleSheetMenu.label "スタイルを適用">
-<!ENTITY useStyleSheetMenu.accesskey "u">
-<!ENTITY useStyleSheetNone.label "使用しない">
-<!ENTITY useStyleSheetNone.accesskey "N">
-<!ENTITY useStyleSheetPersistentOnly.label "標準のスタイル">
-<!ENTITY useStyleSheetPersistentOnly.accesskey "d">
-<!ENTITY pageSourceCmd.label "ページのソース">
-<!ENTITY pageSourceCmd.accesskey "o">
-<!ENTITY pageSourceCmd.commandkey "u">
-<!ENTITY pageInfoCmd.label "ページの情報">
-<!ENTITY pageInfoCmd.accesskey "i">
-<!ENTITY pageInfoCmd.commandkey "i">
-<!ENTITY fullScreenCmd.label "全画面表示">
-<!ENTITY fullScreenCmd.accesskey "f">
-<!ENTITY translateMenu.label "ページ翻訳">
-<!ENTITY translateMenu.accesskey "T">
-
-<!ENTITY closeOtherTabs.label "他のタブを閉じる">
-<!ENTITY closeOtherTabs.accesskey "T">
 <!ENTITY closeWindow.label "ウィンドウを閉じる">
 <!ENTITY closeWindow.accesskey "W">
 
 <!ENTITY minimizeButton.tooltip       "最小化">
 <!ENTITY restoreButton.tooltip        "元のサイズに戻す">
 
-<!ENTITY applyTheme.label	"テーマを適用"> 
-<!ENTITY applyTheme.accesskey	"A"> 
-<!ENTITY getNewThemesCmd.label "テーマを入手">
-<!ENTITY getNewThemesCmd.accesskey "G">
-<!ENTITY findOnCmd.label "ページ内を検索...">
-<!ENTITY findOnCmd.accesskey "f">
-<!ENTITY findOnCmd.commandkey "f">
-<!ENTITY findAgainCmd.label "再検索">
-<!ENTITY findAgainCmd.accesskey "g">
-<!ENTITY findAgainCmd.commandkey "g">
-<!ENTITY findPrevCmd.label "前を検索">
-<!ENTITY findPrevCmd.accesskey "v">
-<!ENTITY findPrevCmd.commandkey "g">
-<!ENTITY findAgainCmd.commandkey2 "VK_F3">
-<!ENTITY findPrevCmd.commandkey2 "VK_F3">
-
-<!ENTITY searchInternetCmd.label "Web 検索">
-<!ENTITY searchInternetCmd.accesskey "S">
-<!ENTITY searchInternet.commandKey "s">
-
-<!ENTITY clearPrivateDataCmd.label "プライバシー情報の消去...">
-<!ENTITY clearPrivateDataCmd.accesskey "e">
-
-<!ENTITY goMenu.label "移動">
-<!ENTITY goMenu.accesskey "g">
-<!ENTITY goHomeCmd.label "ホーム">
-<!ENTITY goHomeCmd.accesskey "h">
-<!ENTITY historyRestoreLastSession.label "前のセッションを復元">
-<!ENTITY historyRestoreLastSession.accesskey "R">
-
-<!ENTITY bookmarksMenu.label "ブックマーク">
-<!ENTITY bookmarksMenu.accesskey "B">
-<!ENTITY addCurPageCmd.label "このページをブックマーク">
-<!ENTITY addCurPageCmd.accesskey "B">
-<!ENTITY addCurPageAsCmd.label "ブックマークに追加...">
-<!ENTITY addCurPageAsCmd.accesskey "F">
-<!ENTITY addCurPageAsCmd.commandkey "d">
-<!ENTITY addCurTabsAsCmd.label "このタブグループをブックマークに追加...">
-<!ENTITY addCurTabsAsCmd.accesskey "G">
-<!ENTITY manBookmarksCmd.label "ブックマークの管理...">
-<!ENTITY manBookmarksCmd.accesskey "M">
-<!ENTITY manBookmarksCmd.commandkey "b">
 <!ENTITY feedsMenu.label "このページを購読する">
 <!ENTITY feedsMenu.accesskey "S">
-<!ENTITY emptyItem.label "(空)">
 
 <!ENTITY menuBar.tooltip                  "メニューバー">
 <!ENTITY personalToolbar.tooltip          "パーソナルツールバー">
 <!ENTITY navigationToolbar.tooltip        "ナビゲーションツールバー">
 
 <!-- Toolbar items --> 
 <!ENTITY backButton.label             "戻る">
 <!ENTITY backButton.tooltip           "前のページへ戻る">
@@ -148,29 +58,18 @@
 
 <!ENTITY locationBar.tooltip          "検索する用語、キーワード、または Web アドレスを入力">
 <!ENTITY locationBar.accesskey        "d">
 <!ENTITY locationBar.title            "アドレス (URL)">
 <!ENTITY proxyIcon.tooltip            "このアイコンをドラッグアンドドロップすると、このページへのリンクが作成されます">
 
 <!ENTITY searchItem.title             "検索">
 
-<!-- Toolbar items --> 
-<!ENTITY  bookmarksButton.label       "ブックマーク">
-<!ENTITY  bookmarksButton.tooltip     "ブックマークリスト">
-<!ENTITY  homeButton.label            "ホーム">
-<!ENTITY  bookmarksToolbarItem.label  "ブックマークツールバーの項目">
+<!ENTITY bookmarksButton.label        "ブックマーク">
+<!ENTITY bookmarksButton.tooltip      "ブックマークリスト">
+<!ENTITY homeButton.label             "ホーム">
+<!ENTITY bookmarksToolbarItem.label   "ブックマークツールバーの項目">
 <!ENTITY bookmarksToolbarChevron.tooltip "他のブックマークを表示">
 
 <!-- Statusbar -->
-<!ENTITY  statusText.label            "完了">
-
-<!ENTITY historyCmd.label           "履歴">
-<!ENTITY historyCmd.accesskey       "i">
-<!ENTITY history.commandKey         "h">
+<!ENTITY statusText.label             "完了">
 
 <!ENTITY popupIcon.tooltiptext      "このサイトのポップアップはブロックされません">
-
-<!ENTITY bidiSwitchPageDirectionItem.label        "ページの書記方向を切り換える">
-<!ENTITY bidiSwitchPageDirectionItem.accesskey    "g">
-
-<!-- LOCALIZATION NOTE (syncTabsMenu.label): This appears in the Go menu -->
-<!ENTITY syncTabsMenu.label         "他のコンピュータのタブと同期">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/browser/navigatorOverlay.dtd
@@ -0,0 +1,151 @@
+<!-- File Menu -->
+<!ENTITY tabCmd.label "ブラウザタブ">
+<!ENTITY tabCmd.accesskey "T">
+<!ENTITY tabCmd.commandkey "t">
+<!ENTITY openCmd.label "URL を開く...">
+<!ENTITY openCmd.accesskey "L">
+<!ENTITY openCmd.commandkey "l">
+<!ENTITY openFileCmd.label "ファイルを開く...">
+<!ENTITY openFileCmd.accesskey "O">
+<!ENTITY openFileCmd.commandkey "o">
+
+<!ENTITY closeOtherTabs.label "他のタブを閉じる">
+<!ENTITY closeOtherTabs.accesskey "T">
+
+<!ENTITY uploadFile.label "ファイルをアップロード...">
+<!ENTITY uploadFile.accesskey "F">
+
+<!ENTITY printSetupCmd.label "ページ設定...">
+<!ENTITY printSetupCmd.accesskey "u">
+
+<!-- Edit Menu -->
+<!ENTITY findOnCmd.label "ページ内を検索...">
+<!ENTITY findOnCmd.accesskey "f">
+<!ENTITY findOnCmd.commandkey "f">
+<!ENTITY findAgainCmd.label "再検索">
+<!ENTITY findAgainCmd.accesskey "g">
+<!ENTITY findAgainCmd.commandkey "g">
+<!ENTITY findPrevCmd.label "前を検索">
+<!ENTITY findPrevCmd.accesskey "v">
+<!ENTITY findPrevCmd.commandkey "g">
+<!ENTITY findAgainCmd.commandkey2 "VK_F3">
+<!ENTITY findPrevCmd.commandkey2 "VK_F3">
+
+<!-- View Menu -->
+<!ENTITY toolbarsCmd.label "表示/非表示">
+<!ENTITY toolbarsCmd.accesskey "w">
+<!ENTITY tabbarCmd.label "タブバー">
+<!ENTITY tabbarCmd.accesskey "T">
+<!ENTITY taskbarCmd.label "ステータスバー">
+<!ENTITY taskbarCmd.accesskey "S">
+<!ENTITY componentbarCmd.label "コンポーネントバー">
+<!ENTITY componentbarCmd.accesskey "C">
+
+<!ENTITY fullScreenCmd.label "全画面表示">
+<!ENTITY fullScreenCmd.accesskey "F">
+
+<!ENTITY useStyleSheetMenu.label "スタイルを適用">
+<!ENTITY useStyleSheetMenu.accesskey "U">
+<!ENTITY useStyleSheetNone.label "使用しない">
+<!ENTITY useStyleSheetNone.accesskey "N">
+<!ENTITY useStyleSheetPersistentOnly.label "標準のスタイル">
+<!ENTITY useStyleSheetPersistentOnly.accesskey "D">
+<!ENTITY bidiSwitchPageDirectionItem.label "ページの書記方向を切り換える">
+<!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
+<!ENTITY pageSourceCmd.label "ページのソース">
+<!ENTITY pageSourceCmd.accesskey "o">
+<!ENTITY pageSourceCmd.commandkey "u">
+<!ENTITY pageInfoCmd.label "ページの情報">
+<!ENTITY pageInfoCmd.accesskey "I">
+<!ENTITY pageInfoCmd.commandkey "i">
+
+<!ENTITY applyTheme.label "テーマを適用"> 
+<!ENTITY applyTheme.accesskey "A"> 
+<!ENTITY getNewThemesCmd.label "テーマを入手">
+<!ENTITY getNewThemesCmd.accesskey "G">
+<!ENTITY getPersonasCmd.label "Personas を入手">
+<!ENTITY getPersonasCmd.accesskey "P">
+
+<!-- Go Menu -->
+<!ENTITY goMenu.label "移動">
+<!ENTITY goMenu.accesskey "G">
+<!ENTITY goHomeCmd.label "ホーム">
+<!ENTITY goHomeCmd.accesskey "H">
+<!ENTITY historyCmd.label "履歴">
+<!ENTITY historyCmd.accesskey "s">
+<!ENTITY history.commandKey "h">
+<!ENTITY recentTabs.label "最近閉じたタブ">
+<!ENTITY recentTabs.accesskey "C">
+<!ENTITY recentTabs.commandkey "t">
+<!ENTITY recentWindows.label "最近閉じたウィンドウ">
+<!ENTITY recentWindows.accesskey "W">
+<!ENTITY recentWindows.commandkey "y">
+<!ENTITY historyRestoreLastSession.label "前のセッションを復元">
+<!ENTITY historyRestoreLastSession.accesskey "R">
+<!ENTITY syncTabsMenu.label "他のコンピュータのタブと同期">
+<!ENTITY syncTabsMenu.accesskey "O">
+
+<!-- Bookmarks Menu -->
+<!ENTITY bookmarksMenu.label "ブックマーク">
+<!ENTITY bookmarksMenu.accesskey "B">
+<!ENTITY addCurPageCmd.label "このページをブックマーク">
+<!ENTITY addCurPageCmd.accesskey "B">
+<!ENTITY addCurPageAsCmd.label "ブックマークに追加...">
+<!ENTITY addCurPageAsCmd.accesskey "F">
+<!ENTITY addCurPageAsCmd.commandkey "d">
+<!ENTITY addCurTabsAsCmd.label "このタブグループをブックマークに追加...">
+<!ENTITY addCurTabsAsCmd.accesskey "G">
+<!ENTITY manBookmarksCmd.label "ブックマークの管理...">
+<!ENTITY manBookmarksCmd.accesskey "M">
+<!ENTITY manBookmarksCmd.commandkey "b">
+
+<!-- Tools Menu -->
+<!ENTITY searchInternetCmd.label "Web 検索">
+<!ENTITY searchInternetCmd.accesskey "S">
+<!ENTITY searchInternet.commandKey "s">
+<!ENTITY translateMenu.label "ページ翻訳">
+<!ENTITY translateMenu.accesskey "T">
+
+<!ENTITY cookieMessageTitle.label "Cookie 取捨設定の変更">
+<!ENTITY cookieDisplayCookiesCmd.label "保存した Cookie の管理">
+<!ENTITY cookieDisplayCookiesCmd.accesskey "M">
+<!ENTITY cookieAllowCookiesCmd.label "このサイトからの Cookie を受け入れる">
+<!ENTITY cookieAllowCookiesCmd.accesskey "A">
+<!ENTITY cookieAllowCookiesMsg.label "このサイトからの Cookie は常に受け入れます。">
+<!ENTITY cookieAllowSessionCookiesCmd.label "このサイトからのセッション Cookie を受け入れる">
+<!ENTITY cookieAllowSessionCookiesCmd.accesskey "S">
+<!ENTITY cookieAllowSessionCookiesMsg.label "このサイトからの Cookie は現在のセッションのみ有効です。">
+<!ENTITY cookieCookiesDefaultCmd.label "既定の Cookie の取捨設定を使用する">
+<!ENTITY cookieCookiesDefaultCmd.accesskey "U">
+<!ENTITY cookieCookiesDefaultMsg.label "このサイトからの Cookie は既定の設定に基づいて受け入れ、または捨てられます。">
+<!ENTITY cookieBlockCookiesCmd.label "このサイトからの Cookie を拒否する">
+<!ENTITY cookieBlockCookiesCmd.accesskey "B">
+<!ENTITY cookieBlockCookiesMsg.label "このサイトからの Cookie は常に拒否します。">
+
+<!ENTITY cookieImageMessageTitle.label "画像表示の可否設定の変更">
+<!ENTITY cookieDisplayImagesCmd.label "画像表示の可否設定の管理">
+<!ENTITY cookieDisplayImagesCmd.accesskey "M">
+<!ENTITY cookieAllowImagesCmd.label "このサイトの画像を表示する">
+<!ENTITY cookieAllowImagesCmd.accesskey "A">
+<!ENTITY cookieAllowImagesMsg.label "このサイトの画像は常に表示します。">
+<!ENTITY cookieImagesDefaultCmd.label "既定の画像表示の可否設定を使用する">
+<!ENTITY cookieImagesDefaultCmd.accesskey "U">
+<!ENTITY cookieImagesDefaultMsg.label "このサイトの画像は、既定の設定に基づいて表示、または無効化されます。">
+<!ENTITY cookieBlockImagesCmd.label "このサイトの画像を表示しない">
+<!ENTITY cookieBlockImagesCmd.accesskey "B">
+<!ENTITY cookieBlockImagesMsg.label "このサイトの画像は一切表示しません。">
+
+<!ENTITY cookieAllowPopupsCmd.label "このサイトのポップアップ表示を許可する">
+<!ENTITY cookieAllowPopupsCmd.accesskey "A">
+<!ENTITY cookieManagePopups.label "ポップアップの管理">
+<!ENTITY cookieManagePopups.accesskey "M">
+
+<!ENTITY cookieCookieManager.label "Cookie マネージャ">
+<!ENTITY cookieCookieManager.accesskey "C">
+<!ENTITY cookieImageManager.label "画像マネージャ">
+<!ENTITY cookieImageManager.accesskey "I">
+<!ENTITY cookiePopupManager.label "ポップアップマネージャ">
+<!ENTITY cookiePopupManager.accesskey "o">
+
+<!ENTITY clearPrivateDataCmd.label "プライバシー情報の消去...">
+<!ENTITY clearPrivateDataCmd.accesskey "e">
--- a/suite/chrome/browser/taskbar.properties
+++ b/suite/chrome/browser/taskbar.properties
@@ -1,7 +1,14 @@
 taskbar.tasks.newTab.label=新しいタブを開く
 taskbar.tasks.newTab.description=新しいブラウザのタブを開きます
 taskbar.tasks.newWindow.label=新しいウィンドウを開く
 taskbar.tasks.newWindow.description=新しいブラウザウィンドウを開きます
+taskbar.tasks.mailWindow.label=メールとニュースグループを開く
+taskbar.tasks.mailWindow.description=メールとニュースグループウィンドウを開きます
+taskbar.tasks.composeMessage.label=新しいメッセージを作成する
+taskbar.tasks.composeMessage.description=新しいメッセージを作成します
+taskbar.tasks.openAddressBook.label=アドレス帳を開く
+taskbar.tasks.openAddressBook.description=アドレス帳を開きます
+taskbar.tasks.openEditor.label=新しい Composer ページを開く
+taskbar.tasks.openEditor.description=新しい Composer ページを開きます
 taskbar.frequent.label=よく見るページ
 taskbar.recent.label=最近見たページ
-
--- a/suite/chrome/browser/unix/platformNavigationBindings.dtd
+++ b/suite/chrome/browser/unix/platformNavigationBindings.dtd
@@ -1,6 +1,5 @@
 <!-- LOCALIZATION NOTE: RTL languages may wish to switch these -->
 <!ENTITY goBackCmd.keyCode "VK_LEFT">
 <!ENTITY goForwardCmd.keyCode "VK_RIGHT">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
-<!ENTITY findOnCmd.commandkey2 "VK_F19">
--- a/suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
+++ b/suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
@@ -2,16 +2,17 @@
 <!ENTITY editBookmarkOverlay.name.accesskey                  "N">
 <!ENTITY editBookmarkOverlay.location.label                  "URL:">
 <!ENTITY editBookmarkOverlay.location.accesskey              "L">
 <!ENTITY editBookmarkOverlay.feedLocation.label              "フィードの URL:">
 <!ENTITY editBookmarkOverlay.feedLocation.accesskey          "F">
 <!ENTITY editBookmarkOverlay.siteLocation.label              "サイトの URL:">
 <!ENTITY editBookmarkOverlay.siteLocation.accesskey          "S">
 <!ENTITY editBookmarkOverlay.folder.label                    "フォルダ:">
+<!ENTITY editBookmarkOverlay.folder.accesskey                "F">
 <!ENTITY editBookmarkOverlay.foldersExpanderDown.tooltip     "すべてのブックマークフォルダを表示します">
 <!ENTITY editBookmarkOverlay.expanderUp.tooltip              "一覧を閉じます">
 <!ENTITY editBookmarkOverlay.tags.label                      "タグ:">
 <!ENTITY editBookmarkOverlay.tags.accesskey                  "a">
 <!ENTITY editBookmarkOverlay.tagsEmptyDesc.label             "カンマ区切りで複数入力できます">
 <!ENTITY editBookmarkOverlay.description.label               "説明:">
 <!ENTITY editBookmarkOverlay.description.accesskey           "D">
 <!ENTITY editBookmarkOverlay.keyword.label                   "キーワード:">
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -136,16 +136,19 @@
     want &brandShortName; to only resize text of websites when using the
     &quot;Zoom&quot; function. If this is not selected, the whole page,
     including images, will be zoomed.</li>
   <li><strong>Warn me when web sites try to redirect or reload the
     page</strong>: Select this to let &brandShortName; block automatic meta
     redirection (HTTP-EQUIV=refresh) requests by default. When a redirect is
     supposed to be executed, a notification bar is shown instead which allows
     you to permit the redirect on a case-by-case basis.</li>
+  <li><strong>Remember zoom levels on a per-site basis</strong>: Select
+    this if you want the system to remember the specific zoom level for
+    each website you visit.</li>
 </ul>
 
 <p><strong>Note</strong>: See the separate preferences panels for colors, fonts
   and languages to further customize content appearance and the Privacy &amp;
   Security section for privacy-related settings that also might influence how
   content appears to you.</p>
 
 <p>[<a href="#appearance_preferences">Return to beginning of section</a>]</p>
--- a/suite/chrome/common/help/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -43,16 +43,17 @@
 <h1 id="navigating_web_pages">Navigating Web Pages</h1>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#viewing_your_home_page">Viewing Your Home Page</a></li>
     <li><a href="#moving_to_another_page">Moving to Another Page</a></li>
     <li><a href="#clicking_a_link">Clicking a Link</a></li>
     <li><a href="#retracing_your_steps">Retracing Your Steps</a></li>
+    <li><a href="#reopening_closed_tabs_windows">Reopening Closed Tabs or Windows</a></li>
     <li><a href="#stopping_and_reloading">Stopping and Reloading</a></li>
     <li><a href="#visiting_bookmarked_pages">Visiting Bookmarked Pages</a></li>
     <li><a href="#using_tabbed_browsing">Using Tabbed Browsing</a></li>
     <li><a href="#using_sidebar">Using Sidebar</a></li>
   </ul>
 </div>
 
 <h2 id="viewing_your_home_page">Viewing Your Home Page</h2>
@@ -241,16 +242,39 @@
 </ul>
 
 <p><strong>Tip</strong>: To sort the history list, click one of the categories
   (Title, Location, or Last Visited). Click the title again to reverse the
   order.</p>
 
 <p>[<a href="#navigating_web_pages">Return to beginning of section</a>]</p>
 
+<h2 id="reopening_closed_tabs_windows">Reopening Closed Tabs or Windows</h2>
+
+<p>&brandShortName; keeps track of your most recently closed tabs and 
+  windows and allows you to get back to them easily.</p>
+
+<p>To reopen closed tabs:</p>
+
+<ul>
+  <li>Open the Go menu and expand the Recently Closed Tabs menu.</li>
+  <li>Select any of the previously closed tabs from the list.
+    Once selected, it will be restored and removed from the list.</li>
+</ul>
+
+<p>Similarly, to reopen closed windows:</p>
+
+<ul>
+   <li>Open the Go Menu and expand the Recently Closed Windows menu.</li>
+   <li>Select any of the previously closed windows. Once selected,
+     it will be restored and removed from the list.</li>
+</ul>
+
+<p>[<a href="#navigating_web_pages">Return to beginning of section</a>]</p>
+
 <h2 id="stopping_and_reloading">Stopping and Reloading</h2>
 
 <p>If a page is taking too long to appear, or you change your mind and
   don&apos;t want to view it, click the Stop button.</p>
 
 <p>To refresh the current page, or get the most up-to-date version, click the
   Reload button, or press
   <kbd class="mac">Cmd</kbd><kbd class="noMac">Ctrl</kbd>+<kbd>R</kbd>.</p>
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -53,16 +53,17 @@
 
   <rdf:Description about="#nav-doc">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="nav-doc-view" nc:name="Viewing Your Home Page" nc:link="nav_help.xhtml#viewing_your_home_page"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-move" nc:name="Moving to Another Page" nc:link="nav_help.xhtml#moving_to_another_page"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-link" nc:name="Clicking a Link" nc:link="nav_help.xhtml#clicking_a_link"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-steps" nc:name="Retracing Your Steps" nc:link="nav_help.xhtml#retracing_your_steps"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="nav-doc-reopen" nc:name="Reopening Closed Tabs or Windows" nc:link="nav_help.xhtml#reopening_closed_tabs_windows"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-reload" nc:name="Stopping and Reloading"  nc:link="nav_help.xhtml#stopping_and_reloading"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-bmark" nc:name="Visiting Bookmarked Pages"  nc:link="nav_help.xhtml#visiting_bookmarked_pages"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-tabbed" nc:name="Using Tabbed Browsing"  nc:link="nav_help.xhtml#using_tabbed_browsing"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-sidebar" nc:name="Using Sidebar"  nc:link="nav_help.xhtml#using_sidebar"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
deleted file mode 100644
--- a/suite/chrome/common/permissions/permissionsNavigatorOverlay.dtd
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- the following is for the task menu overlay -->
-
-<!ENTITY cookieMessageTitle.label "Cookie 取捨設定の変更">
-<!ENTITY cookieDisplayCookiesCmd.label "保存した Cookie の管理">
-<!ENTITY cookieDisplayCookiesCmd.accesskey "M">
-<!ENTITY cookieAllowCookiesCmd.label "このサイトからの Cookie を受け入れる">
-<!ENTITY cookieAllowCookiesCmd.accesskey "A">
-<!ENTITY cookieAllowCookiesMsg.label "このサイトからの Cookie は常に受け入れます。">
-<!ENTITY cookieAllowSessionCookiesCmd.label "このサイトからのセッション Cookie を受け入れる">
-<!ENTITY cookieAllowSessionCookiesCmd.accesskey "S">
-<!ENTITY cookieAllowSessionCookiesMsg.label "このサイトからの Cookie は現在のセッションのみ有効です。">
-<!ENTITY cookieCookiesDefaultCmd.label "既定の Cookie の取捨設定を使用する">
-<!ENTITY cookieCookiesDefaultCmd.accesskey "U">
-<!ENTITY cookieCookiesDefaultMsg.label "このサイトからの Cookie は既定の設定に基づいて受け入れ、または捨てられます。">
-<!ENTITY cookieBlockCookiesCmd.label "このサイトからの Cookie を拒否する">
-<!ENTITY cookieBlockCookiesCmd.accesskey "B">
-<!ENTITY cookieBlockCookiesMsg.label "このサイトからの Cookie は常に拒否します。">
-
-<!ENTITY cookieImageMessageTitle.label "画像表示の可否設定の変更">
-<!ENTITY cookieDisplayImagesCmd.label "画像表示の可否設定の管理">
-<!ENTITY cookieDisplayImagesCmd.accesskey "M">
-<!ENTITY cookieAllowImagesCmd.label "このサイトの画像を表示する">
-<!ENTITY cookieAllowImagesCmd.accesskey "A">
-<!ENTITY cookieAllowImagesMsg.label "このサイトの画像は常に表示します。">
-<!ENTITY cookieImagesDefaultCmd.label "既定の画像表示の可否設定を使用する">
-<!ENTITY cookieImagesDefaultCmd.accesskey "U">
-<!ENTITY cookieImagesDefaultMsg.label "このサイトの画像は、既定の設定に基づいて表示、または無効化されます。">
-<!ENTITY cookieBlockImagesCmd.label "このサイトの画像を表示しない">
-<!ENTITY cookieBlockImagesCmd.accesskey "B">
-<!ENTITY cookieBlockImagesMsg.label "このサイトの画像は一切表示しません。">
-
-<!ENTITY cookieAllowPopupsCmd.label "このサイトのポップアップ表示を許可する">
-<!ENTITY cookieAllowPopupsCmd.accesskey "A">
-<!ENTITY cookieManagePopups.label "ポップアップの管理">
-<!ENTITY cookieManagePopups.accesskey "M">
-
-<!ENTITY cookieCookieManager.label "Cookie マネージャ">
-<!ENTITY cookieCookieManager.accesskey "c">
-<!ENTITY cookieImageManager.label "画像マネージャ">
-<!ENTITY cookieImageManager.accesskey "i">
-<!ENTITY cookiePopupManager.label "ポップアップマネージャ">
-<!ENTITY cookiePopupManager.accesskey "o">
--- a/suite/chrome/common/pref/pref-advanced.dtd
+++ b/suite/chrome/common/pref/pref-advanced.dtd
@@ -1,16 +1,11 @@
 <!--LOCALIZATION NOTE : FILE 'Advanced' prefs settings -->
 <!ENTITY pref.advanced.title        "詳細">
 
-<!ENTITY prefEnableJava.caption     "Web ページで補助的に利用される機能">
-
-<!ENTITY enbJavaCheck.label         "Java を有効にする">
-<!ENTITY enbJavaCheck.accesskey     "J">
-
 <!ENTITY systemPref.caption         "システム設定">
 <!ENTITY systemPrefCheck.label      "システムの標準設定を使用する">
 <!ENTITY systemPrefCheck.accesskey  "U">
 <!ENTITY systemPref.desc            "この項目にチェックを入れると、&brandShortName; 独自の設定よりもシステム標準の設定を優先するようになります。">
 
 <!ENTITY prefCheckDefault.caption   "システム統合">
 <!ENTITY prefCheckDefaultClient.label "起動時に既定のプログラムの設定を確認する">
 <!ENTITY prefCheckDefaultClient.accesskey "C">
--- a/suite/chrome/common/pref/pref-content.dtd
+++ b/suite/chrome/common/pref/pref-content.dtd
@@ -12,8 +12,10 @@
 <!ENTITY useSmoothScroll.label                  "スムーズスクロールを使用する">
 <!ENTITY useSmoothScroll.accesskey              "U">
 <!ENTITY allowHWAccel.label                     "ハードウェアアクセラレーションが利用可能なとき利用する">
 <!ENTITY allowHWAccel.accesskey                 "e">
 <!ENTITY textZoomOnly.label                     "テキストだけをズームする">
 <!ENTITY textZoomOnly.accesskey                 "Z">
 <!ENTITY blockAutoRefresh.label                 "Web サイトがリダイレクトや再読み込みを繰り返すときに警告する">
 <!ENTITY blockAutoRefresh.accesskey             "W">
+<!ENTITY siteSpecific.label                     "サイト別のズームレベルを記憶する">
+<!ENTITY siteSpecific.accesskey                 "m">
--- a/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/unix/platformCommunicatorOverlay.dtd
@@ -6,16 +6,17 @@
 <!ENTITY closeCmd.accesskey             "c">
 
 <!ENTITY quitApplicationCmd.label       "終了">
 <!ENTITY quitApplicationCmd.key         "Q">
 <!ENTITY quitApplicationCmd.accesskey   "q">
 
 <!ENTITY redoCmd.key                    "Y">
 
+<!ENTITY findCmd.key2                   "VK_F19">
 <!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
@@ -50,16 +50,29 @@
 <!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 findCmd.key			"F">
+<!-- LOCALIZATION NOTE (findCmd.accesskey): This accesskey should be within
+     findCmd.label found in messengercompose.dtd, messenger.dtd and
+     editorOverlay.dtd and findOnCmd.label found in navigatorOverlay.dtd -->
+<!ENTITY findCmd.accesskey		"F">
+<!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		"表示/隠す">
--- a/suite/chrome/common/viewZoomOverlay.dtd
+++ b/suite/chrome/common/viewZoomOverlay.dtd
@@ -1,14 +1,11 @@
+<!-- LOCALIZATION NOTE: do not use digits "0"-"9" as accesskeys -->
 <!ENTITY zoomEnlargeCmd.label       "大きく">
 <!ENTITY zoomEnlargeCmd.accesskey   "L">
 <!ENTITY zoomEnlargeCmd.commandkey  "+">
 <!ENTITY zoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
 
 <!ENTITY zoomReduceCmd.label        "小さく">
 <!ENTITY zoomReduceCmd.accesskey    "S">
 <!ENTITY zoomReduceCmd.commandkey   "-">
 
 <!ENTITY zoomResetCmd.commandkey    "0">
-
-<!-- see zoomOtherLabel in viewZoomOverlay.properties -->
-<!ENTITY zoomMenu.accesskey         "z">
-<!ENTITY zoomOtherCmd.accesskey     "o">
--- a/suite/chrome/common/viewZoomOverlay.properties
+++ b/suite/chrome/common/viewZoomOverlay.properties
@@ -1,20 +1,22 @@
-# font size submenu
+# zoom submenu
 #
-# don't translate %zoom%
+# LOCALIZATION NOTE: don't translate %zoom% in any property
+#                    don't use digits "0"-"9" for accesskeys
 
-fullZoom=ズーム (%zoom%%)
-textZoom=テキストをズーム (%zoom%%)
-label=%zoom%%
-labelOriginal=%zoom%% (元のサイズ)
-labelOther=他 (%zoom%%) ...
+# LOCALIZATION NOTE (fullZoom,textZoom): are never available at the same time
+fullZoom.label=ズーム (%zoom%%)
+fullZoom.accesskey=Z
+textZoom.label=テキストをズーム (%zoom%%)
+textZoom.accesskey=Z
 
-# {values} must be greater than 0, include 100 and be in natural order
-# {accessKeys} correspond to {values}, where "z" matches the z in
-# "Original size" in {labelOriginal}
+# labels and accesskeys to emphasize the 100 % and 200 % entries
+zoom.100.label=100% (元のサイズ)
+zoom.100.accesskey=z
+zoom.200.label=200% (2倍)
+zoom.200.accesskey=D
 
-values=50,75,90,100,120,150,200
-accessKeys=5,7,9,z,1,0,2
+# label pattern for remaining values, accesskeys are assigned dynamically
+zoom.value.label=%zoom%%
 
-# {valueOther} must be greater than the largest in values
-
-valueOther=300
+zoom.other.label=他 (%zoom%%) ...
+zoom.other.accesskey=O
--- a/suite/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/chrome/mailnews/compose/messengercompose.dtd
@@ -45,26 +45,16 @@
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "P">
 
 <!-- Edit menu items -->
 <!ENTITY editRewrapCmd.label "再改行">
 <!ENTITY editRewrapCmd.key "R">
 <!ENTITY editRewrapCmd.accesskey  "w">
 <!ENTITY findCmd.label "検索と置換...">
-<!ENTITY findCmd.key "F">
-<!ENTITY findCmd.accesskey "F">
-<!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 accountManagerCmd.label "メールとニュースグループのアカウント設定...">
 <!ENTITY accountManagerCmd.accesskey "m">
 
 <!-- View menu items -->
 <!ENTITY showComposeToolbarCmd.label "メールツールバー">
 <!ENTITY showComposeToolbarCmd.accesskey "o">
 <!ENTITY showFormatToolbarCmd.label "書式ツールバー">
 <!ENTITY showFormatToolbarCmd.accesskey "F">
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -247,16 +247,18 @@
 <!ENTITY bodyMenu.label                        "メッセージの表示形式">
 <!ENTITY bodyMenu.accesskey                    "B">
 <!ENTITY bodyAllowHTML.label                   "オリジナル HTML">
 <!ENTITY bodyAllowHTML.accesskey               "H">
 <!ENTITY bodySanitized.label                   "シンプル HTML">
 <!ENTITY bodySanitized.accesskey               "S">
 <!ENTITY bodyAsPlaintext.label                 "プレーンテキスト">
 <!ENTITY bodyAsPlaintext.accesskey             "P">
+<!ENTITY bodyAllParts.label                    "すべての本文パーツ">
+<!ENTITY bodyAllParts.accesskey                "A">
 
 <!ENTITY bodyMenuFeed.label                     "フィードの表示形式">
 <!ENTITY bodyMenuFeed.accesskey                 "B">
 <!ENTITY viewFeedWebPage.label                  "Web ページ">
 <!ENTITY viewFeedWebPage.accesskey              "W">
 <!ENTITY viewFeedSummary.label                  "要約">
 <!ENTITY viewFeedSummary.accesskey              "m">
 <!ENTITY viewFeedSummaryFeedPropsPref.label     "既定の形式">
@@ -268,26 +270,16 @@
 <!ENTITY reloadCmd.accesskey                    "R">
 <!ENTITY stopCmd.label                          "中止">
 <!ENTITY stopCmd.accesskey                      "S">
 <!ENTITY pageSourceCmd.label                    "メッセージのソース">
 <!ENTITY pageSourceCmd.accesskey                "o">
 <!ENTITY pageSourceCmd.key                      "u">
 
 <!ENTITY findCmd.label                          "このメッセージを検索...">
-<!ENTITY findCmd.accesskey                      "F">
-<!ENTITY findCmd.key                            "f">
-<!ENTITY findAgainCmd.label                     "次を検索">
-<!ENTITY findAgainCmd.accesskey                 "g">
-<!ENTITY findAgainCmd.key                       "g">
-<!ENTITY findAgainCmd.key2                      "VK_F3">
-<!ENTITY findPrevCmd.label                      "前を検索"><!--Find Previous-->
-<!ENTITY findPrevCmd.accesskey                  "v">
-<!ENTITY findPrevCmd.key                        "g">
-<!ENTITY findPrevCmd.key2                       "VK_F3">
 
 <!-- Go Menu -->
 
 <!ENTITY goMenu.label                           "移動">
 <!ENTITY goMenu.accesskey                       "G">
 <!ENTITY nextMenu.label                         "次へ">
 <!ENTITY nextMenu.accesskey                     "N">
 <!ENTITY nextMsgCmd.label                       "メッセージ">
--- a/suite/chrome/mailnews/msgHdrViewPopup.dtd
+++ b/suite/chrome/mailnews/msgHdrViewPopup.dtd
@@ -42,10 +42,13 @@
 <!ENTITY SendMailTo.accesskey              "s">
 <!ENTITY CopyEmailAddress.label            "メールアドレスをコピー">
 <!ENTITY CopyEmailAddress.accesskey        "C">
 <!ENTITY CreateFilterFrom.label            "フィルタを作成...">
 <!ENTITY CreateFilterFrom.accesskey        "F">
 <!ENTITY copyLinkCmd.label                 "リンクの URL をコピー">
 <!ENTITY copyLinkCmd.accesskey             "C">
 <!ENTITY CopyMessageId.label               "メッセージ ID をコピー">
+<!ENTITY CopyMessageId.accesskey           "C">
 <!ENTITY OpenMessageForMsgId.label         "次の ID のメッセージを開く">
+<!ENTITY OpenMessageForMsgId.accesskey     "O">
 <!ENTITY OpenBrowserWithMsgId.label        "次のメッセージ ID をブラウザで開く">
+<!ENTITY OpenBrowserWithMsgId.accesskey    "B">
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -88,8 +88,10 @@ 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= 差出人情報を作成できませんでした
 
 choosefile= ファイルを選択
+
+forAccount=アカウント "%S" について