47.0: sync devtools/client with en-US rev310608:02b8dc35ec80
authorABE Hiroki (hATrayflood)
Mon, 25 Apr 2016 20:07:34 +0900
changeset 2080 e13f9f8c48367c3dbfa9cc4821f7ec9b496213c0
parent 2079 1a76982b51e9103329e7a369843f97fcc957e9e3
child 2081 6e74022eb9970c4ac35e5bb9f69b04e4df2f63f1
push id1121
push useraxel@mozilla.com
push dateMon, 25 Apr 2016 17:10:03 +0000
bugs47
47.0: sync devtools/client with en-US rev310608:02b8dc35ec80
devtools/client/aboutdebugging.dtd
devtools/client/aboutdebugging.properties
devtools/client/animationinspector.properties
devtools/client/debugger.dtd
devtools/client/jit-optimizations.properties
devtools/client/jsonview.properties
devtools/client/markers.properties
devtools/client/memory.properties
devtools/client/netmonitor.dtd
devtools/client/performance.dtd
devtools/client/performance.properties
devtools/client/responsive.properties
devtools/client/responsiveUI.properties
devtools/client/scratchpad.properties
devtools/client/storage.dtd
devtools/client/storage.properties
devtools/client/styleinspector.dtd
devtools/client/tilt.properties
devtools/client/toolbox.dtd
devtools/client/webConsole.dtd
devtools/client/webconsole.properties
devtools/client/webide.dtd
--- a/devtools/client/aboutdebugging.dtd
+++ b/devtools/client/aboutdebugging.dtd
@@ -1,10 +1,5 @@
 <!-- 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 aboutDebugging.title                      "about:debugging">
-<!ENTITY aboutDebugging.addons                     "アドオン">
-<!ENTITY aboutDebugging.addonDebugging.label       "アドオンのデバッグを有効化">
-<!ENTITY aboutDebugging.addonDebugging.tooltip     "このチェックをオンにすると、アドオンとブラウザ UI 部品のデバッグを許可します">
-<!ENTITY aboutDebugging.loadTemporaryAddon         "一時的なアドオンを読み込む">
-<!ENTITY aboutDebugging.workers                    "Worker">
+<!ENTITY aboutDebugging.fullTitle    "Firefox 開発ツール デバッガ">
--- a/devtools/client/aboutdebugging.properties
+++ b/devtools/client/aboutdebugging.properties
@@ -1,13 +1,22 @@
 # 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 = 開始
 
+addons = アドオン
+addonDebugging.label = アドオンのデバッグを有効化
+addonDebugging.tooltip = このチェックをオンにすると、アドオンとブラウザ UI 部品のデバッグを許可します
+addonDebugging.moreInfo = 詳細
+loadTemporaryAddon = 一時的なアドオンを読み込む
 extensions = 拡張機能
 selectAddonFromFile = アドオンフォルダまたは XPI ファイルを選択してください
+
+workers = Worker
 serviceWorkers = Service Worker
 sharedWorkers = Shared Worker
 otherWorkers = その他の Worker
 
 nothing = まだありません。
--- a/devtools/client/animationinspector.properties
+++ b/devtools/client/animationinspector.properties
@@ -8,88 +8,120 @@
 # 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 (player.animationNameLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation name.
-player.animationNameLabel		= アニメーション:
+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
 # transition
-player.transitionNameLabel		= 状態遷移
+player.transitionNameLabel		=状態遷移
 
 # LOCALIZATION NOTE (player.animationDurationLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation duration.
-player.animationDurationLabel		= 再生時間:
+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		= 遅延:
+player.animationDelayLabel		=遅延:
 
 # 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		= 再生速度:
+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.
-player.animationIterationCountLabel	= 繰り返し:
+player.animationIterationCountLabel	=繰り返し:
 
 # LOCALIZATION NOTE (player.infiniteIterationCount):
 # In case the animation repeats infinitely, this string is displayed next to the
 # player.animationIterationCountLabel string, instead of a number.
-player.infiniteIterationCount		= &#8734;
+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	= ∞
+player.infiniteIterationCountText	=∞
 
 # 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 秒
+player.timeLabel			=%S 秒
 
 # LOCALIZATION NOTE (player.playbackRateLabel):
 # This string is displayed in each animation player widget, as the label of
 # drop-down list items that can be used to change the rate at which the
-# animation runs (1x being the default, 2x being twice as fast).
-player.playbackRateLabel		= %S 倍速
+# animation runs (1× being the default, 2× being twice as fast).
+player.playbackRateLabel		=%S 倍速
 
 # LOCALIZATION NOTE (player.runningOnCompositorTooltip):
 # This string is displayed as a tooltip for the icon that indicates that the
 # animation is running on the compositor thread.
-player.runningOnCompositorTooltip	= このアニメーションは描画スレッドで実行しています
+player.runningOnCompositorTooltip	=このアニメーションは描画スレッドで実行しています
+
+# LOCALIZATION NOTE (timeline.rateSelectorTooltip):
+# This string is displayed in the timeline toolbar, as the tooltip of the
+# drop-down list that can be used to change the rate at which the animations
+# run.
+timeline.rateSelectorTooltip		=アニメーションの再生速度を設定します
+
+# LOCALIZATION NOTE (timeline.pauseResumeButtonTooltip):
+# This string is displayed in the timeline toolbar, as the tooltip of the
+# pause/resume button that can be used to pause or resume the animations
+timeline.pausedButtonTooltip		=アニメーションの続きを再生します
+
+# LOCALIZATION NOTE (timeline.pauseResumeButtonTooltip):
+# This string is displayed in the timeline toolbar, as the tooltip of the
+# pause/resume button that can be used to pause or resume the animations
+timeline.resumedButtonTooltip		=アニメーションを一時停止します
+
+# LOCALIZATION NOTE (timeline.rewindButtonTooltip):
+# This string is displayed in the timeline toolbar, as the tooltip of the
+# rewind button that can be used to rewind the animations
+timeline.rewindButtonTooltip		=アニメーションを巻き戻します
 
 # LOCALIZATION NOTE (timeline.timeGraduationLabel):
 # This string is displayed at the top of the animation panel, next to each time
 # graduation, to indicate what duration (in milliseconds) this graduation
 # corresponds to.
-timeline.timeGraduationLabel		= %S ms
+timeline.timeGraduationLabel		=%S ms
 
 # LOCALIZATION NOTE (timeline.cssanimation.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a CSS Animation in the timeline UI.
 # %S will be replaced by the name of the animation at run-time.
-timeline.cssanimation.nameLabel		= %S - CSS アニメーション
+timeline.cssanimation.nameLabel		=%S - CSS アニメーション
 
 # LOCALIZATION NOTE (timeline.csstransition.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a CSS Transition in the timeline UI.
 # %S will be replaced by the name of the transition at run-time.
-timeline.csstransition.nameLabel	= %S - CSS トランジション
+timeline.csstransition.nameLabel	=%S - CSS トランジション
+
+# LOCALIZATION NOTE (timeline.scriptanimation.nameLabel):
+# This string is displayed in a tooltip of the animation panel that is shown
+# when hovering over the name of a script-generated animation in the timeline UI.
+# %S will be replaced by the name of the animation at run-time.
+timeline.scriptanimation.nameLabel	=%S - スクリプトアニメーション
+
+# LOCALIZATION NOTE (timeline.scriptanimation.unnamedLabel):
+# This string is displayed in a tooltip of the animation panel that is shown
+# when hovering over an unnamed script-generated animation in the timeline UI.
+timeline.scriptanimation.unnamedLabel	=スクリプトアニメーション
 
 # LOCALIZATION NOTE (timeline.unknown.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of an unknown animation type in the timeline UI.
 # This can happen if devtools couldn't figure out the type of the animation.
 # %S will be replaced by the name of the transition at run-time.
-timeline.unknown.nameLabel		= %S
+timeline.unknown.nameLabel		=%S
--- a/devtools/client/debugger.dtd
+++ b/devtools/client/debugger.dtd
@@ -8,212 +8,212 @@
 <!-- LOCALIZATION NOTE : FILE 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 (debuggerUI.closeButton.tooltip): This is the tooltip for
   -  the button that closes the debugger UI. -->
-<!ENTITY debuggerUI.closeButton.tooltip	"閉じる">
+<!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	"左右のウィンドウを切り替え">
+<!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  "デバッガオプション">
+<!ENTITY debuggerUI.optsButton.tooltip		"デバッガオプション">
 
 <!-- LOCALIZATION NOTE (debuggerUI.sources.blackBoxTooltip): This is the tooltip
   -  for the button that black boxes the selected source. -->
-<!ENTITY debuggerUI.sources.blackBoxTooltip "ブラックボックスを切り替え">
+<!ENTITY debuggerUI.sources.blackBoxTooltip	"ブラックボックスを切り替え">
 
 <!-- LOCALIZATION NOTE (debuggerUI.sources.prettyPrint): This is the tooltip for the
   -  button that pretty prints the selected source. -->
-<!ENTITY debuggerUI.sources.prettyPrint "ソースを整形">
+<!ENTITY debuggerUI.sources.prettyPrint		"ソースを整形">
 
 <!-- LOCALIZATION NOTE (debuggerUI.autoPrettyPrint): This is the label for the
   -  checkbox that toggles auto pretty print. -->
-<!ENTITY debuggerUI.autoPrettyPrint     "圧縮されたソースを自動的に整形表示">
-<!ENTITY debuggerUI.autoPrettyPrint.accesskey "P">
+<!ENTITY debuggerUI.autoPrettyPrint		"圧縮されたソースを自動的に整形表示">
+<!ENTITY debuggerUI.autoPrettyPrint.accesskey	"P">
 
 <!-- LOCALIZATION NOTE (debuggerUI.sources.toggleBreakpoints): This is the tooltip for the
   -  button that toggles all breakpoints for all sources. -->
-<!ENTITY debuggerUI.sources.toggleBreakpoints "すべてのブレークポイントを有効化 / 無効化">
+<!ENTITY debuggerUI.sources.toggleBreakpoints	"すべてのブレークポイントを有効化 / 無効化">
 
 <!-- LOCALIZATION NOTE (debuggerUI.sources.togglePromiseDebugger): This is the
   -  tooltip for the button that toggles the promise debugger. -->
-<!ENTITY debuggerUI.sources.togglePromiseDebugger "Promise デバッガを切り替え">
+<!ENTITY debuggerUI.sources.togglePromiseDebugger	"Promise デバッガを切り替え">
 
 <!-- LOCALIZATION NOTE (debuggerUI.startTracing): This is the text displayed in
   - the button to start execution tracing. -->
-<!ENTITY debuggerUI.startTracing "トレースを開始">
+<!ENTITY debuggerUI.startTracing		"トレースを開始">
 
 <!-- LOCALIZATION NOTE (debuggerUI.clearButton): This is the label for
   -  the button that clears the collected tracing data in the tracing tab. -->
-<!ENTITY debuggerUI.clearButton "消去">
+<!ENTITY debuggerUI.clearButton			"消去">
 
 <!-- LOCALIZATION NOTE (debuggerUI.clearButton.tooltip): This is the tooltip for
   -  the button that clears the collected tracing data in the tracing tab. -->
-<!ENTITY debuggerUI.clearButton.tooltip "収集したトレースを消去">
+<!ENTITY debuggerUI.clearButton.tooltip		"収集したトレースを消去">
 
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
-<!ENTITY debuggerUI.pauseExceptions           "例外発生で停止">
-<!ENTITY debuggerUI.pauseExceptions.accesskey "E">
+<!ENTITY debuggerUI.pauseExceptions		"例外発生で停止">
+<!ENTITY debuggerUI.pauseExceptions.accesskey	"E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.ignoreCaughtExceptions): This is the label for the
   -  checkbox that toggles ignoring caught exceptions. -->
-<!ENTITY debuggerUI.ignoreCaughtExceptions           "キャッチした例外を無視">
-<!ENTITY debuggerUI.ignoreCaughtExceptions.accesskey "C">
+<!ENTITY debuggerUI.ignoreCaughtExceptions	"キャッチした例外を無視">
+<!ENTITY debuggerUI.ignoreCaughtExceptions.accesskey	"C">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showPanesOnInit): This is the label for the
   -  checkbox that toggles visibility of panes when opening the debugger. -->
-<!ENTITY debuggerUI.showPanesOnInit           "起動時にデバッガを開く">
-<!ENTITY debuggerUI.showPanesOnInit.accesskey "S">
+<!ENTITY debuggerUI.showPanesOnInit		"起動時にデバッガを開く">
+<!ENTITY debuggerUI.showPanesOnInit.accesskey	"S">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showVarsFilter): This is the label for the
   -  checkbox that toggles visibility of a designated variables filter box. -->
-<!ENTITY debuggerUI.showVarsFilter           "変数フィルタボックスを表示">
-<!ENTITY debuggerUI.showVarsFilter.accesskey "V">
+<!ENTITY debuggerUI.showVarsFilter		"変数フィルタボックスを表示">
+<!ENTITY debuggerUI.showVarsFilter.accesskey	"V">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOnlyEnum): This is the label for the
   -  checkbox that toggles visibility of hidden (non-enumerable) variables and
   -  properties in stack views. The "enumerable" flag is a state of a property
   -  defined in JavaScript. When in doubt, leave untranslated. -->
-<!ENTITY debuggerUI.showOnlyEnum           "計算可能なプロパティのみ表示">
-<!ENTITY debuggerUI.showOnlyEnum.accesskey "P">
+<!ENTITY debuggerUI.showOnlyEnum		"計算可能なプロパティのみ表示">
+<!ENTITY debuggerUI.showOnlyEnum.accesskey	"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.accesskey "O">
+<!ENTITY debuggerUI.showOriginalSource		"元のソースを表示">
+<!ENTITY debuggerUI.showOriginalSource.accesskey	"O">
 
 <!-- LOCALIZATION NOTE (debuggerUI.autoBlackBox): This is the label for
   -  the checkbox that toggles whether sources that we suspect are minified are
   -  automatically black boxed or not. -->
-<!ENTITY debuggerUI.autoBlackBox           "圧縮されたソースを自動的にブラックボックス化する">
-<!ENTITY debuggerUI.autoBlackBox.accesskey "B">
+<!ENTITY debuggerUI.autoBlackBox		"圧縮されたソースを自動的にブラックボックス化する">
+<!ENTITY debuggerUI.autoBlackBox.accesskey	"B">
 
 <!-- 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    "検索演算子:">
+<!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">
-<!ENTITY debuggerUI.searchFile.accesskey "P">
+<!ENTITY debuggerUI.searchFile			"スクリプトファイルを検索">
+<!ENTITY debuggerUI.searchFile.key		"P">
+<!ENTITY debuggerUI.searchFile.altkey		"O">
+<!ENTITY debuggerUI.searchFile.accesskey	"P">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
   -  in the source editor's context menu for the global search operation. -->
-<!ENTITY debuggerUI.searchGlobal           "すべてのファイルを検索">
-<!ENTITY debuggerUI.searchGlobal.key       "F">
-<!ENTITY debuggerUI.searchGlobal.accesskey "F">
+<!ENTITY debuggerUI.searchGlobal		"すべてのファイルを検索">
+<!ENTITY debuggerUI.searchGlobal.key		"F">
+<!ENTITY debuggerUI.searchGlobal.accesskey	"F">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFunction): This is the text that appears
   -  in the source editor's context menu for the function search operation. -->
-<!ENTITY debuggerUI.searchFunction           "関数定義を検索">
-<!ENTITY debuggerUI.searchFunction.key       "D">
-<!ENTITY debuggerUI.searchFunction.accesskey "D">
+<!ENTITY debuggerUI.searchFunction		"関数定義を検索">
+<!ENTITY debuggerUI.searchFunction.key		"D">
+<!ENTITY debuggerUI.searchFunction.accesskey	"D">
 
 <!-- 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">
-<!ENTITY debuggerUI.searchToken.accesskey "F">
+<!ENTITY debuggerUI.searchToken			"検索">
+<!ENTITY debuggerUI.searchToken.key		"F">
+<!ENTITY debuggerUI.searchToken.accesskey	"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.searchGoToLine           "指定行へ移動...">
-<!ENTITY debuggerUI.searchGoToLine.key       "L">
-<!ENTITY debuggerUI.searchGoToLine.accesskey "L">
+<!ENTITY debuggerUI.searchGoToLine		"指定行へ移動...">
+<!ENTITY debuggerUI.searchGoToLine.key		"L">
+<!ENTITY debuggerUI.searchGoToLine.accesskey	"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">
-<!ENTITY debuggerUI.searchVariable.accesskey "V">
+<!ENTITY debuggerUI.searchVariable		"変数を検索">
+<!ENTITY debuggerUI.searchVariable.key		"V">
+<!ENTITY debuggerUI.searchVariable.accesskey	"V">
 
 <!-- LOCALIZATION NOTE (debuggerUI.focusVariables): This is the text that appears
   -  in the source editor's context menu for the variables focus operation. -->
-<!ENTITY debuggerUI.focusVariables           "変数ツリーへ">
-<!ENTITY debuggerUI.focusVariables.key       "V">
-<!ENTITY debuggerUI.focusVariables.accesskey "V">
+<!ENTITY debuggerUI.focusVariables		"変数ツリーを開く">
+<!ENTITY debuggerUI.focusVariables.key		"V">
+<!ENTITY debuggerUI.focusVariables.accesskey	"V">
 
 <!-- LOCALIZATION NOTE (debuggerUI.condBreakPanelTitle): This is the text that
   -  appears in the conditional breakpoint panel popup as a description. -->
-<!ENTITY debuggerUI.condBreakPanelTitle "以下の式が true のときに、このブレークポイントで停止します">
+<!ENTITY debuggerUI.condBreakPanelTitle		"以下の式が true のときに、このブレークポイントで停止します">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuBreak): This is the text that
   -  appears in the source editor context menu for adding a breakpoint. -->
-<!ENTITY debuggerUI.seMenuBreak     "ブレークポイントを設置">
-<!ENTITY debuggerUI.seMenuBreak.key "B">
+<!ENTITY debuggerUI.seMenuBreak			"ブレークポイントを設置">
+<!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">
+<!ENTITY debuggerUI.seMenuCondBreak		"条件付きブレークポイントを設置">
+<!ENTITY debuggerUI.seMenuCondBreak.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         "イベント">
+<!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			"イベント">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuAddWatch): This is the text that
   -  appears in the source editor context menu for adding an expression. -->
-<!ENTITY debuggerUI.seMenuAddWatch      "選択範囲をウォッチ式へ">
-<!ENTITY debuggerUI.seMenuAddWatch.key  "E">
+<!ENTITY debuggerUI.seMenuAddWatch		"選択範囲をウォッチ式に追加">
+<!ENTITY debuggerUI.seMenuAddWatch.key		"E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.addWatch): This is the text that
   -  appears in the watch expressions context menu for adding an expression. -->
-<!ENTITY debuggerUI.addWatch            "ウォッチ式を追加">
-<!ENTITY debuggerUI.addWatch.accesskey  "E">
+<!ENTITY debuggerUI.addWatch			"ウォッチ式を追加">
+<!ENTITY debuggerUI.addWatch.accesskey		"E">
 
 <!-- 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">
-<!ENTITY debuggerUI.removeAllWatch.accesskey "E">
+<!ENTITY debuggerUI.removeAllWatch		"すべてのウォッチ式を削除">
+<!ENTITY debuggerUI.removeAllWatch.key		"E">
+<!ENTITY debuggerUI.removeAllWatch.accesskey	"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.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">
+<!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">
 
 <!-- LOCALIZATION NOTE (debuggerUI.context.newTab):  This is the label
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  debugger sources side menu. This should be the same as
   -  netmonitorUI.context.newTab  -->
-<!ENTITY debuggerUI.context.newTab           "新しいタブで開く">
-<!ENTITY debuggerUI.context.newTab.accesskey "O">
+<!ENTITY debuggerUI.context.newTab		"新しいタブで開く">
+<!ENTITY debuggerUI.context.newTab.accesskey	"O">
 
 <!-- LOCALIZATION NOTE (debuggerUI.context.copyUrl): This is the label displayed
   -  on the context menu that copies the selected request's url. This should be
   -  the same as netmonitorUI.context.copyUrl -->
-<!ENTITY debuggerUI.context.copyUrl           "URL をコピー">
-<!ENTITY debuggerUI.context.copyUrl.accesskey "C">
-<!ENTITY debuggerUI.context.copyUrl.key "C">
+<!ENTITY debuggerUI.context.copyUrl		"URL をコピー">
+<!ENTITY debuggerUI.context.copyUrl.accesskey	"C">
+<!ENTITY debuggerUI.context.copyUrl.key		"C">
new file mode 100644
--- /dev/null
+++ b/devtools/client/jit-optimizations.properties
@@ -0,0 +1,35 @@
+# 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 within the JIT tools
+# in the Performance Tools which is available from the Web Developer
+# sub-menu -> 'Performance' 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 (jit.title):
+# This string is displayed in the header of the JIT Optimizations view.
+jit.title=JIT 最適化
+
+# LOCALIZATION NOTE (jit.optimizationFailure):
+# This string is displayed in a tooltip when no JIT optimizations were detected.
+jit.optimizationFailure=最適化に失敗しました
+
+# LOCALIZATION NOTE (jit.samples):
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This string is displayed for the unit representing the number of times a
+# frame is sampled.
+# "#1" represents the number of samples
+# example: 30 samples
+jit.samples=#1 個のサンプル
+
+# LOCALIZATION NOTE (jit.types):
+# This string is displayed for the group of Ion Types in the optimizations view.
+jit.types=種類
+
+# LOCALIZATION NOTE (jit.attempts):
+# This string is displayed for the group of optimization attempts in the optimizations view.
+jit.attempts=試行
--- a/devtools/client/jsonview.properties
+++ b/devtools/client/jsonview.properties
@@ -9,38 +9,38 @@
 # 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 (jsonViewer.tab.JSON, jsonViewer.tab.RawData,
 # jsonViewer.tab.Headers): Label for a panel tab.
-jsonViewer.tab.JSON		= JSON
-jsonViewer.tab.RawData		= 生データ
-jsonViewer.tab.Headers		= ヘッダ
+jsonViewer.tab.JSON		=JSON
+jsonViewer.tab.RawData		=生データ
+jsonViewer.tab.Headers		=ヘッダ
 
 # LOCALIZATION NOTE (jsonViewer.responseHeaders, jsonViewer.requestHeaders):
 # Label for header groups within the 'Headers' panel.
-jsonViewer.responseHeaders	= 応答ヘッダ
-jsonViewer.requestHeaders	= 要求ヘッダ
+jsonViewer.responseHeaders	=応答ヘッダ
+jsonViewer.requestHeaders	=要求ヘッダ
 
 # LOCALIZATION NOTE (jsonViewer.Save): Label for save command
-jsonViewer.Save			= 保存
+jsonViewer.Save			=保存
 
 # LOCALIZATION NOTE (jsonViewer.Copy): Label for clipboard copy command
-jsonViewer.Copy			= コピー
+jsonViewer.Copy			=コピー
 
 # LOCALIZATION NOTE (jsonViewer.PrettyPrint): Label for JSON
 # pretty print action button.
-jsonViewer.PrettyPrint		= 整形
+jsonViewer.PrettyPrint		=整形
 
 # LOCALIZATION NOTE (jsonViewer.reps.more): Label used in arrays
 # that have more items than displayed.
-jsonViewer.reps.more		= 次...
+jsonViewer.reps.more		=次...
 
 # LOCALIZATION NOTE (jsonViewer.filterJSON): Label used in search box
 # at the top right cornder of the JSON Viewer.
-jsonViewer.filterJSON		= JSON をフィルタ
+jsonViewer.filterJSON		=JSON を検索
 
 # LOCALIZATION NOTE (jsonViewer.reps.reference): Label used for cycle
 # references in an array.
-jsonViewer.reps.reference	= 循環参照
+jsonViewer.reps.reference	=循環参照
--- a/devtools/client/markers.properties
+++ b/devtools/client/markers.properties
@@ -27,16 +27,17 @@ marker.label.consoleTime			=コンソール
 marker.label.garbageCollection2			=ガベージコレクション (GC)
 marker.label.garbageCollection.incremental	=インクリメンタル GC
 marker.label.garbageCollection.nonIncremental	=非インクリメンタル GC
 marker.label.minorGC				=マイナー GC
 marker.label.cycleCollection			=サイクルコレクション (CC)
 marker.label.cycleCollection.forgetSkippable	=CC グラフ削減
 marker.label.timestamp				=タイムスタンプ
 marker.label.worker				=Worker
+marker.label.messagePort			=MessagePort
 marker.label.unknown				=不明
 
 # LOCALIZATION NOTE (marker.label.javascript.*):
 # These strings are displayed as JavaScript markers that have special
 # reasons that can be translated.
 marker.label.javascript.scriptElement		=script タグ
 marker.label.javascript.promiseCallback		=Promise コールバック
 marker.label.javascript.promiseInit		=Promise 初期化
@@ -77,16 +78,19 @@ marker.field.restyleHint			=CSS 再計算のヒント:
 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		=データをデシリアライズ
 
 # Strings used in the waterfall sidebar as values.
 marker.value.unknownFrame			=<位置不明>
 marker.value.DOMEventTargetPhase		=ターゲット
 marker.value.DOMEventCapturingPhase		=キャプチャ
 marker.value.DOMEventBubblingPhase		=バブリング
 
 # LOCALIZATION NOTE (marker.gcreason.label.*):
--- a/devtools/client/memory.properties
+++ b/devtools/client/memory.properties
@@ -43,68 +43,121 @@ snapshot.io.filter			=Firefox ヒープスナップショット
 # 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.invertTree): The label describing the boolean
-# checkbox whether or not to invert the tree.
-checkbox.invertTree			=ツリーを反転
-
 # LOCALIZATION NOTE (checkbox.recordAllocationStacks): The label describing the
 # boolean checkbox whether or not to record allocation stacks.
 checkbox.recordAllocationStacks		=割り当てスタックを記録
 
-# LOCALIZATION NOTE (toolbar.breakdownBy): The label describing the select menu
-# options of the breakdown options.
-toolbar.breakdownBy			=グループ化:
+# LOCALIZATION NOTE (checkbox.recordAllocationStacks.tooltip): The tooltip for
+# the label describing the boolean checkbox whether or not to record allocation
+# stacks.
+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			=グループ化する方法を変更します
+
+# 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.
+censusDisplays.allocationStack.tooltip		=オブジェクトの割り当て時に記録された JavaScript スタックでグループ化します
+
+# LOCALIZATION NOTE (censusDisplays.invertedAllocationStack.tooltip): The
+# tooltip for the "inverted allocation stack" display option.
+censusDisplays.invertedAllocationStack.tooltip	=オブジェクトの割り当て時に記録された逆転 JavaScript コールスタックでグループ化します
+
+# 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++ 型でグループ化します
 
 # LOCALIZATION NOTE (toolbar.labelBy): The label describing the select menu
 # options of the label options.
-toolbar.labelBy				=ラベル:
+toolbar.labelBy					=ラベル:
+
+# LOCALIZATION NOTE (toolbar.labelBy): The tooltip for the label describing the
+# 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.
+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 (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			=ヒープスナップショットの表示を変更します
+
 # 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		=収集オブジェクトをグループ化したヒープスナップショットの内容の概要を表示します
+
 # 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		=ドミネータツリーを表示して、ヒープスナップショット内で最大の構造体を浮かび上がらせます
+
 # 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				=インポート...
 
-# LOCALIZATION NOTE (clear-snapshots): The label describing the button that clears
-# existing snapshot.
-clear-snapshots				=消去
-
-# LOCALIZATION NOTE (diff-snapshots): The label for the button that initiates
-# selecting two snapshots to diff with each other.
-diff-snapshots				=+/-
+# LOCALIZATION NOTE (clear-snapshots.tooltip): The tooltip for the button that
+# deletes existing 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			=フィルタ
 
+# LOCALIZATION NOTE (filter.tooltip): The tooltip text used for the memory
+# tool's filter search box.
+filter.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 ルート
 
@@ -239,34 +292,83 @@ snapshot.state.reading			=スナップショットの読み込み中...
 # snapshot state SAVING, used in snapshot list view.
 snapshot.state.saving-census		=集計結果の保存中...
 
 # LOCALIZATION NOTE (snapshot.state.error): The label describing the snapshot
 # state ERROR, used in the snapshot list view.
 snapshot.state.error			=エラー
 
 # LOCALIZATION NOTE (heapview.noAllocationStacks): The message displayed to
-# users when selecting a breakdown by "allocation stack" but no allocation
-# stacks were recorded in the heap snapshot.
+# users when selecting a display by "allocation stack" but no allocation stacks
+# were recorded in the heap snapshot.
 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	=オブジェクト自身のサイズの合計です。このオブジェクトに関連する他の生存オブジェクトすべてのサイズを含みます
+
 # LOCALIZATION NOTE (heapview.field.shallowSize): The name of the column in the
 # dominator tree view for shallow byte sizes.
 heapview.field.shallowSize		=シャローサイズ (バイト)
 
-# LOCALIZATION NOTE (heapview.field.bytes): The name of the column in the heap view for bytes.
+# 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		=ラベル
+
+# 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	=ヒープ内のオブジェクトのラベルです
+
+# LOCALIZATION NOTE (heapview.field.bytes): The name of the column in the heap
+# view for bytes.
 heapview.field.bytes			=バイト
 
-# LOCALIZATION NOTE (heapview.field.count): The name of the column in the heap view for count.
+# LOCALIZATION NOTE (heapview.field.bytes.tooltip): The tooltip for the column
+# header in the heap view for bytes.
+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.totalbytes): The name of the column in the heap view for total bytes.
+# 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.totalcount): The name of the column in the heap view for total count.
+# LOCALIZATION NOTE (heapview.field.totalbytes.tooltip): The tooltip for the
+# column header in the heap view for total bytes.
+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.name): The name of the column in the heap view for name.
+# 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			=名前
+
+# 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 ルートからの保持パス
+
+# 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		=保持パスを表示するノードを選択してください
--- a/devtools/client/netmonitor.dtd
+++ b/devtools/client/netmonitor.dtd
@@ -121,17 +121,17 @@
 <!ENTITY netmonitorUI.footer.filterFlash  "Flash">
 
 <!-- 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.label  "URL を絞り込み">
 <!ENTITY netmonitorUI.footer.filterFreetext.key  "F">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.footer.clear): This is the label displayed
   -  in the network details footer for the "Clear" button. -->
 <!ENTITY netmonitorUI.footer.clear  "消去">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.footer.clear): This is the label displayed
   -  in the network details footer for the performance analysis button. -->
--- a/devtools/client/performance.dtd
+++ b/devtools/client/performance.dtd
@@ -105,16 +105,22 @@
 <!ENTITY performanceUI.invertFlameGraph.tooltiptext "フレームチャートを反転すると、プロファイルされた呼び出し経路を新しい順に、展開した状態で表示します。">
 
 <!-- LOCALIZATION NOTE (performanceUI.showPlatformData): This is the
   -  label for the checkbox that toggles whether or not Gecko platform data
   -  is displayed in the profiler. -->
 <!ENTITY performanceUI.showPlatformData             "Gecko プラットフォームのデータを表示">
 <!ENTITY performanceUI.showPlatformData.tooltiptext "このオプションを有効にすると、JavaScript プロファイラの出力に Gecko プラットフォームのシンボルが含まれるようになります。">
 
+<!-- LOCALIZATION NOTE (performanceUI.showJITOptimizations): This string
+  -  is displayed next to a checkbox determining whether or not JIT optimization data
+  -  should be displayed. -->
+<!ENTITY performanceUI.showJITOptimizations             "JIT 最適化を表示">
+<!ENTITY performanceUI.showJITOptimizations.tooltiptext "JavaScript の各フレームに収集された、JIT 最適化データを表示します。">
+
 <!-- LOCALIZATION NOTE (performanceUI.flattenTreeRecursion): This is the
   -  label for the checkbox that toggles the flattening of tree recursion in inspected
   -  functions in the profiler. -->
 <!ENTITY performanceUI.flattenTreeRecursion             "呼び出しツリーを均す">
 <!ENTITY performanceUI.flattenTreeRecursion.tooltiptext "このオプションを有効にすると、関数インスペクト時の呼び出しツリーの表示を平らにします。">
 
 <!-- LOCALIZATION NOTE (performanceUI.enableMemory): This string
   -  is displayed next to a checkbox determining whether or not memory
@@ -129,26 +135,16 @@
 <!ENTITY performanceUI.enableAllocations.tooltiptext "このオプションを有効にすると、プロファイル時のメモリ割り当てを記録します。">
 
 <!-- LOCALIZATION NOTE (performanceUI.enableFramerate): This string
   -  is displayed next to a checkbox determining whether or not framerate
   -  is recorded. -->
 <!ENTITY performanceUI.enableFramerate             "フレームレートを記録">
 <!ENTITY performanceUI.enableFramerate.tooltiptext "このオプションを有効にすると、プロファイル時のフレームレートを記録します。">
 
-<!-- LOCALIZATION NOTE (performanceUI.enableJITOptimizations): This string
-  -  is displayed next to a checkbox determining whether or not JIT optimization data
-  -  should be recorded. -->
-<!ENTITY performanceUI.enableJITOptimizations             "JIT 最適化を記録">
-<!ENTITY performanceUI.enableJITOptimizations.tooltiptext "このオプションを有効にすると、JavaScript の各フレームに収集された、JIT 最適化データを記録します。">
-
-<!-- LOCALIZATION NOTE (performanceUI.JITOptimizationsTitle): This string
-  -  is displayed as the title of the JIT Optimizations panel. -->
-<!ENTITY performanceUI.JITOptimizationsTitle "JIT 最適化">
-
 <!-- LOCALIZATION NOTE (performanceUI.console.recordingNoticeStart/recordingNoticeEnd):
   -  This string is displayed when a recording is selected that started via console.profile.
   -  Wraps the command used to start, like "Currently recording via console.profile("label")" -->
 <!ENTITY performanceUI.console.recordingNoticeStart "">
 <!ENTITY performanceUI.console.recordingNoticeEnd   "で記録中です。">
 
 <!-- LOCALIZATION NOTE (performanceUI.console.stopCommandStart/stopCommandEnd):
   -  This string is displayed when a recording is selected that started via console.profile.
--- a/devtools/client/performance.properties
+++ b/devtools/client/performance.properties
@@ -136,32 +136,16 @@ recordingsList.saveDialogTitle		=記録を保存...
 # LOCALIZATION NOTE (recordingsList.saveDialogJSONFilter):
 # This string is displayed as a filter for saving a recording to disk.
 recordingsList.saveDialogJSONFilter	=JSON ファイル
 
 # LOCALIZATION NOTE (recordingsList.saveDialogAllFilter):
 # This string is displayed as a filter for saving a recording to disk.
 recordingsList.saveDialogAllFilter	=すべてのファイル
 
-# LOCALIZATION NOTE (jit.optimizationFailure):
-# This string is displayed in a tooltip when no JIT optimizations were detected.
-jit.optimizationFailure			=最適化に失敗しました
-
-# LOCALIZATION NOTE (jit.samples):
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# This string is displayed for the unit representing the number of times a
-# frame is sampled.
-# "#1" represents the number of samples
-# example: 30 samples
-jit.samples				=#1 個のサンプル
-
-# LOCALIZATION NOTE (jit.empty):
-# This string is displayed when there are no JIT optimizations to display.
-jit.empty				=このフレームは JIT 最適化が記録されていません。
-
 # LOCALIZATION NOTE (timeline.tick):
 # This string is displayed in the timeline overview, for delimiting ticks
 # by time, in milliseconds.
 timeline.tick				=%S ms
 
 # LOCALIZATION NOTE (timeline.records):
 # This string is displayed in the timeline waterfall, as a title for the menu.
 timeline.records			=記録
new file mode 100644
--- /dev/null
+++ b/devtools/client/responsive.properties
@@ -0,0 +1,19 @@
+# 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 Responsive Design Mode,
+# 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.title): the title displayed in the global
+# toolbar
+responsive.title	=レスポンシブデザインモード
+
+# LOCALIZATION NOTE (responsive.exit): tooltip text of the exit button.
+responsive.exit		=レスポンシブデザインモードを終了します
--- a/devtools/client/responsiveUI.properties
+++ b/devtools/client/responsiveUI.properties
@@ -8,59 +8,62 @@
 # 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  (responsiveUI.rotate): label of the rotate button.
-responsiveUI.rotate2		= 高さと幅を入れ替え
+responsiveUI.rotate2			=高さと幅を入れ替え
 
 # LOCALIZATION NOTE  (responsiveUI.screenshot): tooltip of the screenshot button.
-responsiveUI.screenshot		= スクリーンショット
+responsiveUI.screenshot			=スクリーンショット
+
+# LOCALIZATION NOTE  (responsiveUI.userAgentPlaceholder): placeholder for the user agent input.
+responsiveUI.userAgentPlaceholder	=カスタムユーザエージェント
 
 # LOCALIZATION NOTE (responsiveUI.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.
-responsiveUI.screenshotGeneratedFilename	= Screen Shot %1$S at %2$S
+responsiveUI.screenshotGeneratedFilename	=Screen Shot %1$S at %2$S
 
 # LOCALIZATION NOTE  (responsiveUI.touch): tooltip of the touch button.
-responsiveUI.touch		= タッチイベントをシミュレート (必要な場合はページを再読み込みします)
+responsiveUI.touch			=タッチイベントをシミュレート (必要な場合はページを再読み込みします)
 
 # LOCALIZATION NOTE  (responsiveUI.addPreset): label of the add preset button.
-responsiveUI.addPreset		= プリセットを追加
+responsiveUI.addPreset			=プリセットを追加
 
 # LOCALIZATION NOTE  (responsiveUI.removePreset): label of the remove preset button.
-responsiveUI.removePreset	= プリセットを削除
+responsiveUI.removePreset		=プリセットを削除
 
 # LOCALIZATION NOTE  (responsiveUI.customResolution): label of the first item
 # in the menulist at the beginning of the toolbar. For %S is replace with the
 # current size of the page. For example: "400x600".
-responsiveUI.customResolution	= %S (指定値)
+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)
+responsiveUI.namedResolution		=%S (%S)
 
 # LOCALIZATION NOTE  (responsiveUI.customNamePromptTitle): prompt title when asking
 # the user to specify a name for a new custom preset.
-responsiveUI.customNamePromptTitle	= レスポンシブデザインビュー
+responsiveUI.customNamePromptTitle	=レスポンシブデザインビュー
 
 # LOCALIZATION NOTE (responsiveUI.close): tooltip text of the close button.
-responsiveUI.close			= レスポンシブデザインビューを終了する
+responsiveUI.close			=レスポンシブデザインビューを終了する
 
 # LOCALIZATION NOTE  (responsiveUI.customNamePromptMsg): prompt message when asking
 # the user to specify a name for a new custom preset.
-responsiveUI.customNamePromptMsg	= プリセット %Sx%S の名前を入力してください
+responsiveUI.customNamePromptMsg	=プリセット %Sx%S の名前を入力してください
 
 # LOCALIZATION NOTE (responsiveUI.resizer): tooltip showed when
 # overring the resizers.
-responsiveUI.resizerTooltip		= Shift キーで大まかに、Ctrl キーで精密にサイズを変更できます。
+responsiveUI.resizerTooltip		=Shift キーで大まかに、Ctrl キーで精密にサイズを変更できます。
 
 # LOCALIZATION NOTE (responsiveUI.needReload): notification that appears
 # when touch events are enabled
-responsiveUI.needReload					= これより前にタッチイベントリスナが追加されている場合は、ページを再読み込みする必要があります。
-responsiveUI.notificationReload				= 再読み込み
-responsiveUI.notificationReload_accesskey		= R
-responsiveUI.dontShowReloadNotification			= 再表示しない
-responsiveUI.dontShowReloadNotification_accesskey	= N
+responsiveUI.needReload					=これより前にタッチイベントリスナが追加されている場合は、ページを再読み込みする必要があります。
+responsiveUI.notificationReload				=再読み込み
+responsiveUI.notificationReload_accesskey		=R
+responsiveUI.dontShowReloadNotification			=再表示しない
+responsiveUI.dontShowReloadNotification_accesskey	=N
--- a/devtools/client/scratchpad.properties
+++ b/devtools/client/scratchpad.properties
@@ -8,117 +8,117 @@
 # 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  (export.fileOverwriteConfirmation): This is displayed when
 # the user attempts to save to an already existing file.
-export.fileOverwriteConfirmation	= ファイルがすでに存在します。上書きしますか?
+export.fileOverwriteConfirmation	=ファイルがすでに存在します。上書きしますか?
 
 # LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
 # when Scratchpad does not find any recently active window of navigator:browser
 # type.
-browserWindow.unavailable		= コードを実行するブラウザウィンドウが見つかりません。
+browserWindow.unavailable		=コードを実行するブラウザウィンドウが見つかりません。
 
 # LOCALIZATION NOTE  (scratchpadContext.invalid): This error message is shown
 # when user tries to run an operation in Scratchpad in an unsupported context.
-scratchpadContext.invalid		= 現在の実行モードでは、このオペレーションは実行できません。
+scratchpadContext.invalid		=現在の実行モードでは、このオペレーションは実行できません。
 
 # LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
 # open a file from Scratchpad.
-openFile.title				= ファイルを開く
+openFile.title				=ファイルを開く
 
 # LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
 # open fails.
-openFile.failed				= ファイルを開けませんでした。
+openFile.failed				=ファイルを開けませんでした。
 
 # LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
 # open fails.
-importFromFile.convert.failed		= %1$S から Unicode へ変換できませんでした。
+importFromFile.convert.failed		=%1$S から Unicode へ変換できませんでした。
 
 # LOCALIZATION NOTE (clearRecentMenuItems.label): This is the label for the
 # menuitem in the 'Open Recent'-menu which clears all recent files.
-clearRecentMenuItems.label		= 最近開いたファイルをクリア
+clearRecentMenuItems.label		=最近開いたファイルの履歴を消去
 
 # LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
 # a file in Scratchpad.
-saveFileAs				= 名前を付けて保存
+saveFileAs				=名前を付けて保存
 
 # LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
 # save fails.
-saveFile.failed				= ファイルを保存できませんでした。
+saveFile.failed				=ファイルを保存できませんでした。
 
 # LOCALIZATION NOTE  (confirmClose): This is message in the prompt dialog when
 # you try to close a scratchpad with unsaved changes.
-confirmClose				= このスクラッチパッドを保存しますか?
+confirmClose				=このスクラッチパッドを保存しますか?
 
 # LOCALIZATION NOTE  (confirmClose.title): This is title of the prompt dialog when
 # you try to close a scratchpad with unsaved changes.
-confirmClose.title			= 変更は保存されていません
+confirmClose.title			=変更は保存されていません
 
 # LOCALIZATION NOTE  (confirmRevert): This is message in the prompt dialog when
 # you try to revert unsaved content of scratchpad.
-confirmRevert				= このスクラッチパッドに加えた変更を元に戻しますか?
+confirmRevert				=このスクラッチパッドに加えた変更を元に戻しますか?
 
 # LOCALIZATION NOTE  (confirmRevert.title): This is title of the prompt dialog when
 # you try to revert unsaved content of scratchpad.
-confirmRevert.title			= 変更を破棄
+confirmRevert.title			=変更を破棄
 
 # LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
-scratchpadIntro1			= /*\n * この画面は JavaScript スクラッチパッドです。\n *\n * JavaScript を入力して、右クリックまたは [実行] メニューを選択してください。\n * 1. 実行: 選択したコードを実行します。(%1$S)\n * 2. 調査: 実行結果をオブジェクトインスペクタで表示します。(%2$S)\n * 3. 表示: 選択したコードの後ろに、実行結果をコメント形式で挿入します。(%3$S)\n */\n\n
+scratchpadIntro1			=/*\n * この画面は JavaScript スクラッチパッドです。\n *\n * JavaScript を入力して、右クリックまたは [実行] メニューを選択してください。\n * 1. 実行: 選択したコードを実行します。(%1$S)\n * 2. 調査: 実行結果をオブジェクトインスペクタで表示します。(%2$S)\n * 3. 表示: 選択したコードの後ろに、実行結果をコメント形式で挿入します。(%3$S)\n */\n\n
 
 # LOCALIZATION NOTE  (scratchpad.noargs): This error message is shown when
 # Scratchpad instance is created without any arguments. Scratchpad window
 # expects to receive its unique identifier as the first window argument.
-scratchpad.noargs			= スクラッチパッドは引数なしで作成されました。
+scratchpad.noargs			=スクラッチパッドは引数なしで作成されました。
 
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
-browserContext.notification		= このスクラッチパッドは、ブラウザコンテキストで実行されます。
+browserContext.notification		=このスクラッチパッドは、ブラウザコンテキストで実行されます。
 
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
-help.openDocumentationPage		= https://developer.mozilla.org/ja/Tools/Scratchpad
+help.openDocumentationPage		=https://developer.mozilla.org/ja/docs/Tools/Scratchpad
 
 # LOCALIZATION NOTE (scratchpad.statusBarLineCol): Line, Column
 # information displayed in statusbar when selection is made in
 # Scratchpad.
-scratchpad.statusBarLineCol		= 行 %1$S, 列 %2$S
+scratchpad.statusBarLineCol		=行 %1$S, 列 %2$S
 
 # LOCALIZATION NOTE (fileExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
-fileNoLongerExists.notification		= このファイルはもう存在しません。
+fileNoLongerExists.notification		=このファイルはもう存在しません。
 
 # LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
-propertiesFilterPlaceholder		= プロパティをフィルタ
+propertiesFilterPlaceholder		=プロパティを絞り込み
 
 # LOCALIZATION NOTE (connectionTimeout): message displayed when the Remote Scratchpad
 # fails to connect to the server due to a timeout.
-connectionTimeout			= 接続がタイムアウトしました。原因と思われるエラーメッセージを、エラーコンソールで確認してください。スクラッチパッドを開きなおして、やり直してください。
+connectionTimeout			=接続がタイムアウトしました。原因と思われるエラーメッセージを、エラーコンソールで確認してください。スクラッチパッドを開きなおして、やり直してください。
 
 # LOCALIZATION NOTE (scratchpad.label): this string is displayed in the title of
 # the tab when the Scratchpad is displayed inside the developer tools window and
 # in the Developer Tools Menu.
-scratchpad.label			= スクラッチパッド
+scratchpad.label			=スクラッチパッド
 
 # LOCALIZATION NOTE (scratchpad.panelLabel): this is used as the
 # label for the toolbox panel.
-scratchpad.panelLabel			= スクラッチパッドパネル
+scratchpad.panelLabel			=スクラッチパッドパネル
 
 # LOCALIZATION NOTE (scratchpad.tooltip):  This string is displayed in the
 # tooltip of the tab when the Scratchpad is displayed inside the developer tools
 # window.
-scratchpad.tooltip			= スクラッチパッド
+scratchpad.tooltip			=スクラッチパッド
 
 # LOCALIZATION NOTE (selfxss.msg): the text that is displayed when
 # a new user of the developer tools pastes code into the console
 # %1 is the text of selfxss.okstring
-selfxss.msg				= 重大な警告: 自分で理解していないものを貼り付けるときは、よく注意してください。あなたの認証情報が傍受されたり、コンピュータが乗っ取られる可能性があります。貼り付けを許可するには、スクラッチパッド内に '%S' と入力してください。
+selfxss.msg				=重大な警告: 自分で理解していないものを貼り付けるときは、よく注意してください。あなたの認証情報が傍受されたり、コンピュータが乗っ取られる可能性があります。貼り付けを許可するには、スクラッチパッド内に '%S' と入力してください。
 
 # LOCALIZATION NOTE (selfxss.msg): the string to be typed
 # in by a new user of the developer tools when they receive the sefxss.msg prompt.
 # Please avoid using non-keyboard characters here
 selfxss.okstring			= allow pasting
new file mode 100644
--- /dev/null
+++ b/devtools/client/storage.dtd
@@ -0,0 +1,8 @@
+<!-- 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		"項目を絞り込み">
--- a/devtools/client/storage.properties
+++ b/devtools/client/storage.properties
@@ -49,16 +49,17 @@ 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			= キャッシュストレージ
 
 # 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		= 有効期限
@@ -79,16 +80,19 @@ table.headers.cookies.isSecure		= isSecu
 table.headers.cookies.isDomain		= isDomain
 
 table.headers.localStorage.name		= 名前
 table.headers.localStorage.value	= 値
 
 table.headers.sessionStorage.name	= 名前
 table.headers.sessionStorage.value	= 値
 
+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		= キー
--- a/devtools/client/styleinspector.dtd
+++ b/devtools/client/styleinspector.dtd
@@ -10,17 +10,17 @@
 
 <!-- LOCALIZATION NOTE (browserStylesLabel): This is the label for the checkbox
   -  that specifies whether the styles that are not from the user's stylesheet
   -  should be displayed or not. -->
 <!ENTITY browserStylesLabel    "ブラウザ CSS">
 
 <!-- LOCALIZATION NOTE (filterStylesPlaceholder): This is the placeholder that goes in
   -  the search box when no search term has been entered. -->
-<!ENTITY filterStylesPlaceholder      "CSS をフィルタ">
+<!ENTITY filterStylesPlaceholder      "CSS を絞り込み">
 
 <!-- LOCALIZATION NOTE (addRuleButtonTooltip): This is the tooltip shown when
   -  hovering the `Add new rule` button in the rules view toolbar. This should
   -  match ruleView.contextmenu.addNewRule in styleinspector.properties -->
 <!ENTITY addRuleButtonTooltip  "新しいルールを追加します">
 
 <!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
deleted file mode 100644
--- a/devtools/client/tilt.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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 Tilt Inspector
-# which is available from the Web Developer sub-menu -> 'Tilt'.
-#
-# 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 (initTilt.error): Tilt requires WebGL capabilities, which
-# are not available on every hardware. This message is displayed as an modal
-# popup window when initialization fails because of unsupported hardware.
-initTilt.error			= Tilt を初期化できませんでした。http://get.webgl.org/troubleshooting\nのトラブルシューティング情報を確認してください。
-
-# LOCALIZATION NOTE (initWebGL.error): Tilt requires WebGL capabilities, which
-# are not available on every hardware. This message is displayed in the console
-# when initialization fails because of unsupported hardware.
-initWebGL.error			= WebGL コンテキストを初期化できませんでした。ハードウェアまたはドライバが WebGL をサポートしていません。
-
-# LOCALIZATION NOTE (linkProgram.error): This error happens when the WebGL
-# context can't link two compiled shader programs together. It is displayed in
-# the Error Console.
-linkProgram.error		= シェーダプログラムを初期化できませんでした: %S
-
-# LOCALIZATION NOTE (compileShader.source.error): This error is caused when the
-# source (uri or path) of a shader is not the expected one. It is displayed in
-# the Error Console.
-compileShader.source.error	= シェーダソースタイプが不正です。(文字列であるべき)
-
-# LOCALIATION NOTE (compileShader.type.error): There are two types of shader
-# programs - vertex and fragment. At a shader initialization, if none of these
-# two types is specified, this compile-time error is shown. It is displayed in
-# the Error Console.
-compileShader.type.error	= 指定のシェーダタイプは間違っています: %S
-
-# LOCALIZATION NOTE (compileShader.compile.error): If the shader source and
-# type are correctly specified, there may be syntax errors in the shader code.
-# If this is the case, this compile-time error is shown. It is displayed in
-# the Error Console.
-compileShader.compile.error	= シェーダコンパイルステータス:\n%S
-
-# LOCALIZATION NOTE (compileShader.source.error): This error is caused when the
-# source (canvas or image) of a texture is not as expected. It is displayed in
-# the Error Console.
-initTexture.source.error	= テクスチャソースタイプが不正です。(画像であるべき)
--- a/devtools/client/toolbox.dtd
+++ b/devtools/client/toolbox.dtd
@@ -36,16 +36,22 @@ values from browser.dtd.  -->
 <!ENTITY toolboxToggleMinimize.key     "U">
 
 <!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 を選択します">
 
+<!-- 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      "ポップアップが自動的に隠れないようにします">
+
 <!-- LOCALIZATION NOTE (browserToolboxErrorMessage): This is the label
   -  shown next to error details when the Browser Toolbox is unable to open. -->
 <!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 "詳細な設定">
 
@@ -54,16 +60,22 @@ values from browser.dtd.  -->
 <!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. -->
 <!ENTITY options.showUserAgentStyles.label	"ブラウザ CSS を表示">
 <!ENTITY options.showUserAgentStyles.tooltip	"このオプションを有効にすると、ブラウザが読み込んだ既定のスタイルを表示します。">
 
+<!-- LOCALIZATION NOTE (options.collapseAttrs.label): This is the label
+  -  for the checkbox option to enable collapse attributes in the Inspector
+  -  panel. -->
+<!ENTITY options.collapseAttrs.label		"DOM 属性値を省略">
+<!ENTITY options.collapseAttrs.tooltip		"値の長い属性を省略します">
+
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.label): This is the label for a
   -  dropdown list that controls the default color unit used in the inspector.
   -  This label is visible in the options panel. -->
 <!ENTITY options.defaultColorUnit.label		"既定の色単位">
 
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.accesskey): This is the access
   -  key for a dropdown list that controls the default color unit used in the
   -  inspector. This is visible in the options panel. -->
--- a/devtools/client/webConsole.dtd
+++ b/devtools/client/webConsole.dtd
@@ -69,17 +69,17 @@
 <!ENTITY btnConsoleSharedWorkers	"Shared Worker">
 <!-- LOCALIZATION NODE (btnConsoleServiceWorkers) the term "Service Workers"
   -  should not be translated. -->
 <!ENTITY btnConsoleServiceWorkers	"Service Worker">
 <!-- LOCALIZATION NODE (btnConsoleWindowlessWorkers) the term "Workers"
   -  should not be translated. -->
 <!ENTITY btnConsoleWindowlessWorkers	"アドオンまたはブラウザ Worker">
 
-<!ENTITY filterOutput.placeholder	"フィルタ出力">
+<!ENTITY filterOutput.placeholder	"出力を絞り込み">
 <!ENTITY btnClear.label			"消去">
 <!ENTITY btnClear.tooltip		"Web コンソールの内容を消去します">
 <!ENTITY btnClear.accesskey		"r">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey 	"+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2	"="> <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey3	"">
 
--- a/devtools/client/webconsole.properties
+++ b/devtools/client/webconsole.properties
@@ -93,21 +93,16 @@ reflow.messageLinkText		= 関数 %1$S, %2$S 行 %3$S
 # anonymous. Test console.trace() in the webconsole.
 stacktrace.anonymousFunction	= <匿名関数>
 
 # LOCALIZATION NOTE (stacktrace.asyncStack): this string is used to
 # indicate that a given stack frame has an async parent.
 # %S is the "Async Cause" of the frame.
 stacktrace.asyncStack		= (非同期: %S)
 
-# LOCALIZATION NOTE (unknownLocation): this string is used to
-# display messages with sources that have an unknown location, eg. from
-# console.trace() calls.
-unknownLocation			= <不明>
-
 # LOCALIZATION NOTE (timerStarted): this string is used to display the result
 # 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
@@ -192,17 +187,17 @@ NetworkPanel.fetchRemainingResponseContentLink	= 残り %1$S バイトを読み込む
 NetworkPanel.fetchRemainingRequestContentLink	= 応答ボディ (%1$S バイト) を読み込む
 
 # LOCALIZATION NOTE (connectionTimeout): message displayed when the Remote Web
 # Console fails to connect to the server due to a timeout.
 connectionTimeout				= 接続がタイムアウトしました。原因と思われるエラーメッセージを、エラーコンソールで確認してください。Web コンソールを開きなおして、やり直してください。
 
 # LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
-propertiesFilterPlaceholder			= プロパティをフィルタ
+propertiesFilterPlaceholder			= プロパティを絞り込み
 
 # LOCALIZATION NOTE (emptyPropertiesList): the text that is displayed in the
 # properties pane when there are no properties to display.
 emptyPropertiesList				= 表示できるプロパティはありません
 
 # LOCALIZATION NOTE (messageRepeats.tooltip2): the tooltip text that is displayed
 # when you hover the red bubble that shows how many times a message is repeated
 # in the web console output.
--- a/devtools/client/webide.dtd
+++ b/devtools/client/webide.dtd
@@ -70,19 +70,16 @@
 <!ENTITY key_toggleToolbox				"VK_F12">
 <!-- toggle sidebar -->
 <!ENTITY key_toggleEditor				"B">
 <!-- zoom -->
 <!ENTITY key_zoomin					"+">
 <!ENTITY key_zoomin2					"=">
 <!ENTITY key_zoomout					"-">
 <!ENTITY key_resetzoom					"0">
-<!-- reload WebIDE and devtools from local checkout -->
-<!-- this binding is with accel+alt, whereas all others are just accel -->
-<!ENTITY key_reload_devtools				"R">
 
 <!ENTITY projectPanel_myProjects			"マイプロジェクト">
 <!ENTITY projectPanel_runtimeApps			"ランタイムアプリ">
 <!ENTITY projectPanel_tabs				"タブ">
 <!ENTITY runtimePanel_usb				"USB デバイス">
 <!ENTITY runtimePanel_wifi				"Wi-Fi デバイス">
 <!ENTITY runtimePanel_simulator				"シミュレータ">
 <!ENTITY runtimePanel_other				"その他">
@@ -194,16 +191,17 @@
      devices that can't scan a QR code. -->
 <!ENTITY wifi_auth_no_scanner				"QR スキャナがない">
 <!-- LOCALIZATION NOTE (wifi_auth_yes_scanner): Link text to assist users with
      devices that can scan a QR code. -->
 <!ENTITY wifi_auth_yes_scanner				"QR スキャナを使う">
 <!-- LOCALIZATION NOTE (wifi_auth_token_request): Instructions requesting the
      user to transfer authentication info by transferring a token. -->
 <!ENTITY wifi_auth_token_request			"別の端末が QR コードのスキャンの代わりにトークンを要求する場合は、以下の値をその端末にコピーしてください:">
+<!ENTITY wifi_auth_qr_size_note				"QR コードの表示が小さすぎて接続できない場合は、拡大するかウィンドウを大きくしてください。">
 
 <!-- Logs panel -->
 <!ENTITY logs_title					"パッケージング前のコマンドログ">
 
 <!-- Simulator Options -->
 <!ENTITY simulator_title				"シミュレータのオプション">
 <!ENTITY simulator_remove				"シミュレータを削除">
 <!ENTITY simulator_reset				"既定値に戻す">