28.0: sync browser (exclude devtools) with en-US rev169516:4b8d14a78596
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Sun, 26 Jan 2014 20:44:35 +0900
changeset 1299 aa69a9bc3ad87241b4b4247c9db49ff527cb67c3
parent 1298 58d1603eb40e8b71222f7b007d4c8a942272f0b8
child 1300 4e22dea2347be54647e8014f88252ef2e958ce2e
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs28
28.0: sync browser (exclude devtools) with en-US rev169516:4b8d14a78596
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/charsetMenu.dtd
browser/chrome/browser/charsetMenu.properties
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/security.dtd
browser/chrome/browser/syncSetup.dtd
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -11,53 +11,48 @@
 <!ENTITY mainWindow.titlemodifier	"&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator	" - ">
 <!-- LOCALIZATION NOTE (mainWindow.titlePrivateBrowsingSuffix): This will be appended to the window's title
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix	"(プライベートブラウジング)">
 
 <!-- Tab context menu -->
-<!ENTITY  reloadTab.label		"タブを再読み込み">
-<!ENTITY  reloadTab.accesskey		"R">
-<!ENTITY  reloadAllTabs.label		"すべてのタブを再読み込み">
-<!ENTITY  reloadAllTabs.accesskey	"A">
+<!ENTITY  reloadTab.label                    "タブを再読み込み">
+<!ENTITY  reloadTab.accesskey                "R">
+<!ENTITY  reloadAllTabs.label                "すべてのタブを再読み込み">
+<!ENTITY  reloadAllTabs.accesskey            "A">
 <!-- LOCALIZATION NOTE (closeTabsToTheEnd.label): This should indicate the
 direction in which tabs are closed, i.e. locales that use RTL mode should say
 left instead of right. -->
-<!ENTITY  closeTabsToTheEnd.label	"右側のタブをすべて閉じる">
-<!ENTITY  closeTabsToTheEnd.accesskey	"i">
-<!ENTITY  closeOtherTabs.label		"他のタブをすべて閉じる">
-<!ENTITY  closeOtherTabs.accesskey	"o">
+<!ENTITY  closeTabsToTheEnd.label            "右側のタブをすべて閉じる">
+<!ENTITY  closeTabsToTheEnd.accesskey        "i">
+<!ENTITY  closeOtherTabs.label               "他のタブをすべて閉じる">
+<!ENTITY  closeOtherTabs.accesskey           "o">
 
 <!-- LOCALIZATION NOTE (pinTab.label, unpinTab.label): "Pin" is being
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
 left edge of the tabstrip. Really we just want the string to express the idea
 that this is a lightweight and reversible action that keeps your tab where you
 can reach it easily. -->
-<!ENTITY  pinTab.label			"タブをピン留め">
-<!ENTITY  pinTab.accesskey		"P">
-<!ENTITY  unpinTab.label		"タブのピン留めを外す">
-<!ENTITY  unpinTab.accesskey		"b">
-<!ENTITY  moveToGroup.label		"グループへ移動">
-<!ENTITY  moveToGroup.accesskey		"M">
-<!ENTITY  moveToNewGroup.label		"新しいタブグループ">
-<!ENTITY  moveToNewWindow.label		"新しいウィンドウへ移動">
-<!ENTITY  moveToNewWindow.accesskey	"W">
-<!ENTITY  bookmarkAllTabs.label		"すべてのタブをブックマーク...">
-<!ENTITY  bookmarkAllTabs.accesskey	"T">
-<!ENTITY  undoCloseTab.label		"閉じたタブを元に戻す">
-<!ENTITY  undoCloseTab.accesskey		"U">
-<!-- LOCALIZATION NOTE (undoCloseTabs.label) : This label is used
-when the previous tab-closing operation closed more than one tab. It
-replaces the undoCloseTab.label and will use the same accesskey as the
-undoCloseTab.label so users will not need to learn new keyboard controls. -->
-<!ENTITY  undoCloseTabs.label		"閉じたタブを戻す">
-<!ENTITY  closeTab.label		"タブを閉じる">
-<!ENTITY  closeTab.accesskey		"c">
+<!ENTITY  pinTab.label                       "タブをピン留め">
+<!ENTITY  pinTab.accesskey                   "P">
+<!ENTITY  unpinTab.label                     "タブのピン留めを外す">
+<!ENTITY  unpinTab.accesskey                 "b">
+<!ENTITY  moveToGroup.label                  "グループへ移動">
+<!ENTITY  moveToGroup.accesskey              "M">
+<!ENTITY  moveToNewGroup.label               "新しいタブグループ">
+<!ENTITY  moveToNewWindow.label              "新しいウィンドウへ移動">
+<!ENTITY  moveToNewWindow.accesskey          "W">
+<!ENTITY  bookmarkAllTabs.label              "すべてのタブをブックマーク...">
+<!ENTITY  bookmarkAllTabs.accesskey          "T">
+<!ENTITY  undoCloseTab.label                 "閉じたタブを元に戻す">
+<!ENTITY  undoCloseTab.accesskey             "U">
+<!ENTITY  closeTab.label                     "タブを閉じる">
+<!ENTITY  closeTab.accesskey                 "c">
 
 <!ENTITY  listAllTabs.label		"タブを一覧表示します">
 
 <!ENTITY tabCmd.label			"新しいタブ"><!-- 表示カ所によりアクセスキーが異なる -->
 <!ENTITY tabCmd.accesskey		"T">
 <!ENTITY tabCmd.commandkey		"t">
 <!ENTITY openLocationCmd.label		"URL を開く...">
 <!ENTITY openLocationCmd.accesskey	"L">
@@ -135,140 +130,140 @@ These should match what Safari and other
 <!ENTITY shareVideoCmd.accesskey	"s">
 <!ENTITY subscribeToPageMenupopup.label	"このページを購読">
 <!ENTITY subscribeToPageMenuitem.label	"このページを購読...">
 <!ENTITY addCurPagesCmd.label		"すべてのタブをブックマーク...">
 <!ENTITY showAllBookmarks2.label		"すべてのブックマークを表示">
 <!ENTITY unsortedBookmarksCmd.label		"未整理のブックマーク">
 <!ENTITY bookmarksToolbarChevron.tooltip	"残りのブックマークを表示します">
 
-<!ENTITY backCmd.label			"戻る">
-<!ENTITY backCmd.accesskey		"B">
-<!ENTITY backButton.tooltip		"前のページへ戻ります">
-<!ENTITY forwardCmd.label		"進む">
-<!ENTITY forwardCmd.accesskey		"F">
-<!ENTITY forwardButton.tooltip		"次のページへ進みます">
+<!ENTITY backCmd.label                "戻る">
+<!ENTITY backCmd.accesskey            "B">
+<!ENTITY backButton.tooltip           "前のページへ戻ります">
+<!ENTITY forwardCmd.label             "進む">
+<!ENTITY forwardCmd.accesskey         "F">
+<!ENTITY forwardButton.tooltip        "次のページへ進みます">
 <!ENTITY backForwardButtonMenu.tooltip		"右クリック、または長押しで履歴を表示します">
 <!ENTITY backForwardButtonMenuMac.tooltip	"長押しで履歴を表示します">
-<!ENTITY reloadCmd.label		"更新">
-<!ENTITY reloadCmd.accesskey		"R">
-<!ENTITY reloadButton.tooltip		"このページを再読み込みします">
-<!ENTITY stopCmd.label			"中止">
-<!ENTITY stopCmd.accesskey		"S">
-<!ENTITY stopCmd.macCommandKey		".">
-<!ENTITY stopButton.tooltip		"このページの読み込みを中止します">
-<!ENTITY goEndCap.tooltip		"ロケーションバーに入力された URL に移動します">
-<!ENTITY printButton.label		"印刷">
-<!ENTITY printButton.tooltip		"このページを印刷します">
+<!ENTITY reloadCmd.label              "更新">
+<!ENTITY reloadCmd.accesskey          "R">
+<!ENTITY reloadButton.tooltip         "このページを再読み込みします">
+<!ENTITY stopCmd.label                "中止">
+<!ENTITY stopCmd.accesskey            "S">
+<!ENTITY stopCmd.macCommandKey        ".">
+<!ENTITY stopButton.tooltip           "このページの読み込みを中止します">
+<!ENTITY goEndCap.tooltip             "ロケーションバーに入力された URL に移動します">
+<!ENTITY printButton.label            "印刷">
+<!ENTITY printButton.tooltip          "このページを印刷します">
 
-<!ENTITY backForwardItem.title		"戻る/進む">
-<!ENTITY locationItem.title		"ロケーションバー">
-<!ENTITY searchItem.title		"検索">
-<!ENTITY bookmarksItem.title		"ブックマーク">
+<!ENTITY backForwardItem.title        "戻る/進む">
+<!ENTITY locationItem.title           "ロケーションバー">
+<!ENTITY searchItem.title             "検索">
+<!ENTITY bookmarksItem.title          "ブックマーク">
 
 <!-- Toolbar items -->
-<!ENTITY homeButton.label		"ホーム">
+<!ENTITY homeButton.label             "ホーム">
 
-<!ENTITY tabGroupsButton.label		"タブグループ">
-<!ENTITY tabGroupsButton.tooltip	"タブをグループ分けして管理できます">
+<!ENTITY tabGroupsButton.label        "タブグループ">
+<!ENTITY tabGroupsButton.tooltip      "タブをグループ分けして管理できます">
 
 <!ENTITY bookmarksButton.label		"ブックマーク">
 <!ENTITY bookmarksCmd.commandkey	"b">
 
-<!ENTITY bookmarksMenuButton.label	"ブックマーク">
-<!ENTITY bookmarksMenuButton.unsorted.label	"未整理のブックマーク">
-<!ENTITY viewBookmarksSidebar.label	"ブックマークをサイドバーに表示します">
-<!ENTITY viewBookmarksToolbar.label	"ブックマークツールバーを表示">
+<!ENTITY bookmarksMenuButton.label          "ブックマーク">
+<!ENTITY bookmarksMenuButton.tooltip        "ブックマークを表示します">
+<!ENTITY bookmarksMenuButton.unsorted.label "未整理のブックマーク">
+<!ENTITY viewBookmarksSidebar.label         "ブックマークをサイドバーに表示します">
+<!ENTITY viewBookmarksToolbar.label         "ブックマークツールバーを表示">
 
 <!-- LOCALIZATION NOTE (bookmarksSidebarGtkCmd.commandkey): This command
   -  key should not contain the letters A-F, since these are reserved
   -  shortcut keys on Linux. -->
-<!ENTITY bookmarksGtkCmd.commandkey	"o">
-<!ENTITY bookmarksWinCmd.commandkey	"i">
+<!ENTITY bookmarksGtkCmd.commandkey "o">
+<!ENTITY bookmarksWinCmd.commandkey "i">
 
-<!ENTITY historyButton.label		"履歴">
-<!ENTITY historySidebarCmd.commandKey	"h">
+<!ENTITY historyButton.label            "履歴">
+<!ENTITY historySidebarCmd.commandKey   "h">
 
-<!ENTITY toolsMenu.label		"ツール">
-<!ENTITY toolsMenu.accesskey		"T">
+<!ENTITY toolsMenu.label              "ツール">
+<!ENTITY toolsMenu.accesskey          "T"> 
 
-<!ENTITY keywordfield.label		"この検索にキーワードを設定...">
-<!ENTITY keywordfield.accesskey		"K">
+<!ENTITY keywordfield.label           "この検索にキーワードを設定...">
+<!ENTITY keywordfield.accesskey       "K">
 
-<!ENTITY downloads.label		"ダウンロード">
-<!ENTITY downloads.tooltip		"ダウンロードの進行状況を表示します">
-<!ENTITY downloads.accesskey		"D">
-<!ENTITY downloads.commandkey		"j">
-<!ENTITY downloadsUnix.commandkey	"y">
-<!ENTITY addons.label			"アドオン">
-<!ENTITY addons.accesskey		"A">
-<!ENTITY addons.commandkey		"A">
+<!ENTITY downloads.label              "ダウンロード">
+<!ENTITY downloads.tooltip            "ダウンロードの進行状況を表示します">
+<!ENTITY downloads.accesskey          "D">
+<!ENTITY downloads.commandkey         "j">
+<!ENTITY downloadsUnix.commandkey     "y">
+<!ENTITY addons.label                 "アドオン">
+<!ENTITY addons.accesskey             "A">
+<!ENTITY addons.commandkey            "A">
 
-<!ENTITY webDeveloperMenu.label		"Web 開発">
-<!ENTITY webDeveloperMenu.accesskey	"W">
+<!ENTITY webDeveloperMenu.label       "Web 開発">
+<!ENTITY webDeveloperMenu.accesskey   "W">
 
-<!ENTITY devToolsCmd.keycode		"VK_F12">
-<!ENTITY devToolsCmd.keytext		"F12">
+<!ENTITY devToolsCmd.keycode          "VK_F12">
+<!ENTITY devToolsCmd.keytext          "F12">
 
-<!ENTITY devtoolsConnect.label		"接続...">
-<!ENTITY devtoolsConnect.accesskey	"e">
+<!ENTITY devtoolsConnect.label        "接続...">
+<!ENTITY devtoolsConnect.accesskey    "e">
 
-<!ENTITY errorConsoleCmd.label		"エラーコンソール">
-<!ENTITY errorConsoleCmd.accesskey	"C">
+<!ENTITY errorConsoleCmd.label        "エラーコンソール">
+<!ENTITY errorConsoleCmd.accesskey    "C">
 
-<!ENTITY remoteWebConsoleCmd.label	"リモート Web コンソール">
+<!ENTITY remoteWebConsoleCmd.label    "リモート Web コンソール">
 
-<!ENTITY browserConsoleCmd.label	"ブラウザコンソール">
-<!ENTITY browserConsoleCmd.commandkey	"j">
-<!ENTITY browserConsoleCmd.accesskey	"B">
+<!ENTITY browserConsoleCmd.label      "ブラウザコンソール">
+<!ENTITY browserConsoleCmd.commandkey "j">
+<!ENTITY browserConsoleCmd.accesskey  "B">
 
-<!ENTITY inspectContextMenu.label	"要素を調査">
-<!ENTITY inspectContextMenu.accesskey	"Q">
+<!ENTITY inspectContextMenu.label     "要素を調査">
+<!ENTITY inspectContextMenu.accesskey "Q">
 
 <!ENTITY responsiveDesignTool.label		"レスポンシブデザインビュー">
 <!ENTITY responsiveDesignTool.accesskey		"R">
 <!ENTITY responsiveDesignTool.commandkey	"M">
 
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
-<!ENTITY scratchpad.label			"スクラッチパッド">
-<!ENTITY scratchpad.accesskey			"s">
-<!ENTITY scratchpad.keycode			"VK_F4">
-<!ENTITY scratchpad.keytext			"F4">
+<!ENTITY scratchpad.label             "スクラッチパッド">
+<!ENTITY scratchpad.accesskey         "s">
+<!ENTITY scratchpad.keycode           "VK_F4">
+<!ENTITY scratchpad.keytext           "F4">
 
-<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
-  -  application menu item that opens the browser debugger UI in the Tools menu. -->
-<!ENTITY chromeDebuggerMenu.label		"ブラウザデバッガ">
-<!ENTITY chromeDebuggerMenu.accesskey		"e">
+<!-- LOCALIZATION NOTE (browserToolboxMenu.label): This is the label for the
+  -  application menu item that opens the browser toolbox UI in the Tools menu. -->
+<!ENTITY browserToolboxMenu.label     "ブラウザツールボックス">
+<!ENTITY browserToolboxMenu.accesskey "e">
 
-<!ENTITY devToolbarCloseButton.tooltiptext	"開発ツールバーを閉じる">
-<!ENTITY devToolbarMenu.label			"開発ツールバー">
-<!ENTITY devToolbarMenu.accesskey		"v">
-<!ENTITY devAppMgrMenu.label			"アプリマネージャ">
-<!ENTITY devAppMgrMenu.accesskey		"a">
-<!ENTITY devToolbar.keycode			"VK_F2">
-<!ENTITY devToolbar.keytext			"F2">
-<!ENTITY devToolboxMenuItem.label		"開発ツールを表示">
-<!ENTITY devToolboxMenuItem.accesskey		"T">
-<!ENTITY devToolboxMenuItem.keycode		"I">
-<!ENTITY devToolboxMenuItem.keytext		"I">
+<!ENTITY devToolbarCloseButton.tooltiptext "開発ツールバーを閉じる">
+<!ENTITY devToolbarMenu.label              "開発ツールバー">
+<!ENTITY devToolbarMenu.accesskey          "v">
+<!ENTITY devAppMgrMenu.label               "アプリマネージャ">
+<!ENTITY devAppMgrMenu.accesskey           "a">
+<!ENTITY devToolbar.keycode                "VK_F2">
+<!ENTITY devToolbar.keytext                "F2">
+<!ENTITY devToolboxMenuItem.label          "開発ツールを表示">
+<!ENTITY devToolboxMenuItem.accesskey      "T">
+<!ENTITY devToolboxMenuItem.keytext        "I">
 
-<!ENTITY devToolbarToolsButton.tooltip		"開発ツールを表示">
-<!ENTITY devToolbarOtherToolsButton.label	"その他のツール">
+<!ENTITY devToolbarToolsButton.tooltip     "開発ツールを表示">
+<!ENTITY devToolbarOtherToolsButton.label  "その他のツール">
 
-<!ENTITY getMoreDevtoolsCmd.label	"その他のツールを入手">
-<!ENTITY getMoreDevtoolsCmd.accesskey	"M">
+<!ENTITY getMoreDevtoolsCmd.label        "その他のツールを入手">
+<!ENTITY getMoreDevtoolsCmd.accesskey    "M">
 
 <!ENTITY fileMenu.label			"ファイル">
 <!ENTITY fileMenu.accesskey		"F">
 <!ENTITY newNavigatorCmd.label		"新しいウィンドウ">
 <!ENTITY newNavigatorCmd.key		"N">
 <!ENTITY newNavigatorCmd.accesskey	"N">
 <!ENTITY newPrivateWindow.label		"新しいプライベートウィンドウ">
 <!ENTITY newPrivateWindow.accesskey	"W">
@@ -323,20 +318,20 @@ These should match what Safari and other
 <!ENTITY historyUndoWindowMenu.label	"最近閉じたウィンドウ">
 <!ENTITY historyRestoreLastSession.label	"以前のセッションを復元">
 
 <!ENTITY showAllHistoryCmd2.label	"すべての履歴を表示"><!-- (^^; -->
 <!ENTITY showAllHistoryCmd.commandkey	"H">
 
 <!ENTITY appMenuCustomize.label		"カスタマイズ">
 
-<!ENTITY openCmd.commandkey		"l">
-<!ENTITY urlbar.placeholder2		"URL または検索語句を入力します">
-<!ENTITY urlbar.accesskey		"d">
-<!ENTITY urlbar.switchToTab.label	"タブを表示:">
+<!ENTITY openCmd.commandkey           "l">
+<!ENTITY urlbar.placeholder2          "URL または検索語句を入力します">
+<!ENTITY urlbar.accesskey             "d">
+<!ENTITY urlbar.switchToTab.label     "タブを表示:">
 
 <!-- 
   Comment duplicated from browser-sets.inc:
 
   Search Command Key Logic works like this:
 
   Unix: Ctrl+J (0.8, 0.9 support)
         Ctrl+K (cross platform binding)
@@ -348,21 +343,21 @@ These should match what Safari and other
   We support Ctrl+K on all platforms now and advertise it in the menu since it is
   our standard - it is a "safe" choice since it is near no harmful keys like "W" as
   "E" is. People mourning the loss of Ctrl+K for emacs compat can switch their GTK
   system setting to use emacs emulation, and we should respect it. Focus-Search-Box
   is a fundamental keybinding and we are maintaining a XP binding so that it is easy
   for people to switch to Linux.
 
  -->
-<!ENTITY searchFocus.commandkey		"k">
-<!ENTITY searchFocus.commandkey2	"e">
-<!ENTITY searchFocusUnix.commandkey	"j">
+<!ENTITY searchFocus.commandkey       "k">
+<!ENTITY searchFocus.commandkey2      "e">
+<!ENTITY searchFocusUnix.commandkey   "j">
 
-<!ENTITY tabView.commandkey		"e">
+<!ENTITY tabView.commandkey           "e">
 
 <!ENTITY openLinkCmdInTab.label		"リンクを新しいタブで開く">
 <!ENTITY openLinkCmdInTab.accesskey	"T">
 <!ENTITY openLinkCmd.label		"リンクを新しいウィンドウで開く">
 <!ENTITY openLinkCmd.accesskey		"W">
 <!ENTITY openLinkInPrivateWindowCmd.label	"リンクを新しいプライベートウィンドウで開く">
 <!ENTITY openLinkInPrivateWindowCmd.accesskey	"P">
 <!ENTITY openLinkCmdInCurrent.label	"選択した URL を開く"><!-- (^m^) Bug 454518  en-US: "Open link" -->
@@ -375,182 +370,184 @@ These should match what Safari and other
 <!ENTITY showOnlyThisFrameCmd.accesskey	"S">
 <!ENTITY reloadCmd.commandkey		"r">
 <!ENTITY reloadFrameCmd.label		"フレームの再読み込み">
 <!ENTITY reloadFrameCmd.accesskey	"R">
 <!ENTITY viewPartialSourceForSelectionCmd.label	"選択した部分のソースを表示">
 <!ENTITY viewPartialSourceForMathMLCmd.label	"MathML のソースを表示">
 <!-- LOCALIZATION NOTE (viewPartialSourceCmd.accesskey): This accesskey is used for both 
          viewPartialSourceForSelectionCmd.label and viewPartialSourceForMathMLCmd.label -->
-<!ENTITY viewPartialSourceCmd.accesskey	"e">
-<!ENTITY viewPageSourceCmd.label	"ページのソースを表示">
-<!ENTITY viewPageSourceCmd.accesskey	"V">
-<!ENTITY viewFrameSourceCmd.label	"フレームのソースを表示">
-<!ENTITY viewFrameSourceCmd.accesskey	"V">
-<!ENTITY viewPageInfoCmd.label		"ページの情報を表示">
-<!ENTITY viewPageInfoCmd.accesskey	"I">
-<!ENTITY viewFrameInfoCmd.label		"フレームの情報を表示">
-<!ENTITY viewFrameInfoCmd.accesskey	"I">
-<!ENTITY reloadImageCmd.label		"画像を再読み込み">
-<!ENTITY reloadImageCmd.accesskey	"R">
-<!ENTITY viewImageCmd.label		"画像だけを表示">
-<!ENTITY viewImageCmd.accesskey		"I">
-<!ENTITY viewImageInfoCmd.label		"画像の情報を表示">
-<!ENTITY viewImageInfoCmd.accesskey	"f">
-<!ENTITY viewImageDescCmd.label		"画像の詳細情報を表示">
-<!ENTITY viewImageDescCmd.accesskey	"D">
-<!ENTITY viewVideoCmd.label		"動画だけを表示">
-<!ENTITY viewVideoCmd.accesskey		"I">
-<!ENTITY viewBGImageCmd.label		"背景画像だけを表示">
-<!ENTITY viewBGImageCmd.accesskey	"w">
+<!ENTITY viewPartialSourceCmd.accesskey "e">
+<!ENTITY viewPageSourceCmd.label      "ページのソースを表示">
+<!ENTITY viewPageSourceCmd.accesskey  "V">
+<!ENTITY viewFrameSourceCmd.label     "フレームのソースを表示">
+<!ENTITY viewFrameSourceCmd.accesskey "V">
+<!ENTITY viewPageInfoCmd.label        "ページの情報を表示">
+<!ENTITY viewPageInfoCmd.accesskey    "I">
+<!ENTITY viewFrameInfoCmd.label       "フレームの情報を表示">
+<!ENTITY viewFrameInfoCmd.accesskey   "I">
+<!ENTITY reloadImageCmd.label         "画像を再読み込み">
+<!ENTITY reloadImageCmd.accesskey     "R">
+<!ENTITY viewImageCmd.label           "画像だけを表示">
+<!ENTITY viewImageCmd.accesskey       "I">
+<!ENTITY viewImageInfoCmd.label       "画像の情報を表示">
+<!ENTITY viewImageInfoCmd.accesskey   "f">
+<!ENTITY viewImageDescCmd.label       "画像の詳細情報を表示">
+<!ENTITY viewImageDescCmd.accesskey   "D">
+<!ENTITY viewVideoCmd.label           "動画だけを表示">
+<!ENTITY viewVideoCmd.accesskey       "I">
+<!ENTITY viewBGImageCmd.label         "背景画像だけを表示">
+<!ENTITY viewBGImageCmd.accesskey     "w">
 <!ENTITY setDesktopBackgroundCmd.label		"デスクトップの背景に設定...">
 <!ENTITY setDesktopBackgroundCmd.accesskey	"S">
-<!ENTITY bookmarkPageCmd2.label		"このページをブックマーク">
-<!ENTITY bookmarkPageCmd2.accesskey	"m">
-<!ENTITY bookmarkThisLinkCmd.label	"このリンクをブックマーク">
-<!ENTITY bookmarkThisLinkCmd.accesskey	"L">
-<!ENTITY bookmarkThisFrameCmd.label	"このフレームをブックマーク">
-<!ENTITY bookmarkThisFrameCmd.accesskey	"m">
-<!ENTITY emailPageCmd.label		"ページの URL をメールで送信...">
-<!ENTITY emailPageCmd.accesskey		"E">
-<!ENTITY savePageCmd.label		"名前を付けてページを保存...">
-<!ENTITY savePageCmd.accesskey		"A">
+<!ENTITY bookmarkPageCmd2.label			"このページをブックマーク">
+<!ENTITY bookmarkPageCmd2.accesskey		"m">
+<!ENTITY bookmarkThisLinkCmd.label		"このリンクをブックマーク">
+<!ENTITY bookmarkThisLinkCmd.accesskey		"L">
+<!ENTITY bookmarkThisFrameCmd.label		"このフレームをブックマーク">
+<!ENTITY bookmarkThisFrameCmd.accesskey		"m">
+<!ENTITY emailPageCmd.label           "ページの URL をメールで送信...">
+<!ENTITY emailPageCmd.accesskey       "E">
+<!ENTITY switchToMetroCmd.label       "Windows 8 スタイルの &brandShortName; に切り替え">
+<!ENTITY switchToMetroCmd2.label      "&brandShortName; for Windows 8 タッチ に切り替え">
+<!ENTITY savePageCmd.label            "名前を付けてページを保存...">
+<!ENTITY savePageCmd.accesskey        "A">
 <!-- alternate for content area context menu -->
-<!ENTITY savePageCmd.accesskey2		"P">
-<!ENTITY savePageCmd.commandkey		"s">
-<!ENTITY saveFrameCmd.label		"名前を付けてフレームを保存...">
-<!ENTITY saveFrameCmd.accesskey		"F">
-<!ENTITY printFrameCmd.label		"フレームを印刷...">
-<!ENTITY printFrameCmd.accesskey	"P">
-<!ENTITY saveLinkCmd.label		"名前を付けてリンク先を保存...">
-<!ENTITY saveLinkCmd.accesskey		"k">
-<!ENTITY saveImageCmd.label		"名前を付けて画像を保存...">
-<!ENTITY saveImageCmd.accesskey		"v">
-<!ENTITY saveVideoCmd.label		"名前を付けて動画を保存...">
-<!ENTITY saveVideoCmd.accesskey		"v">
-<!ENTITY saveAudioCmd.label		"名前を付けてオーディオを保存...">
-<!ENTITY saveAudioCmd.accesskey		"v">
-<!ENTITY emailImageCmd.label		"画像の URL をメールで送信...">
-<!ENTITY emailImageCmd.accesskey	"g">
-<!ENTITY emailVideoCmd.label		"動画の URL をメールで送信...">
-<!ENTITY emailVideoCmd.accesskey	"a">
-<!ENTITY emailAudioCmd.label		"オーディオの URL をメールで送信...">
-<!ENTITY emailAudioCmd.accesskey	"a">
-<!ENTITY playPluginCmd.label		"このプラグインを有効化">
-<!ENTITY playPluginCmd.accesskey	"c">
-<!ENTITY hidePluginCmd.label		"このプラグインを非表示">
-<!ENTITY hidePluginCmd.accesskey	"H">
-<!ENTITY copyLinkCmd.label		"リンクの URL をコピー">
-<!ENTITY copyLinkCmd.accesskey		"a">
-<!ENTITY copyImageCmd.label		"画像の URL をコピー">
-<!ENTITY copyImageCmd.accesskey		"o">
-<!ENTITY copyImageContentsCmd.label	"画像をコピー">
-<!ENTITY copyImageContentsCmd.accesskey	"y">
-<!ENTITY copyVideoURLCmd.label		"動画の URL をコピー">
-<!ENTITY copyVideoURLCmd.accesskey	"o">
-<!ENTITY copyAudioURLCmd.label		"オーディオの URL をコピー">
-<!ENTITY copyAudioURLCmd.accesskey	"o">
-<!ENTITY copyEmailCmd.label		"メールアドレスをコピー">
-<!ENTITY copyEmailCmd.accesskey		"E">
-<!ENTITY thisFrameMenu.label		"このフレーム">
-<!ENTITY thisFrameMenu.accesskey	"h">
+<!ENTITY savePageCmd.accesskey2       "P">
+<!ENTITY savePageCmd.commandkey       "s">
+<!ENTITY saveFrameCmd.label           "名前を付けてフレームを保存...">
+<!ENTITY saveFrameCmd.accesskey       "F">
+<!ENTITY printFrameCmd.label          "フレームを印刷...">
+<!ENTITY printFrameCmd.accesskey      "P">
+<!ENTITY saveLinkCmd.label            "名前を付けてリンク先を保存...">
+<!ENTITY saveLinkCmd.accesskey        "k">
+<!ENTITY saveImageCmd.label           "名前を付けて画像を保存...">
+<!ENTITY saveImageCmd.accesskey       "v">
+<!ENTITY saveVideoCmd.label           "名前を付けて動画を保存...">
+<!ENTITY saveVideoCmd.accesskey       "v">
+<!ENTITY saveAudioCmd.label           "名前を付けてオーディオを保存...">
+<!ENTITY saveAudioCmd.accesskey       "v">
+<!ENTITY emailImageCmd.label          "画像の URL をメールで送信...">
+<!ENTITY emailImageCmd.accesskey      "g">
+<!ENTITY emailVideoCmd.label          "動画の URL をメールで送信...">
+<!ENTITY emailVideoCmd.accesskey      "a">
+<!ENTITY emailAudioCmd.label          "オーディオの URL をメールで送信...">
+<!ENTITY emailAudioCmd.accesskey      "a">
+<!ENTITY playPluginCmd.label          "このプラグインを有効化">
+<!ENTITY playPluginCmd.accesskey      "c">
+<!ENTITY hidePluginCmd.label          "このプラグインを非表示">
+<!ENTITY hidePluginCmd.accesskey      "H">
+<!ENTITY copyLinkCmd.label            "リンクの URL をコピー">
+<!ENTITY copyLinkCmd.accesskey        "a">
+<!ENTITY copyImageCmd.label           "画像の URL をコピー">
+<!ENTITY copyImageCmd.accesskey       "o">
+<!ENTITY copyImageContentsCmd.label   "画像をコピー">
+<!ENTITY copyImageContentsCmd.accesskey  "y"> 
+<!ENTITY copyVideoURLCmd.label        "動画の URL をコピー">
+<!ENTITY copyVideoURLCmd.accesskey    "o">
+<!ENTITY copyAudioURLCmd.label        "オーディオの URL をコピー">
+<!ENTITY copyAudioURLCmd.accesskey    "o">
+<!ENTITY copyEmailCmd.label           "メールアドレスをコピー">
+<!ENTITY copyEmailCmd.accesskey       "E">
+<!ENTITY thisFrameMenu.label              "このフレーム">
+<!ENTITY thisFrameMenu.accesskey          "h">
 
 <!-- Media (video/audio) controls -->
 <!-- LOCALIZATION NOTE: The access keys for "Play" and
 "Pause" are the same because the two context-menu
 items are mutually exclusive. -->
-<!ENTITY mediaPlay.label		"再生">
-<!ENTITY mediaPlay.accesskey		"P">
-<!ENTITY mediaPause.label		"一時停止">
-<!ENTITY mediaPause.accesskey		"P">
+<!ENTITY mediaPlay.label             "再生">
+<!ENTITY mediaPlay.accesskey         "P">
+<!ENTITY mediaPause.label            "一時停止">
+<!ENTITY mediaPause.accesskey        "P">
 <!-- LOCALIZATION NOTE: The access keys for "Mute" and
 "Unmute" are the same because the two context-menu
 items are mutually exclusive. -->
-<!ENTITY mediaMute.label		"ミュート">
-<!ENTITY mediaMute.accesskey		"M">
-<!ENTITY mediaUnmute.label		"ミュート解除">
-<!ENTITY mediaUnmute.accesskey		"m">
-<!ENTITY mediaPlaybackRate.label                "再生スピード">
-<!ENTITY mediaPlaybackRate.accesskey            "l">
+<!ENTITY mediaMute.label             "ミュート">
+<!ENTITY mediaMute.accesskey         "M">
+<!ENTITY mediaUnmute.label           "ミュート解除">
+<!ENTITY mediaUnmute.accesskey       "m">
+<!ENTITY mediaPlaybackRate.label     "再生スピード">
+<!ENTITY mediaPlaybackRate.accesskey "l">
 <!ENTITY mediaPlaybackRate050x.label            "スローモーション (0.5倍)">
 <!ENTITY mediaPlaybackRate050x.accesskey        "S">
 <!ENTITY mediaPlaybackRate100x.label            "通常">
 <!ENTITY mediaPlaybackRate100x.accesskey        "N">
 <!ENTITY mediaPlaybackRate150x.label            "早送り (1.5倍)">
 <!ENTITY mediaPlaybackRate150x.accesskey        "H">
 <!-- LOCALIZATION NOTE: "Ludicrous Speed" is a reference to the
 movie "Space Balls" and is meant to say that this speed is very
 fast. -->
 <!ENTITY mediaPlaybackRate200x.label            "ウルトラスーパーハイ (2倍)">
 <!ENTITY mediaPlaybackRate200x.accesskey        "L">
 <!-- LOCALIZATION NOTE: The access keys for "Show Controls" and
 "Hide Controls" are the same because the two context-menu
 items are mutually exclusive. -->
-<!ENTITY mediaShowControls.label	"コントロールを表示">
-<!ENTITY mediaShowControls.accesskey	"C">
-<!ENTITY mediaHideControls.label	"コントロールを隠す">
-<!ENTITY mediaHideControls.accesskey	"C">
-<!ENTITY videoFullScreen.label		"全画面表示">
-<!ENTITY videoFullScreen.accesskey	"F">
-<!ENTITY videoSaveImage.label		"スナップショットを保存...">
-<!ENTITY videoSaveImage.accesskey	"S">
+<!ENTITY mediaShowControls.label     "コントロールを表示">
+<!ENTITY mediaShowControls.accesskey "C">
+<!ENTITY mediaHideControls.label     "コントロールを隠す">
+<!ENTITY mediaHideControls.accesskey "C">
+<!ENTITY videoFullScreen.label       "全画面表示">
+<!ENTITY videoFullScreen.accesskey   "F">
+<!ENTITY videoSaveImage.label        "スナップショットを保存...">
+<!ENTITY videoSaveImage.accesskey    "S">
 <!-- LOCALIZATION NOTE: The access keys for "Show Statistics" and
 "Hide Statistics" are the same because the two context-menu
 items are mutually exclusive. -->
-<!ENTITY videoShowStats.label		"統計情報を表示">
-<!ENTITY videoShowStats.accesskey	"t">
-<!ENTITY videoHideStats.label		"統計情報を閉じる">
-<!ENTITY videoHideStats.accesskey	"t">
+<!ENTITY videoShowStats.label        "統計情報を表示">
+<!ENTITY videoShowStats.accesskey    "t">
+<!ENTITY videoHideStats.label        "統計情報を閉じる">
+<!ENTITY videoHideStats.accesskey    "t">
 
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
 If shift key is needed with your locale popular keyboard for them,
 you can use these alternative items. Otherwise, their values should be empty.  -->
 
-<!ENTITY fullZoomEnlargeCmd.label	"拡大">
-<!ENTITY fullZoomEnlargeCmd.accesskey	"I">
-<!ENTITY fullZoomEnlargeCmd.commandkey	"+">
-<!ENTITY fullZoomEnlargeCmd.commandkey2	"=">
-<!ENTITY fullZoomEnlargeCmd.commandkey3	";"><!-- JIS キーボード用 -->
+<!ENTITY fullZoomEnlargeCmd.label       "拡大">
+<!ENTITY fullZoomEnlargeCmd.accesskey   "I">
+<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
+<!ENTITY fullZoomEnlargeCmd.commandkey2 "=">
+<!ENTITY fullZoomEnlargeCmd.commandkey3 ";"><!-- JIS キーボード用 -->
 
-<!ENTITY fullZoomReduceCmd.label	"縮小">
-<!ENTITY fullZoomReduceCmd.accesskey	"O">
-<!ENTITY fullZoomReduceCmd.commandkey	"-">
-<!ENTITY fullZoomReduceCmd.commandkey2	"">
+<!ENTITY fullZoomReduceCmd.label        "縮小">
+<!ENTITY fullZoomReduceCmd.accesskey    "O">
+<!ENTITY fullZoomReduceCmd.commandkey   "-">
+<!ENTITY fullZoomReduceCmd.commandkey2  "">
 
-<!ENTITY fullZoomResetCmd.label		"リセット">
-<!ENTITY fullZoomResetCmd.accesskey	"R">
-<!ENTITY fullZoomResetCmd.commandkey	"0">
-<!ENTITY fullZoomResetCmd.commandkey2	"">
+<!ENTITY fullZoomResetCmd.label         "リセット">
+<!ENTITY fullZoomResetCmd.accesskey     "R">
+<!ENTITY fullZoomResetCmd.commandkey    "0">
+<!ENTITY fullZoomResetCmd.commandkey2   "">
 
-<!ENTITY fullZoomToggleCmd.label	"文字サイズだけ変更"><!-- (^^; -->
-<!ENTITY fullZoomToggleCmd.accesskey	"T">
-<!ENTITY fullZoom.label			"ズーム">
-<!ENTITY fullZoom.accesskey		"Z">
+<!ENTITY fullZoomToggleCmd.label        "文字サイズだけ変更"><!-- (^^; -->
+<!ENTITY fullZoomToggleCmd.accesskey    "T">
+<!ENTITY fullZoom.label                 "ズーム">
+<!ENTITY fullZoom.accesskey             "Z">
 
-<!ENTITY newTabButton.tooltip		"新しいタブを開きます">
-<!ENTITY newWindowButton.tooltip	"新しいウィンドウを開きます">
-<!ENTITY sidebarCloseButton.tooltip	"サイドバーを閉じます">
+<!ENTITY newTabButton.tooltip           "新しいタブを開きます">
+<!ENTITY newWindowButton.tooltip        "新しいウィンドウを開きます">
+<!ENTITY sidebarCloseButton.tooltip     "サイドバーを閉じます">
 
-<!ENTITY fullScreenButton.tooltip	"ウィンドウを画面全体に表示します">
+<!ENTITY fullScreenButton.tooltip       "ウィンドウを画面全体に表示します">
 
 <!ENTITY quitApplicationCmdWin.label	"終了">
 <!ENTITY quitApplicationCmdWin.accesskey	"x">
 <!ENTITY goBackCmd.commandKey		"[">
 <!ENTITY goForwardCmd.commandKey	"]">
-<!ENTITY quitApplicationCmd.label	"終了">
-<!ENTITY quitApplicationCmd.accesskey	"Q">
-<!ENTITY quitApplicationCmdMac.label	"&brandShortName; を終了">
+<!ENTITY quitApplicationCmd.label       "終了">
+<!ENTITY quitApplicationCmd.accesskey   "Q">
+<!ENTITY quitApplicationCmdMac.label    "&brandShortName; を終了">
 <!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX builds. -->
-<!ENTITY quitApplicationCmdUnix.key	"Q">
+<!ENTITY quitApplicationCmdUnix.key     "Q">
 
-<!ENTITY closeCmd.label			"閉じる">
-<!ENTITY closeCmd.key			"W">
-<!ENTITY closeCmd.accesskey		"C">
+<!ENTITY closeCmd.label                 "閉じる">
+<!ENTITY closeCmd.key                   "W">  
+<!ENTITY closeCmd.accesskey             "C">
 
 <!ENTITY pageStyleMenu.label		"スタイルシート">
 <!ENTITY pageStyleMenu.accesskey	"y">
 <!ENTITY pageStyleNoStyle.label		"スタイルシートを使用しない">
 <!ENTITY pageStyleNoStyle.accesskey	"n">
 <!ENTITY pageStylePersistentOnly.label	"標準スタイルシート">
 <!ENTITY pageStylePersistentOnly.accesskey	"b">
 
@@ -560,36 +557,36 @@ you can use these alternative items. Oth
 <!-- On Windows we use the term "Options" to describe settings, but
      on Linux and Mac OS X we use "Preferences" - carry that distinction
      over into this string, which is used in the "popup blocked" info bar . -->
 <!ENTITY editPopupSettingsUnix.label	"ポップアップブロック設定を変更...">
 <!ENTITY editPopupSettings.label	"ポップアップブロック設定を変更...">
 <!ENTITY editPopupSettings.accesskey	"E">
 <!ENTITY dontShowMessage.accesskey	"D">
 
-<!ENTITY bidiSwitchPageDirectionItem.label	"ページの方向を切り替える">
-<!ENTITY bidiSwitchPageDirectionItem.accesskey	"D">
-<!ENTITY bidiSwitchTextDirectionItem.label	"テキストの方向を切り替える">
-<!ENTITY bidiSwitchTextDirectionItem.accesskey	"w">
-<!ENTITY bidiSwitchTextDirectionItem.commandkey	"X">
+<!ENTITY bidiSwitchPageDirectionItem.label        "ページの方向を切り替える">
+<!ENTITY bidiSwitchPageDirectionItem.accesskey    "D">
+<!ENTITY bidiSwitchTextDirectionItem.label        "テキストの方向を切り替える">
+<!ENTITY bidiSwitchTextDirectionItem.accesskey    "w">
+<!ENTITY bidiSwitchTextDirectionItem.commandkey   "X">
 
 <!ENTITY findOnCmd.label		"このページを検索...">
 <!ENTITY findOnCmd.accesskey		"F">
 <!ENTITY findOnCmd.commandkey		"f">
 <!ENTITY findAgainCmd.label		"次を検索">
 <!ENTITY findAgainCmd.accesskey		"g">
 <!ENTITY findAgainCmd.commandkey	"g">
 <!ENTITY findAgainCmd.commandkey2	"VK_F3">
 
 <!ENTITY spellAddDictionaries.label	"辞書を追加...">
 <!ENTITY spellAddDictionaries.accesskey	"A">
 
-<!ENTITY editBookmark.done.label		"完了">
-<!ENTITY editBookmark.cancel.label		"キャンセル">
-<!ENTITY editBookmark.removeBookmark.accessKey	"R">
+<!ENTITY editBookmark.done.label                     "完了">
+<!ENTITY editBookmark.cancel.label                   "キャンセル">
+<!ENTITY editBookmark.removeBookmark.accessKey       "R">
 
 <!ENTITY identity.unverifiedsite2		"この Web サイトは認証されていません。"><!-- (^^; identity.connectedTo は通常の SSL 認証(ドメイン認証のみ) と EVSSL による認証(法人登記なども確認して実在証明) で共通  -->
 <!ENTITY identity.connectedTo			"この Web サイトは認証されています">
 <!-- Localization note (identity.runBy) : This string appears between a
 domain name (above) and an organization name (below). E.g.
 
 example.com
 which is run by
@@ -613,29 +610,29 @@ just addresses the organization to follo
 
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label			"ブラウザタブ"><!-- (^m^) Bug 565042  音声読み上げ用ラベル -->
 
 <!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
 <!ENTITY syncTabsMenu2.label			"他の端末で開いていたタブ">
 
-<!ENTITY syncBrand.shortName.label		"Sync">
+<!ENTITY syncBrand.shortName.label    "Sync">
 
-<!ENTITY syncSetup.label				"&syncBrand.shortName.label; をセットアップ...">
-<!ENTITY syncSetup.accesskey			"Y">
-<!ENTITY syncSyncNowItem.label			"今すぐ同期">
-<!ENTITY syncSyncNowItem.accesskey		"S">
-<!ENTITY syncToolbarButton.label		"Sync">
+<!ENTITY syncSetup.label              "&syncBrand.shortName.label; をセットアップ...">
+<!ENTITY syncSetup.accesskey          "Y">
+<!ENTITY syncSyncNowItem.label        "今すぐ同期">
+<!ENTITY syncSyncNowItem.accesskey    "S">
+<!ENTITY syncToolbarButton.label      "Sync">
 
-<!ENTITY socialToolbar.title			"ソーシャルツールバーボタン">
-<!ENTITY social.notLoggedIn.label		"ログインしていません">
+<!ENTITY socialToolbar.title        "ソーシャルツールバーボタン">
+<!ENTITY social.notLoggedIn.label   "ログインしていません">
 
-<!ENTITY social.ok.label			"OK">
-<!ENTITY social.ok.accesskey			"O">
+<!ENTITY social.ok.label       "OK">
+<!ENTITY social.ok.accesskey   "O">
 
 <!ENTITY social.toggleSidebar.label		"サイドバーを表示する">
 <!ENTITY social.toggleSidebar.accesskey		"s">
 
 <!ENTITY social.addons.label			"サービスを管理...">
 
 <!ENTITY social.toggleNotifications.label	"デスクトップ通知を表示する">
 <!ENTITY social.toggleNotifications.accesskey	"n">
@@ -689,39 +686,38 @@ just addresses the organization to follo
 <!ENTITY tabCrashed.checkSendReport		"&vendorShortName; にクラッシュ内容を送信する。">
 <!ENTITY tabCrashed.tryAgain			"再試行">
 
 <!-- LOCALIZATION NOTE: the following strings are unused in Australis, they're
      kept here to avoid warnings from l10n tools like compare-locales on
      l10n-central. They will be definitely removed when Australis is ready
      for mozilla-aurora. -->
 
-<!ENTITY navbarCmd.accesskey		"N">
-<!ENTITY addonBarCmd.label		"アドオンバー">
-<!ENTITY addonBarCmd.accesskey		"A">
-<!ENTITY throbberItem.title		"読み込み中アイコン">
-<!ENTITY appMenuButton.label		"メニュー">
-<!ENTITY appMenuButton.tooltip		"&brandShortName; メニューを開く">
-<!ENTITY feedButton.label		"購読">
-<!ENTITY feedButton.tooltip		"このページのフィードを購読します...">
-<!ENTITY bookmarksButton.tooltip	"ブックマークをサイドバーに表示します">
-<!ENTITY historyButton.tooltip		"最近表示したページの履歴をサイドバーに表示します">
-<!ENTITY viewTabsOnTop.label		"タブを上部に表示">
-<!ENTITY viewTabsOnTop.accesskey	"T">
-<!ENTITY appMenuEdit.label		"編集">
-<!ENTITY appMenuToolbarLayout.label	"ツールバーのカスタマイズ...">
-<!ENTITY appMenuSidebars.label		"サイドバー">
-<!ENTITY appMenuFind.label		"ページ内検索...">
-<!ENTITY appMenuUnsorted.label		"未整理のブックマーク">
-<!ENTITY appMenuWebDeveloper.label	"Web 開発">
-<!ENTITY appMenuGettingStarted.label	"使いこなそう">
-<!ENTITY appMenuSafeMode.label		"アドオンを無効にして再起動...">
-<!ENTITY appMenuSafeMode.accesskey	"R">
-<!ENTITY cutButton.tooltip		"切り取り">
-<!ENTITY copyButton.tooltip		"コピー">
-<!ENTITY pasteButton.tooltip		"貼り付け">
-<!ENTITY zoomOutButton.tooltip		"縮小">
-<!ENTITY zoomInButton.tooltip		"拡大">
-<!ENTITY zoomControls.label		"拡大/縮小コントロール">
-<!ENTITY addonBarCloseButton.tooltip	"アドオンバーを閉じます">
-<!ENTITY toggleAddonBarCmd.key			"/">
+<!ENTITY navbarCmd.accesskey           "N">
+<!ENTITY addonBarCmd.label             "アドオンバー">
+<!ENTITY addonBarCmd.accesskey         "A">
+<!ENTITY throbberItem.title            "読み込み中アイコン">
+<!ENTITY appMenuButton.label           "メニュー">
+<!ENTITY appMenuButton.tooltip         "&brandShortName; メニューを開く">
+<!ENTITY feedButton.label              "購読">
+<!ENTITY feedButton.tooltip            "このページのフィードを購読します...">
+<!ENTITY bookmarksButton.tooltip       "ブックマークをサイドバーに表示します">
+<!ENTITY historyButton.tooltip         "最近表示したページの履歴をサイドバーに表示します">
+<!ENTITY viewTabsOnTop.label           "タブを上部に表示">
+<!ENTITY viewTabsOnTop.accesskey       "T">
+<!ENTITY appMenuEdit.label             "編集">
+<!ENTITY appMenuToolbarLayout.label    "ツールバーのカスタマイズ...">
+<!ENTITY appMenuSidebars.label         "サイドバー">
+<!ENTITY appMenuFind.label             "ページ内検索...">
+<!ENTITY appMenuUnsorted.label         "未整理のブックマーク">
+<!ENTITY appMenuWebDeveloper.label     "Web 開発">
+<!ENTITY appMenuGettingStarted.label   "使いこなそう">
+<!ENTITY appMenuSafeMode.label         "アドオンを無効にして再起動...">
+<!ENTITY appMenuSafeMode.accesskey     "R">
+<!ENTITY cutButton.tooltip             "切り取り">
+<!ENTITY copyButton.tooltip            "コピー">
+<!ENTITY pasteButton.tooltip           "貼り付け">
+<!ENTITY zoomOutButton.tooltip         "縮小">
+<!ENTITY zoomInButton.tooltip          "拡大">
+<!ENTITY zoomControls.label            "拡大/縮小コントロール">
+<!ENTITY addonBarCloseButton.tooltip   "アドオンバーを閉じます">
+<!ENTITY toggleAddonBarCmd.key         "/">
 <!-- end of strings to be removed post-Australis -->
-<!ENTITY bookmarksMenuButton.tooltip	"ブックマークを表示します">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -160,16 +160,24 @@ pluginBlockNow.accesskey			= B
 pluginContinue.label				= 許可を続行
 pluginContinue.accesskey			= C
 
 # in-page UI
 PluginClickToActivate				= %S を有効にします。
 PluginVulnerableUpdatable			= このプラグインは安全ではありません。更新してください。
 PluginVulnerableNoUpdate			= このプラグインはセキュリティの問題があります。
 
+# infobar UI
+pluginContinueBlocking.label			= ブロックを継続
+pluginContinueBlocking.accesskey		= B
+# LOCALIZATION NOTE (pluginActivateTrigger): Use the unicode ellipsis char, \u2026,
+# or use "..." if \u2026 doesn't suit traditions in your locale.
+pluginActivateTrigger.label			= 許可...
+pluginActivateTrigger.accesskey			= A
+
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title	= すべての履歴を消去
 sanitizeButtonOK			= 今すぐ消去
 # LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
 # button between the user clicking it and the window closing.  Indicates the
--- a/browser/chrome/browser/charsetMenu.dtd
+++ b/browser/chrome/browser/charsetMenu.dtd
@@ -0,0 +1,18 @@
+<!-- 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 charsetMenu.label             "文字エンコーディング">
+<!ENTITY charsetMenu.accesskey         "C">
+<!ENTITY charsetMenuAutodet.label      "自動判別">
+<!ENTITY charsetMenuAutodet.accesskey  "D"><!-- A reserved for Arabic -->
+
+<!ENTITY charsetMenuAutodet.off.label     "(解除)">
+<!ENTITY charsetMenuAutodet.off.accesskey "o">
+<!ENTITY charsetMenuAutodet.ja.label      "日本語">
+<!ENTITY charsetMenuAutodet.ja.accesskey  "J">
+<!ENTITY charsetMenuAutodet.ru.label      "ロシア語">
+<!ENTITY charsetMenuAutodet.ru.accesskey  "R">
+<!ENTITY charsetMenuAutodet.uk.label      "ウクライナ語">
+<!ENTITY charsetMenuAutodet.uk.accesskey  "U">
+
--- a/browser/chrome/browser/charsetMenu.properties
+++ b/browser/chrome/browser/charsetMenu.properties
@@ -0,0 +1,103 @@
+# 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: The property keys ending with ".key" are for access keys.
+# Localizations may add or delete properties where the property key ends with
+# ".key" as appropriate for the localization. The code that uses this data can
+# deal with the absence of an access key for an item.
+# 
+# Make sure the keys defined here don't collide with
+# charsetMenuAutodet.accesskey in charsetMenu.dtd.
+#
+# In the en-US version of this file, access keys are given to the following:
+# * UTF-8
+# * All encodings that are the fallback encoding for some locale in Firefox
+# * All encodings that are the fallback encoding for some locale in IE
+# * All Japanese encodings
+#
+# For the items whose property key does not end in ".key" and whose value
+# includes "(" U+0028 LEFT PARENTHESIS, the "(" character is significant for
+# processing by CharsetMenu.jsm. If your localization does not use ASCII
+# parentheses where en-US does in this file, please file a bug to make
+# CharsetMenu.jsm also recognize the delimiter your localization uses.
+# (When this code was developed, all localizations appeared to use
+# U+0028 LEFT PARENTHESIS for this purpose.)
+
+# Globally-relevant
+UTF-8.key        = U
+UTF-8            = Unicode
+windows-1252.key = W
+windows-1252     = 西欧
+
+# Arabic
+windows-1256.key = A
+windows-1256     = アラビア語 (Windows)
+ISO-8859-6       = アラビア語 (ISO)
+
+# Baltic
+windows-1257.key = B
+windows-1257     = バルト語 (Windows)
+ISO-8859-4       = バルト語 (ISO)
+
+# Central European
+windows-1250.key =         E
+windows-1250     = 中欧 (Windows)
+ISO-8859-2.key   =       l
+ISO-8859-2       = 中欧 (ISO)
+
+# Chinese, Simplified
+gbk.key          =          S
+gbk              = 簡体字中国語 (GBK)
+gb18030          = 簡体字中国語 (GB18030)
+
+# Chinese, Traditional
+Big5.key         =          T
+Big5             = 繁体字中国語
+
+# Cyrillic
+windows-1251.key = C
+windows-1251     = キリル文字 (Windows)
+ISO-8859-5       = キリル文字 (ISO)
+KOI8-R           = キリル文字 (KOI8-R)
+KOI8-U           = キリル文字 (KOI8-U)
+IBM866           = キリル文字 (DOS)
+
+# Greek
+windows-1253.key = G
+windows-1253     = ギリシャ語 (Windows)
+ISO-8859-7.key   =          O
+ISO-8859-7       = ギリシャ語 (ISO)
+
+# Hebrew
+windows-1255.key = H
+windows-1255     = ヘブライ語 (Windows)
+# LOCALIZATION NOTE (ISO-8859-8): The value for this item should begin with
+# the same word for Hebrew as the value for windows-1255 so that this item 
+# sorts right after that one in the collation order for your locale.
+ISO-8859-8       = ヘブライ語 (ISO)
+
+# Japanese
+Shift_JIS.key    = J
+Shift_JIS        = 日本語 (Shift_JIS)
+EUC-JP.key       =   p
+EUC-JP           = 日本語 (EUC-JP)
+ISO-2022-JP.key  =     n
+ISO-2022-JP      = 日本語 (ISO-2022-JP)
+
+# Korean
+EUC-KR.key       = K
+EUC-KR           = 韓国語
+
+# Thai
+windows-874.key  =    i
+windows-874      = タイ語
+
+# Turkish
+windows-1254.key =   r
+windows-1254     = トルコ語
+
+# Vietnamese
+windows-1258.key = V
+windows-1258     = ベトナム語
+
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -67,16 +67,20 @@ detailsPane.noItems		= 項目がありません
 # example: 111 items
 # Thanks Feedback! http://forums.mozillazine.jp/viewtopic.php?t=13122
 detailsPane.itemsCountLabel	= 項目の数: #1 個
 
 # (^^; ブックマークツールバー直下のフォルダになったから短く: 表示回数の多いページ、よく表示するページ、よく見るページ、表示回数順 etc...
 mostVisitedTitle		= よく見るページ
 recentlyBookmarkedTitle		= 最近ブックマークしたページ
 recentTagsTitle			= 最近付けたタグ
+# LOCALIZATION NOTE (windows8TouchTitle): this is the name of the folder used
+# to store bookmarks created in Metro mode and share bookmarks between Metro
+# and Desktop.
+windows8TouchTitle		= Windows 8 タッチ
 
 OrganizerQueryHistory		= 履歴
 OrganizerQueryDownloads		= ダウンロード
 OrganizerQueryAllBookmarks	= すべてのブックマーク
 OrganizerQueryTags		= タグ
 
 # LOCALIZATION NOTE (tagResultLabel) :
 # Noun used to describe the location bar autocomplete result type
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -1,27 +1,29 @@
 <!-- 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  blockPopups.label		"ポップアップウィンドウをブロックする">
-<!ENTITY  blockPopups.accesskey		"B">
-<!ENTITY  popupExceptions.label		"許可サイト..."><!-- en-US: Exceptions -->
-<!ENTITY  popupExceptions.accesskey	"E">
+<!ENTITY  popups.label                "Pop-ups">
 
-<!ENTITY  fontsAndColors.label		"フォントと配色">
+<!ENTITY  blockPopups.label           "ポップアップウィンドウをブロックする">
+<!ENTITY  blockPopups.accesskey       "B">
+<!ENTITY  popupExceptions.label       "許可サイト..."><!-- en-US: Exceptions -->
+<!ENTITY  popupExceptions.accesskey   "E">
+
+<!ENTITY  fontsAndColors.label        "フォントと配色">
 
-<!ENTITY  defaultFont.label		"既定のフォント:">
-<!ENTITY  defaultFont.accesskey		"D">
-<!ENTITY  defaultSize.label		"サイズ:">
-<!ENTITY  defaultSize.accesskey		"S">
+<!ENTITY  defaultFont.label           "既定のフォント:">
+<!ENTITY  defaultFont.accesskey       "D">
+<!ENTITY  defaultSize.label           "サイズ:">
+<!ENTITY  defaultSize.accesskey       "S">
 
-<!ENTITY  advancedFonts.label		"詳細設定...">
-<!ENTITY  advancedFonts.accesskey	"A">
+<!ENTITY  advancedFonts.label         "詳細設定...">
+<!ENTITY  advancedFonts.accesskey     "A">
 
-<!ENTITY  colors.label			"配色設定...">
-<!ENTITY  colors.accesskey		"C">
+<!ENTITY  colors.label                "配色設定...">
+<!ENTITY  colors.accesskey            "C">
 
 
-<!ENTITY languages.label		"言語">
-<!ENTITY chooseLanguage.label		"Web ページの表示に使用する言語の優先順位を設定できます。">
-<!ENTITY chooseButton.label		"言語設定...">
-<!ENTITY chooseButton.accesskey		"o">
+<!ENTITY languages.label              "言語">
+<!ENTITY chooseLanguage.label         "Web ページの表示に使用する言語の優先順位を設定できます。">
+<!ENTITY chooseButton.label           "言語設定...">
+<!ENTITY chooseButton.accesskey       "o">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -1,76 +1,111 @@
 <!-- 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/. -->
 
-<!-- (^^; messenger/preferences/fonts.dtd とほぼ同じ -->
+<!ENTITY  fontsDialog.title                       "フォント">
+<!ENTITY  window.width                            "44em"><!-- en-US: 39em -->
+<!ENTITY  window.macWidth                         "48em"><!-- en-US: 43em -->
+<!ENTITY  window.unixWidth                        "44em"><!-- en-US: 41em -->
 
-<!ENTITY  fontsDialog.title		"フォント">
-<!ENTITY  window.width			"44em"><!-- en-US: 39em -->
-<!ENTITY  window.macWidth		"48em"><!-- en-US: 43em -->
-<!ENTITY  window.unixWidth		"44em"><!-- en-US: 41em -->
-
-<!ENTITY  language.label		"対象言語:">
-<!ENTITY  language.accesskey		"F">
+<!ENTITY  language.label                          "対象言語:">
+<!ENTITY  language.accesskey                      "F">
 
-<!ENTITY  size.label			"サイズ:">
-<!ENTITY  sizeProportional.accesskey	"z">
-<!ENTITY  sizeMonospace.accesskey	"e">
+<!ENTITY  size.label                              "サイズ:">
+<!ENTITY  sizeProportional.accesskey              "z">
+<!ENTITY  sizeMonospace.accesskey                 "e">
 
-<!ENTITY  proportional.label		"プロポーショナル:">
-<!ENTITY  proportional.accesskey	"P">
+<!ENTITY  proportional.label                      "プロポーショナル:">
+<!ENTITY  proportional.accesskey                  "P">
 
-<!ENTITY  serif.label			"明朝体 (Serif):">
-<!ENTITY  serif.accesskey		"S">
-<!ENTITY  sans-serif.label		"ゴシック体 (Sans-serif):">
-<!ENTITY  sans-serif.accesskey		"n">
-<!ENTITY  monospace.label		"等幅 (Monospace):">
-<!ENTITY  monospace.accesskey		"M">
+<!ENTITY  serif.label                             "明朝体 (Serif):">
+<!ENTITY  serif.accesskey                         "S">
+<!ENTITY  sans-serif.label                        "ゴシック体 (Sans-serif):">
+<!ENTITY  sans-serif.accesskey                    "n">
+<!ENTITY  monospace.label                         "等幅 (Monospace):">
+<!ENTITY  monospace.accesskey                     "M">
 
-<!ENTITY  font.langGroup.latin1		"西欧">
-<!ENTITY  font.langGroup.latin2		"中欧">
-<!ENTITY  font.langGroup.japanese	"日本語">
-<!ENTITY  font.langGroup.trad-chinese	"繁体字中国語(台湾)">
-<!ENTITY  font.langGroup.simpl-chinese	"簡体字中国語">
-<!ENTITY  font.langGroup.trad-chinese-hk "繁体字中国語(香港)">
-<!ENTITY  font.langGroup.korean		"韓国語">
-<!ENTITY  font.langGroup.cyrillic	"キリル文字"><!-- win では キリル言語 -->
-<!ENTITY  font.langGroup.baltic		"バルト諸語"><!-- (^^; win 対応不明 -->
-<!ENTITY  font.langGroup.el		"ギリシャ語">
-<!ENTITY  font.langGroup.turkish	"トルコ語">
-<!ENTITY  font.langGroup.unicode	"その他の言語">
-<!ENTITY  font.langGroup.user-def	"ユーザ定義">
-<!ENTITY  font.langGroup.thai		"タイ語">
-<!ENTITY  font.langGroup.hebrew		"ヘブライ語">
-<!ENTITY  font.langGroup.arabic		"アラビア語">
-<!ENTITY  font.langGroup.devanagari	"デーヴァナーガリー"><!-- (^^; win 対応不明 -->
-<!ENTITY  font.langGroup.tamil		"タミール語">
-<!ENTITY  font.langGroup.armenian	"アルメニア語">
-<!ENTITY  font.langGroup.bengali	"ベンガル語">
-<!ENTITY  font.langGroup.canadian	"統合カナダ先住民音節文字"><!-- win 対応不明 -->
-<!ENTITY  font.langGroup.ethiopic	"アムハラ語"><!-- (^^; win 対応不明 -->
-<!ENTITY  font.langGroup.georgian	"グルジア語">
-<!ENTITY  font.langGroup.gujarati	"グジャラート語">
-<!ENTITY  font.langGroup.gurmukhi	"グルムキー文字"><!-- (^^; win 対応不明 -->
-<!ENTITY  font.langGroup.khmer		"クメール語">
-<!ENTITY  font.langGroup.malayalam	"マラヤラム語">
-<!ENTITY  font.langGroup.oriya		"オリヤー語"><!-- (^^; win 対応不明 -->
-<!ENTITY  font.langGroup.telugu		"テルグ語">
-<!ENTITY  font.langGroup.kannada	"カナラ語">
-<!ENTITY  font.langGroup.sinhala	"シンハラ語"><!-- (^^; win 対応不明 -->
-<!ENTITY  font.langGroup.tibetan	"チベット語">
+<!ENTITY  font.langGroup.latin1                   "西欧">
+<!ENTITY  font.langGroup.latin2                   "中欧">
+<!ENTITY  font.langGroup.japanese                 "日本語">
+<!ENTITY  font.langGroup.trad-chinese             "繁体字中国語(台湾)">
+<!ENTITY  font.langGroup.simpl-chinese            "簡体字中国語">
+<!ENTITY  font.langGroup.trad-chinese-hk          "繁体字中国語(香港)">
+<!ENTITY  font.langGroup.korean                   "韓国語">
+<!ENTITY  font.langGroup.cyrillic                 "キリル文字"><!-- win では キリル言語 -->
+<!ENTITY  font.langGroup.baltic                   "バルト諸語"><!-- (^^; win 対応不明 -->
+<!ENTITY  font.langGroup.el                       "ギリシャ語">
+<!ENTITY  font.langGroup.turkish                  "トルコ語">
+<!ENTITY  font.langGroup.unicode                  "その他の言語">
+<!ENTITY  font.langGroup.user-def                 "ユーザ定義">
+<!ENTITY  font.langGroup.thai                     "タイ語">
+<!ENTITY  font.langGroup.hebrew                   "ヘブライ語">
+<!ENTITY  font.langGroup.arabic                   "アラビア語">
+<!ENTITY  font.langGroup.devanagari               "デーヴァナーガリー"><!-- (^^; win 対応不明 -->
+<!ENTITY  font.langGroup.tamil                    "タミール語">
+<!ENTITY  font.langGroup.armenian                 "アルメニア語">
+<!ENTITY  font.langGroup.bengali                  "ベンガル語">
+<!ENTITY  font.langGroup.canadian                 "統合カナダ先住民音節文字"><!-- win 対応不明 -->
+<!ENTITY  font.langGroup.ethiopic                 "アムハラ語"><!-- (^^; win 対応不明 -->
+<!ENTITY  font.langGroup.georgian                 "グルジア語">
+<!ENTITY  font.langGroup.gujarati                 "グジャラート語">
+<!ENTITY  font.langGroup.gurmukhi                 "グルムキー文字"><!-- (^^; win 対応不明 -->
+<!ENTITY  font.langGroup.khmer                    "クメール語">
+<!ENTITY  font.langGroup.malayalam                "マラヤラム語">
+<!ENTITY  font.langGroup.oriya                    "オリヤー語"><!-- (^^; win 対応不明 -->
+<!ENTITY  font.langGroup.telugu                   "テルグ語">
+<!ENTITY  font.langGroup.kannada                  "カナラ語">
+<!ENTITY  font.langGroup.sinhala                  "シンハラ語"><!-- (^^; win 対応不明 -->
+<!ENTITY  font.langGroup.tibetan                  "チベット語">
 <!-- Minimum font size -->
-<!ENTITY minSize.label			"最小フォントサイズ:">
-<!ENTITY minSize.accesskey		"o">
-<!ENTITY minSize.none			"なし">
+<!ENTITY minSize.label                            "最小フォントサイズ:">
+<!ENTITY minSize.accesskey                        "o">
+<!ENTITY minSize.none                             "なし">
 
 <!-- default font type -->
-<!ENTITY  useDefaultFontSerif.label	"明朝体 (Serif)">
-<!ENTITY  useDefaultFontSansSerif.label	"ゴシック体 (Sans-serif)">
+<!ENTITY  useDefaultFontSerif.label               "明朝体 (Serif)">
+<!ENTITY  useDefaultFontSansSerif.label           "ゴシック体 (Sans-serif)">
+
+<!ENTITY  allowPagesToUse.label                   "Web ページが指定したフォントを優先する">
+<!ENTITY  allowPagesToUse.accesskey               "A">
+
+<!ENTITY languages.customize.Fallback.grouplabel  "古い Web ページでの文字エンコーディング">
+<!ENTITY languages.customize.Fallback.label       "代替文字エンコーディング:">
+<!ENTITY languages.customize.Fallback.accesskey   "C">
+<!ENTITY languages.customize.Fallback.desc        "この文字エンコーディングは、文字エンコーディングが宣言されていない古い Web ページで使用されます。">
 
-<!ENTITY  allowPagesToUse.label		"Web ページが指定したフォントを優先する">
-<!ENTITY  allowPagesToUse.accesskey	"A">
-
-<!ENTITY languages.customize.Fallback.grouplabel	"古い Web ページでの文字エンコーディング">
-<!ENTITY languages.customize.Fallback.label		"代替文字エンコーディング:">
-<!ENTITY languages.customize.Fallback.accesskey		"C">
-<!ENTITY languages.customize.Fallback.desc		"この文字エンコーディングは、文字エンコーディングが宣言されていない古い Web ページで使用されます。">
+<!ENTITY languages.customize.Fallback.auto        "現在のロケールの既定値">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.arabic):
+     Translate "Arabic" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.arabic      "アラビア語">
+<!ENTITY languages.customize.Fallback.baltic      "バルト諸語">
+<!ENTITY languages.customize.Fallback.ceiso       "中欧 (ISO)">
+<!ENTITY languages.customize.Fallback.cewindows   "中欧 (Windows)">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.simplified):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.simplified  "簡体字中国語">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.traditional):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.traditional "繁体字中国語">
+<!ENTITY languages.customize.Fallback.cyrillic    "キリル文字">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.greek):
+     Translate "Greek" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.greek       "ギリシャ語">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.hebrew):
+     Translate "Hebrew" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.hebrew      "ヘブライ語">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.japanese):
+     Translate "Japanese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.japanese    "日本語">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.korean):
+     Translate "Korean" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.korean      "韓国語">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.thai):
+     Translate "Thai" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.thai        "タイ語">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.turkish):
+     Translate "Turkish" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.turkish     "トルコ語">
+<!-- LOCALIZATION NOTE (languages.customize.Fallback.vietnamese):
+     Translate "Vietnamese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY languages.customize.Fallback.vietnamese  "ベトナム語">
+<!ENTITY languages.customize.Fallback.other       "その他 (西欧含む)">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -1,36 +1,32 @@
 <!-- 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 startup.label			"起動">
+<!ENTITY startup.label             "起動">
 
-<!ENTITY startupPage.label		"&brandShortName; を起動するとき:">
-<!ENTITY startupPage.accesskey		"s">
-<!ENTITY startupHomePage.label		"ホームページを表示する">
-<!ENTITY startupBlankPage.label		"空白ページを表示する">
-<!ENTITY startupLastSession.label	"前回終了時のウィンドウとタブを表示する">
+<!ENTITY startupPage.label         "&brandShortName; を起動するとき:">
+<!ENTITY startupPage.accesskey     "s">
+<!ENTITY startupHomePage.label     "ホームページを表示する">
+<!ENTITY startupBlankPage.label    "空白ページを表示する">
+<!ENTITY startupLastSession.label  "前回終了時のウィンドウとタブを表示する">
 
-<!ENTITY homepage.label			"ホームページ:">
-<!ENTITY homepage.accesskey		"P">
-<!ENTITY useCurrentPage.label		"現在のページを使用">
-<!ENTITY useCurrentPage.accesskey	"C">
-<!ENTITY useMultiple.label		"現在のタブグループを使用">
-<!ENTITY chooseBookmark.label		"ブックマークを使う...">
-<!ENTITY chooseBookmark.accesskey	"B">
-<!ENTITY restoreDefault.label		"初期設定に戻す">
-<!ENTITY restoreDefault.accesskey	"R">
-
-<!ENTITY downloads.label		"ダウンロード">
+<!ENTITY homepage.label            "ホームページ:">
+<!ENTITY homepage.accesskey        "P">
+<!ENTITY useCurrentPage.label      "現在のページを使用">
+<!ENTITY useCurrentPage.accesskey  "C">
+<!ENTITY useMultiple.label         "現在のタブグループを使用">
+<!ENTITY chooseBookmark.label      "ブックマークを使う...">
+<!ENTITY chooseBookmark.accesskey  "B">
+<!ENTITY restoreDefault.label      "初期設定に戻す">
+<!ENTITY restoreDefault.accesskey  "R">
 
-<!ENTITY showWhenDownloading.label	"ファイルのダウンロード時にダウンロードマネージャを表示する">
-<!ENTITY showWhenDownloading.accesskey	"D">
-<!ENTITY closeWhenDone.label		"すべてのダウンロードが完了したら閉じる">
-<!ENTITY closeWhenDone.accesskey	"w">
-<!ENTITY saveTo.label			"次のフォルダに保存する">
-<!ENTITY saveTo.accesskey		"v">
-<!ENTITY chooseFolderWin.label		"参照...">
-<!ENTITY chooseFolderWin.accesskey	"o">
-<!ENTITY chooseFolderMac.label		"選択...">
-<!ENTITY chooseFolderMac.accesskey	"e">
-<!ENTITY alwaysAsk.label		"ファイルごとに保存先を指定する">
-<!ENTITY alwaysAsk.accesskey		"A">
+<!ENTITY downloads.label     "ダウンロード">
+
+<!ENTITY saveTo.label                 "次のフォルダに保存する">
+<!ENTITY saveTo.accesskey             "v">
+<!ENTITY chooseFolderWin.label        "参照...">
+<!ENTITY chooseFolderWin.accesskey    "o">
+<!ENTITY chooseFolderMac.label        "選択...">
+<!ENTITY chooseFolderMac.accesskey    "e">
+<!ENTITY alwaysAsk.label              "ファイルごとに保存先を指定する">
+<!ENTITY alwaysAsk.accesskey          "A">
--- a/browser/chrome/browser/preferences/security.dtd
+++ b/browser/chrome/browser/preferences/security.dtd
@@ -1,38 +1,40 @@
 <!-- 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  warnAddonInstall.label	"アドオンのインストールを求められたときに警告する">
-<!ENTITY  warnAddonInstall.accesskey	"W">
+<!ENTITY  general.label                 "一般">
+
+<!ENTITY  warnAddonInstall.label        "アドオンのインストールを求められたときに警告する">
+<!ENTITY  warnAddonInstall.accesskey    "W">
 
 <!-- LOCALIZATION NOTE (blockWebForgeries.label, blockAttackSites.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics to a
   combination of both, so it's important that these strings and
   useDownloadedList.label convey the meaning "reported" (and not something like
   "known").
 -->
-<!ENTITY  blockAttackSites.label	"攻撃サイトとして報告されているサイトをブロックする">
-<!ENTITY  blockAttackSites.accesskey	"k">
+<!ENTITY  blockAttackSites.label     "攻撃サイトとして報告されているサイトをブロックする">
+<!ENTITY  blockAttackSites.accesskey "k">
 
-<!ENTITY  blockWebForgeries.label	"偽装サイトとして報告されているサイトをブロックする">
-<!ENTITY  blockWebForgeries.accesskey	"B">
+<!ENTITY  blockWebForgeries.label     "偽装サイトとして報告されているサイトをブロックする">
+<!ENTITY  blockWebForgeries.accesskey "B">
 
-<!ENTITY  addonExceptions.label		"許可サイト..."><!-- en-US: Exception -->
-<!ENTITY  addonExceptions.accesskey	"E">
+<!ENTITY  addonExceptions.label         "許可サイト..."><!-- en-US: Exception -->
+<!ENTITY  addonExceptions.accesskey     "E">
 
 
-<!ENTITY  passwords.label		"パスワード">
+<!ENTITY  passwords.label               "パスワード">
 
-<!ENTITY  rememberPasswords.label	"サイトのパスワードを保存する">
-<!ENTITY  rememberPasswords.accesskey	"R">
-<!ENTITY  passwordExceptions.label	"例外サイト...">
-<!ENTITY  passwordExceptions.accesskey	"x">
+<!ENTITY  rememberPasswords.label       "サイトのパスワードを保存する">
+<!ENTITY  rememberPasswords.accesskey   "R">
+<!ENTITY  passwordExceptions.label      "例外サイト...">
+<!ENTITY  passwordExceptions.accesskey  "x">
 
-<!ENTITY  useMasterPassword.label	"マスターパスワードを使用する">
-<!ENTITY  useMasterPassword.accesskey	"U">
-<!ENTITY  changeMasterPassword.label	"マスターパスワードを変更...">
+<!ENTITY  useMasterPassword.label        "マスターパスワードを使用する">
+<!ENTITY  useMasterPassword.accesskey    "U">
+<!ENTITY  changeMasterPassword.label     "マスターパスワードを変更...">
 <!ENTITY  changeMasterPassword.accesskey "M">
 
-<!ENTITY  savedPasswords.label		"保存されているパスワード...">
-<!ENTITY  savedPasswords.accesskey	"P">
+<!ENTITY  savedPasswords.label            "保存されているパスワード...">
+<!ENTITY  savedPasswords.accesskey        "P">
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -28,18 +28,16 @@
 <!-- New Account Page 1: Basic Account Info -->
 <!ENTITY setup.newAccountDetailsPage.title.label  "アカウントの詳細">
 <!ENTITY setup.emailAddress.label     "メールアドレス">
 <!ENTITY setup.emailAddress.accesskey "E">
 <!ENTITY setup.choosePassword.label      "パスワードを入力">
 <!ENTITY setup.choosePassword.accesskey  "P">
 <!ENTITY setup.confirmPassword.label  "パスワードを再度入力">
 <!ENTITY setup.confirmPassword.accesskey  "m">
-<!ENTITY setup.setupMetro.label     "Windows 8 スタイルで &brandShortName; を同期">
-<!ENTITY setup.setupMetro.accesskey "S">
 
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
 <!ENTITY setup.tosAgree1.label      "私は">
 <!ENTITY setup.tosAgree1.accesskey  "a">
 <!ENTITY setup.tosLink.label        "利用規約">
 <!ENTITY setup.tosAgree2.label      "と">
 <!ENTITY setup.ppLink.label         "プライバシーポリシー">