25.0: sync browser with en-US rev149347:4e359e975ae9 FIREFOX_25_0b2_BUILD1 FIREFOX_25_0b2_RELEASE FIREFOX_25_0b3_BUILD1 FIREFOX_25_0b3_RELEASE FIREFOX_25_0b4_BUILD1 FIREFOX_25_0b4_RELEASE FIREFOX_25_0b6_BUILD1 FIREFOX_25_0b6_RELEASE FIREFOX_25_0b7_BUILD1 FIREFOX_25_0b7_RELEASE
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Tue, 17 Sep 2013 05:46:41 +0900
changeset 1191 af8045b77fe08e7d5ab8e62669dffc70ab99b5a4
parent 1190 220a5ba272741c39cc9402a6f5ead2489d5b25d3
child 1196 7882db5061c61ba03d98d7d63592d78186c998e1
child 1197 d13295975467061fa90ee7c7123a31dd1c4208c8
child 1199 4eece69dc9760e5e35310e52e48dcb0e3d80d64e
child 1200 1c0d38fca7ee82f332b99e1b36445e4cd78a8db7
child 1202 a291e67af259ac06bc2246814d478a766b372bed
child 1203 9217254af992f0bf9c05d4c93643528e28c88647
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs25
25.0: sync browser with en-US rev149347:4e359e975ae9
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/sitePermissions.properties
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -1,22 +1,34 @@
 <!-- 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 restorepage.tabtitle		"セッションの復元">
+<!ENTITY restorepage.tabtitle       "セッションの復元">
+
 <!-- LOCALIZATION NOTE: The title is intended to be apologetic and disarming, expressing dismay
      and regret that we are unable to restore the session for the user -->
-<!ENTITY restorepage.errorTitle		"ご迷惑をおかけして申し訳ありません">
-<!ENTITY restorepage.problemDesc	"&brandShortName; はウィンドウとタブを正常に復元できませんでした。多くの場合、正常に復元できない原因は最近開いた Web ページによるものです。">
-<!ENTITY restorepage.tryThis		"次のいずれかをお試しください:">
-<!ENTITY restorepage.restoreSome	"問題の原因となりそうなタブを除外して起動する">
-<!ENTITY restorepage.startNew		"タブを復元せずに新しいブラウザセッションを開始する">
+<!ENTITY restorepage.errorTitle     "ご迷惑をおかけして申し訳ありません">
+<!ENTITY restorepage.problemDesc    "&brandShortName; はウィンドウとタブを正常に復元できませんでした。多くの場合、正常に復元できない原因は最近開いた Web ページによるものです。">
+<!ENTITY restorepage.tryThis        "次のいずれかをお試しください:">
+<!ENTITY restorepage.restoreSome    "問題の原因となりそうなタブを除外して起動する">
+<!ENTITY restorepage.startNew       "タブを復元せずに新しいブラウザセッションを開始する">
+
+<!ENTITY restorepage.tryagainButton "タブを復元">
+<!ENTITY restorepage.restore.access "R">
+<!ENTITY restorepage.closeButton    "閉じる">
+<!ENTITY restorepage.close.access   "C">
 
-<!ENTITY restorepage.tryagainButton	"タブを復元">
-<!ENTITY restorepage.restore.access	"R">
-<!ENTITY restorepage.closeButton	"閉じる">
-<!ENTITY restorepage.close.access	"C">
+<!ENTITY restorepage.restoreHeader  "復元">
+<!ENTITY restorepage.listHeader     "ウィンドウとタブ">
+<!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
+<!ENTITY restorepage.windowLabel    "ウィンドウ &#37;S">
+
 
-<!ENTITY restorepage.restoreHeader	"復元">
-<!ENTITY restorepage.listHeader		"ウィンドウとタブ">
-<!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
-<!ENTITY restorepage.windowLabel	"ウィンドウ &#37;S">
+<!-- LOCALIZATION NOTE: The following 'welcomeback' strings are for about:welcomeback,
+     not for about:sessionstore -->
+<!ENTITY welcomeback.tabtitle       "おかえり!">
+
+<!-- LOCALIZATION NOTE: The title is intended to be welcoming and congratulatory,
+     expressing joy that the user has successfully migrated their stuff and hope
+     that now they have a better experience.  -->
+<!ENTITY welcomeback.pageTitle      "おかえり!">
+<!ENTITY welcomeback.pageInfo       "&brandShortName; はプロファイルをリセットできました。以下は開いていたウィンドウとタブの一覧です。これらを復元するか、または白紙の状態で開始できます。">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -14,16 +14,20 @@
                        for the help button in the menubar but Gnome does not.   -->
 <!ENTITY helpMenuWin.label		"ヘルプ"> 
 <!ENTITY helpMenuWin.accesskey		"H">
 <!ENTITY aboutProduct.label		"&brandShortName; について">
 <!ENTITY aboutProduct.accesskey		"A">
 <!ENTITY productHelp.label		"&brandShortName; ヘルプ">
 <!ENTITY productHelp.accesskey		"H">
 <!ENTITY helpMac.commandkey		"?">
+
+<!ENTITY helpKeyboardShortcuts.label		"キーボードショートカット">
+<!ENTITY helpKeyboardShortcuts.accesskey	"K">
+
 <!ENTITY helpSafeMode.label		"アドオンを無効にして再起動...">
 <!ENTITY helpSafeMode.accesskey		"R">
 
 <!ENTITY healthReport.label		"&brandShortName; ヘルスレポート">
 <!ENTITY healthReport.accesskey		"e">
 
 <!ENTITY helpTroubleshootingInfo.label	"トラブルシューティング情報...">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -68,22 +68,19 @@ can reach it easily. -->
 <!ENTITY printCmd.commandkey		"p">
 
 <!ENTITY goOfflineCmd.label		"オフライン作業">
 <!ENTITY goOfflineCmd.accesskey		"k">
 
 <!ENTITY menubarCmd.label		"メニューバー">
 <!ENTITY menubarCmd.accesskey		"M">
 <!ENTITY navbarCmd.label		"ナビゲーションツールバー">
-<!ENTITY navbarCmd.accesskey		"N">
 <!ENTITY personalbarCmd.label		"ブックマークツールバー">
 <!ENTITY personalbarCmd.accesskey	"B">
 <!ENTITY bookmarksToolbarItem.label	"ブックマークツールバーの項目">
-<!ENTITY addonBarCmd.label		"アドオンバー">
-<!ENTITY addonBarCmd.accesskey		"A">
 
 <!ENTITY pageSourceCmd.label		"ページのソース">
 <!ENTITY pageSourceCmd.accesskey	"o">
 <!ENTITY pageSourceCmd.commandkey	"u">
 <!ENTITY pageInfoCmd.label		"ページの情報">
 <!ENTITY pageInfoCmd.accesskey		"I">
 <!ENTITY pageInfoCmd.commandkey		"i">
 <!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
@@ -102,19 +99,18 @@ These should match what Safari and other
 <!ENTITY fullScreenRestore.tooltip	"元に戻す">
 <!ENTITY fullScreenClose.tooltip	"閉じる">
 <!ENTITY fullScreenAutohide.label	"ツールバーを隠す">
 <!ENTITY fullScreenAutohide.accesskey	"H">
 <!ENTITY fullScreenExit.label		"全画面表示モードを終了">
 <!ENTITY fullScreenExit.accesskey	"F">
 <!ENTITY fullscreenAllowButton.label	"許可">
 <!ENTITY fullscreenExitButton.label	"拒否">
-<!ENTITY fullscreenApproval.value	"全画面表示モードを許可しますか?">
 
-<!ENTITY fullscreenExitHint.value	"ESC キーを押すと、全画面表示モードを終了します。">
+<!ENTITY fullscreenExitHint2.value	"ESC キーを押すと、全画面表示モードを終了します。">
 <!ENTITY leaveDOMFullScreen.label	"全画面表示モードを終了">
 <!ENTITY leaveDOMFullScreen.accesskey	"u">
 
 <!ENTITY closeWindow.label		"ウィンドウを閉じる">
 <!ENTITY closeWindow.accesskey 		"d">
 
 <!ENTITY bookmarksMenu.label		"ブックマーク">
 <!ENTITY bookmarksMenu.accesskey	"B">
@@ -156,69 +152,62 @@ These should match what Safari and other
 <!ENTITY stopButton.tooltip		"このページの読み込みを中止します">
 <!ENTITY goEndCap.tooltip		"ロケーションバーに入力された URL に移動します">
 <!ENTITY printButton.label		"印刷">
 <!ENTITY printButton.tooltip		"このページを印刷します">
 
 <!ENTITY backForwardItem.title		"戻る/進む">
 <!ENTITY locationItem.title		"ロケーションバー">
 <!ENTITY searchItem.title		"検索">
-<!ENTITY throbberItem.title		"読み込み中アイコン">
 <!ENTITY bookmarksItem.title		"ブックマーク">
 
 <!-- Toolbar items -->
-<!ENTITY appMenuButton.label		"メニュー">
-<!ENTITY appMenuButton.tooltip		"&brandShortName; メニューを開く">
 <!ENTITY homeButton.label		"ホーム">
 
 <!ENTITY tabGroupsButton.label		"タブグループ">
 <!ENTITY tabGroupsButton.tooltip	"タブをグループ分けして管理できます">
 
-<!ENTITY feedButton.label		"購読">
-<!ENTITY feedButton.tooltip		"このページのフィードを購読します...">
-
 <!ENTITY bookmarksButton.label		"ブックマーク">
-<!ENTITY bookmarksButton.tooltip	"ブックマークをサイドバーに表示します">
 <!ENTITY bookmarksCmd.commandkey	"b">
 
 <!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 historyButton.label		"履歴">
-<!ENTITY historyButton.tooltip		"最近表示したページの履歴をサイドバーに表示します">
 <!ENTITY historySidebarCmd.commandKey	"h">
 
 <!ENTITY toolsMenu.label		"ツール">
 <!ENTITY toolsMenu.accesskey		"T">
 
 <!ENTITY keywordfield.label		"この検索にキーワードを設定...">
 <!ENTITY keywordfield.accesskey		"K">
-<!ENTITY search.label			"Web 検索">
-<!ENTITY search.accesskey		"S">
+
 <!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 devToolsCmd.keycode		"VK_F12">
+<!ENTITY devToolsCmd.keytext		"F12">
+
 <!ENTITY devtoolsConnect.label		"接続...">
 <!ENTITY devtoolsConnect.accesskey	"e">
 
 <!ENTITY errorConsoleCmd.label		"エラーコンソール">
 <!ENTITY errorConsoleCmd.accesskey	"C">
 
 <!ENTITY remoteWebConsoleCmd.label	"リモート Web コンソール">
 
@@ -254,16 +243,18 @@ These should match what Safari and other
 
 <!ENTITY devToolbarCloseButton.tooltiptext	"開発ツールバーを閉じる">
 <!ENTITY devToolbarMenu.label			"開発ツールバー">
 <!ENTITY devToolbarMenu.accesskey		"v">
 <!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 devToolbarToolsButton.tooltip		"開発ツールを表示">
 <!ENTITY devToolbarOtherToolsButton.label	"その他のツール">
 
 <!ENTITY getMoreDevtoolsCmd.label	"その他のツールを入手">
 <!ENTITY getMoreDevtoolsCmd.accesskey	"M">
 
 <!ENTITY fileMenu.label			"ファイル">
@@ -311,40 +302,28 @@ These should match what Safari and other
 <!ENTITY viewTabGroups.label		"タブグループ...">
 <!ENTITY viewTabGroups.accesskey	"G">
 <!ENTITY viewToolbarsMenu.label		"ツールバー">
 <!ENTITY viewToolbarsMenu.accesskey	"T">
 <!ENTITY viewSidebarMenu.label		"サイドバー">
 <!ENTITY viewSidebarMenu.accesskey	"e">
 <!ENTITY viewCustomizeToolbar.label	"カスタマイズ...">
 <!ENTITY viewCustomizeToolbar.accesskey	"C">
-<!ENTITY viewTabsOnTop.label		"タブを上部に表示">
-<!ENTITY viewTabsOnTop.accesskey	"T">
 
 <!ENTITY historyMenu.label		"履歴">
 <!ENTITY historyMenu.accesskey		"s">
 <!ENTITY historyUndoMenu.label		"最近閉じたタブ">
 <!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
 <!ENTITY historyUndoWindowMenu.label	"最近閉じたウィンドウ">
 <!ENTITY historyRestoreLastSession.label	"以前のセッションを復元">
 
-<!ENTITY historyHomeCmd.label		"ホーム">
 <!ENTITY showAllHistoryCmd2.label	"すべての履歴を表示"><!-- (^^; -->
 <!ENTITY showAllHistoryCmd.commandkey	"H">
 
-<!ENTITY appMenuEdit.label		"編集">
 <!ENTITY appMenuCustomize.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 openCmd.commandkey		"l">
 <!ENTITY urlbar.placeholder2		"URL または検索語句を入力します">
 <!ENTITY urlbar.accesskey		"d">
 <!ENTITY urlbar.switchToTab.label	"タブを表示:">
 
 <!-- 
   Comment duplicated from browser-sets.inc:
@@ -403,16 +382,18 @@ These should match what Safari and other
 <!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">
@@ -537,26 +518,18 @@ you can use these alternative items. Oth
 <!ENTITY fullZoomToggleCmd.accesskey	"T">
 <!ENTITY fullZoom.label			"ズーム">
 <!ENTITY fullZoom.accesskey		"Z">
 
 <!ENTITY newTabButton.tooltip		"新しいタブを開きます">
 <!ENTITY newWindowButton.tooltip	"新しいウィンドウを開きます">
 <!ENTITY sidebarCloseButton.tooltip	"サイドバーを閉じます">
 
-<!ENTITY cutButton.tooltip		"切り取り">
-<!ENTITY copyButton.tooltip		"コピー">
-<!ENTITY pasteButton.tooltip		"貼り付け">
-
 <!ENTITY fullScreenButton.tooltip	"ウィンドウを画面全体に表示します">
 
-<!ENTITY zoomOutButton.tooltip		"縮小">
-<!ENTITY zoomInButton.tooltip		"拡大">
-<!ENTITY zoomControls.label		"拡大/縮小コントロール">
-
 <!ENTITY quitApplicationCmdWin.label	"終了">
 <!ENTITY quitApplicationCmdWin.accesskey	"x">
 <!ENTITY goBackCmd.commandKey		"[">
 <!ENTITY goForwardCmd.commandKey	"]">
 <!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. -->
@@ -618,34 +591,33 @@ The layout of the identity dialog preven
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!-- (^^; EVSSL の場合のみ identity.runBy の値に組織名を出力 -->
 <!ENTITY identity.runBy				"このサイトの運営者:">
 
 <!ENTITY identity.moreInfoLinkText		"詳細を表示...">
 
+<!ENTITY identity.permissions			"サイト別設定">
+
 <!-- 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 syncSetup.label				"&syncBrand.shortName.label; をセットアップ...">
 <!ENTITY syncSetup.accesskey			"Y">
 <!ENTITY syncSyncNowItem.label			"今すぐ同期">
 <!ENTITY syncSyncNowItem.accesskey		"S">
 <!ENTITY syncToolbarButton.label		"Sync">
 
-<!ENTITY addonBarCloseButton.tooltip	"アドオンバーを閉じます">
-<!ENTITY toggleAddonBarCmd.key			"/">
-
 <!ENTITY socialToolbar.title			"ソーシャルツールバーボタン">
 <!ENTITY social.notLoggedIn.label		"ログインしていません">
 
 <!ENTITY social.ok.label			"OK">
 <!ENTITY social.ok.accesskey			"O">
 
 <!ENTITY social.toggleSidebar.label		"サイドバーを表示する">
 <!ENTITY social.toggleSidebar.accesskey		"s">
@@ -685,8 +657,45 @@ just addresses the organization to follo
 
 <!ENTITY pluginNotification.showAll.label	"すべて表示">
 <!ENTITY pluginNotification.showAll.accesskey	"S">
 
 <!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
 <!ENTITY pluginActivateNow.label		"今すぐ許可">
 <!ENTITY pluginActivateAlways.label		"常に許可">
 <!ENTITY pluginBlockNow.label			"プラグインをブロック">
+
+<!-- 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			"/">
+<!-- end of strings to be removed post-Australis -->
+<!ENTITY bookmarksMenuButton.tooltip	"ブックマークを表示します">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -255,26 +255,31 @@ offlineApps.manageUsageAccessKey	= S
 # LOCALIZATION NOTE (indexedDB.usage): %1$S is the website host name
 # %2$S a number of megabytes.
 indexedDB.usage				= この Web サイト (%1$S) はオフライン作業用のデータを %2$S MB 以上保存しようとしています。
 
 identity.identified.verifier		= 認証局: %S
 identity.identified.verified_by_you	= このサイトはあなたがセキュリティ例外として追加しました。
 identity.identified.state_and_country	= %S, %S
 
-identity.encrypted			= この Web サイトとの通信は第三者に盗み見られないように暗号化されています。
+identity.encrypted2			= この Web サイトとの通信は安全です。
+identity.mixed_display_loaded		= この Web サイトとのすべての通信が暗号化されていません。画像などの暗号化されてない要素が含まれています。
+identity.mixed_display_loaded_active_blocked	= 暗号化されてないスクリプトなどのインタラクティブなコンテンツは、保護のためブロックしました。
+identity.mixed_active_loaded2		= この Web サイトは、暗号化されてないスクリプトなどのインタラクティブなコンテンツが含まれています。第三者に情報を盗み見られたり、Web サイトの動作を改ざんされる可能性があります。
 identity.unencrypted			= この Web サイトとの通信は暗号化されていません。
-identity.mixed_content			= この Web サイトとの通信は一部しか暗号化されておらず、第三者に盗み見られないようにはなっていません。
 
 identity.unknown.tooltip		= この Web サイトには運営者を証明する証明書がありません
 
 # (^^; EVSSL による認証(法人登記なども確認して実在証明) ではなく通常の SSL 認証(ドメイン真正性のみ検証) の場合:
 #identity.ownerUnknown2			= (運営者は実在認証されていません)
 identity.ownerUnknown2			= (運営者は不明です)
 
+# LOCALIZATION NOTE (identity.chrome): %S is replaced with the brandShortName.
+identity.chrome				= %S のシステムページです。
+
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle		= ブックマークに追加しました
 # (^^; ツールメニューのブックマークからは無理...要再検討
 editBookmarkPanel.pageBookmarkedDescription	= %1$0.S今後このページにはブックマークからアクセスできます。
 editBookmarkPanel.bookmarkedRemovedTitle	= ブックマークを削除しました
 editBookmarkPanel.editBookmarkTitle		= ブックマークを編集できます
 
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label): Semicolon-separated list of plural forms.
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -14,16 +14,26 @@
 <!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
   -  the button that closes the debugger UI. -->
 <!ENTITY debuggerUI.closeButton.tooltip	"閉じる">
 
 <!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the debugger UI. -->
 <!ENTITY debuggerUI.panesButton.tooltip	"左右のウィンドウを切り替え">
 
+<!-- LOCALIZATION NOTE (debuggerUI.blackBoxMessage.label): This is the message
+  - displayed to users when they select a black boxed source from the sources
+  - list in the debugger. -->
+<!ENTITY debuggerUI.blackBoxMessage.label		"このソースはブラックボックス化されています。ブレークポイントは無効化されます。また、ステッピングはすべて通過します。">
+
+<!-- LOCALIZATION NOTE (debuggerUI.blackBoxMessage.unBlackBoxButton): This is
+  - the text displayed in the button to stop black boxing the currently selected
+  - source. -->
+<!ENTITY debuggerUI.blackBoxMessage.unBlackBoxButton	"このソースのブラックボックスを解除">
+
 <!-- LOCALIZATION NOTE (debuggerUI.optsButton.tooltip): This is the tooltip for
   -  the button that opens up an options context menu for the debugger UI. -->
 <!ENTITY debuggerUI.optsButton.tooltip	"デバッガオプション">
 
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 <!ENTITY debuggerUI.pauseExceptions	"例外発生で停止">
 <!ENTITY debuggerUI.pauseExceptions.key	"E">
@@ -46,19 +56,19 @@
 <!ENTITY debuggerUI.showOnlyEnum.key	"P">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
   -  the checkbox that toggles the display of original or sourcemap-derived
   -  sources. -->
 <!ENTITY debuggerUI.showOriginalSource      "元のソースを表示">
 <!ENTITY debuggerUI.showOriginalSource.key  "O">
 
-<!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
-  -  appears in the filter panel popup as a description. -->
-<!ENTITY debuggerUI.searchPanelTitle	"検索演算子">
+<!-- LOCALIZATION NOTE (debuggerUI.searchPanelOperators): This is the text that
+  -  appears in the filter panel popup as a header for the operators part. -->
+<!ENTITY debuggerUI.searchPanelOperators    "検索演算子:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
 <!ENTITY debuggerUI.searchFile		"スクリプトをフィルタ">
 <!ENTITY debuggerUI.searchFile.key	"P">
 <!ENTITY debuggerUI.searchFile.altkey	"O">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
@@ -73,18 +83,18 @@
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchToken): This is the text that appears
   -  in the source editor's context menu for the token search operation. -->
 <!ENTITY debuggerUI.searchToken		"検索">
 <!ENTITY debuggerUI.searchToken.key	"F">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
-<!ENTITY debuggerUI.searchLine		"指定行へ移動...">
-<!ENTITY debuggerUI.searchLine.key	"J">
+<!ENTITY debuggerUI.searchGoToLine      "指定行へ移動...">
+<!ENTITY debuggerUI.searchGoToLine.key  "L">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchVariable): This is the text that appears
   -  in the source editor's context menu for the variables search operation. -->
 <!ENTITY debuggerUI.searchVariable	"変数をフィルタ">
 <!ENTITY debuggerUI.searchVariable.key	"V">
 
 <!-- LOCALIZATION NOTE (debuggerUI.focusVariables): This is the text that appears
   -  in the source editor's context menu for the variables focus operation. -->
@@ -119,12 +129,16 @@
 <!-- LOCALIZATION NOTE (debuggerUI.removeWatch): This is the text that
   -  appears in the watch expressions context menu for removing all expressions. -->
 <!ENTITY debuggerUI.removeAllWatch	"すべてのウォッチ式を削除">
 <!ENTITY debuggerUI.removeAllWatch.key	"E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.stepping): These are the keycodes that
   -  control the stepping commands in the debugger (continue, step over,
   -  step in and step out). -->
-<!ENTITY debuggerUI.stepping.resume	"VK_F6">
-<!ENTITY debuggerUI.stepping.stepOver	"VK_F7">
-<!ENTITY debuggerUI.stepping.stepIn	"VK_F8">
-<!ENTITY debuggerUI.stepping.stepOut	"VK_F8">
+<!ENTITY debuggerUI.stepping.resume1    "VK_F8">
+<!ENTITY debuggerUI.stepping.resume2    "VK_SLASH">
+<!ENTITY debuggerUI.stepping.stepOver1  "VK_F10">
+<!ENTITY debuggerUI.stepping.stepOver2  "VK_QUOTE">
+<!ENTITY debuggerUI.stepping.stepIn1    "VK_F11">
+<!ENTITY debuggerUI.stepping.stepIn2    "VK_SEMICOLON">
+<!ENTITY debuggerUI.stepping.stepOut1   "VK_F11">
+<!ENTITY debuggerUI.stepping.stepOut2   "VK_SEMICOLON">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -60,52 +60,61 @@ noGlobalsText				= グローバル変数はありません
 # LOCALIZATION NOTE (noMatchingGlobalsText): The text to display in the
 # menulist when there are no matching chrome globals after filtering.
 noMatchingGlobalsText			= 一致するグローバル変数がありません
 
 # LOCALIZATION NOTE (noSourcesText): The text to display in the sources menu
 # when there are no scripts.
 noSourcesText				= このページにソースはありません。
 
+# LOCALIZATION NOTE (blackBoxCheckboxTooltip) = The tooltip text to display when
+# the user hovers over the checkbox used to toggle black boxing its associated
+# source.
+blackBoxCheckboxTooltip			= ブラックボックス化を切り替え
+
 # LOCALIZATION NOTE (noMatchingSourcesText): The text to display in the
 # sources menu when there are no matching scripts after filtering.
 noMatchingSourcesText			= 一致するソースはありません。
 
 # LOCALIZATION NOTE (noMatchingStringsText): The text to display in the
 # global search results when there are no matching strings after filtering.
 noMatchingStringsText			= 一致する文字列はありません
 
-# LOCALIZATION NOTE (emptyFilterText): This is the text that appears in the
+# LOCALIZATION NOTE (emptySearchText): This is the text that appears in the
 # filter text box when it is empty and the scripts container is selected.
-emptyFilterText				= ファイル名を検索 (%S)
+emptySearchText				= ファイル名を検索 (%S)
 
 # LOCALIZATION NOTE (emptyChromeGlobalsFilterText): This is the text that
 # appears in the filter text box when it is empty and the chrome globals
 # container is selected.
 emptyChromeGlobalsFilterText		= ブラウザコンテキストを検索 (%S)
 
 # LOCALIZATION NOTE (emptyVariablesFilterText): This is the text that
 # appears in the filter text box for the variables view container.
 emptyVariablesFilterText		= 変数を検索
 
+# LOCALIZATION NOTE (searchPanelFilter): This is the text that appears in the
+# filter panel popup for the filter scripts operation.
+searchPanelFilter			= スクリプトを検索 (%S)
+
 # LOCALIZATION NOTE (searchPanelGlobal): This is the text that appears in the
 # filter panel popup for the global search operation.
 searchPanelGlobal			= すべてのファイルを検索 (%S)
 
 # LOCALIZATION NOTE (searchPanelFunction): This is the text that appears in the
 # filter panel popup for the function search operation.
 searchPanelFunction			= 関数定義を検索 (%S)
 
 # LOCALIZATION NOTE (searchPanelToken): This is the text that appears in the
 # filter panel popup for the token search operation.
 searchPanelToken			= このファイルを検索 (%S)
 
-# LOCALIZATION NOTE (searchPanelLine): This is the text that appears in the
+# LOCALIZATION NOTE (searchPanelGoToLine): This is the text that appears in the
 # filter panel popup for the line search operation.
-searchPanelLine				= 指定行へ移動 (%S)
+searchPanelGoToLine			= 指定行へ移動 (%S)
 
 # LOCALIZATION NOTE (searchPanelVariable): This is the text that appears in the
 # filter panel popup for the variables search operation.
 searchPanelVariable			= 変数を検索 (%S)
 
 # LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
 breakpointMenuItem.setConditional	= 条件付きブレークポイントを設定する
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -6,514 +6,325 @@
 # command line which is available from the Web Developer sub-menu
 # -> 'Web Console'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-# LOCALIZATION NOTE (canonDescNone): Short string used to describe any command
-# or command parameter when no description has been provided.
+# For each command there are in general two strings. As an example consider
+# the 'pref' command.
+# commandDesc (e.g. prefDesc for the command 'pref'): this string contains a
+# very short description of the command. It's designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+# commandManual (e.g. prefManual for the command 'pref'): this string will
+# contain a fuller description of the command. It's diplayed when the user
+# asks for help about a specific command (e.g. 'help pref').
+
+# LOCALIZATION NOTE: This message is used to describe any command or command
+# parameter when no description has been provided.
 canonDescNone		= (説明はありません)
 
-# LOCALIZATION NOTE (canonDefaultGroupName): The default name for a group of
-# parameters.
+# LOCALIZATION NOTE: The default name for a group of parameters.
 canonDefaultGroupName	= オプション
 
-# LOCALIZATION NOTE (canonProxyDesc): A very short description of a set of
-# remote commands. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# canonProxyManual for a fuller description of what it does.
+# LOCALIZATION NOTE (canonProxyDesc, canonProxyManual): These commands are
+# used to execute commands on a remote system (using a proxy). Parameters: %S
+# is the name of the remote system.
 canonProxyDesc		= %S でコマンドを実行します
-
-# LOCALIZATION NOTE (canonProxyManual): A fuller description of a set of
-# remote commands. Displayed when the user asks for help on what it does.
 canonProxyManual	= コマンドのセットはリモートで実行されます。%S を経由します。
 
-# LOCALIZATION NOTE (canonProxyExists): An error message displayed when we try
-# to add new command (via a proxy) where one already exists in that name.
+# LOCALIZATION NOTE: This error message is displayed when we try to add a new
+# command (using a proxy) where one already exists with the same name.
 canonProxyExists	= '%S' というコマンドはすでに存在します
 
-# LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
-# of JavaScript like traditional developer tool command lines. This describes
-# the '{' command.
+# LOCALIZATION NOTE: This message describes the '{' command, which allows
+# entry of JavaScript like traditional developer tool command lines.
 cliEvalJavascript	= JavaScript を直接実行します
 
-# LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
-# than the current command can understand this is the error message shown to
-# the user.
+# LOCALIZATION NOTE: This message is displayed when the command line has more
+# arguments than the current command can understand.
 cliUnusedArg		= 引数が多すぎます
 
-# LOCALIZATION NOTE (cliOptions): The title of the dialog which displays the
-# options that are available to the current command.
+# LOCALIZATION NOTE: The title of the dialog which displays the options that
+# are available to the current command.
 cliOptions		= 利用可能なオプション
 
-# LOCALIZATION NOTE (fieldSelectionSelect): When a command has a parameter
-# that has a number of pre-defined options the user interface presents these
-# in a drop-down menu, where the first 'option' is an indicator that a
-# selection should be made. This string describes that first option.
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that does not exist, but should (e.g. for use with File->Open) %1$S is a
+# filename
+fileErrNotExists	= '%1$S' は存在しません
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that exists, but should not (e.g. for use with File->Save As) %1$S is a
+# filename
+fileErrExists		= '%1$S' はすでに存在します
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-file, when a file is needed. %1$S is a filename
+fileErrIsNotFile	= '%1$S' はファイルではありません
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-directory, when a directory is needed (e.g. for use with 'cd') %1$S is a
+# filename
+fileErrIsNotDirectory	= '%1$S' はディレクトリではありません
+
+# LOCALIZATION NOTE: Error message given when a file argument does not match
+# the specified regular expression %1$S is a filename %2$S is a regular
+# expression
+fileErrDoesntMatch	= '%1$S' は '%2$S' とマッチしません
+
+# LOCALIZATION NOTE: When a command has a parameter that has a number of
+# pre-defined options the user interface presents these in a drop-down menu,
+# where the first 'option' is an indicator that a selection should be made.
+# This string describes that first option.
 fieldSelectionSelect	= %S を選択...
 
-# LOCALIZATION NOTE (fieldArrayAdd): When a command has a parameter that can
-# be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
-# user interface presents buttons to add and remove arguments. This string is
-# used to add arguments.
+# LOCALIZATION NOTE (fieldArrayAdd, fieldArrayDel): When a command has a
+# parameter that can be repeated multiple times (e.g. like the 'cat a.txt
+# b.txt' command) the user interface presents buttons to add and remove
+# arguments. This string is used to add arguments.
 fieldArrayAdd		= 追加
-
-# LOCALIZATION NOTE (fieldArrayDel): When a command has a parameter that can
-# be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
-# user interface presents buttons to add and remove arguments. This string is
-# used to remove arguments.
 fieldArrayDel		= 削除
 
-# LOCALIZATION NOTE (fieldMenuMore): When the menu has displayed all the
-# matches that it should (i.e. about 10 items) then we display this to alert
-# the user that more matches are available.
+# LOCALIZATION NOTE: When the menu has displayed all the matches that it
+# should (i.e. about 10 items) then we display this to alert the user that
+# more matches are available.
 fieldMenuMore		= 候補があります。タイプを続けてください
 
-# LOCALIZATION NOTE (jstypeParseScope): The command line provides completion
-# for JavaScript commands, however there are times when the scope of what
-# we're completing against can't be used. This error message is displayed when
-# this happens.
+# LOCALIZATION NOTE: The command line provides completion for JavaScript
+# commands, however there are times when the scope of what we're completing
+# against can't be used. This error message is displayed when this happens.
 jstypeParseScope	= スコープを見失いました
 
-# LOCALIZATION NOTE (jstypeParseMissing): When the command line is doing
-# JavaScript completion, sometimes the property to be completed does not
-# exist. This error message is displayed when this happens.
+# LOCALIZATION NOTE (jstypeParseMissing, jstypeBeginSyntax,
+# jstypeBeginUnterm): These error messages are displayed when the command line
+# is doing JavaScript completion and encounters errors.
 jstypeParseMissing	= '%S' プロパティが見つかりません
-
-# LOCALIZATION NOTE (jstypeBeginSyntax): When the command line is doing
-# JavaScript completion using invalid JavaScript, this error message is
-# displayed.
 jstypeBeginSyntax	= 構文エラー
-
-# LOCALIZATION NOTE (jstypeBeginUnterm): When the command line is doing
-# JavaScript completion using a string that is not properly terminated, this
-# error message is displayed.
 jstypeBeginUnterm	= 文字列リテラルが終了していません
 
-# LOCALIZATION NOTE (jstypeParseError): If the system for providing JavaScript
-# completions encounters and error it displays this.
+# LOCALIZATION NOTE: This message is displayed if the system for providing
+# JavaScript completions encounters and error it displays this.
 jstypeParseError	= エラー
 
-# LOCALIZATION NOTE (typesNumberNan): When the command line is passed a
-# number, however the input string is not a valid number, this error message
-# is displayed.
+# LOCALIZATION NOTE (typesNumberNan, typesNumberNotInt2, typesDateNan): These
+# error messages are displayed when the command line is passed a variable
+# which has the wrong format and can't be converted. Parameters: %S is the
+# passed variable.
 typesNumberNan		= "%S" を数値に変換できません。
-
-# LOCALIZATION NOTE (typesNumberMax): When the command line is passed a
-# number, but the number is bigger than the largest allowed number, this error
-# message is displayed.
-typesNumberMax		= %1$S が設定された最大値 %2$S より大きいです。
-
-# LOCALIZATION NOTE (typesNumberMin): When the command line is passed a
-# number, but the number is lower than the smallest allowed number, this error
-# message is displayed.
-typesNumberMin		= %1$S が設定された最小値 %2$S より小さいです。
-
-# LOCALIZATION NOTE (typesNumberNotInt2): When the command line is passed a
-# number, but the number has a decimal part and floats are not allowed.
 typesNumberNotInt2	= "%S" を整数に変換できません。
-
-# LOCALIZATION NOTE (typesDateNan): When the command line is passed a date,
-# however the input string is not a valid date, this error message is
-# displayed.
 typesDateNan		= "%S" を日付に変換できません。
 
-# LOCALIZATION NOTE (typesDateMax): When the command line is passed a date,
-# but the number is later than the latest allowed date, this error message is
-# displayed.
+# LOCALIZATION NOTE (typesNumberMax, typesNumberMin, typesDateMax,
+# typesDateMin): These error messages are displayed when the command line is
+# passed a variable which has a value out of range (number or date).
+# Parameters: %1$S is the passed variable, %2$S is the limit value.
+typesNumberMax		= %1$S は数値型の最大値 %2$S より大きいです。
+typesNumberMin		= %1$S は数値型の最小値 %2$S より小さいです。
 typesDateMax		= %1$S は日付型の最大値 %2$S より大きいです。
-
-# LOCALIZATION NOTE (typesDateMin): When the command line is passed a date,
-# but the date is earlier than the earliest allowed number, this error message
-# is displayed.
 typesDateMin		= %1$S は日付型の最小値 %2$S より小さいです。
 
-# LOCALIZATION NOTE (typesSelectionNomatch): When the command line is passed
-# an option with a limited number of correct values, but the passed value is
-# not one of them, this error message is displayed.
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# passed an option with a limited number of correct values, but the passed
+# value is not one of them.
 typesSelectionNomatch	= '%S' は使用できません。
 
-# LOCALIZATION NOTE (nodeParseSyntax): When the command line is expecting a
-# CSS query string, however the passed string is not valid, this error message
-# is displayed.
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# expecting a CSS query string, however the passed string is not valid.
 nodeParseSyntax		= CSS クエリの構文エラー
 
-# LOCALIZATION NOTE (nodeParseMultiple): When the command line is expecting a
-# CSS string that matches a single node, but more than one node matches, this
-# error message is displayed.
+# LOCALIZATION NOTE (nodeParseMultiple, nodeParseNone): These error messages
+# are displayed when the command line is expecting a CSS string that matches a
+# single node, but more nodes (or none) match.
 nodeParseMultiple	= 多すぎます (%S)
-
-# LOCALIZATION NOTE (nodeParseNone): When the command line is expecting a CSS
-# string that matches a single node, but no nodes match, this error message is
-# displayed.
 nodeParseNone		= 見つかりません
 
-# LOCALIZATION NOTE (helpDesc): A very short description of the 'help'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See helpManual for a
-# fuller description of what it does.
+# LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
+# These strings describe the "help" command, used to display a description of
+# a command (e.g. "help pref"), and its parameter 'search'.
 helpDesc		= 使用可能なコマンドのヘルプ
-
-# LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
-# Displayed when the user asks for help on what it does.
 helpManual		= 特定のコマンド (検索文字列が一致した場合) または使用可能なコマンド (検索文字列がない、または一致するものがない場合) のヘルプを表示します。
-
-# LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
-# parameter to the 'help' command. See helpSearchManual3 for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
 helpSearchDesc		= コマンドを検索する
-
-# LOCALIZATION NOTE (helpSearchManual3): A fuller description of the 'search'
-# parameter to the 'help' command. Displayed when the user asks for help on
-# what it does.
 helpSearchManual3	= コマンドを絞り込む検索文字列を指定します。正規表現は使えません。
 
-# LOCALIZATION NOTE (helpManSynopsis): A heading shown at the top of a help
-# page for a command in the console It labels a summary of the parameters to
-# the command
+# LOCALIZATION NOTE (helpManSynopsis, helpManDescription, helpManParameters):
+# These strings are displayed in the help page for a command in the console.
 helpManSynopsis		= 概要
-
-# LOCALIZATION NOTE (helpManDescription): A heading shown in a help page for a
-# command in the console. This heading precedes the top level description.
 helpManDescription	= 詳細
-
-# LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
-# in a help page for a command in the console.
 helpManParameters	= パラメータ
 
-# LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
-# heading in a help page for a command which has no parameters.
+# LOCALIZATION NOTE: This message is displayed in the help page if the command
+# has no parameters.
 helpManNone		= なし
 
 # LOCALIZATION NOTE (helpListAll): The heading shown in response to the 'help'
 # command when used without a filter, just above the list of known commands.
 helpListAll		= 利用可能なコマンド:
 
-# LOCALIZATION NOTE (helpListPrefix): The heading shown in response to the
-# 'help <search>' command (i.e. with a search string), just above the list of
-# matching commands.
+# LOCALIZATION NOTE (helpListPrefix, helpListNone): These messages are
+# displayed in response to the 'help <search>' command (i.e. with a search
+# string), just above the list of matching commands. Parameters: %S is the
+# search string.
 helpListPrefix		= '%1$S' ではじまるコマンド:
-
-# LOCALIZATION NOTE (helpListNone): The heading shown in response to the 'help
-# <search>' command (i.e. with a search string), when there are no matching
-# commands.
 helpListNone		= '%1$S' ではじまるコマンドはありません
 
-# LOCALIZATION NOTE (helpManRequired): When the 'help x' command wants to show
-# the manual for the 'x' command it needs to be able to describe the
-# parameters as either required or optional, or if they have a default value.
-# See also 'helpManOptional' and 'helpManDefault'.
+# LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
+# the 'help x' command wants to show the manual for the 'x' command, it needs
+# to be able to describe the parameters as either required or optional, or if
+# they have a default value.
 helpManRequired		= 必須
-
-# LOCALIZATION NOTE (helpManOptional): See description of 'helpManRequired'
 helpManOptional		= オプション
-
-# LOCALIZATION NOTE (helpManDefault): See description of 'helpManRequired'. %1$
-# S is the default value
 helpManDefault		= オプション, 既定値=%1$S
 
-# LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
-# 'help' command when the command in question has sub-commands, before a list
-# of the matching sub-commands
+# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
+# when the command in question has sub-commands, before a list of the matching
+# sub-commands.
 subCommands		= サブコマンド
 
-# LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
-# 'help' command when the command in question should have sub-commands but in
-# fact has none
+# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
+# when the command in question should have sub-commands but in fact has none.
 subCommandsNone		= なし
 
-# LOCALIZATION NOTE (contextDesc): A very short description of the 'context'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See contextManual for
-# a fuller description of what it does.
+# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
+# strings are used to describe the 'context' command and its 'prefix'
+# parameter. See localization comment for 'connect' for an explanation about
+# 'prefix'.
 contextDesc		= 省略コマンドを設定します
-
-# LOCALIZATION NOTE (contextManual): A fuller description of the 'context'
-# command. Displayed when the user asks for help on what it does.
 contextManual		= タイプしなくても入力したと見なせる省略コマンドを設定します。たとえば、'context addon' とすると 'addon list' ではなく 'list' とタイプして実行できます。
-
-# LOCALIZATION NOTE (contextPrefixDesc): A short description of the 'prefix'
-# parameter to the 'context' command. This string is designed to be shown in a
-# dialog with restricted space, which is why it should be as short as
-# possible.
 contextPrefixDesc	= 省略するコマンド
 
-# LOCALIZATION NOTE (contextNotParentError): An error message displayed during
-# the processing of the 'context' command, when the found command is not a
-# parent command.
+# LOCALIZATION NOTE: This message message displayed during the processing of
+# the 'context' command, when the found command is not a parent command.
 contextNotParentError	= '%1$S' は親コマンドではないため、省略コマンドとして使用できません。
 
-# LOCALIZATION NOTE (contextReply): A message displayed during the processing
-# of the 'context' command, to indicate success.
+# LOCALIZATION NOTE (contextReply, contextEmptyReply): These messages are
+# displayed during the processing of the 'context' command, to indicate
+# success or that there is no command prefix.
 contextReply		= 省略コマンドとして %1$S を使用します
-
-# LOCALIZATION NOTE (contextEmptyReply): A message displayed during the
-# processing of the 'context' command, to indicate that there is no command
-# prefix
 contextEmptyReply	= 省略コマンドを解除しました
 
-# LOCALIZATION NOTE (connectDesc): A very short description of the 'connect'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See connectManual for
-# a fuller description of what it does.
+# LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
+# connectPortDesc, connectHostDesc, connectDupReply): These strings describe
+# the 'connect' command and all its available parameters. A 'prefix' is an 
+# alias for the remote server (think of it as a "connection name"), and it
+# allows to identify a specific server when connected to multiple remote
+# servers.
 connectDesc		= サーバにコマンドを中継します
-
-# LOCALIZATION NOTE (connectManual): A fuller description of the 'connect'
-# command. Displayed when the user asks for help on what it does.
 connectManual		= サーバに接続して、ローカルのバージョンのコマンドをサーバ上に作成します。リモートのコマンドは、ローカルのコマンドと区別できる接頭辞が設定されます (まずは context コマンドを参照してください)
-
-# LOCALIZATION NOTE (connectPrefixDesc): A short description of the 'prefix'
-# parameter to the 'connect' command. This string is designed to be shown in a
-# dialog with restricted space, which is why it should be as short as
-# possible.
 connectPrefixDesc	= インポートされたコマンドの親接頭辞
-
-# LOCALIZATION NOTE (connectPortDesc): A short description of the 'port'
-# parameter to the 'connect' command. This string is designed to be shown in a
-# dialog with restricted space, which is why it should be as short as
-# possible.
 connectPortDesc		= 接続を許可する TCP ポート番号
-
-# LOCALIZATION NOTE (connectHostDesc): A short description of the 'host'
-# parameter to the 'connect' command. This string is designed to be shown in a
-# dialog with restricted space, which is why it should be as short as
-# possible.
 connectHostDesc		= 接続するホスト名
-
-# LOCALIZATION NOTE (connectDupReply): An error condition from executing the
-# 'connect' command
 connectDupReply		= %S にはすでに接続しています。
 
-# LOCALIZATION NOTE (connectReply): The output of the 'connect' command,
-# telling the user what it has done.
+# LOCALIZATION NOTE: The output of the 'connect' command, telling the user
+# what it has done. Parameters: %S is the prefix command. See localization
+# comment for 'connect' for an explanation about 'prefix'.
 connectReply		= %S コマンドを追加しました。
 
-# LOCALIZATION NOTE (disconnectDesc): A very short description of the
-# 'disconnect' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-# See connectManual for a fuller description of what it does.
-disconnectDesc		= サーバにコマンドを中継します
-
-# LOCALIZATION NOTE (disconnectManual): A fuller description of the
-# 'disconnect' command. Displayed when the user asks for help on what it does.
-disconnectManual	= サーバに接続して、ローカルのバージョンのコマンドをサーバ上に作成します。リモートのコマンドは、ローカルのコマンドと区別できる接頭辞が設定されます (まずは context コマンドを参照してください)
-
-# LOCALIZATION NOTE (disconnectPrefixDesc): A short description of the
-# 'prefix' parameter to the 'disconnect' command. This string is designed to
-# be shown in a dialog with restricted space, which is why it should be as
-# short as possible.
+# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2, disconnectPrefixDesc,
+# disconnectForceDesc): These strings describe the 'disconnect' command and
+# all its available parameters. See localization comment for 'connect' for an
+# explanation about 'prefix'.
+disconnectDesc2		= サーバから切断
+disconnectManual2	= リモートのコマンドを実行するために現在接続しているサーバから切断します
 disconnectPrefixDesc	= インポートされたコマンドの親接頭辞
-
-# LOCALIZATION NOTE (disconnectForceDesc): A short description of the 'force'
-# parameter to the 'disconnect' command. This string is designed to be shown
-# in a dialog with restricted space, which is why it should be as short as
-# possible.
 disconnectForceDesc	= 未完了の要求を無視
 
-# LOCALIZATION NOTE (disconnectReply): The output of the 'disconnect' command,
-# telling the user what it's done.
+# LOCALIZATION NOTE: This is the output of the 'disconnect' command,
+# explaining the user what has been done. Parameters: %S is the number of
+# commands removed.
 disconnectReply		= %S コマンドを削除しました。
 
-# LOCALIZATION NOTE (disconnectOutstanding): An error message displayed when
-# the user attempts to disconnect before all requests have completed. %1$S is
-# a list of commands which are incomplete
+# LOCALIZATION NOTE: This error message is displayed when the user attempts to
+# disconnect before all requests have completed. Parameters: %S is a list of
+# incomplete requests.
 disconnectOutstanding	= 未完了の要求 (%1$S)
 
-# LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See prefManual for a
-# fuller description of what it does.
+# LOCALIZATION NOTE (prefDesc, prefManual, prefListDesc, prefListManual,
+# prefListSearchDesc, prefListSearchManual, prefShowDesc, prefShowManual,
+# prefShowSettingDesc, prefShowSettingManual): These strings describe the
+# 'pref' command and all its available sub-commands and parameters.
 prefDesc		= 設定に関するコマンド
-
-# LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
-# Displayed when the user asks for help on what it does.
 prefManual		= GCLI や環境の設定を、表示または変更するコマンドです
-
-# LOCALIZATION NOTE (prefListDesc): A very short description of the 'pref
-# list' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# prefListManual for a fuller description of what it does.
 prefListDesc		= 利用可能な設定値を表示する
-
-# LOCALIZATION NOTE (prefListManual): A fuller description of the 'pref list'
-# command. Displayed when the user asks for help on what it does.
 prefListManual		= 設定値の一覧を表示します。'search' パラメータで検索が可能です
-
-# LOCALIZATION NOTE (prefListSearchDesc): A short description of the 'search'
-# parameter to the 'pref list' command. See prefListSearchManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
 prefListSearchDesc	= 設定値の一覧から検索する
-
-# LOCALIZATION NOTE (prefListSearchManual): A fuller description of the
-# 'search' parameter to the 'pref list' command. Displayed when the user asks
-# for help on what it does.
 prefListSearchManual	= 入力された文字列で、利用可能な設定値を検索します
-
-# LOCALIZATION NOTE (prefShowDesc): A very short description of the 'pref
-# show' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# prefShowManual for a fuller description of what it does.
 prefShowDesc		= 設定を表示
-
-# LOCALIZATION NOTE (prefShowManual): A fuller description of the 'pref show'
-# command. Displayed when the user asks for help on what it does.
 prefShowManual		= 指定された設定項目の値を表示します
-
-# LOCALIZATION NOTE (prefShowSettingDesc): A short description of the
-# 'setting' parameter to the 'pref show' command. See prefShowSettingManual
-# for a fuller description of what it does. This string is designed to be
-# shown in a dialog with restricted space, which is why it should be as short
-# as possible.
 prefShowSettingDesc	= 表示する設定項目
-
-# LOCALIZATION NOTE (prefShowSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref show' command. Displayed when the user asks
-# for help on what it does.
 prefShowSettingManual	= 表示する設定項目の名前
 
-# LOCALIZATION NOTE (prefShowSettingValue): This is used to show the
-# preference name and the associated preference value. %1$S is replaced with
-# the preference name and %2$S is replaced with the preference value.
+# LOCALIZATION NOTE: This message is used to show the preference name and the
+# associated preference value. Parameters: %1$S is the preference name, %2$S
+# is the preference value.
 prefShowSettingValue	= %1$S: %2$S
 
-# LOCALIZATION NOTE (prefSetDesc): A very short description of the 'pref set'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See prefSetManual for
-# a fuller description of what it does.
+# LOCALIZATION NOTE (prefSetDesc, prefSetManual, prefSetSettingDesc,
+# prefSetSettingManual, prefSetValueDesc, prefSetValueManual): These strings
+# describe the 'pref set' command and all its parameters.
 prefSetDesc		= 設定を変更
-
-# LOCALIZATION NOTE (prefSetManual): A fuller description of the 'pref set'
-# command. Displayed when the user asks for help on what it does.
 prefSetManual		= 環境で定義された設定を変更します
-
-# LOCALIZATION NOTE (prefSetSettingDesc): A short description of the 'setting'
-# parameter to the 'pref set' command. See prefSetSettingManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
 prefSetSettingDesc	= 変更する設定項目
-
-# LOCALIZATION NOTE (prefSetSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref set' command. Displayed when the user asks
-# for help on what it does.
 prefSetSettingManual	= 変更する設定項目の名前
-
-# LOCALIZATION NOTE (prefSetValueDesc): A short description of the 'value'
-# parameter to the 'pref set' command. See prefSetValueManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
 prefSetValueDesc	= 新しい値
-
-# LOCALIZATION NOTE (prefSetValueManual): A fuller description of the 'value'
-# parameter to the 'pref set' command. Displayed when the user asks for help
-# on what it does.
 prefSetValueManual	= 指定された設定項目の新しい値
 
-# LOCALIZATION NOTE (prefSetCheckHeading): Title displayed to the user the
-# first time they try to alter a setting This is displayed directly above
-# prefSetCheckBody and prefSetCheckGo.
+# LOCALIZATION NOTE (prefSetCheckHeading, prefSetCheckBody, prefSetCheckGo):
+# These strings are displayed to the user the first time they try to alter a
+# setting.
 prefSetCheckHeading	= 動作保証対象外になります!
-
-# LOCALIZATION NOTE (prefSetCheckBody): The main text of the warning displayed
-# to the user the first time they try to alter a setting. See also
-# prefSetCheckHeading and prefSetCheckGo.
 prefSetCheckBody	= プログラムの高度な設定を変更すると、安定性、セキュリティ、パフォーマンスに深刻な問題を引き起こす恐れがあります。設定変更による影響を完全に理解している場合に限ってご利用ください。
-
-# LOCALIZATION NOTE (prefSetCheckGo): The text to enable preference editing.
-# Displayed in a button directly under prefSetCheckHeading and
-# prefSetCheckBody
 prefSetCheckGo		= 細心の注意を払って使用する
 
-# LOCALIZATION NOTE (prefResetDesc): A very short description of the 'pref
-# reset' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# prefResetManual for a fuller description of what it does.
+# LOCALIZATION NOTE (prefResetDesc, prefResetManual, prefResetSettingDesc,
+# prefResetSettingManual): These strings describe the 'pref reset' command and
+# all its parameters.
 prefResetDesc		= 設定をリセット
-
-# LOCALIZATION NOTE (prefResetManual): A fuller description of the 'pref
-# reset' command. Displayed when the user asks for help on what it does.
 prefResetManual		= 設定項目の値をシステムの既定値にリセットします
-
-# LOCALIZATION NOTE (prefResetSettingDesc): A short description of the
-# 'setting' parameter to the 'pref reset' command. See prefResetSettingManual
-# for a fuller description of what it does. This string is designed to be
-# shown in a dialog with restricted space, which is why it should be as short
-# as possible.
 prefResetSettingDesc	= リセットする設定項目
-
-# LOCALIZATION NOTE (prefResetSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref reset' command. Displayed when the user
-# asks for help on what it does.
 prefResetSettingManual	= システムの既定値にリセットする設定項目の名前
 
-# LOCALIZATION NOTE (prefOutputFilter): Displayed in the output from the 'pref
+# LOCALIZATION NOTE: This string is displayed in the output from the 'pref
 # list' command as a label to an input element that allows the user to filter
-# the results
+# the results.
 prefOutputFilter	= フィルタ
 
-# LOCALIZATION NOTE (prefOutputName): Displayed in the output from the 'pref
-# list' command as a heading to a table. The column contains the names of the
-# available preferences
+# LOCALIZATION NOTE (prefOutputName, prefOutputValue): These strings are
+# displayed in the output from the 'pref list' command as table headings.
 prefOutputName		= 名前
-
-# LOCALIZATION NOTE (prefOutputValue): Displayed in the output from the 'pref
-# list' command as a heading to a table. The column contains the values of the
-# available preferences
 prefOutputValue		= 値
 
-# LOCALIZATION NOTE (introDesc): A very short description of the 'intro'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See introManual for a
-# fuller description of what it does.
+# LOCALIZATION NOTE (introDesc, introManual): These strings describe the
+# 'intro' command. The localization of 'Got it!' should be the same used in
+# introTextGo.
 introDesc		= 初回メッセージを表示
-
-# LOCALIZATION NOTE (introManual): A fuller description of the 'intro'
-# command. Displayed when the user asks for help on what it does.
 introManual		= 'はじめる!' ボタンがクリックされるまで新しいユーザに表示されていた、初回メッセージを再表示します
 
-# LOCALIZATION NOTE (introTextOpening2): The 'intro text' opens when the user
+# LOCALIZATION NOTE (introTextOpening2, introTextCommands, introTextKeys2,
+# introTextF1Escape, introTextGo): These strings are displayed when the user
 # first opens the developer toolbar to explain the command line, and is shown
-# each time it is opened until the user clicks the 'Got it!' button. This
-# string is the opening paragraph of the intro text.
+# each time it is opened until the user clicks the 'Got it!' button.
 introTextOpening2	= このコマンドラインは開発者向けに設計されました。JavaScript 構文の入力と、単純出力以上の豊富な表示のスピードに注力しています。
-
-# LOCALIZATION NOTE (introTextCommands): For information about the 'intro
-# text' see introTextOpening2. The second paragraph is in 2 sections, the
-# first section points the user to the 'help' command.
 introTextCommands	= コマンド一覧は次のコマンドを入力してください
-
-# LOCALIZATION NOTE (introTextKeys2): For information about the 'intro text'
-# see introTextOpening2. The second section in the second paragraph points the
-# user to the F1/Escape keys which show and hide hints.
 introTextKeys2		= コマンドのヒントを表示または隠すには、次のキーを押してください
-
-# LOCALIZATION NOTE (introTextF1Escape): For information about the 'intro
-# text' see introTextOpening2. This string is used with introTextKeys2, and
-# contains the keys that are pressed to open and close hints.
 introTextF1Escape	= F1/Escape
-
-# LOCALIZATION NOTE (introTextGo): For information about the 'intro text' see
-# introTextOpening2. The text on the button that dismisses the intro text.
 introTextGo		= はじめる!
 
-# LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro'
-# setting. Displayed when the user asks for help on the settings.
+# LOCALIZATION NOTE: This is a short description of the 'hideIntro' setting.
 hideIntroDesc		= 初回メッセージを表示
 
-# LOCALIZATION NOTE (eagerHelperDesc): Short description of the 'eagerHelper'
-# setting. Displayed when the user asks for help on the settings. eagerHelper
-# allows users to select between showing no tooltips, permanent tooltips, and
-# only important tooltips
+# LOCALIZATION NOTE: This is a description of the 'eagerHelper' setting. It's
+# displayed when the user asks for help on the settings. eagerHelper allows
+# users to select between showing no tooltips, permanent tooltips, and only
+# important tooltips.
 eagerHelperDesc		= ツールチップの表示頻度
 
-# LOCALIZATION NOTE (allowSetDesc): Short description of the 'allowSetDesc'
-# setting. Displayed when the user asks for help on the settings.
+# LOCALIZATION NOTE: This is a short description of the 'allowSetDesc'
+# setting.
 allowSetDesc		= ユーザは 'pref set' コマンドが利用可能になっていますか?
 
-# LOCALIZATION NOTE (introBody): The text displayed at the top of the output
-# for the help command, just before the list of commands. This text is wrapped
-# inside a link to a localized MDN article
+# LOCALIZATION NOTE: This text is displayed at the top of the output for the
+# help command, just before the list of commands. This text is wrapped inside
+# a link to a localized MDN article.
 introBody		= 詳しくは MDN をご覧ください。
-
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -413,16 +413,66 @@ dbgStepInDesc		= 現在のステートメントを実行して、次のステートメントで停止します。現在のステートメントが関数呼び出しの場合は、関数内にステッピングを進めます。そうでない場合は次のステートメントで停止します。
 # LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
 # function of the dbg step out command.
 dbgStepOutDesc		= 現在の関数から抜けます。関数がネストしてる場合は、1レベル上の関数に戻ります。呼び出し元がない場合は、次のブレークポイントかスクリプトの終わりまで実行します。スキップされたステートメントは実行されますが、ステッピングが通り過ぎるわけではありません。
 
 # LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
 # function of the dbg list command.
 dbgListSourcesDesc	= デバッガに読み込まれたソースの URL 一覧を表示します
 
+# LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg blackbox' command.
+dbgBlackBoxDesc		= デバッガのソースをブラックボックス化
+
+# LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg blackbox' command.
+dbgBlackBoxSourceDesc	= ブラックボックス化するソース
+
+# LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgBlackBoxGlobDesc	= ブラックボックス化するソースのファイル名のパターン (例: "*.min.js")
+
+# LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
+# user know that no sources were black boxed.
+dbgBlackBoxEmptyDesc	= (ブラックボックス化したソースはありませんでした)
+
+# LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources were black boxed.
+dbgBlackBoxNonEmptyDesc	= 次のソースをブラックボックス化しました:
+
+# LOCALIZATION NOTE (dbgBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgBlackBoxErrorDesc	= ブラックボックス化エラー:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg unblackbox' command.
+dbgUnBlackBoxDesc	= デバッガのソースのブラックボックスを解除
+
+# LOCALIZATION NOTE (dbgUnBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxSourceDesc	= ブラックボックスを解除するソース
+
+# LOCALIZATION NOTE (dbgUnBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgUnBlackBoxGlobDesc	= ブラックボックスを解除するソースのファイル名のパターン (例: "*.min.js")
+
+# LOCALIZATION NOTE (dbgUnBlackBoxEmptyDesc) A very short string used to let the
+# user know that we did not stop black boxing any sources.
+dbgUnBlackBoxEmptyDesc	= (ブラックボックスを解除したソースはありませんでした)
+
+# LOCALIZATION NOTE (dbgUnBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources we stopped black boxing.
+dbgUnBlackBoxNonEmptyDesc	= 次のソースのブラックボックスを解除しました:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgUnBlackBoxErrorDesc	= ブラックボックス解除エラー:
+
 # LOCALIZATION NOTE (consolecloseDesc) A very short description of the
 # 'console close' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 consolecloseDesc	= コンソールを閉じます
 
 # LOCALIZATION NOTE (consoleopenDesc) A very short description of the
 # 'console open' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
@@ -502,16 +552,31 @@ resizeModeManual2	= レスポンシブな Web サイトとは、モバイルディスプレイからシネマディスプレイまでのすべての環境に適応する Web サイトです。レスポンシブデザインモードでは、ブラウザすべてをサイズ変更することなく、%1$S で様々なページサイズを簡単にテストできます。
 # name, which is why it should be as short as possible.
 cmdDesc			= コマンドを操作します
 
 # LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
 cmdRefreshDesc		= mozcmd ディレクトリを再読み込みします
 
+# LOCALIZATION NOTE (cmdStatus) When the we load new commands from mozcmd
+# directory, we report on how many we loaded. %1$S is a count of the number
+# of loaded commands, and %2$S is the directory we loaded from.
+cmdStatus		= %1$S コマンドを '%2$S' から読み込みます
+
+# LOCALIZATION NOTE (cmdSetdirDesc) 
+cmdSetdirDesc		= mozcmd ディレクトリをセットアップします
+
+# LOCALIZATION NOTE (cmdSetdirManual) 
+cmdSetdirManual		= 'mozcmd' ディレクトリは、Firefox のコマンドラインのカスタムコマンドを簡単に作成する方法です。詳細は <a href="https://developer.mozilla.org/ja/docs/Tools/GCLI/Customization">MDN ドキュメント</a> をご覧ください。
+
+# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
+# parameter to the 'cmd setdir' command.
+cmdSetdirDirectoryDesc	= .mozcmd ファイルが含まれるディレクトリ
+
 # LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
 addonDesc		= アドオンを操作します
 
 # LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
@@ -1236,42 +1301,32 @@ profilerShowDesc		= プロファイルを読み込みます
 # LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
 # parameter. This parameter is used to name a newly created profile or to lookup
 # an existing profile by its name.
 profilerShowManual		= プロファイルの名前
 
 # LOCALIZATION NOTE (profilerAlreadyStarted) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has already
 # been started.
-profilerAlreadyStarted		= このプロファイルはすでにプロファイリングを開始しています。
-
-# LOCALIZATION NOTE (profilerAlreadyFinished) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has already
-# been finished. It also contains a hint to use the 'profile show' command to see
-# the profiling results.
-profilerAlreadyFinished		= このプロファイルはすでにプロファイリングを終了しています。'profile show' で結果を確認してください。
+profilerAlreadyStarted2		= すでにプロファイリングを開始しています。
 
 # LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
 # an operation cannot be completed because the profile in question could not be
 # found.
 profilerNotFound		= プロファイルが見つかりません
 
 # LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has not been
 # started yet. It also contains a hint to use the 'profile start' command to
 # start the profiler.
-profilerNotStarted2		= このプロファイルはまだプロファイリングが開始されていません。'profile start' でプロファイリングを開始してください
+profilerNotStarted3		= プロファイリングはまだ開始されていません。'profile start' でプロファイリングを開始してください
 
-# LOCALIZATION NOTE (profilerStarting) A very short string that indicates that
-# we're starting the profiler.
-profilerStarting2		= 開始中...
-
-# LOCALIZATION NOTE (profilerStopping) A very short string that indicates that
-# we're stopping the profiler.
-profilerStopping2		= 終了中...
+# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
+# we have started recording.
+profilerStarted2		= 記録中...
 
 # LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
 # an operation cannot be completed because the profiler has not been opened yet.
 profilerNotReady		= このコマンドを実行するには、先にプロファイラウィンドウを開いてください
 
 # LOCALIZATION NOTE (listenDesc) A very short string used to describe the
 # function of the 'listen' command.
 listenDesc			= リモートデバッガのポートを開きます
@@ -1290,8 +1345,18 @@ listenDisabledOutput		= 接続は devtools.debugger.remote-enabled の設定により無効になっています
 
 # LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
 # execution of the 'listen' command. %1$S is a port number
 listenInitOutput		= ポート番号 %1$S で接続待機中
 
 # LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
 # execution of the 'listen' command.
 listenNoInitOutput		= デバッガサーバが初期されていません
+
+# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
+# mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
+# the 'media' commands and all available parameters.
+mediaDesc			= CSS メディアタイプエミュレーション
+mediaEmulateDesc		= 指定の CSS メディアタイプをエミュレーションします
+mediaEmulateManual		= 指定のメディアタイプに対応するデバイス上で描画されたようにページを表示します。関連する CSS ルールも適用されます。
+mediaEmulateType		= エミュレートするメディアタイプ
+mediaResetDesc			= メディアタイプのエミュレートを終了
+mediaResetManual		= メディアタイプのエミュレートを終了
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -30,17 +30,17 @@ debuggerPausedWarning.message		= デバッガが停止しています。マウスによる選択のような一部の機能は動作しません。
 # This menu appears in the Infobar (on top of the highlighted node) once
 # the node is selected.
 nodeMenu.tooltiptext			= ノードの操作
 
 
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
 inspector.label				= インスペクタ
-inspector.commandkey			= I
+inspector.commandkey			= C
 inspector.accesskey			= I
 
 # LOCALIZATION NOTE (markupView.more.*)
 # When there are too many nodes to load at once, we will offer to
 # show all the nodes.
 markupView.more.showing			= いくつかのノードは隠されています。
 markupView.more.showAll			= すべてのノード (%S個) を表示
 inspector.tooltip			= DOM とスタイルシートの調査
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -163,8 +163,49 @@
   -  in the network details timings tab identifying the amount of time spent
   -  in a "wait" state. -->
 <!ENTITY netmonitorUI.timings.wait        "待機:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.timings.receive): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "receive" state. -->
 <!ENTITY netmonitorUI.timings.receive     "受信:">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
+  -  on the context menu that copies the selected request's url -->
+<!ENTITY netmonitorUI.context.copyUrl      "URL をコピー">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
+  -  for the Copy URL menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyUrl.accesskey  "C">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.resend): This is the label displayed
+  -  on the button in the headers tab that opens a form to resend the currently
+     displayed request -->
+<!ENTITY netmonitorUI.summary.resend      "再送信">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.resend.accesskey): This is the access key
+  -  for the Resend menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.summary.resend.accesskey  "R">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.newRequest): This is the label displayed
+  -  as the title of the new custom request form -->
+<!ENTITY netmonitorUI.custom.newRequest   "新しい要求">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.query): This is the label displayed
+  -  above the query string entry in the custom request form -->
+<!ENTITY netmonitorUI.custom.query        "クエリ文字列:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.headers): This is the label displayed
+  -  above the request headers entry in the custom request form -->
+<!ENTITY netmonitorUI.custom.headers      "要求ヘッダ:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.postData): This is the label displayed
+  -  above the request body entry in the custom request form -->
+<!ENTITY netmonitorUI.custom.postData     "要求ボディ:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.send): This is the label displayed
+  -  on the button which sends the custom request -->
+<!ENTITY netmonitorUI.custom.send         "送信">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.cancel): This is the label displayed
+  -  on the button which cancels and closes the custom request form -->
+<!ENTITY netmonitorUI.custom.cancel       "キャンセル">
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -8,8 +8,20 @@
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 <!-- LOCALIZATION NOTE (profilerNew.label): This is the label for the
   -  button that creates a new profile. -->
 <!ENTITY profilerNew.label "新規作成">
+
+<!-- LOCALIZATION NOTE (profilerStart.label): This is the label for the
+  -  button that starts the profiler. -->
+<!ENTITY profilerStart.label "開始">
+
+<!-- LOCALIZATION NOTE (profilerStop.label): This is the label for the
+  -  button that stops the profiler. -->
+<!ENTITY profilerStop.label "終了">
+
+<!-- LOCALIZATION NOTE (profiler.importProfile): This string is displayed
+  -  on a button that opens a dialog to import a saved profile data file. -->
+<!ENTITY importProfile.label "インポート...">
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -92,8 +92,27 @@ profiler.stateIdle		= 待機中
 # This string is used to show that the profile in question is in RUNNING
 # state meaning that it has been started and currently gathering profile data.
 profiler.stateRunning		= 実行中
 
 # LOCALIZATION NOTE (profiler.stateCompleted)
 # This string is used to show that the profile in question is in COMPLETED
 # state meaning that it has been started and stopped already.
 profiler.stateCompleted		= 完了
+
+# LOCALIZATION NOTE (profiler.sidebarNotice)
+# This string is displayed in the profiler sidebar when there are no
+# existing profiles to show (usually happens when the user opens the
+# profiler for the first time).
+profiler.sidebarNotice		= プロファイルはまだありません。
+
+# LOCALIZATION NOTE (profiler.save)
+# This string is displayed as a label for a button that opens a Save File
+# dialog where user can save generated profiler to a file.
+profiler.save			= 保存
+
+# LOCALIZATION NOTE (profiler.saveFileAs)
+# This string as a title for a Save File dialog.
+profiler.saveFileAs		= 名前を付けてプロファイルを保存
+
+# LOCALIZATION NOTE (profiler.openFile)
+# This string as a title for a Open File dialog.
+profiler.openFile		= プロファイルのインポート
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -80,8 +80,16 @@ help.openDocumentationPage		= https://de
 
 # LOCALIZATION NOTE (fileExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification		= このファイルはもう存在しません。
 
 # LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
 propertiesFilterPlaceholder		= プロパティをフィルタ
+
+# LOCALIZATION NOTE (stringConversionFailed): Happens when a value cannot be
+# converted to a string for inspection.
+stringConversionFailed			= 値を文字列に変換できません。
+
+# LOCALIZATION NOTE (connectionTimeout): message displayed when the Remote Scratchpad
+# fails to connect to the server due to a timeout.
+connectionTimeout			= 接続がタイムアウトしました。原因と思われるエラーメッセージを、エラーコンソールで確認してください。スクラッチパッドを開きなおして、やり直してください。
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -4,16 +4,18 @@
 
 <!-- LOCALIZATION NOTE : FILE This file contains the Toolbox strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate key -->
 
 <!ENTITY closeCmd.key  "W">
 
 <!ENTITY toolboxCloseButton.tooltip    "開発ツールを閉じる">
 <!ENTITY toolboxOptionsButton.key      "O">
+<!ENTITY toolboxNextTool.key           "]">
+<!ENTITY toolboxPreviousTool.key       "[">
 
 <!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
   -  the heading of the advanced settings group in the options panel. -->
 <!ENTITY options.context.advancedSettings "詳細な設定">
 
 <!-- LOCALIZATION NOTE (options.context.requiresRestart2): This is the requires
   -  restart label at right of settings that require a browser restart to be
   -  effective. -->
@@ -74,8 +76,20 @@
 <!ENTITY options.webconsole.label            "Web コンソール">
 
 <!-- LOCALIZATION NOTE (options.enablePersistentLogging.label): This is the
   -  label for the checkbox that toggles persistent logs in the Web Console,
   -  i.e. devtools.webconsole.persistlog a boolean preference in about:config,
   -  in the options panel. -->
 <!ENTITY options.enablePersistentLogging.label    "ログ出力を残す">
 <!ENTITY options.enablePersistentLogging.tooltip  "このオプションを有効にすると、新しいページに誘導させられた場合でも Web コンソールの出力を消去しないようになります">
+
+<!-- LOCALIZATION NOTE (options.profiler.label): This is the label for the
+  -  heading of the group of JavaScript Profiler preferences in the options
+  -  panel. -->
+<!ENTITY options.profiler.label            "JavaScript プロファイラ">
+
+<!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
+  -  label for the checkbox that toggles the display of the platform data in the,
+  -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
+  -  in about:config, in the options panel. -->
+<!ENTITY options.showPlatformData.label    "Gecko プラットフォームのデータを表示">
+<!ENTITY options.showPlatformData.tooltip  "このオプションを有効にすると、JavaScript プロファイラの出力に Gecko プラットフォームのシンボルが含まれるようになります">
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -45,8 +45,10 @@ 16_firefox	= 保存されているパスワード
 32_ie		= お気に入り
 32_safari	= ブックマーク
 32_chrome	= ブックマーク
 
 64_ie		= その他のデータ
 64_safari	= その他のデータ
 64_chrome	= その他のデータ
 64_firefox_other= その他のデータ
+
+128_firefox	= ウィンドウとタブ
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -53,27 +53,18 @@
 <!ENTITY  permTab			"サイト別設定">
 <!ENTITY  permTab.accesskey		"P">
 <!ENTITY  permUseDefault		"標準設定を使用する">
 <!ENTITY  permAskAlways			"毎回確認する">
 <!ENTITY  permAllow			"許可">
 <!ENTITY  permAllowSession		"セッション中のみ許可">
 <!ENTITY  permBlock			"ブロック">
 <!ENTITY  permissionsFor		"対象サイト:">
-<!ENTITY  permImage			"画像の読み込み">
-<!ENTITY  permPopup			"ポップアップウィンドウを開く">
-<!ENTITY  permCookie			"Cookie データの保存">
-<!ENTITY  permNotifications		"サイトからの通知の表示">
-<!ENTITY  permInstall			"拡張機能やテーマのインストール">
-<!ENTITY  permGeo			"位置情報の送信">
 <!ENTITY  permPlugins			"プラグインの実行">
-<!ENTITY  permFullscreen		"全画面表示に切り替え">
-<!ENTITY  permPointerLock2		"マウスポインタを隠す">
 
-<!ENTITY  permIndexedDB			"オフラインストレージの維持">
 <!ENTITY  permClearStorage		"ストレージを消去">
 <!ENTITY  permClearStorage.accesskey	"C">
 
 <!ENTITY  securityTab			"セキュリティ">
 <!ENTITY  securityTab.accesskey		"S">
 <!ENTITY  securityHeader		"このページのセキュリティ情報">
 <!ENTITY  securityView.certView		"証明書を表示...">
 <!ENTITY  securityView.accesskey	"V">
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -50,8 +50,10 @@ securityOneVisit	= はい (1 回)
 securityNVisits		= はい (%S 回)
 
 # LOCALIZATION NOTE: The next string is for the disk usage of the
 # database
 #   e.g. indexedDBUsage : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
 #   %2$S = unit of measure (bytes, KB, MB, ...)
 indexedDBUsage		= この Web サイトは %1$S %2$S 使っています
+
+permissions.useDefault	= 標準設定を使用する
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/sitePermissions.properties
@@ -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/.
+
+allow					= 許可
+allowForSession				= セッション中のみ許可
+block					= ブロック
+alwaysAsk				= 毎回確認する
+
+permission.cookie.label			= Cookie データの保存
+permission.desktop-notification.label	= サイトからの通知の表示
+permission.image.label			= 画像の読み込み
+permission.install.label		= アドオンのインストール
+permission.popup.label			= ポップアップウィンドウを開く
+permission.geo.label			= 位置情報の送信
+permission.indexedDB.label		= オフラインストレージの維持
+permission.fullscreen.label		= 全画面表示に切り替え
+permission.pointerLock.label		= マウスポインタを隠す