48.0: sync devtools/client with en-US rev333490:e50c761a9bfb (mozilla-beta)
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Tue, 28 Jun 2016 15:48:53 +0900
changeset 2124 97bb66f541091536b74fa5ebff019aa3d8667eb4
parent 2123 ed55eca1c76856f538b5a692fa4745a3eed2bc6d
child 2125 92f12caf4aef41e1871214a696d56abc3147d542
push id1147
push useraxel@mozilla.com
push dateMon, 01 Aug 2016 14:18:35 +0000
bugs48
48.0: sync devtools/client with en-US rev333490:e50c761a9bfb (mozilla-beta)
browser/chrome/browser/browser.dtd
devtools/client/aboutdebugging.properties
devtools/client/animationinspector.dtd
devtools/client/animationinspector.properties
devtools/client/debugger.dtd
devtools/client/debugger.properties
devtools/client/dom.properties
devtools/client/inspector.dtd
devtools/client/jsonview.properties
devtools/client/layoutview.dtd
devtools/client/markers.properties
devtools/client/memory.properties
devtools/client/menus.properties
devtools/client/netmonitor.dtd
devtools/client/netmonitor.properties
devtools/client/responsive.properties
devtools/client/responsiveUI.properties
devtools/client/storage.dtd
devtools/client/storage.properties
devtools/client/toolbox.dtd
devtools/client/toolbox.properties
devtools/client/webconsole.properties
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -246,105 +246,34 @@ These should match what Safari and other
 <!ENTITY downloads.label              "ダウンロード">
 <!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 devtoolsServiceWorkers.label      "Service Worker">
-<!ENTITY devtoolsServiceWorkers.accesskey  "k">
-
-<!ENTITY devtoolsConnect.label        "接続...">
-<!ENTITY devtoolsConnect.accesskey    "e">
-
-<!ENTITY errorConsoleCmd.label        "エラーコンソール">
-<!ENTITY errorConsoleCmd.accesskey    "C">
-
-<!ENTITY remoteWebConsoleCmd.label    "リモート Web コンソール">
-
-<!ENTITY browserConsoleCmd.label      "ブラウザコンソール">
-<!ENTITY browserConsoleCmd.commandkey "j">
-<!ENTITY browserConsoleCmd.accesskey  "B">
-
-<!ENTITY inspectContextMenu.label     "要素を調査">
-<!ENTITY inspectContextMenu.accesskey "Q">
-
-<!ENTITY responsiveDesignTool.label   "レスポンシブデザインビュー">
-<!ENTITY responsiveDesignTool.accesskey "R">
-<!ENTITY responsiveDesignTool.commandkey "M">
-
-<!ENTITY eyedropper.label			"スポイト">
-<!ENTITY eyedropper.accesskey			"Y">
+<!ENTITY webDeveloperMenu.label		"Web 開発">
+<!ENTITY webDeveloperMenu.accesskey	"W">
 
-<!-- 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">
-
-<!-- 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 browserToolboxCmd.commandkey		"i">
-
-<!-- LOCALIZATION NOTE (browserContentToolboxMenu.label): This is the label for the
-  -  application menu item that opens the browser content toolbox UI in the Tools menu.
-  -  This toolbox allows to debug the chrome of the content process in multiprocess builds.  -->
-<!ENTITY browserContentToolboxMenu.label	"ブラウザコンテンツツールボックス">
-<!ENTITY browserContentToolboxMenu.accesskey	"x">
-
-<!ENTITY devToolbarCloseButton.tooltiptext	"開発ツールバーを閉じる">
-<!ENTITY devToolbarMenu.label			"開発ツールバー">
-<!ENTITY devToolbarMenu.accesskey		"v">
-<!ENTITY webide.label				"WebIDE">
-<!ENTITY webide.accesskey			"W">
-<!ENTITY webide.keycode				"VK_F8">
-<!ENTITY webide.keytext				"F8">
-<!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 getMoreDevtoolsCmd.label		"その他のツールを入手">
-<!ENTITY getMoreDevtoolsCmd.accesskey		"M">
+<!ENTITY inspectContextMenu.label	"要素を調査">
+<!ENTITY inspectContextMenu.accesskey	"Q">
 
 <!ENTITY fileMenu.label			"ファイル">
 <!ENTITY fileMenu.accesskey		"F">
-<!ENTITY newUserContext.label             "新しいコンテナタブ">
-<!ENTITY newUserContext.accesskey         "C">
-<!ENTITY userContextPersonal.label        "プライベート">
-<!ENTITY userContextPersonal.accesskey    "P">
-<!ENTITY userContextWork.label            "仕事">
-<!ENTITY userContextWork.accesskey        "W">
-<!ENTITY userContextBanking.label         "銀行取引">
-<!ENTITY userContextBanking.accesskey     "B">
-<!ENTITY userContextShopping.label        "ショッピング">
-<!ENTITY userContextShopping.accesskey    "S">
+<!ENTITY newUserContext.label		"新しいコンテナタブ">
+<!ENTITY newUserContext.accesskey	"C">
+<!ENTITY userContextPersonal.label	"プライベート">
+<!ENTITY userContextPersonal.accesskey	"P">
+<!ENTITY userContextWork.label		"仕事">
+<!ENTITY userContextWork.accesskey	"W">
+<!ENTITY userContextBanking.label	"銀行取引">
+<!ENTITY userContextBanking.accesskey	"B">
+<!ENTITY userContextShopping.label	"ショッピング">
+<!ENTITY userContextShopping.accesskey	"S">
 <!ENTITY newNavigatorCmd.label		"新しいウィンドウ">
 <!ENTITY newNavigatorCmd.key		"N">
 <!ENTITY newNavigatorCmd.accesskey	"N">
 <!ENTITY newPrivateWindow.label		"新しいプライベートウィンドウ">
 <!ENTITY newPrivateWindow.accesskey	"W">
 <!ENTITY newNonRemoteWindow.label	"新しいシングルプロセスウィンドウ">
 
 <!ENTITY editMenu.label			"編集">
--- a/devtools/client/aboutdebugging.properties
+++ b/devtools/client/aboutdebugging.properties
@@ -1,22 +1,26 @@
 # 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/.
 
 debug = デバッグ
 push = プッシュ
 start = 開始
 
+scope = スコープ
+unregister = 登録解除
+
 addons = アドオン
 addonDebugging.label = アドオンのデバッグを有効化
 addonDebugging.tooltip = このチェックをオンにすると、アドオンとブラウザ UI 部品のデバッグを許可します
 addonDebugging.moreInfo = 詳細
 loadTemporaryAddon = 一時的なアドオンを読み込む
 extensions = 拡張機能
-selectAddonFromFile = アドオンフォルダまたは XPI ファイルを選択してください
+selectAddonFromFile2 = マニフェストファイルまたはパッケージ (.xpi) を選択してください
+reload = 再読み込み
 
 workers = Worker
 serviceWorkers = Service Worker
 sharedWorkers = Shared Worker
 otherWorkers = その他の Worker
 
 nothing = まだありません。
--- a/devtools/client/animationinspector.dtd
+++ b/devtools/client/animationinspector.dtd
@@ -9,21 +9,17 @@
      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 (animationInspectorTitle): This is the label shown in the sidebar tab -->
 <!ENTITY animationInspectorTitle "アニメーション">
 
-<!-- LOCALIZATION NOTE (invalidElement): This is the label shown in the panel
-     when an invalid node is currently selected in the inspector. -->
-<!ENTITY invalidElement "この要素にアニメーションはありません。">
-
 <!-- LOCALIZATION NOTE (selectElement): This is the label shown in the panel
      when an invalid node is currently selected in the inspector, to invite the
      user to select a new node by clicking on the element-picker icon. -->
-<!ENTITY selectElement "このページのほかの要素を選択してください。">
+<!ENTITY selectElement "このページから別の要素を選択してください。">
 
 <!-- LOCALIZATION NOTE (allAnimations): This is the label shown at the bottom of
      the panel, in a toolbar, to let the user know the toolbar applies to all
      animations, not just the ones applying to the current element. -->
 <!ENTITY allAnimations "すべてのアニメーション">
--- a/devtools/client/animationinspector.properties
+++ b/devtools/client/animationinspector.properties
@@ -5,16 +5,22 @@
 # LOCALIZATION NOTE These strings are used inside the Animation inspector
 # which is available as a sidebar panel in the Inspector.
 # 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 (panel.invalidElementSelected):
+# This is the label shown in the panel when an invalid node is currently
+# selected in the inspector (i.e. a non-element node or a node that is not
+# animated).
+panel.invalidElementSelected		=現在の要素にアニメーションが見つかりませんでした。
+
 # LOCALIZATION NOTE (player.animationNameLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation name.
 player.animationNameLabel		=アニメーション:
 
 # LOCALIZATION NOTE (player.transitionNameLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed in the header, when the element is animated by mean of a css
@@ -26,16 +32,21 @@ player.transitionNameLabel		=状態遷移
 # displayed before the animation duration.
 player.animationDurationLabel		=再生時間:
 
 # LOCALIZATION NOTE (player.animationDelayLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation delay.
 player.animationDelayLabel		=遅延:
 
+# LOCALIZATION NOTE (player.animationEndDelayLabel):
+# This string is displayed in each animation player widget. It is the label
+# displayed before the animation endDelay.
+player.animationEndDelayLabel		=遅延終了:
+
 # LOCALIZATION NOTE (player.animationRateLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation playback rate.
 player.animationRateLabel		=再生速度:
 
 # LOCALIZATION NOTE (player.animationIterationCountLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the number of times the animation is set to repeat.
@@ -47,16 +58,24 @@ player.animationIterationCountLabel	=繰り返し:
 player.infiniteIterationCount		=&#8734;
 
 # LOCALIZATION NOTE (player.infiniteIterationCountText):
 # See player.infiniteIterationCount for a description of what this is.
 # Unlike player.infiniteIterationCount, this string isn't used in HTML, but in
 # a tooltip.
 player.infiniteIterationCountText	=∞
 
+# LOCALIZATION NOTE (player.animationIterationStartLabel):
+# This string is displayed in a tooltip that appears when hovering over
+# animations in the timeline. It is the label displayed before the animation
+# iterationStart value.
+# %1$S will be replaced by the original iteration start value
+# %2$S will be replaced by the actual time of iteration start
+player.animationIterationStartLabel	=繰り返し開始: %1$S (%2$Ss)
+
 # LOCALIZATION NOTE (player.timeLabel):
 # This string is displayed in each animation player widget, to indicate either
 # how long (in seconds) the animation lasts, or what is the animation's current
 # time (in seconds too);
 player.timeLabel			=%S 秒
 
 # LOCALIZATION NOTE (player.playbackRateLabel):
 # This string is displayed in each animation player widget, as the label of
--- a/devtools/client/debugger.dtd
+++ b/devtools/client/debugger.dtd
@@ -162,16 +162,21 @@
 <!ENTITY debuggerUI.seMenuBreak.key		"B">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuCondBreak): This is the text that
   -  appears in the source editor context menu for adding a conditional
   -  breakpoint. -->
 <!ENTITY debuggerUI.seMenuCondBreak		"条件付きブレークポイントを設置">
 <!ENTITY debuggerUI.seMenuCondBreak.key		"B">
 
+<!-- LOCALIZATION NOTE (debuggerUI.seMenuBreak): This is the text that
+  -  appears in the source editor context menu for editing a breakpoint. -->
+<!ENTITY debuggerUI.seEditMenuCondBreak		"条件付きブレークポイントを編集">
+<!ENTITY debuggerUI.seEditMenuCondBreak.key	"B">
+
 <!-- LOCALIZATION NOTE (debuggerUI.tabs.*): This is the text that
   -  appears in the debugger's side pane tabs. -->
 <!ENTITY debuggerUI.tabs.workers		"Worker">
 <!ENTITY debuggerUI.tabs.sources		"ソース">
 <!ENTITY debuggerUI.tabs.traces			"トレース">
 <!ENTITY debuggerUI.tabs.callstack		"コールスタック">
 <!ENTITY debuggerUI.tabs.variables		"変数">
 <!ENTITY debuggerUI.tabs.events			"イベント">
--- a/devtools/client/debugger.properties
+++ b/devtools/client/debugger.properties
@@ -325,8 +325,10 @@ functionSearchSeparatorLabel		= \u2190
 # resumed first.
 resumptionOrderPanelTitle		= ほかのデバッガが停止しています。最後の停止させたデバッガを復帰させてください: %S
 
 variablesViewOptimizedOut		= (最適化により削除)
 variablesViewUninitialized		= (未初期化)
 variablesViewMissingArgs		= (利用不可)
 
 anonymousSourcesLabel			= 匿名ソース
+
+experimental				=これは実験段階の機能です
new file mode 100644
--- /dev/null
+++ b/devtools/client/dom.properties
@@ -0,0 +1,39 @@
+# 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 These strings are used inside the DOM panel
+# which is available from the Web Developer sub-menu -> 'DOM'.
+# 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 (dom.label):
+# This string is displayed in the title of the tab when the DOM panel is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+dom.label		=DOM
+
+# LOCALIZATION NOTE (dom.panelLabel):
+# This is used as the label for the toolbox panel.
+dom.panelLabel		=DOM パネル
+
+# LOCALIZATION NOTE (dom.commandkey, dom.accesskey)
+# Used for the menuitem in the tool menu
+dom.commandkey		=W
+dom.accesskey		=D
+
+# LOCALIZATION NOTE (dom.tooltip):
+# This string is displayed in the tooltip of the tab when the DOM is
+# displayed inside the developer tools window.
+# Keyboard shortcut for DOM panel will be shown inside the brackets.
+dom.tooltip		=DOM (%S)
+
+# LOCALIZATION NOTE (dom.filterDOMPanel): A placeholder text used for
+# DOM panel search box.
+dom.filterDOMPanel	=DOM を絞り込み
+
+# LOCALIZATION NOTE (dom.refresh): A label for Refresh button in
+# DOM panel toolbar
+dom.refresh		=更新
--- a/devtools/client/inspector.dtd
+++ b/devtools/client/inspector.dtd
@@ -1,158 +1,164 @@
 <!-- LOCALIZATION NOTE (inspectorHTMLEdit.label): This is the label shown
      in the inspector contextual-menu for the item that lets users edit the
      (outer) HTML of the current node -->
-<!ENTITY inspectorHTMLEdit.label       "HTML として編集">
-<!ENTITY inspectorHTMLEdit.accesskey   "E">
+<!ENTITY inspectorHTMLEdit.label		"HTML として編集">
+<!ENTITY inspectorHTMLEdit.accesskey		"E">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLCopyInner.label): This is the label shown
      in the inspector contextual-menu for the item that lets users copy the
      inner HTML of the current node -->
-<!ENTITY inspectorHTMLCopyInner.label       "innerHTML をコピー">
-<!ENTITY inspectorHTMLCopyInner.accesskey   "I">
+<!ENTITY inspectorHTMLCopyInner.label		"innerHTML をコピー">
+<!ENTITY inspectorHTMLCopyInner.accesskey	"I">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLCopyOuter.label): This is the label shown
      in the inspector contextual-menu for the item that lets users copy the
      outer HTML of the current node -->
-<!ENTITY inspectorHTMLCopyOuter.label       "outerHTML をコピー">
-<!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
+<!ENTITY inspectorHTMLCopyOuter.label		"outerHTML をコピー">
+<!ENTITY inspectorHTMLCopyOuter.accesskey	"O">
 
 <!-- LOCALIZATION NOTE (inspectorCopyUniqueSelector.label): This is the label
      shown in the inspector contextual-menu for the item that lets users copy
      the CSS Selector of the current node -->
-<!ENTITY inspectorCopyUniqueSelector.label       "一意なセレクタをコピー">
-<!ENTITY inspectorCopyUniqueSelector.accesskey   "U">
+<!ENTITY inspectorCopyUniqueSelector.label	"一意なセレクタをコピー">
+<!ENTITY inspectorCopyUniqueSelector.accesskey	"U">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteOuter.label): This is the label shown
      in the inspector contextual-menu for the item that lets users paste outer
      HTML in the current node -->
-<!ENTITY inspectorHTMLPasteOuter.label      "outerHTML に貼り付け">
-<!ENTITY inspectorHTMLPasteOuter.accesskey  "P">
+<!ENTITY inspectorHTMLPasteOuter.label		"outerHTML に貼り付け">
+<!ENTITY inspectorHTMLPasteOuter.accesskey	"P">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteInner.label): This is the label shown
      in the inspector contextual-menu for the item that lets users paste inner
      HTML in the current node -->
-<!ENTITY inspectorHTMLPasteInner.label      "innerHTML に貼り付け">
-<!ENTITY inspectorHTMLPasteInner.accesskey  "N">
+<!ENTITY inspectorHTMLPasteInner.label		"innerHTML に貼り付け">
+<!ENTITY inspectorHTMLPasteInner.accesskey 	"N">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteExtraSubmenu.label): This is the label
      shown in the inspector contextual-menu for the sub-menu of the other Paste
      items, which allow to paste HTML:
      - before the current node
      - after the current node
      - as the first child of the current node
      - as the last child of the current node -->
-<!ENTITY inspectorHTMLPasteExtraSubmenu.label      "貼り付け...">
-<!ENTITY inspectorHTMLPasteExtraSubmenu.accesskey  "t">
+<!ENTITY inspectorHTMLPasteExtraSubmenu.label	"貼り付け...">
+<!ENTITY inspectorHTMLPasteExtraSubmenu.accesskey	"t">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteBefore.label): This is the label shown
      in the inspector contextual-menu for the item that lets users paste
      the HTML before the current node -->
-<!ENTITY inspectorHTMLPasteBefore.label      "前">
-<!ENTITY inspectorHTMLPasteBefore.accesskey  "B">
+<!ENTITY inspectorHTMLPasteBefore.label		"前">
+<!ENTITY inspectorHTMLPasteBefore.accesskey 	"B">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteAfter.label): This is the label shown
      in the inspector contextual-menu for the item that lets users paste
      the HTML after the current node -->
-<!ENTITY inspectorHTMLPasteAfter.label       "後">
-<!ENTITY inspectorHTMLPasteAfter.accesskey   "A">
+<!ENTITY inspectorHTMLPasteAfter.label		"後">
+<!ENTITY inspectorHTMLPasteAfter.accesskey	"A">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteFirstChild.label): This is the label
      shown in the inspector contextual-menu for the item that lets users paste
      the HTML as the first child the current node -->
-<!ENTITY inspectorHTMLPasteFirstChild.label      "最初の子要素として">
-<!ENTITY inspectorHTMLPasteFirstChild.accesskey  "F">
+<!ENTITY inspectorHTMLPasteFirstChild.label	"最初の子要素として">
+<!ENTITY inspectorHTMLPasteFirstChild.accesskey	"F">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLPasteLastChild.label): This is the label
      shown in the inspector contextual-menu for the item that lets users paste
      the HTML as the last child the current node -->
-<!ENTITY inspectorHTMLPasteLastChild.label       "最後の子要素として">
-<!ENTITY inspectorHTMLPasteLastChild.accesskey   "L">
+<!ENTITY inspectorHTMLPasteLastChild.label	"最後の子要素として">
+<!ENTITY inspectorHTMLPasteLastChild.accesskey	"L">
 
 <!-- LOCALIZATION NOTE (inspectorScrollNodeIntoView.label): This is the label
      shown in the inspector contextual-menu for the item that lets users scroll
      the current node into view -->
-<!ENTITY inspectorScrollNodeIntoView.label       "この要素の位置にスクロール">
-<!ENTITY inspectorScrollNodeIntoView.accesskey   "S">
+<!ENTITY inspectorScrollNodeIntoView.label	"この要素の位置にスクロール">
+<!ENTITY inspectorScrollNodeIntoView.accesskey	"S">
 
 <!-- LOCALIZATION NOTE (inspectorHTMLDelete.label): This is the label shown in
      the inspector contextual-menu for the item that lets users delete the
      current node -->
-<!ENTITY inspectorHTMLDelete.label          "ノードを削除">
-<!ENTITY inspectorHTMLDelete.accesskey      "D">
+<!ENTITY inspectorHTMLDelete.label		"ノードを削除">
+<!ENTITY inspectorHTMLDelete.accesskey		"D">
 <!-- LOCALIZATION NOTE (inspectorAttributeSubmenu.label): This is the label
      shown in the inspector contextual-menu for the sub-menu of the other
      attribute items, which allow to:
      - add new attribute
      - edit attribute
      - remove attribute -->
-<!ENTITY inspectorAttributeSubmenu.label      "属性">
-<!ENTITY inspectorAttributeSubmenu.accesskey  "A">
+<!ENTITY inspectorAttributeSubmenu.label	"属性">
+<!ENTITY inspectorAttributeSubmenu.accesskey	"A">
 
 <!-- LOCALIZATION NOTE (inspectorAddAttribute.label): This is the label shown in
      the inspector contextual-menu for the item that lets users add attribute
      to current node -->
-<!ENTITY inspectorAddAttribute.label        "属性を追加">
-<!ENTITY inspectorAddAttribute.accesskey    "A">
+<!ENTITY inspectorAddAttribute.label		"属性を追加">
+<!ENTITY inspectorAddAttribute.accesskey	"A">
 
 <!-- LOCALIZATION NOTE (inspectorEditAttribute.label): This is the label shown in
      the inspector contextual-menu for the item that lets users edit attribute
      for current node -->
-<!ENTITY inspectorEditAttribute.label        "属性を編集">
-<!ENTITY inspectorEditAttribute.accesskey    "E">
+<!ENTITY inspectorEditAttribute.label		"属性を編集">
+<!ENTITY inspectorEditAttribute.accesskey	"E">
 
 <!-- LOCALIZATION NOTE (inspectorRemoveAttribute.label): This is the label shown in
      the inspector contextual-menu for the item that lets users delete attribute
      from current node -->
-<!ENTITY inspectorRemoveAttribute.label        "属性を削除">
-<!ENTITY inspectorRemoveAttribute.accesskey    "R">
+<!ENTITY inspectorRemoveAttribute.label		"属性を削除">
+<!ENTITY inspectorRemoveAttribute.accesskey	"R">
 
-<!ENTITY inspector.selectButton.tooltip     "マウスで要素を選択">
+<!ENTITY inspector.selectButton.tooltip		"マウスで要素を選択">
 
 <!-- LOCALIZATION NOTE (inspectorSearchHTML.label2): This is the label shown as
      the placeholder in inspector search box -->
-<!ENTITY inspectorSearchHTML.label2         "CSS セレクタで検索">
-<!ENTITY inspectorSearchHTML.key            "F">
+<!ENTITY inspectorSearchHTML.label2		"CSS セレクタで検索">
+<!ENTITY inspectorSearchHTML.key		"F">
 
 <!-- LOCALIZATION NOTE (inspectorSearchHTML.label3): This is the label that will
      be shown as the placeholder in the future, once the inspector search box
      supports the full text HTML search in Bug 835896. -->
-<!ENTITY inspectorSearchHTML.label3 "HTML を検索">
+<!ENTITY inspectorSearchHTML.label3		"HTML を検索">
 
 <!-- LOCALIZATION NOTE (inspectorCopyImageDataUri.label): This is the label
      shown in the inspector contextual-menu for the item that lets users copy
      the URL embedding the image data encoded in Base 64 (what we name
      here Image Data URL). For more information:
      https://developer.mozilla.org/en-US/docs/Web/HTTP/data_URIs -->
-<!ENTITY inspectorCopyImageDataUri.label       "画像のデータ URI をコピー">
+<!ENTITY inspectorCopyImageDataUri.label	"画像のデータ URI をコピー">
 
 <!-- LOCALIZATION NOTE (inspectorShowDOMProperties.label): This is the label
      shown in the inspector contextual-menu for the item that lets users see
      the DOM properties of the current node. When triggered, this item
      opens the split Console and displays the properties in its side panel. -->
-<!ENTITY inspectorShowDOMProperties.label       "DOM プロパティを表示">
+<!ENTITY inspectorShowDOMProperties.label	"DOM プロパティを表示">
 
 <!-- LOCALIZATION NOTE (inspectorUseInConsole.label): This is the label
      shown in the inspector contextual-menu for the item that outputs a
      variable for the current node to the console. When triggered,
      this item opens the split Console. -->
-<!ENTITY inspectorUseInConsole.label       "コンソールで使う">
+<!ENTITY inspectorUseInConsole.label		"コンソールで使う">
 
 <!-- LOCALIZATION NOTE (inspectorExpandNode.label): This is the label
      shown in the inspector contextual-menu for recursively expanding
      mark-up elements -->
-<!ENTITY inspectorExpandNode.label       "すべて展開">
+<!ENTITY inspectorExpandNode.label		"すべて展開">
 
 <!-- LOCALIZATION NOTE (inspectorCollapseNode.label): This is the label
      shown in the inspector contextual-menu for recursively collapsing
      mark-up elements -->
-<!ENTITY inspectorCollapseNode.label       "折りたたむ">
+<!ENTITY inspectorCollapseNode.label		"折りたたむ">
 
 <!-- LOCALIZATION NOTE (inspectorScreenshotNode.label): This is the label
      shown in the inspector contextual-menu for the item that lets users take
      a screenshot of the currently selected node. -->
-<!ENTITY inspectorScreenshotNode.label       "ノードのスクリーンショットを撮影">
+<!ENTITY inspectorScreenshotNode.label		"ノードのスクリーンショットを撮影">
 
 <!-- LOCALIZATION NOTE (inspectorDuplicateNode.label): This is the label
      shown in the inspector contextual-menu for the item that lets users
      duplicate the currently selected node. -->
-<!ENTITY inspectorDuplicateNode.label       "ノードを複製">
+<!ENTITY inspectorDuplicateNode.label		"ノードを複製">
+
+<!-- LOCALIZATION NOTE (inspectorAddNode.label): This is the label shown in
+     the inspector toolbar for the button that lets users add elements to the
+     DOM (as children of the currently selected element). -->
+<!ENTITY inspectorAddNode.label			"新しいノードを作成">
+<!ENTITY inspectorAddNode.accesskey		"C">
--- a/devtools/client/jsonview.properties
+++ b/devtools/client/jsonview.properties
@@ -24,16 +24,19 @@ jsonViewer.responseHeaders	=応答ヘッダ
 jsonViewer.requestHeaders	=要求ヘッダ
 
 # LOCALIZATION NOTE (jsonViewer.Save): Label for save command
 jsonViewer.Save			=保存
 
 # LOCALIZATION NOTE (jsonViewer.Copy): Label for clipboard copy command
 jsonViewer.Copy			=コピー
 
+# LOCALIZATION NOTE (jsonViewer.ExpandAll): Label for expanding all nodes
+jsonViewer.ExpandAll		=すべて展開
+
 # LOCALIZATION NOTE (jsonViewer.PrettyPrint): Label for JSON
 # pretty print action button.
 jsonViewer.PrettyPrint		=整形
 
 # LOCALIZATION NOTE (jsonViewer.reps.more): Label used in arrays
 # that have more items than displayed.
 jsonViewer.reps.more		=次...
 
--- a/devtools/client/layoutview.dtd
+++ b/devtools/client/layoutview.dtd
@@ -11,13 +11,18 @@
   - 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 (*.tooltip): These tooltips are not regular tooltips.
   -  The text appears on the bottom right corner of the layout view when
   -  the corresponding box is hovered. -->
 
-<!ENTITY layoutViewTitle        "ボックスモデル">
-<!ENTITY margin.tooltip         "margin">
-<!ENTITY border.tooltip         "border">
-<!ENTITY padding.tooltip        "padding">
-<!ENTITY content.tooltip        "要素の内容">
+<!ENTITY layoutViewTitle		"ボックスモデル">
+<!ENTITY margin.tooltip			"margin">
+<!ENTITY border.tooltip			"border">
+<!ENTITY padding.tooltip		"padding">
+<!ENTITY content.tooltip		"要素の内容">
+
+<!-- LOCALIZATION NOTE: This label is displayed as a tooltip that appears when
+  -  hovering over the button that allows users to edit the position of an
+  -  element in the page. -->
+<!ENTITY geometry.button.tooltip	"位置を編集">
--- a/devtools/client/markers.properties
+++ b/devtools/client/markers.properties
@@ -40,49 +40,53 @@ marker.label.unknown				=不明
 # reasons that can be translated.
 marker.label.javascript.scriptElement		=script タグ
 marker.label.javascript.promiseCallback		=Promise コールバック
 marker.label.javascript.promiseInit		=Promise 初期化
 marker.label.javascript.workerRunnable		=Worker
 marker.label.javascript.jsURI			=JavaScript URI
 marker.label.javascript.eventHandler		=イベントハンドラ
 
-# LOCALIZATION NOTE (marker.fieldFormat):
-# Some timeline markers come with details, like a size, a name, a js function.
-# %1$S is replaced with one of the above label (marker.label.*) and %2$S
-# with the details. For examples: Paint (200x100), or console.time (FOO)
-marker.fieldFormat				=%1$S (%2$S)
-
 # LOCALIZATION NOTE (marker.field.*):
 # Strings used in the waterfall sidebar as property names.
 
 # General marker fields
 marker.field.start				=開始:
 marker.field.end				=終了:
 marker.field.duration				=所要時間:
+
+# General "reason" for a marker (JavaScript, Garbage Collection)
+marker.field.causeName				=発生源:
+# General "type" for a marker (Cycle Collection, Garbage Collection)
+marker.field.type				=種別:
+# General "label" for a marker (user defined)
+marker.field.label				=ラベル:
+
 # Field names for stack values
 marker.field.stack				=スタック:
 marker.field.startStack				=スタック開始:
 marker.field.endStack				=スタック終了:
+
 # %S is the "Async Cause" of a marker, and this signifies that the cause
 # was an asynchronous one in a displayed stack.
 marker.field.asyncStack				=(非同期: %S)
+
 # For console.time markers
 marker.field.consoleTimerName			=タイマー名:
+
 # For DOM Event markers
 marker.field.DOMEventType			=イベント種別:
 marker.field.DOMEventPhase			=フェーズ:
+
 # Non-incremental cause for a Garbage Collection marker
 marker.field.nonIncrementalCause		=非インクリメンタル GC の発生源:
+
 # For "Recalculate Style" markers
 marker.field.restyleHint			=CSS 再計算のヒント:
-# General "reason" for a marker (JavaScript, Garbage Collection)
-marker.field.causeName				=発生源:
-# General "type" for a marker (Cycle Collection, Garbage Collection)
-marker.field.type				=種別:
+
 # The type of operation performed by a Worker.
 marker.worker.serializeDataOffMainThread	=Worker でデータをシリアライズ
 marker.worker.serializeDataOnMainThread		=メインスレッドでデータをシリアライズ
 marker.worker.deserializeDataOffMainThread	=Worker でデータをデシリアライズ
 marker.worker.deserializeDataOnMainThread	=メインスレッドでデータをデシリアライズ
 # The type of operation performed by a MessagePort
 marker.messagePort.serializeData		=データをシリアライズ
 marker.messagePort.deserializeData		=データをデシリアライズ
--- a/devtools/client/memory.properties
+++ b/devtools/client/memory.properties
@@ -22,65 +22,87 @@ memory.panelLabel			=メモリパネル
 # LOCALIZATION NOTE (memory.tooltip): This string is displayed in the tooltip of
 # the tab when the memory tool is displayed inside the developer tools window.
 memory.tooltip				=メモリ
 
 # LOCALIZATION NOTE (snapshot.io.save): The label for the link that saves a
 # snapshot to disk.
 snapshot.io.save			=保存
 
+# LOCALIZATION NOTE (snapshot.io.delete): The label for the link that deletes
+# a snapshot
+snapshot.io.delete			=削除
+
 # LOCALIZATION NOTE (snapshot.io.save.window): The title for the window
 # displayed when saving a snapshot to disk.
-snapshot.io.save.window			=ヒープスナップショットを保存
+snapshot.io.save.window			=スナップショットを保存
 
 # LOCALIZATION NOTE (snapshot.io.import.window): The title for the window
 # displayed when importing a snapshot form disk.
-snapshot.io.import.window		=ヒープスナップショットをインポート
+snapshot.io.import.window		=スナップショットをインポート
 
 # LOCALIZATION NOTE (snapshot.io.filter): The title for the filter used to
 # filter file types (*.fxsnapshot)
-snapshot.io.filter			=Firefox ヒープスナップショット
+snapshot.io.filter			=Firefox スナップショット
 
 # LOCALIZATION NOTE (aggregate.mb): The label annotating the number of bytes (in
 # megabytes) in a snapshot. %S represents the value, rounded to 2 decimal
 # points.
 aggregate.mb				=%S MB
 
 # LOCALIZATION NOTE (snapshot-title.loading): The title for a snapshot before
 # it has a creation time to display.
 snapshot-title.loading			=処理中...
 
 # LOCALIZATION NOTE (checkbox.recordAllocationStacks): The label describing the
-# boolean checkbox whether or not to record allocation stacks.
-checkbox.recordAllocationStacks		=割り当てスタックを記録
+# boolean checkbox whether or not to record call stacks.
+checkbox.recordAllocationStacks		=コールスタックを記録
 
 # LOCALIZATION NOTE (checkbox.recordAllocationStacks.tooltip): The tooltip for
-# the label describing the boolean checkbox whether or not to record allocation
+# the label describing the boolean checkbox whether or not to record call
 # stacks.
-checkbox.recordAllocationStacks.tooltip	=割り当てスタックの記録を切り替えます。次回から、割り当てスタックの記録が有効な場合に作成されたヒープスナップショットに、ラベルを付けたりグループ化できるようになります。割り当てスタックの記録は性能上のオーバーヘッドがあります。
+checkbox.recordAllocationStacks.tooltip	=オブジェクトが割り当てられた時のコールスタックの記録を切り替えます。後続のスナップショットにラベル付けやグループ化ができるようになりますが、このオプションを切り替えた後に作成されたオブジェクトにしかできません。コールスタックの記録は性能上のオーバーヘッドが生じます。
 
 # LOCALIZATION NOTE (toolbar.displayBy): The label describing the select menu
 # options of the display options.
 toolbar.displayBy				=グループ化:
 
 # LOCALIZATION NOTE (toolbar.displayBy.tooltip): The tooltip for the label
 # describing the select menu options of the display options.
-toolbar.displayBy.tooltip			=グループ化する方法を変更します
+toolbar.displayBy.tooltip			=グループ化の方法を変更します
+
+# LOCALIZATION NOTE (toolbar.pop-view): The text in the button to go back to the
+# previous view.
+## "\u2190" is "←"
+toolbar.pop-view				=\u2190
+
+# LOCALIZATION NOTE (toolbar.pop-view.label): The text for the label for the
+# button to go back to the previous view.
+toolbar.pop-view.label				=総計へ戻ります
+
+# LOCALIZATION NOTE (toolbar.viewing-individuals): The text letting the user
+# know that they are viewing individual nodes from a census group.
+## "\u2042" is "⁂"
+toolbar.viewing-individuals			=\u2042 グループ内を個別に表示
 
 # LOCALIZATION NOTE (censusDisplays.coarseType.tooltip): The tooltip for the
 # "coarse type" display option.
 censusDisplays.coarseType.tooltip		=型でグループ化します
 
 # LOCALIZATION NOTE (censusDisplays.allocationStack.tooltip): The tooltip for
-# the "allocation stack" display option.
+# the "call stack" display option.
 censusDisplays.allocationStack.tooltip		=オブジェクトの割り当て時に記録された JavaScript スタックでグループ化します
 
 # LOCALIZATION NOTE (censusDisplays.invertedAllocationStack.tooltip): The
-# tooltip for the "inverted allocation stack" display option.
-censusDisplays.invertedAllocationStack.tooltip	=オブジェクトの割り当て時に記録された逆転 JavaScript コールスタックでグループ化します
+# tooltip for the "inverted call stack" display option.
+censusDisplays.invertedAllocationStack.tooltip	=オブジェクトの作成時に記録された逆転 JavaScript コールスタックでグループ化します
+
+# LOCALIZATION NOTE (censusDisplays.treeMap.tooltip): The tooltip for the
+# "tree map" display option.
+censusDisplays.treeMap.tooltip			=メモリ使用を視覚化します: 大きなブロックはメモリ使用の多くを占めています
 
 # LOCALIZATION NOTE (censusDisplays.objectClass.tooltip): The tooltip for the
 # "object class" display option.
 censusDisplays.objectClass.tooltip		=JavaScript オブジェクト [[クラス]] 名でグループ化します
 
 # LOCALIZATION NOTE (censusDisplays.internalType.tooltip): The tooltip for the
 # "internal type" display option.
 censusDisplays.internalType.tooltip		=内部 C++ 型でグループ化します
@@ -93,46 +115,58 @@ toolbar.labelBy					=ラベル:
 # select menu options of the label options.
 toolbar.labelBy.tooltip				=グループ化するラベルを変更します
 
 # LOCALIZATION NOTE (dominatorTreeDisplays.coarseType.tooltip): The tooltip for
 # the "coarse type" dominator tree display option.
 dominatorTreeDisplays.coarseType.tooltip	=大まかなカテゴリに一致するオブジェクトにラベル付けします
 
 # LOCALIZATION NOTE (dominatorTreeDisplays.allocationStack.tooltip): The
-# tooltip for the "allocation stack" dominator tree display option.
+# tooltip for the "call stack" dominator tree display option.
 dominatorTreeDisplays.allocationStack.tooltip	=割り当てられたときに記録された JavaScript スタックでオブジェクトにラベル付けします
 
 # LOCALIZATION NOTE (dominatorTreeDisplays.internalType.tooltip): The
 # tooltip for the "internal type" dominator tree display option.
 dominatorTreeDisplays.internalType.tooltip	=内部 C++ 型名でオブジェクトにラベル付けします
 
+# LOCALIZATION NOTE (treeMapDisplays.coarseType.tooltip): The tooltip for
+# the "coarse type" tree map display option.
+treeMapDisplays.coarseType.tooltip		=オブジェクトに相応しい大まかなカテゴリでラベル付けします
+
 # LOCALIZATION NOTE (toolbar.view): The label for the view selector in the
 # toolbar.
 toolbar.view				=表示:
 
 # LOCALIZATION NOTE (toolbar.view.tooltip): The tooltip for the label for the
 # view selector in the toolbar.
-toolbar.view.tooltip			=ヒープスナップショットの表示を変更します
+toolbar.view.tooltip			=スナップショットの表示を変更します
 
 # LOCALIZATION NOTE (toolbar.view.census): The label for the census view option
 # in the toolbar.
 toolbar.view.census			=総計
 
 # LOCALIZATION NOTE (toolbar.view.census.tooltip): The tooltip for the label for
 # the census view option in the toolbar.
-toolbar.view.census.tooltip		=収集オブジェクトをグループ化したヒープスナップショットの内容の概要を表示します
+toolbar.view.census.tooltip		=収集オブジェクトをグループ化したスナップショットの内容の概要を表示します
 
 # LOCALIZATION NOTE (toolbar.view.dominators): The label for the dominators view
 # option in the toolbar.
 toolbar.view.dominators			=ドミネータ
 
 # LOCALIZATION NOTE (toolbar.view.dominators.tooltip): The tooltip for the label
 # for the dominators view option in the toolbar.
-toolbar.view.dominators.tooltip		=ドミネータツリーを表示して、ヒープスナップショット内で最大の構造体を浮かび上がらせます
+toolbar.view.dominators.tooltip		=ドミネータツリーを表示してスナップショット内で最大の構造体を表面化させます
+
+# LOCALIZATION NOTE (toolbar.view.treemap): The label for the tree map option
+# in the toolbar.
+toolbar.view.treemap			=ツリーマップ
+
+# LOCALIZATION NOTE (toolbar.view.treemap.tooltip): The tooltip for the label for
+# the tree map view option in the toolbar.
+toolbar.view.treemap.tooltip		=メモリ使用を視覚化します: 大きなブロックはメモリ使用の多くを占めています
 
 # LOCALIZATION NOTE (take-snapshot): The label describing the button that
 # initiates taking a snapshot, either as the main label, or a tooltip.
 take-snapshot				=スナップショットを採取
 
 # LOCALIZATION NOTE (import-snapshot): The label describing the button that
 # initiates importing a snapshot.
 import-snapshot				=インポート...
@@ -142,32 +176,36 @@ import-snapshot				=インポート...
 clear-snapshots.tooltip			=スナップショットをすべて削除します
 
 # LOCALIZATION NOTE (diff-snapshots.tooltip): The tooltip for the button that
 # initiates selecting two snapshots to diff with each other.
 diff-snapshots.tooltip			=スナップショットを比較します
 
 # LOCALIZATION NOTE (filter.placeholder): The placeholder text used for the
 # memory tool's filter search box.
-filter.placeholder			=フィルタ
+filter.placeholder			=絞り込み
 
 # LOCALIZATION NOTE (filter.tooltip): The tooltip text used for the memory
 # tool's filter search box.
-filter.tooltip				=ヒープスナップショットの内容を絞り込みます
+filter.tooltip				=スナップショットの内容を絞り込みます
+
+# LOCALIZATION NOTE (tree-item.view-individuals.tooltip): The tooltip for the
+# button to view individuals in this group.
+tree-item.view-individuals.tooltip	=このグループ内の個別のノードと保持するパスを表示します
 
 # LOCALIZATION NOTE (tree-item.load-more): The label for the links to fetch the
 # lazily loaded sub trees in the dominator tree view.
 tree-item.load-more			=続きを取得...
 
 # LOCALIZATION NOTE (tree-item.rootlist): The label for the root of the
 # dominator tree.
 tree-item.rootlist			=GC ルート
 
 # LOCALIZATION NOTE (tree-item.nostack): The label describing the row in the heap tree
-# that represents a row broken down by allocation stack when no stack was available.
+# that represents a row broken down by call stack when no stack was available.
 tree-item.nostack			=(有効なスタックはありません)
 
 # LOCALIZATION NOTE (tree-item.nofilename): The label describing the row in the
 # heap tree that represents a row broken down by filename when no filename was
 # available.
 tree-item.nofilename			=(有効なファイル名はありません)
 
 # LOCALIZATION NOTE (tree-item.root): The label describing the row in the heap tree
@@ -219,37 +257,37 @@ diffing.state.selecting			=比較する 2 つのスナップショットを選択
 
 # LOCALIZATION NOTE (diffing.state.selecting.full): The label describing the
 # diffing state SELECTING, used in the main view when selecting snapshots to
 # diff.
 diffing.state.selecting.full		=比較する 2 つのスナップショットを選択してください
 
 # LOCALIZATION NOTE (dominatorTree.state.computing): The label describing the
 # dominator tree state COMPUTING.
-dominatorTree.state.computing		=ドミネータの計算中...
+dominatorTree.state.computing		=ドミネータレポートの生成中...
 
 # LOCALIZATION NOTE (dominatorTree.state.computing): The label describing the
 # dominator tree state COMPUTING, used in the dominator tree view.
-dominatorTree.state.computing.full	=ドミネータツリーを計算しています...
+dominatorTree.state.computing.full	=ドミネータツリーを生成しています...
 
 # LOCALIZATION NOTE (dominatorTree.state.fetching): The label describing the
 # dominator tree state FETCHING.
 dominatorTree.state.fetching		=サイズの計算中...
 
 # LOCALIZATION NOTE (dominatorTree.state.fetching): The label describing the
 # dominator tree state FETCHING, used in the dominator tree view.
-dominatorTree.state.fetching.full	=保持サイズを計算しています...
+dominatorTree.state.fetching.full	=ドミネータの保持サイズを計算しています...
 
 # LOCALIZATION NOTE (dominatorTree.state.incrementalFetching): The label
 # describing the dominator tree state INCREMENTAL_FETCHING.
 dominatorTree.state.incrementalFetching	=取得中...
 
 # LOCALIZATION NOTE (dominatorTree.state.incrementalFetching): The label describing the
 # dominator tree state INCREMENTAL_FETCHING, used in the dominator tree view.
-dominatorTree.state.incrementalFetching.full	=サブツリーを取得しています...
+dominatorTree.state.incrementalFetching.full	=続きを取得しています...
 
 # LOCALIZATION NOTE (dominatorTree.state.error): The label describing the
 # dominator tree state ERROR.
 dominatorTree.state.error		=エラー
 
 # LOCALIZATION NOTE (dominatorTree.state.error): The label describing the
 # dominator tree state ERROR, used in the dominator tree view.
 dominatorTree.state.error.full		=ドミネータツリーの処理中にエラーが発生しました。
@@ -264,47 +302,91 @@ snapshot.state.importing.full		=インポートしています...
 
 # LOCALIZATION NOTE (snapshot.state.reading.full): The label describing the
 # snapshot state READING, and SAVED, due to these states being combined
 # visually, used in the main heap view.
 snapshot.state.reading.full		=スナップショットを読み込んでいます...
 
 # LOCALIZATION NOTE (snapshot.state.saving-census.full): The label describing
 # the snapshot state SAVING, used in the main heap view.
-snapshot.state.saving-census.full	=集計結果を保存しています...
+snapshot.state.saving-census.full	=総計レポートを生成しています...
+
+# LOCALIZATION NOTE (snapshot.state.saving-tree-map.full): The label describing
+# the snapshot state SAVING, used in the main heap view.
+snapshot.state.saving-tree-map.full	=ツリーマップを保存しています...
 
 # LOCALIZATION NOTE (snapshot.state.error.full): The label describing the
 # snapshot state ERROR, used in the main heap view.
 snapshot.state.error.full		=スナップショットの処理中にエラーが発生しました。
 
+# LOCALIZATION NOTE (individuals.state.error): The short message displayed when
+# there is an error fetching individuals from a group.
+individuals.state.error			=エラー
+
+# LOCALIZATION NOTE (individuals.state.error.full): The longer message displayed
+# when there is an error fetching individuals from a group.
+individuals.state.error.full		=グループ内の個別のノードの取得中にエラーが発生しました
+
+# LOCALIZATION NOTE (individuals.state.fetching): The short message displayed
+# while fetching individuals.
+individuals.state.fetching		=取得中...
+
+# LOCALIZATION NOTE (individuals.state.fetching.full): The longer message
+# displayed while fetching individuals.
+individuals.state.fetching.full		=グループ内の個別のノードを取得しています...
+
+# LOCALIZATION NOTE (individuals.field.node): The header label for an individual
+# node.
+individuals.field.node			=ノード
+
+# LOCALIZATION NOTE (individuals.field.node.tooltip): The tooltip for the header
+# label for an individual node.
+individuals.field.node.tooltip		=スナップショット内の個別のノード
+
 # LOCALIZATION NOTE (snapshot.state.saving): The label describing the snapshot
 # state SAVING, used in the snapshot list view
 snapshot.state.saving			=スナップショットの保存中...
 
 # LOCALIZATION NOTE (snapshot.state.importing): The label describing the
 # snapshot state IMPORTING, used in the snapshot list view
 snapshot.state.importing		=スナップショットのインポート中...
 
 # LOCALIZATION NOTE (snapshot.state.reading): The label describing the snapshot
 # state READING, and SAVED, due to these states being combined visually, used in
 # the snapshot list view.
 snapshot.state.reading			=スナップショットの読み込み中...
 
 # LOCALIZATION NOTE (snapshot.state.saving-census): The label describing the
 # snapshot state SAVING, used in snapshot list view.
-snapshot.state.saving-census		=集計結果の保存中...
+snapshot.state.saving-census		=レポートの保存中...
+
+# LOCALIZATION NOTE (snapshot.state.saving-census): The label describing the
+# snapshot state SAVING, used in snapshot list view.
+snapshot.state.saving-tree-map		=ツリーマップの保存中...
 
 # LOCALIZATION NOTE (snapshot.state.error): The label describing the snapshot
 # state ERROR, used in the snapshot list view.
 snapshot.state.error			=エラー
 
+# LOCALIZATION NOTE (heapview.no-difference): Message displayed when there is no
+# difference between two snapshots.
+heapview.no-difference			=ベースラインとの比較で違いがありません。
+
+# LOCALIZATION NOTE (heapview.none-match): Message displayed when there are no
+# matches when filtering.
+heapview.none-match			=一致なし。
+
+# LOCALIZATION NOTE (heapview.none-match): Message displayed when there report
+# is empty.
+heapview.empty				=レポートなし。
+
 # LOCALIZATION NOTE (heapview.noAllocationStacks): The message displayed to
-# users when selecting a display by "allocation stack" but no allocation stacks
+# users when selecting a display by "call stack" but no call stacks
 # were recorded in the heap snapshot.
-heapview.noAllocationStacks		=割り当てスタックがありませんでした。ヒープのスナップショットを採取する前に割り当てスタックを記録してください。
+heapview.noAllocationStacks		=コールスタックが見つかりませんでした。スナップショットを採取する前にコールスタックを記録してください。
 
 # LOCALIZATION NOTE (heapview.field.retainedSize): The name of the column in the
 # dominator tree view for retained byte sizes.
 heapview.field.retainedSize		=保持サイズ (バイト)
 
 # LOCALIZATION NOTE (heapview.field.retainedSize.tooltip): The tooltip for the
 # column header in the dominator tree view for retained byte sizes.
 heapview.field.retainedSize.tooltip	=オブジェクト自身のサイズの合計です。このオブジェクトに関連する他の生存オブジェクトすべてのサイズを含みます
@@ -314,61 +396,65 @@ heapview.field.retainedSize.tooltip	=オブジェクト自身のサイズの合計です。このオブジェクトに関連する他の生存オブジェクトすべてのサイズを含みます
 heapview.field.shallowSize		=シャローサイズ (バイト)
 
 # LOCALIZATION NOTE (heapview.field.shallowSize.tooltip): The tooltip for the
 # column header in the dominator tree view for shallow byte sizes.
 heapview.field.shallowSize.tooltip	=オブジェクト自身のサイズです
 
 # LOCALIZATION NOTE (dominatortree.field.label): The name of the column in the
 # dominator tree for an object's label.
-dominatortree.field.label		=ラベル
+dominatortree.field.label		=ドミネータ
 
 # LOCALIZATION NOTE (dominatortree.field.label.tooltip): The tooltip for the column
 # header in the dominator tree view for an object's label.
-dominatortree.field.label.tooltip	=ヒープ内のオブジェクトのラベルです
+dominatortree.field.label.tooltip	=メモリ内のオブジェクトのラベルです
 
 # LOCALIZATION NOTE (heapview.field.bytes): The name of the column in the heap
 # view for bytes.
 heapview.field.bytes			=バイト
 
 # LOCALIZATION NOTE (heapview.field.bytes.tooltip): The tooltip for the column
 # header in the heap view for bytes.
-heapview.field.bytes.tooltip		=このグループが消費したバイト数です。サブグループは含みません
+heapview.field.bytes.tooltip		=このグループに占有されているバイト数です。サブグループは含みません
 
 # LOCALIZATION NOTE (heapview.field.count): The name of the column in the heap
 # view for count.
 heapview.field.count			=個数
 
 # LOCALIZATION NOTE (heapview.field.count.tooltip): The tooltip for the column
 # header in the heap view for count.
 heapview.field.count.tooltip		=このグループの到達可能オブジェクトの数です。サブグループは含みません
 
 # LOCALIZATION NOTE (heapview.field.totalbytes): The name of the column in the
 # heap view for total bytes.
 heapview.field.totalbytes		=合計バイト
 
 # LOCALIZATION NOTE (heapview.field.totalbytes.tooltip): The tooltip for the
 # column header in the heap view for total bytes.
-heapview.field.totalbytes.tooltip	=このグループが消費したバイト数です。サブグループを含みます
+heapview.field.totalbytes.tooltip	=このグループに占有されているバイト数です。サブグループを含みます
 
 # LOCALIZATION NOTE (heapview.field.totalcount): The name of the column in the
 # heap view for total count.
 heapview.field.totalcount		=合計数
 
 # LOCALIZATION NOTE (heapview.field.totalcount.tooltip): The tooltip for the
 # column header in the heap view for total count.
 heapview.field.totalcount.tooltip	=このグループの到達可能オブジェクトの数です。サブグループを含みます
 
 # LOCALIZATION NOTE (heapview.field.name): The name of the column in the heap
 # view for name.
-heapview.field.name			=名前
+heapview.field.name			=グループ
 
 # LOCALIZATION NOTE (heapview.field.name.tooltip): The tooltip for the column
 # header in the heap view for name.
 heapview.field.name.tooltip		=このグループの名前です
 
 # LOCALIZATION NOTE (shortest-paths.header): The header label for the shortest
 # paths pane.
-shortest-paths.header			=GC ルートからの保持パス
+shortest-paths.header			=保持パス (Garbage Collector ルートから)
 
 # LOCALIZATION NOTE (shortest-paths.select-node): The message displayed in the
 # shortest paths pane when a node is not yet selected.
-shortest-paths.select-node		=保持パスを表示するノードを選択してください
+shortest-paths.select-node		=保持パスを表示するアイテムを選択してください
+
+# LOCALIZATION NOTE (tree-map.node-count): The label for the count value of a
+# node in the tree map
+tree-map.node-count			=ノード数
new file mode 100644
--- /dev/null
+++ b/devtools/client/menus.properties
@@ -0,0 +1,67 @@
+# 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/.
+
+devToolsCmd.key				=VK_F12
+devToolsCmd.keytext			=F12
+
+devtoolsServiceWorkers.label		=Service Worker
+devtoolsServiceWorkers.accesskey	=k
+
+devtoolsConnect.label			=接続...
+devtoolsConnect.accesskey		=C
+
+browserConsoleCmd.label			=ブラウザコンソール
+browserConsoleCmd.accesskey		=B
+browserConsoleCmd.key			=j
+
+responsiveDesignMode.label		=レスポンシブデザインモード
+responsiveDesignMode.accesskey		=R
+responsiveDesignMode.key		=M
+
+eyedropper.label			=スポイト
+eyedropper.accesskey			=Y
+
+# 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".
+scratchpad.label			=スクラッチパッド
+scratchpad.accesskey			=s
+scratchpad.key				=VK_F4
+scratchpad.keytext			=F4
+
+# LOCALIZATION NOTE (browserToolboxMenu.label): This is the label for the
+# application menu item that opens the browser toolbox UI in the Tools menu.
+browserToolboxMenu.label		=ブラウザツールボックス
+browserToolboxMenu.accesskey		=e
+browserToolboxMenu.key			=i
+
+# LOCALIZATION NOTE (browserContentToolboxMenu.label): This is the label for the
+# application menu item that opens the browser content toolbox UI in the Tools menu.
+# This toolbox allows to debug the chrome of the content process in multiprocess builds.
+browserContentToolboxMenu.label		=ブラウザコンテンツツールボックス
+browserContentToolboxMenu.accesskey	=x
+
+devToolbarMenu.label			=開発ツールバー
+devToolbarMenu.accesskey		=v
+devToolbarMenu.key			=VK_F2
+devToolbarMenu.keytext			=F2
+
+webide.label				=WebIDE
+webide.accesskey			=W
+webide.key				=VK_F8
+webide.keytext				=F8
+
+devToolboxMenuItem.label		=開発ツールを表示
+devToolboxMenuItem.accesskey		=T
+devToolboxMenuItem.key			=I
+
+getMoreDevtoolsCmd.label		=その他のツールを入手
+getMoreDevtoolsCmd.accesskey		=M
--- a/devtools/client/netmonitor.dtd
+++ b/devtools/client/netmonitor.dtd
@@ -115,16 +115,20 @@
 <!-- LOCALIZATION NOTE (netmonitorUI.footer.filterMedia): This is the label displayed
   -  in the network details footer for the "Media" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterMedia  "メディア">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.footer.filterFlash): This is the label displayed
   -  in the network details footer for the "Flash" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterFlash  "Flash">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterWS): This is the label displayed
+  -  in the network details footer for the "WS" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterWS  "WS">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.footer.filterOther): This is the label displayed
   -  in the network details footer for the "Other" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterOther  "その他">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.footer.filterFreetext): This is the label displayed
   -  in the network details footer for the url filtering textbox. -->
 <!ENTITY netmonitorUI.footer.filterFreetext.label  "URL を絞り込み">
 <!ENTITY netmonitorUI.footer.filterFreetext.key  "F">
--- a/devtools/client/netmonitor.properties
+++ b/devtools/client/netmonitor.properties
@@ -64,31 +64,21 @@ netmonitor.security.disabled		=無効
 # LOCALIZATION NOTE (netmonitor.security.hostHeader):
 # This string is used as a header for section containing security information
 # related to the remote host. %S is replaced with the domain name of the remote
 # host. For example: Host example.com
 netmonitor.security.hostHeader		=ホスト %S:
 
 # LOCALIZATION NOTE (netmonitor.security.notAvailable):
 # This string is used to indicate that a certain piece of information is not
-# available to be displayd. For example a certificate that has no organization
+# available to be displayed. For example a certificate that has no organization
 # defined:
 #   Organization: <Not Available>
 netmonitor.security.notAvailable	=<利用不可>
 
-# LOCALIZATION NOTE (netmonitor.status.cached):
-# This string is used as tooltip text over the status icon when a request is
-# served from cached.
-netmonitor.status.cached		=キャッシュ
-
-# LOCALIZATION NOTE (netmonitor.status.serviceWorker):
-# This string is used as tooltip text over the status icon when a request is
-# served from a service worker.
-netmonitor.status.serviceWorker		=Service Worker
-
 # LOCALIZATION NOTE (collapseDetailsPane): This is the tooltip for the button
 # that collapses the network details pane in the UI.
 collapseDetailsPane	=要求の詳細を閉じる
 
 # LOCALIZATION NOTE (expandDetailsPane): This is the tooltip for the button
 # that expands the network details pane in the UI.
 expandDetailsPane	=要求の詳細を表示
 
@@ -263,8 +253,58 @@ charts.totalSeconds	=所要時間: #1 秒
 
 # LOCALIZATION NOTE (charts.totalCached): This is the label displayed
 # in the performance analysis view for total cached responses.
 charts.totalCached	=キャッシュ済み応答: %S
 
 # LOCALIZATION NOTE (charts.totalCount): This is the label displayed
 # in the performance analysis view for total requests.
 charts.totalCount	=すべての応答: %S
+
+# LOCALIZATION NOTE (netRequest.headers): A label used for Headers tab
+# This tab displays list of HTTP headers
+netRequest.headers			=ヘッダ
+
+# LOCALIZATION NOTE (netRequest.response): A label used for Response tab
+# This tab displays HTTP response body
+netRequest.response			=応答
+
+# LOCALIZATION NOTE (netRequest.rawData): A label used for a section
+# in Response tab. This section displays raw response body as it's
+# been received from the backend (debugger server)
+netRequest.rawData			=生データ
+
+# LOCALIZATION NOTE (netRequest.xml): A label used for a section
+# in Response tab. This section displays parsed XML response body.
+netRequest.xml				=XML
+
+# LOCALIZATION NOTE (netRequest.image): A label used for a section
+# in Response tab. This section displays images returned in response body.
+netRequest.image			=画像
+
+# LOCALIZATION NOTE (netRequest.sizeLimitMessage): A label used
+# in Response and Post tabs in case the body is bigger than given limit.
+# It allows the user to click and fetch more from the backend.
+# The {{link}} will be replace at run-time by an active link.
+# String with ID 'netRequest.sizeLimitMessageLink' will be used as text
+# for this link.
+netRequest.sizeLimitMessage		=サイズ制限に到達しました。{{link}}。
+netRequest.sizeLimitMessageLink		=続きを読み込む
+
+# LOCALIZATION NOTE (netRequest.responseBodyDiscarded): A label used
+# in Response tab if the response body is not available.
+netRequest.responseBodyDiscarded	=応答ボディは格納されていません。
+
+# LOCALIZATION NOTE (netRequest.requestBodyDiscarded): A label used
+# in Post tab if the post body is not available.
+netRequest.requestBodyDiscarded		=要求 POST ボディは格納されていません。
+
+# LOCALIZATION NOTE (netRequest.post): A label used for Post tab
+# This tab displays HTTP post body
+netRequest.post				=POST
+
+# LOCALIZATION NOTE (netRequest.cookies): A label used for Cookies tab
+# This tab displays request and response cookies.
+netRequest.cookies			=Cookie
+
+# LOCALIZATION NOTE (netRequest.params): A label used for URL parameters tab
+# This tab displays data parsed from URL query string.
+netRequest.params			=パラメータ
--- a/devtools/client/responsive.properties
+++ b/devtools/client/responsive.properties
@@ -6,14 +6,34 @@
 # available from the Web Developer sub-menu -> 'Responsive Design Mode'.
 #
 # 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 (responsive.editDeviceList): option displayed in the device
+# selector
+responsive.editDeviceList	=リストを編集...
+
+# LOCALIZATION NOTE (responsive.exit): tooltip text of the exit button.
+responsive.exit			=レスポンシブデザインモードを終了します
+
+# LOCALIZATION NOTE (responsive.done): button text in the device list modal
+responsive.done			=完了
+
+# LOCALIZATION NOTE (responsive.noDeviceSelected): placeholder text for the
+# device selector
+responsive.noDeviceSelected	=端末が選択されていません
+
 # LOCALIZATION NOTE  (responsive.title): the title displayed in the global
 # toolbar
-responsive.title	=レスポンシブデザインモード
+responsive.title		=レスポンシブデザインモード
+
+# LOCALIZATION NOTE  (responsive.screenshot): tooltip of the screenshot button.
+responsive.screenshot		=ビューポートのスクリーンショットを撮影します
 
-# LOCALIZATION NOTE (responsive.exit): tooltip text of the exit button.
-responsive.exit		=レスポンシブデザインモードを終了します
+# LOCALIZATION NOTE (responsive.screenshotGeneratedFilename): The auto generated
+# filename.
+# The first argument (%1$S) is the date string in yyyy-mm-dd format and the
+# second argument (%2$S) is the time string in HH.MM.SS format.
+responsive.screenshotGeneratedFilename	=Screen Shot %1$S at %2$S
--- a/devtools/client/responsiveUI.properties
+++ b/devtools/client/responsiveUI.properties
@@ -40,22 +40,22 @@ responsiveUI.removePreset		=プリセットを削除
 # current size of the page. For example: "400x600".
 responsiveUI.customResolution		=%S (指定値)
 
 # LOCALIZATION NOTE  (responsiveUI.namedResolution): label of custom items with a name
 # in the menulist of the toolbar.
 # For example: "320x480 (phone)".
 responsiveUI.namedResolution		=%S (%S)
 
-# LOCALIZATION NOTE  (responsiveUI.customNamePromptTitle): prompt title when asking
+# LOCALIZATION NOTE  (responsiveUI.customNamePromptTitle1): prompt title when asking
 # the user to specify a name for a new custom preset.
-responsiveUI.customNamePromptTitle	=レスポンシブデザインビュー
+responsiveUI.customNamePromptTitle1	=レスポンシブデザインモード
 
-# LOCALIZATION NOTE (responsiveUI.close): tooltip text of the close button.
-responsiveUI.close			=レスポンシブデザインビューを終了する
+# LOCALIZATION NOTE (responsiveUI.close1): tooltip text of the close button.
+responsiveUI.close1			=レスポンシブデザインモードを終了する
 
 # LOCALIZATION NOTE  (responsiveUI.customNamePromptMsg): prompt message when asking
 # the user to specify a name for a new custom preset.
 responsiveUI.customNamePromptMsg	=プリセット %Sx%S の名前を入力してください
 
 # LOCALIZATION NOTE (responsiveUI.resizer): tooltip showed when
 # overring the resizers.
 responsiveUI.resizerTooltip		=Shift キーで大まかに、Ctrl キーで精密にサイズを変更できます。
--- a/devtools/client/storage.dtd
+++ b/devtools/client/storage.dtd
@@ -1,8 +1,11 @@
 <!-- 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 : This file contains the Storage Inspector strings. -->
 
 <!-- LOCALIZATION NOTE : Placeholder for the searchbox that allows you to filter the table items. -->
-<!ENTITY searchBox.placeholder		"項目を絞り込み">
+<!ENTITY searchBox.placeholder			"項目を絞り込み">
+
+<!-- LOCALIZATION NOTE : Label of popup menu action to delete all storage items. -->
+<!ENTITY storage.popupMenu.deleteAllLabel	"すべて削除">
--- a/devtools/client/storage.properties
+++ b/devtools/client/storage.properties
@@ -6,112 +6,120 @@
 # LOCALIZATION NOTE 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  (storage.commandkey): This the key to use in
 # conjunction with shift to open the storage editor
-storage.commandkey			= VK_F9
+storage.commandkey			=VK_F9
 
 # LOCALIZATION NOTE (storage.accesskey): The access key used to open the storage
 # editor.
-storage.accesskey			= a
+storage.accesskey			=a
 
 # LOCALIZATION NOTE (storage.label):
 # This string is displayed as the label of the tab in the developer tools window
-storage.label				= ストレージ
+storage.label				=ストレージ
 
 # LOCALIZATION NOTE (storage.menuLabel):
 # This string is displayed in the Tools menu as a shortcut to open the devtools
 # with the Storage Inspector tab selected.
-storage.menuLabel			= ストレージインスペクタ
+storage.menuLabel			=ストレージインスペクタ
 
 # LOCALIZATION NOTE (storage.panelLabel):
 # This string is used as the aria-label for the iframe of the Storage Inspector
 # tool in developer tools toolbox.
-storage.panelLabel			= ストレージパネル
+storage.panelLabel			=ストレージパネル
 
 # LOCALIZATION NOTE (storage.tooltip3):
 # This string is displayed in the tooltip of the tab when the storage editor is
 # displayed inside the developer tools window.
 # A keyboard shortcut for Storage Inspector will be shown inside the brackets.
-storage.tooltip3			= ストレージインスペクタ (Cookie、ローカルストレージ ...) (%S)
+storage.tooltip3			=ストレージインスペクタ (Cookie、ローカルストレージ ...) (%S)
 
 # LOCALIZATION NOTE (tree.emptyText):
 # This string is displayed when the Storage Tree is empty. This can happen when
 # there are no websites on the current page (about:blank)
-tree.emptyText				= ホストがありません
+tree.emptyText				=ホストがありません
 
 # LOCALIZATION NOTE (table.emptyText):
 # This string is displayed when there are no rows in the Storage Table for the
 # selected host.
-table.emptyText				= 選択されたホストには表示できるデータがありません
+table.emptyText				=選択されたホストには表示できるデータがありません
 
 # LOCALIZATION NOTE (tree.labels.*):
 # These strings are the labels for Storage type groups present in the Storage
 # Tree, like cookies, local storage etc.
-tree.labels.cookies			= Cookie
-tree.labels.localStorage		= ローカルストレージ
-tree.labels.sessionStorage		= セッションストレージ
-tree.labels.indexedDB			= Indexed DB
-tree.labels.Cache			= キャッシュストレージ
+tree.labels.cookies			=Cookie
+tree.labels.localStorage		=ローカルストレージ
+tree.labels.sessionStorage		=セッションストレージ
+tree.labels.indexedDB			=Indexed DB
+tree.labels.Cache			=キャッシュストレージ
 
 # LOCALIZATION NOTE (table.headers.*.*):
 # These strings are the header names of the columns in the Storage Table for
 # each type of storage available through the Storage Tree to the side.
-table.headers.cookies.name		= 名前
-table.headers.cookies.path		= パス
-table.headers.cookies.host		= ドメイン
-table.headers.cookies.expires		= 有効期限
-table.headers.cookies.value		= 値
-table.headers.cookies.lastAccessed	= アクセス日時
-table.headers.cookies.creationTime	= 作成日時
+table.headers.cookies.name		=名前
+table.headers.cookies.path		=パス
+table.headers.cookies.host		=ドメイン
+table.headers.cookies.expires		=有効期限
+table.headers.cookies.value		=値
+table.headers.cookies.lastAccessed	=アクセス日時
+table.headers.cookies.creationTime	=作成日時
 # LOCALIZATION NOTE (table.headers.cookies.isHttpOnly):
 # This string is used in the header for the column which denotes whether a
 # cookie is HTTP only or not.
-table.headers.cookies.isHttpOnly	= isHttpOnly
+table.headers.cookies.isHttpOnly	=isHttpOnly
 # LOCALIZATION NOTE (table.headers.cookies.isSecure):
 # This string is used in the header for the column which denotes whether a
 # cookie can be accessed via a secure channel only or not.
-table.headers.cookies.isSecure		= isSecure
+table.headers.cookies.isSecure		=isSecure
 # LOCALIZATION NOTE (table.headers.cookies.isDomain):
 # This string is used in the header for the column which denotes whether a
 # cookie is a domain cookie only or not.
-table.headers.cookies.isDomain		= isDomain
+table.headers.cookies.isDomain		=isDomain
 
-table.headers.localStorage.name		= 名前
-table.headers.localStorage.value	= 値
+table.headers.localStorage.name		=名前
+table.headers.localStorage.value	=値
 
-table.headers.sessionStorage.name	= 名前
-table.headers.sessionStorage.value	= 値
+table.headers.sessionStorage.name	=名前
+table.headers.sessionStorage.value	=値
 
-table.headers.Cache.url			= URL
-table.headers.Cache.status		= 状態
+table.headers.Cache.url			=URL
+table.headers.Cache.status		=状態
 
-table.headers.indexedDB.name		= 名前
-table.headers.indexedDB.db		= データベース名
-table.headers.indexedDB.objectStore	= オブジェクトストア名
-table.headers.indexedDB.value		= 値
-table.headers.indexedDB.origin		= オリジン
-table.headers.indexedDB.version		= バージョン
-table.headers.indexedDB.objectStores	= オブジェクトストア
-table.headers.indexedDB.keyPath		= キー
-table.headers.indexedDB.autoIncrement	= 自動インクリメント
-table.headers.indexedDB.indexes		= インデックス
+table.headers.indexedDB.name		=名前
+table.headers.indexedDB.db		=データベース名
+table.headers.indexedDB.objectStore	=オブジェクトストア名
+table.headers.indexedDB.value		=値
+table.headers.indexedDB.origin		=オリジン
+table.headers.indexedDB.version		=バージョン
+table.headers.indexedDB.objectStores	=オブジェクトストア
+table.headers.indexedDB.keyPath		=キー
+table.headers.indexedDB.autoIncrement	=自動インクリメント
+table.headers.indexedDB.indexes		=インデックス
 
 # LOCALIZATION NOTE (label.expires.session):
 # This string is displayed in the expires column when the cookie is Session
 # Cookie
-label.expires.session			= セッション
+label.expires.session			=セッション
 
 # LOCALIZATION NOTE (storage.search.placeholder):
 # This is the placeholder text in the sidebar search box
-storage.search.placeholder		= 値を絞り込み
+storage.search.placeholder		=値を絞り込み
 
 # LOCALIZATION NOTE (storage.data.label):
 # This is the heading displayed over the item value in the sidebar
-storage.data.label			= データ
+storage.data.label			=データ
 
 # LOCALIZATION NOTE (storage.parsedValue.label):
 # This is the heading displayed over the item parsed value in the sidebar
-storage.parsedValue.label		= パース済みの値
+storage.parsedValue.label		=パース済みの値
+
+# LOCALIZATION NOTE (storage.popupMenu.deleteLabel):
+# Label of popup menu action to delete storage item.
+storage.popupMenu.deleteLabel		="%S" を削除
+
+# LOCALIZATION NOTE (storage.popupMenu.deleteAllLabel):
+# Label of popup menu action to delete all storage items.
+storage.popupMenu.deleteAllFromLabel	="%S" のすべてのアイテムを削除
--- a/devtools/client/toolbox.dtd
+++ b/devtools/client/toolbox.dtd
@@ -1,64 +1,64 @@
 <!-- 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 : FILE This file contains the Toolbox strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate key -->
 
-<!ENTITY closeCmd.key  "W">
-<!ENTITY toggleToolbox.key  "I">
-<!ENTITY toggleToolboxF12.keycode          "VK_F12">
-<!ENTITY toggleToolboxF12.keytext          "F12">
+<!ENTITY closeCmd.key			"W">
+<!ENTITY toggleToolbox.key		"I">
+<!ENTITY toggleToolboxF12.keycode	"VK_F12">
+<!ENTITY toggleToolboxF12.keytext	"F12">
 
-<!ENTITY toolboxCloseButton.tooltip    "開発ツールを閉じる">
-<!ENTITY toolboxOptionsButton.key      "O">
-<!ENTITY toolboxNextTool.key           "]">
-<!ENTITY toolboxPreviousTool.key       "[">
+<!ENTITY toolboxCloseButton.tooltip	"開発ツールを閉じる">
+<!ENTITY toolboxOptionsButton.key	"O">
+<!ENTITY toolboxNextTool.key		"]">
+<!ENTITY toolboxPreviousTool.key	"[">
 
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey, fullZoomEnlargeCmd.commandkey2,
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey,
 fullZoomReduceCmd.commandkey2, fullZoomResetCmd.commandkey,
 and fullZoomResetCmd.commandkey2 should all match the corresponding
 values from browser.dtd.  -->
-<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
-<!ENTITY fullZoomEnlargeCmd.commandkey2 "=">
-<!ENTITY fullZoomEnlargeCmd.commandkey3 "">
+<!ENTITY fullZoomEnlargeCmd.commandkey	"+">
+<!ENTITY fullZoomEnlargeCmd.commandkey2	"=">
+<!ENTITY fullZoomEnlargeCmd.commandkey3	"">
 
-<!ENTITY fullZoomReduceCmd.commandkey   "-">
-<!ENTITY fullZoomReduceCmd.commandkey2  "">
+<!ENTITY fullZoomReduceCmd.commandkey	"-">
+<!ENTITY fullZoomReduceCmd.commandkey2	"">
 
-<!ENTITY fullZoomResetCmd.commandkey    "0">
-<!ENTITY fullZoomResetCmd.commandkey2   "">
+<!ENTITY fullZoomResetCmd.commandkey	"0">
+<!ENTITY fullZoomResetCmd.commandkey2	"">
 
-<!ENTITY toolboxReload.key             "r">
+<!ENTITY toolboxReload.key		"r">
 <!-- This key is used with the accel+shift modifiers to minimize the toolbox -->
-<!ENTITY toolboxToggleMinimize.key     "U">
+<!ENTITY toolboxToggleMinimize.key	"U">
 
-<!ENTITY toolboxToggle.key             "d">
+<!ENTITY toolboxToggle.key		"d">
 <!-- LOCALIZATION NOTE (toolboxFramesButton): This is the label for
   -  the iframes menu list that appears only when the document has some.
   -  It allows you to switch the context of the whole toolbox. -->
-<!ENTITY toolboxFramesTooltip          "現在のドキュメントとして読み込む iframe を選択します">
+<!ENTITY toolboxFramesTooltip		"現在のドキュメントとして読み込む iframe を選択します">
 
 <!-- LOCALIZATION NOTE (toolboxNoAutoHideButton): This is the label for
   -  the button to force the popups/panels to stay visible on blur.
   -  This is only visible in the browser toolbox as it is meant for
   -  addon developers and Firefox contributors. -->
-<!ENTITY toolboxNoAutoHideTooltip      "ポップアップが自動的に隠れないようにします">
+<!ENTITY toolboxNoAutoHideTooltip	"ポップアップが自動的に隠れないようにします">
 
 <!-- LOCALIZATION NOTE (browserToolboxErrorMessage): This is the label
   -  shown next to error details when the Browser Toolbox is unable to open. -->
-<!ENTITY browserToolboxErrorMessage          "ブラウザツールボックスを開いた時のエラーを通知:">
+<!ENTITY browserToolboxErrorMessage	"ブラウザツールボックスを開いた時のエラーを通知:">
 
 <!-- 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 "詳細な設定">
+<!ENTITY options.context.advancedSettings	"詳細設定">
 
 <!-- LOCALIZATION NOTE (options.context.inspector): This is the label for
   -  the heading of the Inspector group in the options panel. -->
 <!ENTITY options.context.inspector		"調査">
 
 <!-- LOCALIZATION NOTE (options.showUserAgentStyles.label): This is the label
   -  for the checkbox option to show user agent styles in the Inspector
   -  panel. -->
@@ -100,135 +100,135 @@ values from browser.dtd.  -->
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.name): This is used in
   -  the 'Default color unit' dropdown list and is visible in the options panel.
   -  -->
 <!ENTITY options.defaultColorUnit.name		"色の名前">
 
 <!-- LOCALIZATION NOTE (options.context.triggersPageRefresh): This is the
   -  triggers page refresh footnote under the advanced settings group in the
   -  options panel and is used for settings that trigger page reload. -->
-<!ENTITY options.context.triggersPageRefresh  "* 現在のセッションのみ有効。再読み込みで復帰">
+<!ENTITY options.context.triggersPageRefresh	"* 現在のセッションのみ有効。再読み込みで復帰">
 
 <!-- LOCALIZATION NOTE (options.enableChrome.label4): This is the label for the
   -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
   -  boolean preference in about:config, in the options panel. -->
-<!ENTITY options.enableChrome.label5    "ブラウザとアドオンのデバッガを有効">
-<!ENTITY options.enableChrome.tooltip3  "さまざまな開発ツールがブラウザコンテキスト (ツール > Web 開発 > ブラウザツールボックス) とアドオンマネージャからのアドオンデバッグで使えるようになります">
+<!ENTITY options.enableChrome.label5		"ブラウザとアドオンのデバッガを有効">
+<!ENTITY options.enableChrome.tooltip3		"さまざまな開発ツールがブラウザコンテキスト (ツール > Web 開発 > ブラウザツールボックス) とアドオンマネージャからのアドオンデバッグで使えるようになります">
 
 <!-- LOCALIZATION NOTE (options.enableRemote.label3): This is the label for the
   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
   -  boolean preference in about:config, in the options panel. -->
-<!ENTITY options.enableRemote.label3    "リモートデバッガを有効">
-<!ENTITY options.enableRemote.tooltip   "Firefox OS などのリモート Firefox インスタンスを、開発ツールでデバッグできるようになります">
+<!ENTITY options.enableRemote.label3		"リモートデバッガを有効化">
+<!ENTITY options.enableRemote.tooltip		"Firefox OS などのリモート Firefox インスタンスを、開発ツールでデバッグできるようになります">
 
 <!-- LOCALIZATION NOTE (options.enableWorkers.label): This is the label for the
   -  checkbox that toggles worker debugging, i.e. devtools.debugger.workers
   -  boolean preference in about:config, in the options panel. -->
-<!ENTITY options.enableWorkers.label    "Worker のデバッグを有効 (開発ツール)">
-<!ENTITY options.enableWorkers.tooltip  "開発ツールで Worker のデバッグができるようになります">
+<!ENTITY options.enableWorkers.label		"Worker のデバッグを有効化 (開発ツール)">
+<!ENTITY options.enableWorkers.tooltip		"開発ツールで Worker のデバッグができるようになります">
 
 <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
   -  options.disableJavaScript.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles JavaScript on or off. -->
-<!ENTITY options.disableJavaScript.label     "JavaScript を無効 *">
-<!ENTITY options.disableJavaScript.tooltip   "このオプションを有効にすると、現在のタブの JavaScript を無効にします。タブまたはツールボックスを閉じると、この設定は元に戻されます。">
+<!ENTITY options.disableJavaScript.label	"JavaScript を無効化 *">
+<!ENTITY options.disableJavaScript.tooltip	"このオプションを有効にすると、現在のタブの JavaScript を無効にします。タブまたはツールボックスを閉じると、この設定は元に戻されます。">
 
 <!-- LOCALIZATION NOTE (options.disableCache.label,
   -  options.disableCache.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles the cache on or off. -->
-<!ENTITY options.disableCache.label2     "キャッシュを無効 (ツールボックスを開いているとき)">
-<!ENTITY options.disableCache.tooltip2   "このオプションを有効にすると、ツールボックスを開いているときはすべてのタブのキャッシュを無効にします。">
+<!ENTITY options.disableCache.label2		"キャッシュを無効化 (ツールボックスを開いているとき)">
+<!ENTITY options.disableCache.tooltip2		"このオプションを有効にすると、ツールボックスを開いているときはすべてのタブのキャッシュを無効にします。">
 
 <!-- LOCALIZATION NOTE (options.enableServiceWorkersHTTP.label,
   -  options.enableServiceWorkersHTTP.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles the service workers testing features on or off. This option enables service workers over HTTP. -->
-<!ENTITY options.enableServiceWorkersHTTP.label     "HTTP による Service Worker を有効 (ツールボックスを開いたとき)">
-<!ENTITY options.enableServiceWorkersHTTP.tooltip   "このオプションを有効にすると、ツールボックスを開いているすべてのタブで HTTP による Service Worker を有効にします。">
+<!ENTITY options.enableServiceWorkersHTTP.label	"HTTP による Service Worker を有効化 (ツールボックスを開いたとき)">
+<!ENTITY options.enableServiceWorkersHTTP.tooltip	"このオプションを有効にすると、ツールボックスを開いているすべてのタブで HTTP による Service Worker を有効にします。">
 
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
-<!ENTITY options.selectDefaultTools.label     "標準の Firefox 開発ツール">
+<!ENTITY options.selectDefaultTools.label	"標準の Firefox 開発ツール">
 
 <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
   -  added by add-ons. This heading is hidden when there is no developer tool
   -  installed by add-ons. -->
-<!ENTITY options.selectAdditionalTools.label  "開発ツールのアドオン">
+<!ENTITY options.selectAdditionalTools.label	"開発ツールのアドオン">
 
 <!-- LOCALIZATION NOTE (options.selectEnabledToolboxButtons.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tool buttons. -->
-<!ENTITY options.selectEnabledToolboxButtons.label     "利用可能なツールボックスのボタン">
+<!ENTITY options.selectEnabledToolboxButtons.label	"利用可能なツールボックスのボタン">
 
 <!-- LOCALIZATION NOTE (options.toolNotSupported.label): This is the label for
   -  the explanation of the * marker on a tool which is currently not supported
   -  for the target of the toolbox. -->
-<!ENTITY options.toolNotSupported.label  "* 現在のツールボックスには対応していません">
+<!ENTITY options.toolNotSupported.label		"* 現在のツールボックスには対応していません">
 
 <!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label2): This is the label for
   -  the heading of the radiobox corresponding to the theme of the developer
   -  tools. -->
-<!ENTITY options.selectDevToolsTheme.label2   "テーマ">
+<!ENTITY options.selectDevToolsTheme.label2	"テーマ">
 
 <!-- LOCALIZATION NOTE (options.usedeveditiontheme.*) Options under the
   -  toolbox for enabling and disabling the Developer Edition browser theme. -->
-<!ENTITY options.usedeveditiontheme.label   "Developer Edition テーマを使用">
-<!ENTITY options.usedeveditiontheme.tooltip "Developer Edition テーマに切り替えます。">
+<!ENTITY options.usedeveditiontheme.label	"Developer Edition テーマを使用">
+<!ENTITY options.usedeveditiontheme.tooltip	"Developer Edition テーマに切り替えます">
 
 <!-- LOCALIZATION NOTE (options.webconsole.label): This is the label for the
   -  heading of the group of Web Console preferences in the options panel. -->
-<!ENTITY options.webconsole.label            "Web コンソール">
+<!ENTITY options.webconsole.label		"Web コンソール">
 
 <!-- LOCALIZATION NOTE (options.timestampMessages.label): This is the
    - label for the checkbox that toggles timestamps in the Web Console -->
-<!ENTITY options.timestampMessages.label      "タイムスタンプを表示">
-<!ENTITY options.timestampMessages.tooltip    "このオプションを有効にすると、Web コンソールにタイムスタンプを表示します">
+<!ENTITY options.timestampMessages.label	"タイムスタンプを表示">
+<!ENTITY options.timestampMessages.tooltip	"このオプションを有効にすると、Web コンソールにタイムスタンプを表示します">
 
 <!-- LOCALIZATION NOTE (options.styleeditor.label): This is the label for the
   -  heading of the group of Style Editor preferences in the options
   -  panel. -->
-<!ENTITY options.styleeditor.label            "スタイルエディタ">
+<!ENTITY options.styleeditor.label		"スタイルエディタ">
 
 <!-- LOCALIZATION NOTE (options.stylesheetSourceMaps.label): This is the
    - label for the checkbox that toggles showing original sources in the Style Editor -->
-<!ENTITY options.stylesheetSourceMaps.label      "元のソースを表示">
-<!ENTITY options.stylesheetSourceMaps.tooltip    "スタイルエディタとインスペクタで元のソースを表示します (例: Sass ファイル)">
+<!ENTITY options.stylesheetSourceMaps.label	"元のソースを表示">
+<!ENTITY options.stylesheetSourceMaps.tooltip	"スタイルエディタとインスペクタで元のソースを表示します (例: Sass ファイル)">
 
 <!-- LOCALIZATION NOTE (options.stylesheetAutocompletion.label): This is the
    - label for the checkbox that toggles autocompletion of css in the Style Editor -->
-<!ENTITY options.stylesheetAutocompletion.label      "CSS 自動補完">
-<!ENTITY options.stylesheetAutocompletion.tooltip    "スタイルエディタで CSS プロパティ、値、セレクタ入力時に自動補完">
+<!ENTITY options.stylesheetAutocompletion.label		"CSS 自動補完">
+<!ENTITY options.stylesheetAutocompletion.tooltip	"スタイルエディタで CSS プロパティ、値、セレクタ入力時に自動補完">
 
 <!-- LOCALIZATION NOTE (options.commonprefs): This is the label for the heading
       of all preferences that affect both the Web Console and the Network
       Monitor -->
-<!ENTITY options.commonPrefs.label           "共通設定">
+<!ENTITY options.commonPrefs.label		"共通設定">
 
 <!-- LOCALIZATION NOTE (options.enablePersistentLogs.label): This is the
   -  label for the checkbox that toggles persistent logs in the Web Console and
   -  network monitor,  i.e. devtools.webconsole.persistlog a boolean preference in
   -  about:config, in the options panel. -->
-<!ENTITY options.enablePersistentLogs.label    "ログ出力を残す">
-<!ENTITY options.enablePersistentLogs.tooltip  "このオプションを有効にすると、新しいページに誘導させられた場合でも Web コンソールとネットワークモニタの出力を消去しないようになります">
+<!ENTITY options.enablePersistentLogs.label	"ログ出力を残す">
+<!ENTITY options.enablePersistentLogs.tooltip	"このオプションを有効にすると、新しいページに誘導させられた場合でも Web コンソールとネットワークモニタの出力を消去しないようになります">
 
 <!-- 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 プラットフォームのシンボルが含まれるようになります">
+<!ENTITY options.showPlatformData.label		"Gecko プラットフォームのデータを表示">
+<!ENTITY options.showPlatformData.tooltip	"このオプションを有効にすると、JavaScript プロファイラの出力に Gecko プラットフォームのシンボルが含まれるようになります">
 
 <!-- LOCALIZATION NOTE (options.sourceeditor.*): Options under the editor
   -  section. -->
 
-<!ENTITY options.sourceeditor.label                     "エディタ設定">
-<!ENTITY options.sourceeditor.detectindentation.label   "インデントを検知">
-<!ENTITY options.sourceeditor.detectindentation.tooltip "ソースの内容からインデントを推測します">
-<!ENTITY options.sourceeditor.autoclosebrackets.label   "閉じ括弧自動入力">
-<!ENTITY options.sourceeditor.autoclosebrackets.tooltip "閉じ括弧を自動的に入力します">
-<!ENTITY options.sourceeditor.expandtab.label           "インデントにスペース文字を使う">
-<!ENTITY options.sourceeditor.expandtab.tooltip         "タブ文字の代わりにスペース文字を使います">
-<!ENTITY options.sourceeditor.tabsize.label             "タブの長さ">
-<!ENTITY options.sourceeditor.tabsize.accesskey         "T">
-<!ENTITY options.sourceeditor.keybinding.label          "キー割り当て">
-<!ENTITY options.sourceeditor.keybinding.accesskey      "K">
-<!ENTITY options.sourceeditor.keybinding.default.label  "既定">
+<!ENTITY options.sourceeditor.label			"エディタ設定">
+<!ENTITY options.sourceeditor.detectindentation.label	"インデントを検知">
+<!ENTITY options.sourceeditor.detectindentation.tooltip	"ソースの内容からインデントを推測します">
+<!ENTITY options.sourceeditor.autoclosebrackets.label	"閉じ括弧自動入力">
+<!ENTITY options.sourceeditor.autoclosebrackets.tooltip	"閉じ括弧を自動的に入力します">
+<!ENTITY options.sourceeditor.expandtab.label		"インデントにスペース文字を使う">
+<!ENTITY options.sourceeditor.expandtab.tooltip		"タブ文字の代わりにスペース文字を使います">
+<!ENTITY options.sourceeditor.tabsize.label		"タブ幅">
+<!ENTITY options.sourceeditor.tabsize.accesskey		"T">
+<!ENTITY options.sourceeditor.keybinding.label		"キー割り当て">
+<!ENTITY options.sourceeditor.keybinding.accesskey	"K">
+<!ENTITY options.sourceeditor.keybinding.default.label	"既定">
--- a/devtools/client/toolbox.properties
+++ b/devtools/client/toolbox.properties
@@ -1,14 +1,14 @@
 # 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/.
 
 toolboxDockButtons.bottom.tooltip	=ブラウザの下側に表示
-toolboxDockButtons.side.tooltip		=ブラウザのサイドに表示
+toolboxDockButtons.side.tooltip		=ブラウザの右側に表示
 toolboxDockButtons.window.tooltip	=ウィンドウ表示
 
 # LOCALIZATION NOTE (toolboxDockButtons.bottom.minimize): This string is shown
 # as a tooltip that appears in the toolbox when it is in "bottom host" mode and
 # when hovering over the minimize button in the toolbar. When clicked, the
 # button minimizes the toolbox so that just the toolbar is visible at the
 # bottom.
 toolboxDockButtons.bottom.minimize	=開発ツールを最小化
@@ -34,16 +34,26 @@ toolboxToggleButton.warnings		=#1 個の警告
 
 # LOCALIZATION NOTE (toolboxToggleButton.tooltip): This string is shown
 # as tooltip in the developer toolbar to open/close the developer tools.
 # It's using toolboxToggleButton.errors as first and
 # toolboxToggleButton.warnings as second argument to show the number of errors
 # and warnings.
 toolboxToggleButton.tooltip		=%1$S、%2$S\nクリックすると開発ツールを切り替えます。
 
+# LOCALIZATION NOTE (toolbar.closeButton.tooltip)
+# Used as a message in tooltip when overing the close button of the Developer
+# Toolbar.
+toolbar.closeButton.tooltip		=開発ツールバーを閉じる
+
+# LOCALIZATION NOTE (toolbar.toolsButton.tooltip)
+# Used as a message in tooltip when overing the wrench icon of the Developer
+# Toolbar, which toggle the developer toolbox.
+toolbar.toolsButton.tooltip		=開発ツールの表示を切り替えます
+
 # LOCALIZATION NOTE (toolbox.titleTemplate): This is the template
 # used to format the title of the toolbox.
 # The name of the selected tool: %1$S.
 # The url of the page being tooled: %2$S.
 toolbox.titleTemplate			=%1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
@@ -85,23 +95,27 @@ browserConsoleCmd.commandkey		=j
 # This is the tooltip of the pick button in the toolbox toolbar
 pickButton.tooltip			=ページから要素を選択します
 
 # LOCALIZATION NOTE (sidebar.showAllTabs.tooltip)
 # This is the tooltip shown when hover over the '…' button in the tabbed side
 # bar, when there's no enough space to show all tabs at once
 sidebar.showAllTabs.tooltip		=すべてのタブ
 
-# LOCALIZATION NOTE (options.darkTheme.label)
+# LOCALIZATION NOTE (options.darkTheme.label2)
 # Used as a label for dark theme
-options.darkTheme.label			=Dark テーマ
+options.darkTheme.label2		=Dark
 
-# LOCALIZATION NOTE (options.lightTheme.label)
+# LOCALIZATION NOTE (options.lightTheme.label2)
 # Used as a label for light theme
-options.lightTheme.label		=Light テーマ
+options.lightTheme.label2		=Light
+
+# LOCALIZATION NOTE (options.firebugTheme.label2)
+# Used as a label for Firebug theme
+options.firebugTheme.label2		=Firebug
 
 # LOCALIZATION NOTE (toolbox.noContentProcess.message)
 # Used as a message in the alert displayed when trying to open a browser
 # content toolbox and there is no content process running
 toolbox.noContentProcess.message	=実行中のコンテンツプロセスはありません。
 
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
--- a/devtools/client/webconsole.properties
+++ b/devtools/client/webconsole.properties
@@ -102,16 +102,21 @@ stacktrace.asyncStack		= (非同期: %S)
 # of the console.time() call. Parameters: %S is the name of the timer.
 timerStarted			= %S: タイマー開始
 
 # LOCALIZATION NOTE (timeEnd): this string is used to display the result of
 # the console.timeEnd() call. Parameters: %1$S is the name of the timer, %2$S
 # is the number of milliseconds.
 timeEnd				= %1$S: %2$Sms
 
+# LOCALIZATION NOTE (consoleCleared): this string is displayed when receiving a
+# call to console.clear() to let the user know the previous messages of the
+# console have been removed programmatically.
+consoleCleared			= コンソールの内容が消去されました。
+
 # LOCALIZATION NOTE (noCounterLabel): this string is used to display
 # count-messages with no label provided.
 noCounterLabel			= <ラベルなし>
 
 # LOCALIZATION NOTE (Autocomplete.blank): this string is used when inputnode
 # string containing anchor doesn't matches to any property in the content.
 Autocomplete.blank		=  <- 結果なし