55.0: sync devtools/client with en-US rev411737:ac72ab16001e (mozilla-beta)
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Mon, 26 Jun 2017 18:01:24 +0900
changeset 1991 c76b5ec6f816e0210193482bef544ee9972b0be4
parent 1981 c8d9f74fbf5a6520c8312feb4d325108c1b2a477
child 1992 c6a14d0462251d8bc5b66a5fadca92ae82f2fdbc
push id902
push useraxel@mozilla.com
push dateWed, 02 Aug 2017 08:40:14 +0000
bugs55
55.0: sync devtools/client with en-US rev411737:ac72ab16001e (mozilla-beta)
devtools/client/aboutdebugging.properties
devtools/client/animationinspector.properties
devtools/client/boxmodel.properties
devtools/client/debugger.properties
devtools/client/inspector.properties
devtools/client/layout.properties
devtools/client/markers.properties
devtools/client/netmonitor.properties
devtools/client/projecteditor.properties
devtools/client/responsiveUI.properties
devtools/client/startup.properties
devtools/client/storage.properties
devtools/client/webconsole.properties
devtools/client/webide.dtd
--- a/devtools/client/aboutdebugging.properties
+++ b/devtools/client/aboutdebugging.properties
@@ -42,47 +42,82 @@ addons			=アドオン
 # addon debugging on/off.
 addonDebugging.label	=アドオンのデバッグを有効化
 
 # LOCALIZATION NOTE (addonDebugging.tooltip):
 # This string is displayed in a tooltip that appears when hovering over a check
 # box that switches addon debugging on/off.
 addonDebugging.tooltip	=このチェックをオンにすると、アドオンとブラウザー UI 部品のデバッグを許可します
 
-# LOCALIZATION NOTE (moreInfo):
-# This string is displayed next to addonDebugging.label as a link to a page
-# with documentation.
-moreInfo		=詳細
+# LOCALIZATION NOTE (addonDebugging.learnMore):
+# This string is displayed as a link next to addonDebugging.label and leads the user to
+# the MDN documentation page for about:debugging.
+# (https://developer.mozilla.org/docs/Tools/about:debugging#Enabling_add-on_debugging)
+addonDebugging.learnMore	=詳細情報
 
 # LOCALIZATION NOTE (loadTemporaryAddon):
 # This string is displayed as a label of a button that allows the user to
 # load additional add-ons.
 loadTemporaryAddon	=一時的なアドオンを読み込む
 
 # LOCALIZATION NOTE (extensions):
 # This string is displayed as a header above the list of loaded add-ons.
 extensions		=拡張機能
 
 # LOCALIZATION NOTE (temporaryExtensions):
 # This string is displayed as a header above the list of temporarily loaded add-ons.
 temporaryExtensions	=一時的な拡張機能
 
+# LOCALIZATION NOTE (internalUUID):
+# This string is displayed as a label for the internal UUID of an extension.
+# The UUID is generated for this profile on install.
+internalUUID		=内部 UUID
+
+# LOCALIZATION NOTE (manifestURL):
+# This string is displayed as a link for the manifest of an extension,
+# accessible in a browser, such as moz-extension://[internalUUID]/manifest.json.
+manifestURL		=マニフェストの URL
+
+# LOCALIZATION NOTE (webExtTip):
+# This string is displayed as a message below the list of temporarily loaded add-ons.
+# Web-ext is a command line tool for web-extensions developers.
+# See https://developer.mozilla.org/Add-ons/WebExtensions/Getting_started_with_web-ext
+webExtTip		=コマンドラインから WebExtension を一時的に読み込むには web-ext を使用してください。
+
+# LOCALIZATION NOTE (webExtTip.learnMore):
+# This string is displayed as a link next to webExtTip and leads the user to the MDN
+# documentation page for web-ext.
+# (https://developer.mozilla.org/Add-ons/WebExtensions/Getting_started_with_web-ext)
+webExtTip.learnMore	=詳細情報
+
+# LOCALIZATION NOTE (temporaryID):
+# This string is displayed as a message about the add-on having a temporaryID.
+temporaryID		=この WebExtension の ID は一時 ID です。
+
+# LOCALIZATION NOTE (temporaryID.learnMore):
+# This string is displayed as a link next to the temporaryID message and leads
+# the user to MDN.
+temporaryID.learnMore	=詳細情報
+
 # LOCALIZATION NOTE (selectAddonFromFile2):
 # This string is displayed as the title of the file picker that appears when
 # the user clicks the 'Load Temporary Add-on' button
 selectAddonFromFile2	=マニフェストファイルまたはパッケージ (.xpi) を選択してください
 
 # LOCALIZATION NOTE (reload):
 # This string is displayed as a label of the button that reloads a given addon.
 reload			=再読み込み
 
-# LOCALIZATION NOTE (reloadDisabledTooltip):
-# This string is displayed in a tooltip that appears when hovering over a
-# disabled 'reload' button.
-reloadDisabledTooltip	=一時的なアドオンのみ再読み込みできます
+# LOCALIZATION NOTE (remove):
+# This string is displayed as a label of the button that will remove a given addon.
+remove			=削除
+
+# LOCALIZATION NOTE (location):
+# This string is displayed as a label for the filesystem location of an extension.
+location		=場所
 
 # LOCALIZATION NOTE (workers):
 # This string is displayed as a header of the about:debugging#workers page.
 workers			=Worker
 
 serviceWorkers		=Service Worker
 sharedWorkers		=Shared Worker
 otherWorkers		=その他の Worker
@@ -113,9 +148,40 @@ pageNotFound		=ページが見つかりません
 # This string is displayed as an error message when navigating to an invalid page
 # %S will be replaced by the name of the page at run-time.
 doesNotExist		=#%S はありません
 
 # LOCALIZATION NOTE (nothing):
 # This string is displayed when the list of workers is empty.
 nothing				=まだありません。
 
-configurationIsNotCompatible	=このブラウザーは Service Worker に対応していません
+# LOCALIZATION NOTE (configurationIsNotCompatible.label):
+# This string is displayed in about:debugging#workers if the current configuration of the
+# browser is incompatible with service workers. More details at
+# https://developer.mozilla.org/en-US/docs/Tools/about%3Adebugging#Service_workers_not_compatible
+configurationIsNotCompatible.label	=現在のブラウザー設定は Service Worker に対応していません
+
+# LOCALIZATION NOTE (configurationIsNotCompatible.learnMore):
+# This string is displayed as a link next to configurationIsNotCompatible.label and leads
+# the user to the MDN documentation page for about:debugging, on the section explaining
+# why service workers might not be available.
+# (https://developer.mozilla.org/en-US/docs/Tools/about%3Adebugging#Service_workers_not_compatible)
+configurationIsNotCompatible.learnMore	=詳細情報
+
+# LOCALIZATION NOTE (multiProcessWarningTitle):
+# This string is displayed as a warning message on top of the about:debugging#workers
+# page when multi-e10s is enabled
+multiProcessWarningTitle	=Service Worker のデバッグは現在マルチプロセスコンテンツに対応していません。
+
+# LOCALIZATION NOTE (multiProcessWarningMessage):
+# This string is displayed in the warning section for multi-e10s in
+# about:debugging#workers
+multiProcessWarningMessage2	=“dom.ipc.multiOptOut” 設定を変更して現在のバージョンでシングルコンテンツプロセスを強制できます
+
+# LOCALIZATION NOTE (multiProcessWarningLink):
+# This string is the text content of a link in the warning section for multi-e10s in
+# about:debugging#workers. The link updates the pref and restarts the browser.
+multiProcessWarningUpdateLink2	=マルチコンテンツプロセスをオプトアウトする
+
+# LOCALIZATION NOTE (multiProcessWarningConfirmUpdate):
+# This string is displayed as a confirmation message when the user clicks on
+# the multiProcessWarningUpdateLink in about:debugging#workers
+multiProcessWarningConfirmUpdate2	=マルチプロセスをオプトアウトしますか?
--- a/devtools/client/animationinspector.properties
+++ b/devtools/client/animationinspector.properties
@@ -167,8 +167,22 @@ timeline.scriptanimation.nameLabel	=%S - スクリプトアニメーション
 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
+
+# LOCALIZATION NOTE (detail.propertiesHeader.percentage):
+# This string is displayed on header label in .animated-properties-header.
+# %S represents the value in percentage with two decimal points, localized.
+# there are two "%" after %S to escape and display "%"
+detail.propertiesHeader.percentage	=%S%%
+
+# LOCALIZATION NOTE (detail.headerTitle):
+# This string is displayed on header label in .animation-detail-header.
+detail.headerTitle			=アニメーションプロパティの対象
+
+# LOCALIZATION NOTE (detail.header.closeLabel):
+# This string is displayed in a tooltip of close button for animated properties
+detail.header.closeLabel		=アニメーションプロパティパネルを閉じます
--- a/devtools/client/boxmodel.properties
+++ b/devtools/client/boxmodel.properties
@@ -10,16 +10,20 @@
 # 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 (boxmodel.title) This is the title of the box model panel and is
 # displayed as a label.
 boxmodel.title			=ボックスモデル
 
+# LOCALIZATION NOTE (boxmodel.position) This refers to the position in the box model and
+# might be displayed as a label or as a tooltip.
+boxmodel.position		=位置: %S
+
 # LOCALIZATION NOTE (boxmodel.margin) This refers to the margin in the box model and
 # might be displayed as a label or as a tooltip.
 boxmodel.margin			=margin
 
 # LOCALIZATION NOTE (boxmodel.padding) This refers to the padding in the box model and
 # might be displayed as a label or as a tooltip.
 boxmodel.padding		=padding
 
@@ -34,8 +38,14 @@ boxmodel.content		=要素の内容
 # LOCALIZATION NOTE: (boxmodel.geometryButton.tooltip) 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.
 boxmodel.geometryButton.tooltip	=位置を編集
 
 # LOCALIZATION NOTE: (boxmodel.propertiesLabel) This label is displayed as the header
 # for showing and collapsing the properties underneath the box model in the layout view
 boxmodel.propertiesLabel	=ボックスモデルの情報
+
+# LOCALIZATION NOTE: (boxmodel.offsetParent) This label is displayed inside the list of
+# properties, below the box model, in the layout view. It is displayed next to the
+# position property, when position is absolute, relative, sticky. This label tells users
+# what the DOM node previewed next to it is: an offset parent for the position element.
+boxmodel.offsetParent		=オフセット
--- a/devtools/client/debugger.properties
+++ b/devtools/client/debugger.properties
@@ -17,16 +17,24 @@ collapsePanes				=左右のウインドウを折りたたみます
 # LOCALIZATION NOTE (copySourceUrl): This is the text that appears in the
 # context menu to copy the source URL of file open.
 copySourceUrl				=ソース URL をコピー
 
 # LOCALIZATION NOTE (copySourceUrl.accesskey): Access key to copy the source URL of a file from
 # the context menu.
 copySourceUrl.accesskey			=u
 
+# LOCALIZATION NOTE (copyStackTrace): This is the text that appears in the
+# context menu to copy the stack trace methods, file names and row number.
+copyStackTrace				=スタックトレースをコピー
+
+# LOCALIZATION NOTE (copyStackTrace.accesskey): Access key to copy the stack trace data from
+# the context menu.
+copyStackTrace.accesskey		=c
+
 # LOCALIZATION NOTE (expandPanes): This is the tooltip for the button
 # that expands the left and right panes in the debugger UI.
 expandPanes				=左右のウインドウを展開します
 
 # LOCALIZATION NOTE (pauseButtonTooltip): The tooltip that is displayed for the pause
 # button when the debugger is in a running state.
 pauseButtonTooltip			=停止 %S
 
@@ -110,40 +118,56 @@ mutationEvents				=ミューテーション
 navigationEvents			=ナビゲーション
 pointerLockEvents			=マウスポインターロック
 sensorEvents				=センサー
 storageEvents				=ストレージ
 timeEvents				=時間
 touchEvents				=タッチ
 otherEvents				=その他
 
-# LOCALIZATION NOTE (blackBoxCheckboxTooltip) = The tooltip text to display when
-# the user hovers over the checkbox used to toggle black boxing its associated
+# LOCALIZATION NOTE (blackboxCheckboxTooltip2): The tooltip text to display when
+# the user hovers over the checkbox used to toggle blackboxing its associated
 # source.
-blackBoxCheckboxTooltip			=ブラックボックス化を切り替えます
+blackboxCheckboxTooltip2		=ブラックボックス化を切り替えます
 
-# LOCALIZATION NOTE (sources.search.key): Key shortcut to open the search for
+# LOCALIZATION NOTE (sources.search.key2): Key shortcut to open the search for
 # searching all the source files the debugger has seen.
-sources.search.key			=P
+sources.search.key2			=CmdOrCtrl+P
+
+# LOCALIZATION NOTE (sources.search.alt.key): A second key shortcut to open the
+# search for searching all the source files the debugger has seen.
+sources.search.alt.key			=CmdOrCtrl+O
+
+# LOCALIZATION NOTE (sources.noSourcesAvailable): Text shown when the debugger
+# does not have any sources.
+sources.noSourcesAvailable		=このページにはソースがありません
 
-# LOCALIZATION NOTE (sources.searchAlt.key): Alternate key shortcut to open
-# the search for searching all the source files the debugger has seen.
-sources.searchAlt.key			=O
+# LOCALIZATION NOTE (sourcesPane.showSourcesTooltip): The tooltip shown when
+# the user will navigate to the source tree view.
+sourcesPane.showSourcesTooltip		=ソースを表示
 
-# LOCALIZATION NOTE (sourceSearch.search.key): Key shortcut to open the search
+# LOCALIZATION NOTE (sourcesPane.showOutlineTooltip): The tooltip shown when
+# the user will navigate to the source outline view.
+sourcesPane.showOutlineTooltip		=アウトラインを表示
+
+# LOCALIZATION NOTE (sourceSearch.search.key2): Key shortcut to open the search
 # for searching within a the currently opened files in the editor
-sourceSearch.search.key			=F
+sourceSearch.search.key2		=CmdOrCtrl+F
 
 # LOCALIZATION NOTE (sourceSearch.search.placeholder): placeholder text in
 # the source search input bar
 sourceSearch.search.placeholder		=ファイル内を検索...
 
-# LOCALIZATION NOTE (sourceSearch.search.again.key): Key shortcut to re-open
-# the search for re-searching the same search triggered from a sourceSearch
-sourceSearch.search.again.key		=G
+# LOCALIZATION NOTE (sourceSearch.search.again.key2): Key shortcut to highlight
+# the next occurrence of the last search triggered from a source search
+sourceSearch.search.again.key2		=CmdOrCtrl+G
+
+# LOCALIZATION NOTE (sourceSearch.search.againPrev.key2): Key shortcut to highlight
+# the previous occurrence of the last search triggered from a source search
+sourceSearch.search.againPrev.key2	=CmdOrCtrl+Shift+G
 
 # LOCALIZATION NOTE (sourceSearch.resultsSummary1): Shows a summary of
 # the number of matches for autocomplete
 sourceSearch.resultsSummary1		=%d 件の結果
 
 # LOCALIZATION NOTE (noMatchingStringsText): The text to display in the
 # global search results when there are no matching strings after filtering.
 noMatchingStringsText			=一致する文字列はありません
@@ -230,20 +254,35 @@ callStack.collapse			=行を折りたたむ
 # LOCALIZATION NOTE (callStack.expand): Call Stack right sidebar pane
 # message to show more of the frames.
 callStack.expand			=行を広げる
 
 # LOCALIZATION NOTE (editor.searchResults): Editor Search bar message
 # for the summarizing the selected search result. e.g. 5 of 10 results.
 editor.searchResults			=検索結果 %d / %d
 
+# LOCALIZATION NOTE (sourceSearch.singleResult): Copy shown when there is one result.
+editor.singleResult			=検索結果 1 件
+
 # LOCALIZATION NOTE (editor.noResults): Editor Search bar message
 # for when no results found.
 editor.noResults			=検索結果はありません
 
+# LOCALIZATION NOTE (editor.searchResults.nextResult): Editor Search bar
+# tooltip for traversing to the Next Result
+editor.searchResults.nextResult		=次の検索結果
+
+# LOCALIZATION NOTE (editor.searchResults.prevResult): Editor Search bar
+# tooltip for traversing to the Previous Result
+editor.searchResults.prevResult		=前の検索結果
+
+# LOCALIZATION NOTE (editor.searchTypeToggleTitle): Search bar title for
+# toggling search type buttons(function search, variable search)
+editor.searchTypeToggleTitle		=検索対象:
+
 # LOCALIZATION NOTE (editor.addBreakpoint): Editor gutter context menu item
 # for adding a breakpoint on a line.
 editor.addBreakpoint			=ブレークポイントを追加
 
 # LOCALIZATION NOTE (editor.disableBreakpoint): Editor gutter context menu item
 # for disabling a breakpoint on a line.
 editor.disableBreakpoint		=ブレークポイントを無効化
 
@@ -270,16 +309,32 @@ editor.conditionalPanel.placeholder	=このブレークポイントは条件式が真の場合に停止します
 # LOCALIZATION NOTE (editor.conditionalPanel.placeholder): Tooltip text for
 # close button inside ConditionalPanel component
 editor.conditionalPanel.close		=ブレークポイントの編集をキャンセルして閉じます
 
 # LOCALIZATION NOTE (editor.jumpToMappedLocation1): Context menu item
 # for navigating to a source mapped location
 editor.jumpToMappedLocation1		=%S の位置へジャンプ
 
+# LOCALIZATION NOTE (framework.disableGrouping): This is the text that appears in the
+# context menu to disable framework grouping.
+framework.disableGrouping		=フレームワークのグループ化を無効化
+
+# LOCALIZATION NOTE (framework.disableGrouping.accesskey): Access key to toggle
+# framework grouping from the context menu.
+framework.disableGrouping.accesskey	=u
+
+# LOCALIZATION NOTE (framework.enableGrouping): This is the text that appears in the
+# context menu to enable framework grouping.
+framework.enableGrouping		=フレームワークのグループ化を有効化
+
+# LOCALIZATION NOTE (framework.enableGrouping.accesskey): Access key to toggle
+# framework grouping from the context menu.
+framework.enableGrouping.accesskey	=u
+
 # LOCALIZATION NOTE (generated): Source Map term for a server source location
 generated				=生成場所
 
 # LOCALIZATION NOTE (original): Source Map term for a debugger UI source location
 original				=元の場所
 
 # LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression
 # input element
@@ -336,16 +391,36 @@ sourceTabs.copyLink.accesskey		=l
 # LOCALIZATION NOTE (sourceTabs.prettyPrint): Editor source tab context menu item
 # for pretty printing the source.
 sourceTabs.prettyPrint			=ソースコードを整形
 
 # LOCALIZATION NOTE (sourceTabs.prettyPrint.accesskey): Access key to pretty print a source from
 # the editor context menu.
 sourceTabs.prettyPrint.accesskey	=p
 
+# LOCALIZATION NOTE (sourceFooter.blackbox): Tooltip text associated
+# with the blackbox button
+sourceFooter.blackbox			=ブラックボックスのソース
+
+# LOCALIZATION NOTE (sourceFooter.unblackbox): Tooltip text associated
+# with the blackbox button
+sourceFooter.unblackbox			=ブラックボックス解除ソース
+
+# LOCALIZATION NOTE (sourceFooter.unblackbox.accesskey): Access key to blackbox
+# an associated source
+sourceFooter.unblackbox.accesskey	=b
+
+# LOCALIZATION NOTE (sourceFooter.blackbox.accesskey): Access key to blackbox
+# an associated source
+sourceFooter.blackbox.accesskey		=b
+
+# LOCALIZATION NOTE (sourceFooter.blackboxed): Text associated
+# with a blackboxed source
+sourceFooter.blackboxed			=ブラックボックス化ソース
+
 # LOCALIZATION NOTE (sourceTabs.closeTabButtonTooltip): The tooltip that is displayed
 # for close tab button in source tabs.
 sourceTabs.closeTabButtonTooltip	=タブを閉じます
 
 # LOCALIZATION NOTE (sourceTabs.newTabButtonTooltip): The tooltip that is displayed for
 # new tab button in source tabs.
 sourceTabs.newTabButtonTooltip		=ソースを検索します (%S)
 
@@ -384,30 +459,20 @@ watchExpressions.refreshButton		=リフレッシュ
 # search prompt. e.g. cmd+p to search for files. On windows, it's ctrl, on
 # a mac we use the unicode character.
 welcome.search				=%S でソースファイルを検索します
 
 # LOCALIZATION NOTE (sourceSearch.search): The center pane Source Search
 # prompt for searching for files.
 sourceSearch.search			=ソースを検索...
 
-# LOCALIZATION NOTE (sourceSearch.search): The center pane Source Search
-# prompt for searching for files.
-# Used in the old debugger fronted
-## (^m^) 重複
-##sourceSearch.search			=検索...
-
 # LOCALIZATION NOTE (sourceSearch.noResults): The center pane Source Search
 # message when the query did not match any of the sources.
 sourceSearch.noResults			=%S と一致するファイルはありません
 
-# LOCALIZATION NOTE (sourceFooter.debugBtnTooltip): Tooltip text associated
-# with the pretty-print button
-sourceFooter.debugBtnTooltip		=ソースコードを整形します
-
 # LOCALIZATION NOTE (ignoreExceptions): The pause on exceptions button tooltip
 # when the debugger will not pause on exceptions.
 ignoreExceptions			=例外を無視します。クリックすると捕捉できない例外で停止します
 
 # LOCALIZATION NOTE (pauseOnUncaughtExceptions): The pause on exceptions button
 # tooltip when the debugger will pause on uncaught exceptions.
 pauseOnUncaughtExceptions		=捕捉できない例外で停止します。クリックするとすべての例外で停止します
 
@@ -509,18 +574,40 @@ variablesSeparatorLabel			=:
 # LOCALIZATION NOTE (watchExpressionsSeparatorLabel2): The text that is displayed
 # in the watch expressions list as a separator between the code and evaluation.
 watchExpressionsSeparatorLabel2		=\u0020\u2192
 
 # LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed
 # in the functions search panel as a separator between function's inferred name
 # and its real name (if available).
 functionSearchSeparatorLabel		=\u2190
-functionSearch.search.placeholder	=関数を検索します...
-functionSearch.search.key		=O
+
+# LOCALIZATION NOTE(symbolSearch.search.functionsPlaceholder): The placeholder
+# text displayed when the user searches for functions in a file
+symbolSearch.search.functionsPlaceholder	=関数を検索...
+
+# LOCALIZATION NOTE(symbolSearch.search.variablesPlaceholder): The placeholder
+# text displayed when the user searches for variables in a file
+symbolSearch.search.variablesPlaceholder	=変数を検索...
+
+# LOCALIZATION NOTE(symbolSearch.search.key2): The Key Shortcut for
+# searching for a function or variable
+symbolSearch.search.key2			=CmdOrCtrl+Shift+O
+
+# LOCALIZATION NOTE(symbolSearch.searchModifier.regex): A search option
+# when searching text in a file
+symbolSearch.searchModifier.regex		=正規表現
+
+# LOCALIZATION NOTE(symbolSearch.searchModifier.caseSensitive): A search option
+# when searching text in a file
+symbolSearch.searchModifier.caseSensitive	=大文字/小文字を区別
+
+# LOCALIZATION NOTE(symbolSearch.searchModifier.wholeWord): A search option
+# when searching text in a file
+symbolSearch.searchModifier.wholeWord		=単語全体
 
 # LOCALIZATION NOTE (resumptionOrderPanelTitle): This is the text that appears
 # as a description in the notification panel popup, when multiple debuggers are
 # open in separate tabs and the user tries to resume them in the wrong order.
 # The substitution parameter is the URL of the last paused window that must be
 # resumed first.
 resumptionOrderPanelTitle		=他のデバッガーが停止しています。最後の停止させたデバッガーを復帰させてください: %S
 
@@ -578,8 +665,12 @@ whyPaused.assert			=アサーションで停止しました
 # in a info block explaining how the debugger is currently paused on a
 # debugger statement
 whyPaused.debugCommand			=デバッグされた関数で停止しました
 
 # LOCALIZATION NOTE (whyPaused.other): The text that is displayed
 # in a info block explaining how the debugger is currently paused on an event
 # listener breakpoint set
 whyPaused.other				=デバッガーが停止しました
+
+# LOCALIZATION NOTE (ctrl): The text that is used for documenting
+# keyboard shortcuts that use the control key
+ctrl					=Ctrl
--- a/devtools/client/inspector.properties
+++ b/devtools/client/inspector.properties
@@ -322,63 +322,114 @@ markupView.edit.key			=F2
 # LOCALIZATION NOTE (markupView.scrollInto.key):
 # Key shortcut used to scroll the webpage in order to ensure the selected node
 # is visible
 markupView.scrollInto.key		=s
 
 # LOCALIZATION NOTE (inspector.sidebar.fontInspectorTitle):
 # This is the title shown in a tab in the side panel of the Inspector panel
 # that corresponds to the tool displaying the list of fonts used in the page.
-inspector.sidebar.fontInspectorTitle		=フォント
+inspector.sidebar.fontInspectorTitle	=フォント
 
 # LOCALIZATION NOTE (inspector.sidebar.ruleViewTitle):
 # This is the title shown in a tab in the side panel of the Inspector panel
 # that corresponds to the tool displaying the list of CSS rules used
 # in the page.
-inspector.sidebar.ruleViewTitle			=ルール
+inspector.sidebar.ruleViewTitle		=ルール
 
 # LOCALIZATION NOTE (inspector.sidebar.computedViewTitle):
 # This is the title shown in a tab in the side panel of the Inspector panel
 # that corresponds to the tool displaying the list of computed CSS values
 # used in the page.
-inspector.sidebar.computedViewTitle		=計算済み
+inspector.sidebar.computedViewTitle	=計算済み
 
 # LOCALIZATION NOTE (inspector.sidebar.layoutViewTitle2):
 # This is the title shown in a tab in the side panel of the Inspector panel
 # that corresponds to the tool displaying layout information defined in the page.
-inspector.sidebar.layoutViewTitle2		=レイアウト
+inspector.sidebar.layoutViewTitle2	=レイアウト
 
 # LOCALIZATION NOTE (inspector.sidebar.animationInspectorTitle):
 # This is the title shown in a tab in the side panel of the Inspector panel
 # that corresponds to the tool displaying animations defined in the page.
 inspector.sidebar.animationInspectorTitle	=アニメーション
 
 # LOCALIZATION NOTE (inspector.eyedropper.label): A string displayed as the tooltip of
 # a button in the inspector which toggles the Eyedropper tool
-inspector.eyedropper.label			=ページからカラーを採取
+inspector.eyedropper.label		=ページからカラーを採取
+
+# LOCALIZATION NOTE (inspector.colorwidget.colorNameLabel):
+# The label for the current color widget's color name field.
+inspector.colorwidget.colorNameLabel	=カラー名:
+
+# LOCALIZATION NOTE (inspector.colorwidget.contrastRatio.header):
+# This string is used as a header to indicate the contrast section of the
+# color widget.
+inspector.colorwidget.contrastRatio.header	=コントラスト比
+
+# LOCALIZATION NOTE (inspector.colorwidget.contrastRatio.invalidColor):
+# This string is used when an invalid color is passed as a background color
+# to the color widget.
+inspector.colorwidget.contrastRatio.invalidColor	=不正なカラー
+
+# LOCALIZATION NOTE (inspector.colorwidget.contrastRatio.info):
+# This string is used to explain the contrast ratio grading system when you hover over the help icon in the contrast info.
+inspector.colorwidget.contrastRatio.info	=テキストのコントラスト比等級システムには次の等級があります: 可読性の低いほうから順に、不適合、AA*、AAA*、AAA\nこれは計算された背景カラーを基に算出されました:
+
+# LOCALIZATION NOTE (inspector.colorwidget.contrastRatio.failGrade):
+# This string is used to indicate that the text fails for contrast ratio grading criteria.
+inspector.colorwidget.contrastRatio.failGrade	=不適合
+
+# LOCALIZATION NOTE (inspector.colorwidget.contrastRatio.failInfo):
+# This string is used to explain that the text fails for contrast ratio grading criteria.
+inspector.colorwidget.contrastRatio.failInfo	=このコントラスト比はすべてのテキストサイズで不適合です。
+
+# LOCALIZATION NOTE (inspector.colorwidget.contrastRatio.AABigInfo):
+# This string is used to explain that the text passes AA* grade for contrast ratio.
+inspector.colorwidget.contrastRatio.AABigInfo	=このコントラスト比は大きいサイズのテキスト (18pt 以上または 14pt の太字) で AA 等級に適合します。
+
+# LOCALIZATION NOTE (inspector.colorwidget.contrastRatio.AAABigInfo):
+# This string is used to explain that the text passes the AA grade and AAA* for contrast ratio.
+inspector.colorwidget.contrastRatio.AAABigInfo	=このコントラスト比はすべてのテキストサイズで AA 等級に適合し、大きいサイズのテキスト (18pt 以上または 14pt の太字) で AAA 等級に適合します。
+
+# LOCALIZATION NOTE (inspector.colorwidget.contrastRatio.AAAInfo):
+# This string is used to explain that the text passes AAA grade for contrast ratio.
+inspector.colorwidget.contrastRatio.AAAInfo	=このコントラスト比はすべてのテキストサイズで AAA 等級に適合します。
 
 # LOCALIZATION NOTE (inspector.breadcrumbs.label): A string visible only to a screen reader and
 # is used to label (using aria-label attribute) a container for inspector breadcrumbs
-inspector.breadcrumbs.label			=パンくずリスト
+inspector.breadcrumbs.label		=パンくずリスト
 
 # LOCALIZATION NOTE (inspector.browserStyles.label): 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.
-inspector.browserStyles.label			=ブラウザー CSS
+inspector.browserStyles.label		=ブラウザー CSS
 
 # LOCALIZATION NOTE (inspector.filterStyles.placeholder): This is the placeholder that
 # goes in the search box when no search term has been entered.
-inspector.filterStyles.placeholder		=スタイルを絞り込み
+inspector.filterStyles.placeholder	=スタイルを絞り込み
 
 # LOCALIZATION NOTE (inspector.addRule.tooltip): 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
-inspector.addRule.tooltip			=新規ルールを追加します
+inspector.addRule.tooltip		=新規ルールを追加します
 
 # LOCALIZATION NOTE (inspector.togglePseudo.tooltip): This is the tooltip
 # shown when hovering over the `Toggle Pseudo Class Panel` button in the
 # rule view toolbar.
-inspector.togglePseudo.tooltip			=疑似クラスを切り替えます
+inspector.togglePseudo.tooltip		=疑似クラスを切り替えます
+
+# LOCALIZATION NOTE (inspector.classPanel.toggleClass.tooltip): This is the tooltip
+# shown when hovering over the `Toggle Class Panel` button in the
+# rule view toolbar.
+inspector.classPanel.toggleClass.tooltip	=クラスを切り替えます
+
+# LOCALIZATION NOTE (inspector.classPanel.newClass.placeholder): This is the placeholder
+# shown inside the text field used to add a new class in the rule-view.
+inspector.classPanel.newClass.placeholder	=新規クラスを追加
+
+# LOCALIZATION NOTE (inspector.classPanel.noClasses): This is the text displayed in the
+# class panel when the current element has no classes applied.
+inspector.classPanel.noClasses		=この要素にはクラスがありません
 
 # LOCALIZATION NOTE (inspector.noProperties): In the case where there are no CSS
 # properties to display e.g. due to search criteria this message is
 # displayed.
-inspector.noProperties				=CSS プロパティはありません。
+inspector.noProperties			=CSS プロパティはありません。
--- a/devtools/client/layout.properties
+++ b/devtools/client/layout.properties
@@ -2,34 +2,47 @@
 # 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 Layout Inspector strings.
 # The Layout Inspector is a panel accessible in the Inspector sidebar.
 # The Layout Inspector may need to be enabled in about:config by setting
 # devtools.layoutview.enabled to true.
 
+# LOCALIZATION NOTE (layout.cannotShowGridOutline, layout.cannotSHowGridOutline.title):
+# In the case where the grid outline cannot be effectively displayed.
+layout.cannotShowGridOutline		=このグリッドのアウトラインは表示できません
+layout.cannotShowGridOutline.title	=選択したグリッドのアウトラインはレイアウトパネル内に収まらないため利用できません。
+
+# LOCALIZATION NOTE (layout.displayGridAreas): Label of the display grid areas setting
+# option in the CSS Grid pane.
+layout.displayGridAreas			=グリッド領域を表示
+
 # LOCALIZATION NOTE (layout.displayNumbersOnLines): Label of the display numbers on lines
 # setting option in the CSS Grid pane.
 layout.displayNumbersOnLines		=線上に番号を表示
 
 # LOCALIZATION NOTE (layout.extendGridLinesInfinitely): Label of the extend grid lines
 # infinitely setting option in the CSS Grid pane.
 layout.extendGridLinesInfinitely	=グリッド線を無限に延伸
 
 # LOCALIZATION NOTE (layout.header): The accordion header for the CSS Grid pane.
 layout.header				=グリッド
 
 # LOCALIZATION NOTE (layout.gridDisplaySettings): The header for the grid display
 # settings container in the CSS Grid pane.
 layout.gridDisplaySettings		=グリッドの表示設定
 
-# LOCALIZATION NOTE (layout.noGrids): In the case where there are no CSS grid
+# LOCALIZATION NOTE (layout.noGridsOnThisPage): In the case where there are no CSS grid
 # containers to display.
-layout.noGrids				=グリッドはありません
+layout.noGridsOnThisPage		=CSS グリッドはこのページで使用されていません
 
 # LOCALIZATION NOTE (layout.overlayMultipleGrids): The header for the list of grid
 # container elements that can be highlighted in the CSS Grid pane.
 layout.overlayMultipleGrids		=複数グリッドをオーバーレイ表示
 
 # LOCALIZATION NOTE (layout.overlayGrid): Alternate header for the list of grid container
 # elements if only one item can be selected.
 layout.overlayGrid			=グリッドをオーバーレイ表示
+
+# LOCALIZATION NOTE (layout.rowColumnPositions): The row and column position of a grid
+# cell shown in the grid cell infobar when hovering over the CSS grid outline.
+layout.rowColumnPositions		=行 %1$S / 列 %2$S
--- a/devtools/client/markers.properties
+++ b/devtools/client/markers.properties
@@ -124,17 +124,16 @@ marker.gcreason.label.NSJSCONTEXT_DESTROY	=JS コンテキスト破損
 marker.gcreason.label.SET_NEW_DOCUMENT		=新規ドキュメント
 marker.gcreason.label.SET_DOC_SHELL		=新規ドキュメント
 marker.gcreason.label.DOM_UTILS			=API 呼び出し
 marker.gcreason.label.DOM_IPC			=プロセス間通信
 marker.gcreason.label.DOM_WORKER		=定期 Worker GC
 marker.gcreason.label.INTER_SLICE_GC		=定期インクリメンタル GC スライス
 marker.gcreason.label.FULL_GC_TIMER		=定期完全 GC
 marker.gcreason.label.SHUTDOWN_CC		=シャットダウン
-marker.gcreason.label.FINISH_LARGE_EVALUATE	=大きなスクリプトの評価
 marker.gcreason.label.DOM_WINDOW_UTILS		=ユーザー操作なし
 marker.gcreason.label.USER_INACTIVE		=ユーザー操作なし
 
 # The name of a nursery collection.
 ## (^m^) 世代別ガベージコレクションの若い領域のほう
 marker.nurseryCollection			=ナーサリーコレクション
 
 # LOCALIZATION NOTE (marker.gcreason.description.*):
@@ -164,11 +163,10 @@ marker.gcreason.description.NSJSCONTEXT_DESTROY		=シャットダウンする前の最後のガベージコレクションで JavaScript ランタイムまたはコンテキストが破損しました。
 marker.gcreason.description.SET_NEW_DOCUMENT		=新規ドキュメントを開きました。
 marker.gcreason.description.SET_DOC_SHELL		=新規ドキュメントを開きました。
 marker.gcreason.description.DOM_UTILS			=ガベージコレクションを強制する API 呼び出しがありました。
 marker.gcreason.description.DOM_IPC			=ガベージコレクションを要求する内部プロセスメッセージを受信しました。
 marker.gcreason.description.DOM_WORKER			=Worker が長時間、待機状態でした。
 marker.gcreason.description.INTER_SLICE_GC		=最後のインクリメンタル GC スライスから長時間経過しています。
 marker.gcreason.description.FULL_GC_TIMER		=JavaScript がイベントループに戻りました。ガベージコレクションが実行されてから長時間経過しました。
 marker.gcreason.description.SHUTDOWN_CC			=シャットダウンする前の最後のガベージコレクションで JavaScript ランタイムまたはコンテキストが破損しました。
-marker.gcreason.description.FINISH_LARGE_EVALUATE	=大きなスクリプトの評価が完了しました。このスクリプトは再び実行されないため、ガベージコレクションを実行しました。
 marker.gcreason.description.DOM_WINDOW_UTILS		=ユーザーの操作が長時間なかったため、その間にガベージコレクションが実行されました。
 marker.gcreason.description.USER_INACTIVE		=ユーザーの操作が長時間なかったため、その間にガベージコレクションが実行されました。
--- a/devtools/client/netmonitor.properties
+++ b/devtools/client/netmonitor.properties
@@ -132,33 +132,62 @@ jsonFilterText		=プロパティを検索
 jsonScopeName		=JSON
 
 # LOCALIZATION NOTE (jsonpScopeName): This is the text displayed
 # in the response tab of the network details pane for a JSONP scope.
 jsonpScopeName		=JSONP \u2192 コールバック %S()
 
 # LOCALIZATION NOTE (networkMenu.sortedAsc): This is the tooltip displayed
 # in the network table toolbar, for any column that is sorted ascending.
-networkMenu.sortedAsc	=昇順
+networkMenu.sortedAsc				=昇順
 
 # LOCALIZATION NOTE (networkMenu.sortedDesc): This is the tooltip displayed
 # in the network table toolbar, for any column that is sorted descending.
-networkMenu.sortedDesc	=降順
+networkMenu.sortedDesc				=降順
+
+# LOCALIZATION NOTE (networkMenu.summary.tooltip.perf): A tooltip explaining
+# what the perf button does
+networkMenu.summary.tooltip.perf		=パフォーマンス解析を開始
 
-# LOCALIZATION NOTE (networkMenu.empty): This is the label displayed
-# in the network table footer when there are no requests available.
-networkMenu.empty	=要求はありません
+# LOCALIZATION NOTE (networkMenu.summary.tooltip.domContentLoaded): A tooltip explaining
+# what the DOMContentLoaded label displays
+networkMenu.summary.tooltip.domContentLoaded	=“DOMContentLoad” イベント発生時の時刻
 
+# LOCALIZATION NOTE (networkMenu.summary.tooltip.load): A tooltip explaining
+# what the load label displays
+networkMenu.summary.tooltip.load		=“load” イベント発生時の時刻
+
+# LOCALIZATION NOTE (networkMenu.summary.requestsCount): This label is displayed
+# in the network table footer providing the number of requests
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+networkMenu.summary.requestsCount		=要求 %S 件
 
-# LOCALIZATION NOTE (networkMenu.summary3): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# This label is displayed in the network table footer providing concise
-# information about all requests. Parameters: #1 is the number of requests,
-# #2 is the size, #3 is the transferred size, #4 is the number of seconds.
-networkMenu.summary3	=要求 #1 件、#2 (転送済み: #3)、#4
+# LOCALIZATION NOTE (networkMenu.summary.requestsCountEmpty): This label is displayed
+# in the network table footer when there are no requests
+networkMenu.summary.requestsCountEmpty		=要求はありません
+
+# LOCALIZATION NOTE (networkMenu.summary.tooltip.requestsCount): A tooltip explaining
+# what the requestsCount label displays
+networkMenu.summary.tooltip.requestsCount	=要求件数
+
+# LOCALIZATION NOTE (networkMenu.summary.transferred): This label is displayed
+# in the network table footer providing the transferred size.
+networkMenu.summary.transferred			=%S / %S 転送済み
+
+# LOCALIZATION NOTE (networkMenu.summary.tooltip.transferred): A tooltip explaining
+# what the transferred  label displays
+networkMenu.summary.tooltip.transferred		=サイズ/全要求の転送サイズ
+
+# LOCALIZATION NOTE (networkMenu.summary.finish): This label is displayed
+# in the network table footer providing the transfer time.
+networkMenu.summary.finish			=完了: %S
+
+# LOCALIZATION NOTE (networkMenu.summary.tooltip.finish): A tooltip explaining
+# what the finish label displays
+networkMenu.summary.tooltip.finish		=全要求の読み込みに必要な合計時間
 
 # LOCALIZATION NOTE (networkMenu.sizeB): This is the label displayed
 # in the network menu specifying the size of a request (in bytes).
 networkMenu.sizeB	=%S バイト
 
 # LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
 # in the network menu specifying the size of a request (in kilobytes).
 networkMenu.sizeKB	=%S KB
@@ -185,16 +214,50 @@ networkMenu.sizeCached		=キャッシュ
 # in the network menu specifying the transferred of a request computed
 # by a service worker.
 networkMenu.sizeServiceWorker	=Service Worker
 
 # LOCALIZATION NOTE (networkMenu.totalMS): This is the label displayed
 # in the network menu specifying the time for a request to finish (in milliseconds).
 networkMenu.totalMS	=\u2192 %S ms
 
+# This string is used to concatenate tooltips (netmonitor.waterfall.tooltip.*)
+# in the requests waterfall for total time (in milliseconds). \\u0020 represents
+# a whitespace. You can replace this with a different character, e.g. an hyphen
+# or a period, if a comma doesn't work for your language.
+netmonitor.waterfall.tooltip.separator	=,\u0020
+
+# LOCALIZATION NOTE (netmonitor.waterfall.tooltip.total): This is part of the tooltip
+# displayed in the requests waterfall for total time (in milliseconds).
+netmonitor.waterfall.tooltip.total	=合計 %S ms
+
+# LOCALIZATION NOTE (netmonitor.waterfall.tooltip.blocked): This is part of the tooltip
+# displayed in the requests waterfall for blocked time (in milliseconds).
+netmonitor.waterfall.tooltip.blocked	=ブロック %S ms
+
+# LOCALIZATION NOTE (netmonitor.waterfall.tooltip.dns): This is part of the tooltip
+# displayed in the requests waterfall for dns time (in milliseconds).
+netmonitor.waterfall.tooltip.dns	=DNS %S ms
+
+# LOCALIZATION NOTE (netmonitor.waterfall.tooltip.connect): This is part of the tooltip
+# displayed in the requests waterfall for connect time (in milliseconds).
+netmonitor.waterfall.tooltip.connect	=接続 %S ms
+
+# LOCALIZATION NOTE (netmonitor.waterfall.tooltip.send): This is part of the tooltip
+# displayed in the requests waterfall for send time (in milliseconds).
+netmonitor.waterfall.tooltip.send	=送信 %S ms
+
+# LOCALIZATION NOTE (netmonitor.waterfall.tooltip.wait): This is part of the tooltip
+# displayed in the requests waterfall for wait time (in milliseconds).
+netmonitor.waterfall.tooltip.wait	=待機 %S ms
+
+# LOCALIZATION NOTE (netmonitor.waterfall.tooltip.receive): This is part of the tooltip
+# displayed in the requests waterfall for receive time (in milliseiconds).
+netmonitor.waterfall.tooltip.receive	=受信 %S ms
+
 # LOCALIZATION NOTE (networkMenu.millisecond): This is the label displayed
 # in the network menu specifying timing interval divisions (in milliseconds).
 networkMenu.millisecond	=%S ms
 
 # LOCALIZATION NOTE (networkMenu.second): This is the label displayed
 # in the network menu specifying timing interval divisions (in seconds).
 networkMenu.second	=%S 秒
 
@@ -229,36 +292,31 @@ charts.sizeKB			=%S KB
 # LOCALIZATION NOTE (charts.transferredSizeKB): This is the label displayed
 # in pie or table charts specifying the size of a transferred request (in kilobytes).
 charts.transferredSizeKB	=%S KB
 
 # LOCALIZATION NOTE (charts.totalS): This is the label displayed
 # in pie or table charts specifying the time for a request to finish (in seconds).
 charts.totalS			=%S 秒
 
-# LOCALIZATION NOTE (charts.totalS): This is the label displayed
-# in the performance analysis view for total requests size, in kilobytes.
-charts.totalSize		=サイズ: %S KB
-
 # LOCALIZATION NOTE (charts.totalTranferredSize): This is the label displayed
 # in the performance analysis view for total transferred size, in kilobytes.
 charts.totalTransferredSize	=転送済みサイズ: %S KB
 
 # LOCALIZATION NOTE (charts.cacheEnabled): This is the label displayed
 # in the performance analysis view for "cache enabled" charts.
 charts.cacheEnabled		=キャッシュ済み
 
 # LOCALIZATION NOTE (charts.cacheDisabled): This is the label displayed
 # in the performance analysis view for "cache disabled" charts.
 charts.cacheDisabled		=非キャッシュ
 
 # LOCALIZATION NOTE (charts.totalSize): This is the label displayed
 # in the performance analysis view for total requests size, in kilobytes.
-## (^m^) 重複
-##charts.totalSize		=サイズ: %S KB
+charts.totalSize		=サイズ: %S KB
 
 # LOCALIZATION NOTE (charts.totalSeconds): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # This is the label displayed in the performance analysis view for the
 # total requests time, in seconds.
 charts.totalSeconds		=所要時間: #1 秒
 
 # LOCALIZATION NOTE (charts.totalCached): This is the label displayed
@@ -408,37 +466,84 @@ netmonitor.toolbar.status3		=ステータス
 # LOCALIZATION NOTE (netmonitor.toolbar.method): This is the label displayed
 # in the network table toolbar, above the "method" column.
 netmonitor.toolbar.method		=メソッド
 
 # LOCALIZATION NOTE (netmonitor.toolbar.file): This is the label displayed
 # in the network table toolbar, above the "file" column.
 netmonitor.toolbar.file			=ファイル
 
+# LOCALIZATION NOTE (netmonitor.toolbar.protocol): This is the label displayed
+# in the network table toolbar, above the "protocol" column.
+netmonitor.toolbar.protocol		=プロトコル
+
 # LOCALIZATION NOTE (netmonitor.toolbar.domain): This is the label displayed
 # in the network table toolbar, above the "domain" column.
 netmonitor.toolbar.domain		=ドメイン
 
+# LOCALIZATION NOTE (netmonitor.toolbar.remoteip): This is the label displayed
+# in the network table toolbar, above the "remoteip" column.
+netmonitor.toolbar.remoteip		=リモート IP
+
 # LOCALIZATION NOTE (netmonitor.toolbar.cause): This is the label displayed
 # in the network table toolbar, above the "cause" column.
 netmonitor.toolbar.cause		=発生源
 
 # LOCALIZATION NOTE (netmonitor.toolbar.type): This is the label displayed
 # in the network table toolbar, above the "type" column.
 netmonitor.toolbar.type			=タイプ
 
+# LOCALIZATION NOTE (netmonitor.toolbar.cookies): This is the label displayed
+# in the network table toolbar, above the "cookies" column.
+netmonitor.toolbar.cookies		=Cookie
+
+# LOCALIZATION NOTE (netmonitor.toolbar.setCookies): This is the label displayed
+# in the network table toolbar, above the "set cookies" column.
+# Set-Cookie is a HTTP response header. This string is the plural form of it.
+# See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie
+netmonitor.toolbar.setCookies		=Set-Cookies
+
+# LOCALIZATION NOTE (netmonitor.toolbar.scheme): This is the label displayed
+# in the network table toolbar, above the "scheme" column.
+netmonitor.toolbar.scheme		=スキーム
+
+# LOCALIZATION NOTE (netmonitor.toolbar.startTime): This is the label displayed
+# in the network table toolbar, above the "start time" column, which is the time
+# from start of 1st request until the start of this request.
+netmonitor.toolbar.startTime		=開始時刻
+
+# LOCALIZATION NOTE (netmonitor.toolbar.endTime): This is the label displayed
+# in the network table toolbar, above the "end time" column, which is the time
+# from start of 1st request until the end of this response.
+netmonitor.toolbar.endTime		=終了時刻
+
+# LOCALIZATION NOTE (netmonitor.toolbar.responseTime): This is the label displayed
+# in the network table toolbar, above the "response time" column, which is the time
+# from start of 1st request until the beginning of download of this response.
+netmonitor.toolbar.responseTime		=応答時間
+
+# LOCALIZATION NOTE (netmonitor.toolbar.duration): This is the label displayed
+# in the network table toolbar, above the "duration" column, which is the time
+# from start of this request until the end of this response.
+netmonitor.toolbar.duration		=間隔
+
+# LOCALIZATION NOTE (netmonitor.toolbar.latency): This is the label displayed
+# in the network table toolbar, above the "latency" column, which is the time
+# from end of this request until the beginning of download of this response.
+netmonitor.toolbar.latency		=遅延
+
 # LOCALIZATION NOTE (netmonitor.toolbar.transferred): This is the label displayed
 # in the network table toolbar, above the "transferred" column, which is the
 # compressed / encoded size.
 netmonitor.toolbar.transferred		=転送量
 
-# LOCALIZATION NOTE (netmonitor.toolbar.size): This is the label displayed
+# LOCALIZATION NOTE (netmonitor.toolbar.contentSize): This is the label displayed
 # in the network table toolbar, above the "size" column, which is the
 # uncompressed / decoded size.
-netmonitor.toolbar.size			=サイズ
+netmonitor.toolbar.contentSize		=サイズ
 
 # LOCALIZATION NOTE (netmonitor.toolbar.waterfall): This is the label displayed
 # in the network table toolbar, above the "waterfall" column.
 netmonitor.toolbar.waterfall		=タイムライン
 
 # LOCALIZATION NOTE (netmonitor.tab.headers): This is the label displayed
 # in the network details pane identifying the headers tab.
 netmonitor.tab.headers			=ヘッダー
@@ -454,19 +559,19 @@ netmonitor.tab.params			=パラメーター
 # LOCALIZATION NOTE (netmonitor.tab.response): This is the label displayed
 # in the network details pane identifying the response tab.
 netmonitor.tab.response			=応答
 
 # LOCALIZATION NOTE (netmonitor.tab.timings): This is the label displayed
 # in the network details pane identifying the timings tab.
 netmonitor.tab.timings			=タイミング
 
-# LOCALIZATION NOTE (netmonitor.tab.preview): This is the label displayed
-# in the network details pane identifying the preview tab.
-netmonitor.tab.preview			=プレビュー
+# LOCALIZATION NOTE (netmonitor.tab.stackTrace): This is the label displayed
+# in the network details pane identifying the stack-trace tab.
+netmonitor.tab.stackTrace		=スタックトレース
 
 # LOCALIZATION NOTE (netmonitor.tab.security): This is the label displayed
 # in the network details pane identifying the security tab.
 netmonitor.tab.security			=暗号化
 
 # LOCALIZATION NOTE (netmonitor.toolbar.filter.all): This is the label displayed
 # in the network toolbar for the "All" filtering button.
 netmonitor.toolbar.filter.all		=すべて
@@ -522,16 +627,24 @@ netmonitor.toolbar.filterFreetext.key	=C
 # LOCALIZATION NOTE (netmonitor.toolbar.clear): This is the label displayed
 # in the network toolbar for the "Clear" button.
 netmonitor.toolbar.clear		=消去
 
 # LOCALIZATION NOTE (netmonitor.toolbar.perf): This is the label displayed
 # in the network toolbar for the performance analysis button.
 netmonitor.toolbar.perf			=パフォーマンス解析を切り替える...
 
+# LOCALIZATION NOTE (netmonitor.toolbar.resetColumns): This is the label
+# displayed in the network table header context menu.
+netmonitor.toolbar.resetColumns		=列表示をリセット
+
+# LOCALIZATION NOTE (netmonitor.toolbar.timings): This is the label
+# displayed in the network table header context menu for the timing submenu
+netmonitor.toolbar.timings		=タイミング
+
 # LOCALIZATION NOTE (netmonitor.summary.url): This is the label displayed
 # in the network details headers tab identifying the URL.
 netmonitor.summary.url			=要求 URL:
 
 # LOCALIZATION NOTE (netmonitor.summary.method): This is the label displayed
 # in the network details headers tab identifying the method.
 netmonitor.summary.method		=要求メソッド:
 
@@ -639,16 +752,24 @@ netmonitor.security.hpkp		=公開鍵のピン留め:
 # in the security tab describing the section containing information related to
 # the secure connection.
 netmonitor.security.connection		=接続:
 
 # LOCALIZATION NOTE (netmonitor.security.certificate): This is the label displayed
 # in the security tab describing the server certificate section.
 netmonitor.security.certificate		=証明書:
 
+# LOCALIZATION NOTE (netmonitor.context.copy): This is the label displayed
+# for the copy sub-menu in the context menu for a request
+netmonitor.context.copy				=コピー
+
+# LOCALIZATION NOTE (netmonitor.context.copy.accesskey): This is the access key
+# for the copy sub-menu displayed in the context menu for a request
+netmonitor.context.copy.accesskey		=C
+
 # LOCALIZATION NOTE (netmonitor.context.copyUrl): This is the label displayed
 # on the context menu that copies the selected request's url
 netmonitor.context.copyUrl			=URL をコピー
 
 # LOCALIZATION NOTE (netmonitor.context.copyUrl.accesskey): This is the access key
 # for the Copy URL menu item displayed in the context menu for a request
 netmonitor.context.copyUrl.accesskey		=U
 
@@ -705,16 +826,24 @@ netmonitor.context.copyResponse.accesske
 # LOCALIZATION NOTE (netmonitor.context.copyImageAsDataUri): This is the label displayed
 # on the context menu that copies the selected image as data uri
 netmonitor.context.copyImageAsDataUri		=画像をデータ URI としてコピー
 
 # LOCALIZATION NOTE (netmonitor.context.copyImageAsDataUri.accesskey): This is the access key
 # for the Copy Image As Data URI menu item displayed in the context menu for a request
 netmonitor.context.copyImageAsDataUri.accesskey	=I
 
+# LOCALIZATION NOTE (netmonitor.context.saveImageAs): This is the label displayed
+# on the context menu that save the Image
+netmonitor.context.saveImageAs			=別名で画像を保存
+
+# LOCALIZATION NOTE (netmonitor.context.copyImageAsDataUri.accesskey): This is the access key
+# for the Copy Image As Data URI menu item displayed in the context menu for a request
+netmonitor.context.saveImageAs.accesskey	=V
+
 # LOCALIZATION NOTE (netmonitor.context.copyAllAsHar): This is the label displayed
 # on the context menu that copies all as HAR format
 netmonitor.context.copyAllAsHar			=HAR 形式ですべてコピー
 
 # LOCALIZATION NOTE (netmonitor.context.copyAllAsHar.accesskey): This is the access key
 # for the Copy All As HAR menu item displayed in the context menu for a network panel
 netmonitor.context.copyAllAsHar.accesskey	=O
 
@@ -779,8 +908,28 @@ netmonitor.custom.cancel		=キャンセル
 
 # LOCALIZATION NOTE (netmonitor.backButton): This is the label displayed
 # on the button which exists the performance statistics view
 netmonitor.backButton			=戻る
 
 # LOCALIZATION NOTE (netmonitor.headers.learnMore): This is the label displayed
 # next to a header list item, with a link to external documentation
 netmonitor.headers.learnMore		=詳細情報
+
+# LOCALIZATION NOTE (netmonitor.status.tooltip.simple): This is the tooltip of the
+# column status code, when request is not being cached or is not from a service worker
+# %1$S is the status code, %2$S is the status text.
+netmonitor.status.tooltip.simple	=%1$S %2$S
+
+# LOCALIZATION NOTE (netmonitor.status.tooltip.cached): This is the tooltip of
+# the column status code, when the request is cached
+# %1$S is the status code, %2$S is the status text.
+netmonitor.status.tooltip.cached	=%1$S %2$S (キャッシュ)
+
+# LOCALIZATION NOTE (netmonitor.status.tooltip.worker): This is the tooltip of
+# the column status code, when the request is from a service worker
+# %1$S is the status code, %2$S is the status text.
+netmonitor.status.tooltip.worker	=%1$S %2$S (Service Worker)
+
+# LOCALIZATION NOTE (netmonitor.status.tooltip.cachedworker): This is the tooltip
+# of the column status code, when the request is cached and is from a service worker
+# %1$S is the status code, %2$S is the status text.
+netmonitor.status.tooltip.cachedworker	=%1$S %2$S (キャッシュ、Service Worker)
deleted file mode 100644
--- a/devtools/client/projecteditor.properties
+++ /dev/null
@@ -1,88 +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 ProjectEditor component
-# which is used for editing files in a directory and is used inside the
-# App Manager.
-# 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 (projecteditor.confirmUnsavedTitle):
-# This string is displayed as as the title of the confirm prompt that checks
-# to make sure if the project can be closed/switched without saving changes
-projecteditor.confirmUnsavedTitle	= 未保存の変更
-
-# LOCALIZATION NOTE (projecteditor.confirmUnsavedLabel2):
-# This string is displayed as the message of the confirm prompt that checks
-# to make sure if the project can be closed/switched without saving changes
-projecteditor.confirmUnsavedLabel2	= 未保存の変更は失われます。よろしいですか?
-
-# LOCALIZATION NOTE (projecteditor.deleteLabel):
-# This string is displayed as a context menu item for allowing the selected
-# file / folder to be deleted.
-projecteditor.deleteLabel	= 削除
-
-# LOCALIZATION NOTE (projecteditor.deletePromptTitle):
-# This string is displayed as as the title of the confirm prompt that checks
-# to make sure if a file or folder should be removed.
-projecteditor.deletePromptTitle	= 削除
-
-# LOCALIZATION NOTE (projecteditor.deleteFolderPromptMessage):
-# This string is displayed as as the message of the confirm prompt that checks
-# to make sure if a folder should be removed.
-projecteditor.deleteFolderPromptMessage	= このフォルダーを削除しますか?
-
-# LOCALIZATION NOTE (projecteditor.deleteFilePromptMessage):
-# This string is displayed as as the message of the confirm prompt that checks
-# to make sure if a file should be removed.
-projecteditor.deleteFilePromptMessage	= このファイルを削除しますか?
-
-# LOCALIZATION NOTE (projecteditor.newLabel):
-# This string is displayed as a menu item for adding a new file to
-# the directory.
-projecteditor.newLabel		= 新規作成...
-
-# LOCALIZATION NOTE (projecteditor.renameLabel):
-# This string is displayed as a menu item for renaming a file in
-# the directory.
-projecteditor.renameLabel	= 名前変更
-
-# LOCALIZATION NOTE (projecteditor.saveLabel):
-# This string is displayed as a menu item for saving the current file.
-projecteditor.saveLabel		= 保存
-
-# LOCALIZATION NOTE (projecteditor.saveAsLabel):
-# This string is displayed as a menu item for saving the current file
-# with a new name.
-projecteditor.saveAsLabel	= 別名で保存...
-
-# LOCALIZATION NOTE (projecteditor.selectFileLabel):
-# This string is displayed as the title on the file picker when saving a file.
-projecteditor.selectFileLabel	= ファイルを選択
-
-# LOCALIZATION NOTE (projecteditor.openFolderLabel):
-# This string is displayed as the title on the file picker when opening a folder.
-projecteditor.openFolderLabel	= フォルダーを選択
-
-# LOCALIZATION NOTE (projecteditor.openFileLabel):
-# This string is displayed as the title on the file picker when opening a file.
-projecteditor.openFileLabel	= ファイルを開く
-
-# LOCALIZATION NOTE  (projecteditor.find.commandkey): This is the key to use in
-# conjunction with accel (Command on Mac or Ctrl on other platforms) to search
-# text in the files.
-projecteditor.find.commandkey	= F
-
-# LOCALIZATION NOTE  (projecteditor.save.commandkey): This is the key to use in
-# conjunction with accel (Command on Mac or Ctrl on other platforms) to
-# save the file.  It is used with accel+shift to "save as".
-projecteditor.save.commandkey	= S
-
-# LOCALIZATION NOTE  (projecteditor.new.commandkey): This is the key to use in
-# conjunction with accel (Command on Mac or Ctrl on other platforms) to
-# create a new file.
-projecteditor.new.commandkey	= N
--- a/devtools/client/responsiveUI.properties
+++ b/devtools/client/responsiveUI.properties
@@ -6,17 +6,16 @@
 # which is available from the Web Developer sub-menu -> 'Responsive 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  (responsiveUI.rotate): label of the rotate button.
 responsiveUI.rotate2			=高さと幅を入れ替え
 
 # LOCALIZATION NOTE  (responsiveUI.screenshot): tooltip of the screenshot button.
 responsiveUI.screenshot			=スクリーンショット
 
 # LOCALIZATION NOTE  (responsiveUI.userAgentPlaceholder): placeholder for the user agent input.
 responsiveUI.userAgentPlaceholder	=カスタムユーザーエージェント
@@ -62,8 +61,18 @@ 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
+
+# LOCALIZATION NOTE (responsiveUI.newVersionUserDisabled): notification that appears
+# when old RDM is displayed because the user has disabled new RDM.
+responsiveUI.newVersionUserDisabled		=レスポンシブデザインモードの新しいバージョンが利用可能ですが無効化されています。有効にしてフィードバックをお寄せください。このバージョンは削除されます。
+# LOCALIZATION NOTE (responsiveUI.newVersionE10sDisabled): notification that appears
+# when old RDM is displayed because e10s is disabled.
+responsiveUI.newVersionE10sDisabled		=レスポンシブデザインモードの新しいバージョンが利用可能ですが、現在無効化されているマルチプロセスモードにする必要があります。これを有効にしてフィードバックをお寄せください。このバージョンは削除されます。
+# LOCALIZATION NOTE (responsiveUI.newVersionEnableAndRestart): button text in notification
+# to enable new RDM itself or e10s as a prerequisite for new RDM.
+responsiveUI.newVersionEnableAndRestart		=有効にして再起動
--- a/devtools/client/startup.properties
+++ b/devtools/client/startup.properties
@@ -170,19 +170,19 @@ inspector.tooltip2		=DOM とスタイルシートの調査 (%S)
 # This string is displayed in the title of the tab when the Network Monitor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 netmonitor.label		=ネットワーク
 
 # LOCALIZATION NOTE (netmonitor.panelLabel):
 # This is used as the label for the toolbox panel.
 netmonitor.panelLabel		=ネットワークパネル
 
-# LOCALIZATION NOTE (netmonitor.commandkey, netmonitor.accesskey)
+# LOCALIZATION NOTE (netmonitor.commandkey2, netmonitor.accesskey)
 # Used for the menuitem in the tool menu
-netmonitor.commandkey		=Q
+netmonitor.commandkey2		=E
 netmonitor.accesskey		=N
 
 # LOCALIZATION NOTE (netmonitor.tooltip2):
 # This string is displayed in the tooltip of the tab when the Network Monitor is
 # displayed inside the developer tools window.
 # Keyboard shortcut for Network Monitor will be shown inside the brackets.
 netmonitor.tooltip2		=ネットワークモニター (%S)
 
--- a/devtools/client/storage.properties
+++ b/devtools/client/storage.properties
@@ -82,19 +82,33 @@ storage.data.label			=データ
 # LOCALIZATION NOTE (storage.parsedValue.label):
 # This is the heading displayed over the item parsed value in the sidebar
 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):
+# LOCALIZATION NOTE (storage.popupMenu.addItemLabel):
+# Label of popup menu action to add an item.
+storage.popupMenu.addItemLabel		=アイテムを追加
+
+# LOCALIZATION NOTE (storage.popupMenu.deleteAllFromLabel):
 # Label of popup menu action to delete all storage items.
 storage.popupMenu.deleteAllFromLabel	="%S" のすべてのアイテムを削除
 
 # LOCALIZATION NOTE (storage.idb.deleteBlocked):
 # Warning notification when IndexedDB database could not be deleted immediately.
 storage.idb.deleteBlocked		=データベース "%S" はすべての接続が切断されてから削除されます。
 
 # LOCALIZATION NOTE (storage.idb.deleteError):
 # Error notification when IndexedDB database could not be deleted.
-storage.idb.deleteError			=データベース "%S" は削除できませんでした。
+storage.idb.deleteError			=データベース "%S" を削除できませんでした。
+
+# LOCALIZATION NOTE (storage.expandPane):
+# This is the tooltip for the button that collapses the right panel in the
+# storage UI when the panel is closed.
+storage.expandPane			=ペインを展開します
+
+# LOCALIZATION NOTE (storage.collapsePane):
+# This is the tooltip for the button that collapses the right panel in the
+# storage UI when the panel is open.
+storage.collapsePane			=ペインを折りたたみます
--- a/devtools/client/webconsole.properties
+++ b/devtools/client/webconsole.properties
@@ -89,16 +89,19 @@ noCounterLabel			=<ラベルなし>
 # console.group messages with no label provided.
 noGroupLabel			=<グループラベルなし>
 
 # LOCALIZATION NOTE (Autocomplete.blank): this string is used when inputnode
 # string containing anchor doesn't matches to any property in the content.
 Autocomplete.blank		=  <- 結果なし
 
 maxTimersExceeded		=ページ内で使用可能なタイマー数が上限に達しました。
+timerAlreadyExists		=タイマー “%S” はすでに存在します。
+timerDoesntExist		=タイマー “%S” は存在しません。
+timerJSError			=タイマー名の処理に失敗しました。
 
 # LOCALIZATION NOTE (maxCountersExceeded): Error message shown when the maximum
 # number of console.count()-counters was exceeded.
 maxCountersExceeded		=ページ内で使用可能なカウンターが上限に達しました。
 
 # LOCALIZATION NOTE (longStringEllipsis): the string displayed after a long
 # string. This string is clickable such that the rest of the string is
 # retrieved from the server.
--- a/devtools/client/webide.dtd
+++ b/devtools/client/webide.dtd
@@ -40,18 +40,16 @@
 <!ENTITY runtimeMenu_showMonitor_accesskey		"M">
 <!ENTITY runtimeMenu_showDevicePrefs_label		"端末の設定">
 <!ENTITY runtimeMenu_showDevicePrefs_accesskey		"D">
 <!ENTITY runtimeMenu_showSettings_label			"端末オプション">
 <!ENTITY runtimeMenu_showSettings_accesskey		"s">
 
 <!ENTITY viewMenu_label					"表示">
 <!ENTITY viewMenu_accesskey				"V">
-<!ENTITY viewMenu_toggleEditor_label			"エディターを切り替え">
-<!ENTITY viewMenu_toggleEditor_accesskey		"E">
 <!ENTITY viewMenu_zoomin_label				"拡大">
 <!ENTITY viewMenu_zoomin_accesskey			"I">
 <!ENTITY viewMenu_zoomout_label				"縮小">
 <!ENTITY viewMenu_zoomout_accesskey			"O">
 <!ENTITY viewMenu_resetzoom_label			"拡大/縮小をリセット">
 <!ENTITY viewMenu_resetzoom_accesskey			"R">
 
 <!ENTITY projectButton_label				"アプリを開く">
@@ -61,18 +59,16 @@
 <!-- quit app -->
 <!ENTITY key_quit					"W">
 <!-- open menu -->
 <!ENTITY key_showProjectPanel				"O">
 <!-- reload app -->
 <!ENTITY key_play					"R">
 <!-- show toolbox -->
 <!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">
 
 <!ENTITY projectPanel_myProjects			"マイプロジェクト">
 <!ENTITY projectPanel_runtimeApps			"ランタイムアプリ">
@@ -118,31 +114,16 @@
 <!ENTITY prefs_restore					"デフォルトに戻す">
 <!ENTITY prefs_manage_components			"追加のコンポーネントを管理">
 <!ENTITY prefs_options_autoconnectruntime		"前回のランタイムに再接続">
 <!ENTITY prefs_options_autoconnectruntime_tooltip	"WebIDE の起動時に前回のランタイムに再接続します">
 <!ENTITY prefs_options_rememberlastproject		"最後に選択したプロジェクトを記録">
 <!ENTITY prefs_options_rememberlastproject_tooltip	"WebIDE の起動時に前回開いたプロジェクトを自動的に選択します">
 <!ENTITY prefs_options_templatesurl			"テンプレート URL">
 <!ENTITY prefs_options_templatesurl_tooltip		"利用可能なテンプレートの一覧です">
-<!ENTITY prefs_options_showeditor			"エディターを表示">
-<!ENTITY prefs_options_showeditor_tooltip		"組み込みエディターを表示します">
-<!ENTITY prefs_options_tabsize				"タブの長さ">
-<!ENTITY prefs_options_expandtab			"ソフトタブ">
-<!ENTITY prefs_options_expandtab_tooltip		"タブ文字の代わりにスペース文字を使います">
-<!ENTITY prefs_options_detectindentation		"自動インデント">
-<!ENTITY prefs_options_detectindentation_tooltip	"ソースの内容からインデントを推測します">
-<!ENTITY prefs_options_autocomplete			"自動補完">
-<!ENTITY prefs_options_autocomplete_tooltip		"コードの自動補完を有効にします">
-<!ENTITY prefs_options_autoclosebrackets		"閉じ括弧自動入力">
-<!ENTITY prefs_options_autoclosebrackets_tooltip	"閉じ括弧を自動的に入力します">
-<!ENTITY prefs_options_keybindings			"キー割り当て">
-<!ENTITY prefs_options_keybindings_default		"デフォルト">
-<!ENTITY prefs_options_autosavefiles			"ファイルの自動保存">
-<!ENTITY prefs_options_autosavefiles_tooltip		"プロジェクトを実行する前に、編集したファイルを自動的に保存します">
 
 <!-- Runtime Details -->
 <!ENTITY runtimedetails_title				"ランタイム情報">
 <!ENTITY runtimedetails_adbIsRoot			"ADB は root です: ">
 <!ENTITY runtimedetails_summonADBRoot			"root 端末">
 <!ENTITY runtimedetails_ADBRootWarning			"(ロック解除されたブートローダが必要です)">
 <!ENTITY runtimedetails_unrestrictedPrivileges		"開発ツールの権限の制限解除: ">
 <!ENTITY runtimedetails_requestPrivileges		"上位の権限を要求">