46.0: sync devtools/client with en-US rev304440:a67f02c29ede
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Mon, 07 Mar 2016 12:40:13 +0900
changeset 2043 e5420ef3312531d3927315120f07c5dafedd0abf
parent 2042 e5063f2aa827a1a6f7a11cf32528951974628d43
child 2044 bb6de64b3309f925aabaa82b053b61b6935fdb78
push id1104
push useraxel@mozilla.com
push dateMon, 07 Mar 2016 14:30:53 +0000
bugs46
46.0: sync devtools/client with en-US rev304440:a67f02c29ede
devtools/client/components.properties
devtools/client/markers.properties
devtools/client/memory.properties
devtools/client/netmonitor.dtd
devtools/client/netmonitor.properties
devtools/client/shared.properties
devtools/client/toolbox.properties
devtools/client/webConsole.dtd
devtools/client/webide.dtd
new file mode 100644
--- /dev/null
+++ b/devtools/client/components.properties
@@ -0,0 +1,15 @@
+# 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 in the shared React components,
+# so files in `devtools/client/shared/components/*`.
+
+# LOCALIZATION NOTE (frame.unknownSource): When we do not know the source filename of
+# a frame, we use this string instead.
+frame.unknownSource		=(不明)
+
+# LOCALIZATION NOTE (viewsourceindebugger): The label for the tooltip when hovering over
+# a source link that links to the debugger.
+# %S represents the URL to match in the debugger.
+frame.viewsourceindebugger	=デバッガでソースを表示 → %S
--- a/devtools/client/markers.properties
+++ b/devtools/client/markers.properties
@@ -19,21 +19,22 @@ marker.label.reflow				=レイアウト
 marker.label.paint				=描画
 marker.label.composite				=レイヤー合成
 marker.label.compositeForwardTransaction	=合成要求の送信
 marker.label.javascript				=関数呼び出し
 marker.label.parseHTML				=HTML パース
 marker.label.parseXML				=XML パース
 marker.label.domevent				=DOM イベント
 marker.label.consoleTime			=コンソール
-marker.label.garbageCollection2			=ガベージコレクション
+marker.label.garbageCollection2			=ガベージコレクション (GC)
 marker.label.garbageCollection.incremental	=インクリメンタル GC
 marker.label.garbageCollection.nonIncremental	=非インクリメンタル GC
-marker.label.cycleCollection			=サイクルコレクション
-marker.label.cycleCollection.forgetSkippable	=サイクルコレクショングラフ削減
+marker.label.minorGC				=マイナー GC
+marker.label.cycleCollection			=サイクルコレクション (CC)
+marker.label.cycleCollection.forgetSkippable	=CC グラフ削減
 marker.label.timestamp				=タイムスタンプ
 marker.label.worker				=Worker
 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 タグ
@@ -120,16 +121,20 @@ 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.*):
 # These strings are used to give an expanded description of why a GC occurred.
 marker.gcreason.description.API				=ガベージコレクションを強制する API 呼び出しがありました。
 marker.gcreason.description.EAGER_ALLOC_TRIGGER		=JavaScript がイベントループに戻りました。最後に新しい GC サイクルが開始してから十分な量のメモリが割り当てられています。
 marker.gcreason.description.DESTROY_RUNTIME		=シャットダウンする前の最後のガベージコレクションで JavaScript ランタイムまたはコンテキストが破損しました。
 marker.gcreason.description.DESTROY_CONTEXT		=シャットダウンする前の最後のガベージコレクションで JavaScript ランタイムまたはコンテキストが破損しました。
 marker.gcreason.description.LAST_DITCH			=JavaScript がメモリを割り当てようとしましたが利用可能なメモリが足りません。割り当てに必要なメモリを確保するため、完全最適化 GC を実行しています。
 marker.gcreason.description.TOO_MUCH_MALLOC		=多量のメモリを割り当てたため、ガベージコレクションが実行されました。
--- a/devtools/client/memory.properties
+++ b/devtools/client/memory.properties
@@ -5,210 +5,268 @@
 # LOCALIZATION NOTE These strings are used inside the Memory Tools
 # which is available from the Web Developer sub-menu -> 'Memory'.
 # 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 (memory.label):
-# This string is displayed in the title of the tab when the memory tool is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-memory.label				= メモリ
+# LOCALIZATION NOTE (memory.label): This string is displayed in the title of the
+# tab when the memory tool is displayed inside the developer tools window and in
+# the Developer Tools Menu.
+memory.label				=メモリ
 
-# LOCALIZATION NOTE (memory.panelLabel):
-# This is used as the label for the toolbox panel.
-memory.panelLabel			= メモリパネル
+# LOCALIZATION NOTE (memory.panelLabel): This is used as the label for the
+# toolbox panel.
+memory.panelLabel			=メモリパネル
 
-# LOCALIZATION NOTE (memory.tooltip):
-# This string is displayed in the tooltip of the tab when the memory tool is
-# displayed inside the developer tools window.
-memory.tooltip				= メモリ
+# LOCALIZATION NOTE (memory.tooltip): This string is displayed in the tooltip of
+# the tab when the memory tool is displayed inside the developer tools window.
+memory.tooltip				=メモリ
+
+# LOCALIZATION NOTE (snapshot.io.save): The label for the link that saves a
+# snapshot to disk.
+snapshot.io.save			=保存
 
-# LOCALIZATION NOTE (snapshot.io.save): The label for the link that saves a snapshot
-# to disk.
-snapshot.io.save			= 保存
+# LOCALIZATION NOTE (snapshot.io.save.window): The title for the window
+# displayed when saving a snapshot to disk.
+snapshot.io.save.window			=ヒープスナップショットを保存
 
-# LOCALIZATION NOTE (snapshot.io.save.window): The title for the window displayed when
-# saving a snapshot to disk.
-snapshot.io.save.window			= ヒープスナップショットを保存
-
-# LOCALIZATION NOTE (snapshot.io.import.window): The title for the window displayed when
-# importing a snapshot form disk.
-snapshot.io.import.window		= ヒープスナップショットをインポート
+# LOCALIZATION NOTE (snapshot.io.import.window): The title for the window
+# displayed when importing a snapshot form disk.
+snapshot.io.import.window		=ヒープスナップショットをインポート
 
 # LOCALIZATION NOTE (snapshot.io.filter): The title for the filter used to
 # filter file types (*.fxsnapshot)
-snapshot.io.filter			= Firefox ヒープスナップショット
+snapshot.io.filter			=Firefox ヒープスナップショット
 
-# LOCALIZATION NOTE (aggregate.mb): The label annotating the number of bytes (in megabytes)
-# in a snapshot. %S represents the value, rounded to 2 decimal points.
-aggregate.mb				= %S MB
+# LOCALIZATION NOTE (aggregate.mb): The label annotating the number of bytes (in
+# megabytes) in a snapshot. %S represents the value, rounded to 2 decimal
+# points.
+aggregate.mb				=%S MB
 
 # LOCALIZATION NOTE (snapshot-title.loading): The title for a snapshot before
 # it has a creation time to display.
-snapshot-title.loading			= 処理中...
+snapshot-title.loading			=処理中...
 
 # LOCALIZATION NOTE (checkbox.invertTree): The label describing the boolean
 # checkbox whether or not to invert the tree.
-checkbox.invertTree			= ツリーを反転
+checkbox.invertTree			=ツリーを反転
 
-# LOCALIZATION NOTE (checkbox.recordAllocationStacks): The label describing the boolean
-# checkbox whether or not to record allocation stacks.
-checkbox.recordAllocationStacks		= 割り当てスタックを記録
+# 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			= グループ化:
+toolbar.breakdownBy			=グループ化:
+
+# LOCALIZATION NOTE (toolbar.labelBy): The label describing the select menu
+# options of the label options.
+toolbar.labelBy				=ラベル:
+
+# LOCALIZATION NOTE (toolbar.view): The label for the view selector in the
+# toolbar.
+toolbar.view				=表示:
+
+# LOCALIZATION NOTE (toolbar.view.census): The label for the census view option
+# in the toolbar.
+toolbar.view.census			=総計
 
-# 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 (toolbar.view.dominators): The label for the dominators view
+# option in the toolbar.
+toolbar.view.dominators			=ドミネータ
+
+# 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 (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				= +/-
+diff-snapshots				=+/-
 
 # LOCALIZATION NOTE (diff-snapshots.tooltip): The tooltip for the button that
 # initiates selecting two snapshots to diff with each other.
-diff-snapshots.tooltip			= スナップショットを比較します
+diff-snapshots.tooltip			=スナップショットを比較します
 
 # LOCALIZATION NOTE (filter.placeholder): The placeholder text used for the
 # memory tool's filter search box.
-filter.placeholder			= フィルタ
+filter.placeholder			=フィルタ
 
-# LOCALIZATION NOTE (viewsourceindebugger): The label for the tooltip when hovering over
-# a link in the heap tree to jump to the debugger view.
-# %S represents the URL to match in the debugger.
-viewsourceindebugger			= デバッガでソースを表示 → %S
+# LOCALIZATION NOTE (tree-item.load-more): The label for the links to fetch the
+# lazily loaded sub trees in the dominator tree view.
+tree-item.load-more			=続きを取得...
+
+# LOCALIZATION NOTE (tree-item.rootlist): The label for the root of the
+# dominator tree.
+tree-item.rootlist			=GC ルート
 
 # LOCALIZATION NOTE (tree-item.nostack): The label describing the row in the heap tree
 # that represents a row broken down by allocation stack when no stack was available.
-tree-item.nostack			= (有効なスタックはありません)
+tree-item.nostack			=(有効なスタックはありません)
 
 # LOCALIZATION NOTE (tree-item.nofilename): The label describing the row in the
 # heap tree that represents a row broken down by filename when no filename was
 # available.
-tree-item.nofilename			= (有効なファイル名はありません)
+tree-item.nofilename			=(有効なファイル名はありません)
 
 # LOCALIZATION NOTE (tree-item.root): The label describing the row in the heap tree
 # that represents the root of the tree when inverted.
-tree-item.root				= (ルート)
+tree-item.root				=(ルート)
 
 # LOCALIZATION NOTE (tree-item.percent): A percent of bytes or count displayed in the tree view.
-tree-item.percent			= %S%
+tree-item.percent			=%S%
 
 # LOCALIZATION NOTE (diffing.baseline): The name of the baseline snapshot in a
 # diffing comparison.
-diffing.baseline			= ベースライン
+diffing.baseline			=ベースライン
 
 # LOCALIZATION NOTE (diffing.comparison): The name of the snapshot being
 # compared to the baseline in a diffing comparison.
-diffing.comparison			= 比較
+diffing.comparison			=比較
 
 # LOCALIZATION NOTE (diffing.prompt.selectBaseline): The prompt to select the
 # first snapshot when doing a diffing comparison.
-diffing.prompt.selectBaseline		= ベースラインスナップショットを選択してください
+diffing.prompt.selectBaseline		=ベースラインスナップショットを選択してください
 
 # LOCALIZATION NOTE (diffing.prompt.selectComparison): The prompt to select the
 # second snapshot when doing a diffing comparison.
-diffing.prompt.selectComparison		= ベースラインと比較するスナップショットを選択してください
+diffing.prompt.selectComparison		=ベースラインと比較するスナップショットを選択してください
 
 # LOCALIZATION NOTE (diffing.state.error): The label describing the diffing
 # state ERROR, used in the snapshot list when an error occurs while diffing two
 # snapshots.
-diffing.state.error			= エラー
+diffing.state.error			=エラー
 
 # LOCALIZATION NOTE (diffing.state.error.full): The text describing the diffing
 # state ERROR, used in the main view when an error occurs while diffing two
 # snapshots.
-diffing.state.error.full		= スナップショットの比較でエラーがありました
+diffing.state.error.full		=スナップショットの比較中にエラーが発生しました。
 
 # LOCALIZATION NOTE (diffing.state.taking-diff): The label describing the diffin
 # state TAKING_DIFF, used in the snapshots list when computing the difference
 # between two snapshots.
-diffing.state.taking-diff		= 差分を計算中...
+diffing.state.taking-diff		=差分を計算中...
 
 # LOCALIZATION NOTE (diffing.state.taking-diff.full): The label describing the
 # diffing state TAKING_DIFF, used in the main view when computing the difference
 # between two snapshots.
-diffing.state.taking-diff.full		= 差分を計算しています...
+diffing.state.taking-diff.full		=差分を計算しています...
 
 # LOCALIZATION NOTE (diffing.state.selecting): The label describing the diffing
 # state SELECTING.
-diffing.state.selecting			= 比較する 2 つのスナップショットを選択
+diffing.state.selecting			=比較する 2 つのスナップショットを選択
 
 # LOCALIZATION NOTE (diffing.state.selecting.full): The label describing the
 # diffing state SELECTING, used in the main view when selecting snapshots to
 # diff.
-diffing.state.selecting.full		= 比較する 2 つのスナップショットを選択してください
+diffing.state.selecting.full		=比較する 2 つのスナップショットを選択してください
+
+# LOCALIZATION NOTE (dominatorTree.state.computing): The label describing the
+# dominator tree state COMPUTING.
+dominatorTree.state.computing		=ドミネータの計算中...
+
+# LOCALIZATION NOTE (dominatorTree.state.computing): The label describing the
+# dominator tree state COMPUTING, used in the dominator tree view.
+dominatorTree.state.computing.full	=ドミネータツリーを計算しています...
+
+# LOCALIZATION NOTE (dominatorTree.state.fetching): The label describing the
+# dominator tree state FETCHING.
+dominatorTree.state.fetching		=サイズの計算中...
+
+# LOCALIZATION NOTE (dominatorTree.state.fetching): The label describing the
+# dominator tree state FETCHING, used in the dominator tree view.
+dominatorTree.state.fetching.full	=保持サイズを計算しています...
+
+# LOCALIZATION NOTE (dominatorTree.state.incrementalFetching): The label
+# describing the dominator tree state INCREMENTAL_FETCHING.
+dominatorTree.state.incrementalFetching	=取得中...
+
+# LOCALIZATION NOTE (dominatorTree.state.incrementalFetching): The label describing the
+# dominator tree state INCREMENTAL_FETCHING, used in the dominator tree view.
+dominatorTree.state.incrementalFetching.full	=サブツリーを取得しています...
+
+# LOCALIZATION NOTE (dominatorTree.state.error): The label describing the
+# dominator tree state ERROR.
+dominatorTree.state.error		=エラー
+
+# LOCALIZATION NOTE (dominatorTree.state.error): The label describing the
+# dominator tree state ERROR, used in the dominator tree view.
+dominatorTree.state.error.full		=ドミネータツリーの処理中にエラーが発生しました。
 
 # LOCALIZATION NOTE (snapshot.state.saving.full): The label describing the
 # snapshot state SAVING, used in the main heap view.
-snapshot.state.saving.full		= スナップショットを保存しています...
+snapshot.state.saving.full		=スナップショットを保存しています...
 
 # LOCALIZATION NOTE (snapshot.state.importing.full): The label describing the
 # snapshot state IMPORTING, used in the main heap view.
-snapshot.state.importing.full		= インポートしています...
+snapshot.state.importing.full		=インポートしています...
 
 # LOCALIZATION NOTE (snapshot.state.reading.full): The label describing the
 # snapshot state READING, and SAVED, due to these states being combined
 # visually, used in the main heap view.
-snapshot.state.reading.full		= スナップショットを読み込んでいます...
+snapshot.state.reading.full		=スナップショットを読み込んでいます...
 
 # LOCALIZATION NOTE (snapshot.state.saving-census.full): The label describing
 # the snapshot state SAVING, used in the main heap view.
-snapshot.state.saving-census.full	= 集計結果を保存しています...
+snapshot.state.saving-census.full	=集計結果を保存しています...
 
 # LOCALIZATION NOTE (snapshot.state.error.full): The label describing the
 # snapshot state ERROR, used in the main heap view.
-snapshot.state.error.full		= スナップショットの処理中にエラーがありました
+snapshot.state.error.full		=スナップショットの処理中にエラーが発生しました。
 
 # LOCALIZATION NOTE (snapshot.state.saving): The label describing the snapshot
 # state SAVING, used in the snapshot list view
-snapshot.state.saving			= スナップショットの保存中...
+snapshot.state.saving			=スナップショットの保存中...
 
 # LOCALIZATION NOTE (snapshot.state.importing): The label describing the
 # snapshot state IMPORTING, used in the snapshot list view
-snapshot.state.importing		= スナップショットのインポート中...
+snapshot.state.importing		=スナップショットのインポート中...
 
 # LOCALIZATION NOTE (snapshot.state.reading): The label describing the snapshot
 # state READING, and SAVED, due to these states being combined visually, used in
 # the snapshot list view.
-snapshot.state.reading			= スナップショットの読み込み中...
+snapshot.state.reading			=スナップショットの読み込み中...
 
 # LOCALIZATION NOTE (snapshot.state.saving-census): The label describing the
 # snapshot state SAVING, used in snapshot list view.
-snapshot.state.saving-census		= 集計結果の保存中...
+snapshot.state.saving-census		=集計結果の保存中...
 
 # LOCALIZATION NOTE (snapshot.state.error): The label describing the snapshot
 # state ERROR, used in the snapshot list view.
-snapshot.state.error			= エラー
+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.
-heapview.noAllocationStacks		= 割り当てスタックがありませんでした。ヒープのスナップショットを採取する前に割り当てスタックを記録してください。
+heapview.noAllocationStacks		=割り当てスタックがありませんでした。ヒープのスナップショットを採取する前に割り当てスタックを記録してください。
+
+# LOCALIZATION NOTE (heapview.field.retainedSize): The name of the column in the
+# dominator tree view for retained byte sizes.
+heapview.field.retainedSize		=保持サイズ (バイト)
+
+# LOCALIZATION NOTE (heapview.field.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.
-heapview.field.bytes			= バイト
+heapview.field.bytes			=バイト
 
 # LOCALIZATION NOTE (heapview.field.count): The name of the column in the heap view for count.
-heapview.field.count			= 個数
+heapview.field.count			=個数
 
 # LOCALIZATION NOTE (heapview.field.totalbytes): The name of the column in the heap view for total bytes.
-heapview.field.totalbytes		= 合計バイト
+heapview.field.totalbytes		=合計バイト
 
 # LOCALIZATION NOTE (heapview.field.totalcount): The name of the column in the heap view for total count.
-heapview.field.totalcount		= 合計数
+heapview.field.totalcount		=合計数
 
 # LOCALIZATION NOTE (heapview.field.name): The name of the column in the heap view for name.
-heapview.field.name			= 名前
-
-# LOCALIZATION NOTE (unknownSource): When we do not know the source filename of
-# a frame in the allocation stack breakdown tree view, we use this string
-# instead.
-unknownSource				= (不明)
+heapview.field.name			=名前
--- a/devtools/client/netmonitor.dtd
+++ b/devtools/client/netmonitor.dtd
@@ -19,17 +19,17 @@
 <!-- LOCALIZATION NOTE (netmonitorUI.reload1/2/3): These are the labels displayed
   -  in the network table when empty to start logging network requests. -->
 <!ENTITY netmonitorUI.reloadNotice1       "• 要求を送信するかページを">
 <!ENTITY netmonitorUI.reloadNotice2       "再読み込み">
 <!ENTITY netmonitorUI.reloadNotice3       "すると、ネットワークの稼働状況を確認できます。">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status2): This is the label displayed
   -  in the network table toolbar, above the "status" column. -->
-<!ENTITY netmonitorUI.toolbar.status2     "✓">
+<!ENTITY netmonitorUI.toolbar.status3     "状態">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
   -  in the network table toolbar, above the "method" column. -->
 <!ENTITY netmonitorUI.toolbar.method      "メソッド">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.file): This is the label displayed
   -  in the network table toolbar, above the "file" column. -->
 <!ENTITY netmonitorUI.toolbar.file        "ファイル">
--- a/devtools/client/netmonitor.properties
+++ b/devtools/client/netmonitor.properties
@@ -42,17 +42,17 @@ netmonitor.security.state.insecure	=このリソースの取得に使われる接続は安全ではありません。
 
 # LOCALIZATION NOTE (netmonitor.security.state.broken)
 # This string is used as an tooltip for request that failed due to security
 # issues.
 netmonitor.security.state.broken	=暗号化に問題があるため、読み込まれたリソースを無視しました。
 
 # LOCALIZATION NOTE (netmonitor.security.state.weak)
 # This string is used as an tooltip for request that had minor security issues
-netmonitor.security.state.weak		=このリソースは、十分に保護できない暗号化を使用した接続を通して転送されました。
+netmonitor.security.state.weak		=このリソースは、十分に保護できない暗号を使用した接続を通して転送されました。
 
 # LOCALIZATION NOTE (netmonitor.security.enabled):
 # This string is used to indicate that a specific security feature is used by
 # a connection in the security details tab.
 # For example: "HTTP Strict Transport Security: Enabled"
 netmonitor.security.enabled		=有効
 
 # LOCALIZATION NOTE (netmonitor.security.disabled):
@@ -69,16 +69,26 @@ netmonitor.security.hostHeader		=ホスト %S:
 
 # LOCALIZATION NOTE (netmonitor.security.notAvailable):
 # This string is used to indicate that a certain piece of information is not
 # available to be displayd. For example a certificate that has no organization
 # defined:
 #   Organization: <Not Available>
 netmonitor.security.notAvailable	=<利用不可>
 
+# LOCALIZATION NOTE (netmonitor.status.cached):
+# This string is used as tooltip text over the status icon when a request is
+# served from cached.
+netmonitor.status.cached		=キャッシュ
+
+# LOCALIZATION NOTE (netmonitor.status.serviceWorker):
+# This string is used as tooltip text over the status icon when a request is
+# served from a service worker.
+netmonitor.status.serviceWorker		=Service Worker
+
 # LOCALIZATION NOTE (collapseDetailsPane): This is the tooltip for the button
 # that collapses the network details pane in the UI.
 collapseDetailsPane	=要求の詳細を閉じる
 
 # LOCALIZATION NOTE (expandDetailsPane): This is the tooltip for the button
 # that expands the network details pane in the UI.
 expandDetailsPane	=要求の詳細を表示
 
@@ -179,16 +189,21 @@ networkMenu.sizeKB	=%S KB
 # unavailable.
 networkMenu.sizeUnavailable	=—
 
 # LOCALIZATION NOTE (networkMenu.sizeCached): This is the label displayed
 # in the network menu specifying the transferred of a request is
 # cached.
 networkMenu.sizeCached		=キャッシュ
 
+# LOCALIZATION NOTE (networkMenu.sizeServiceWorker): This is the label displayed
+# 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
 
 # LOCALIZATION NOTE (networkMenu.millisecond): This is the label displayed
 # in the network menu specifying timing interval divisions (in milliseconds).
 networkMenu.millisecond	=%S ms
 
--- a/devtools/client/shared.properties
+++ b/devtools/client/shared.properties
@@ -1,7 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (dimensions): This is used to display the dimensions
 # of a node or image, like 100×200.
-dimensions	= %S\u00D7%S
+dimensions	=%S\u00D7%S
+
+# LOCALIZATION NOTE (groupCheckbox.tooltip): This is used in the SideMenuWidget
+# as the default tooltip of a group checkbox
+sideMenu.groupCheckbox.tooltip	=このグループのすべてのチェックボックスを選択または選択解除します
--- a/devtools/client/toolbox.properties
+++ b/devtools/client/toolbox.properties
@@ -1,116 +1,118 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-toolboxDockButtons.bottom.tooltip	= ブラウザの下側に表示
-toolboxDockButtons.side.tooltip		= ブラウザのサイドに表示
-toolboxDockButtons.window.tooltip	= ウィンドウ表示
+toolboxDockButtons.bottom.tooltip	=ブラウザの下側に表示
+toolboxDockButtons.side.tooltip		=ブラウザのサイドに表示
+toolboxDockButtons.window.tooltip	=ウィンドウ表示
 
 # LOCALIZATION NOTE (toolboxDockButtons.bottom.minimize): This string is shown
 # as a tooltip that appears in the toolbox when it is in "bottom host" mode and
 # when hovering over the minimize button in the toolbar. When clicked, the
 # button minimizes the toolbox so that just the toolbar is visible at the
 # bottom.
-toolboxDockButtons.bottom.minimize	= 開発ツールを最小化
+toolboxDockButtons.bottom.minimize	=開発ツールを最小化
 
 # LOCALIZATION NOTE (toolboxDockButtons.bottom.maximize): This string is shown
 # as a tooltip that appears in the toolbox when it is in "bottom host" mode and
 # when hovering over the maximize button in the toolbar. When clicked, the
 # button maximizes the toolbox again (if it had been minimized before) so that
 # the whole toolbox is visible again.
-toolboxDockButtons.bottom.maximize	= 開発ツールを最大化
+toolboxDockButtons.bottom.maximize	=開発ツールを最大化
 
 # LOCALIZATION NOTE (toolboxToggleButton.errors): Semi-colon list of plural
 # forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of errors in the current web page
-toolboxToggleButton.errors		= #1 個のエラー
+toolboxToggleButton.errors		=#1 個のエラー
 
 # LOCALIZATION NOTE (toolboxToggleButton.warnings): Semi-colon list of plural
 # forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of warnings in the current web page
-toolboxToggleButton.warnings		= #1 個の警告
+toolboxToggleButton.warnings		=#1 個の警告
 
 # LOCALIZATION NOTE (toolboxToggleButton.tooltip): This string is shown
 # as tooltip in the developer toolbar to open/close the developer tools.
 # It's using toolboxToggleButton.errors as first and
 # toolboxToggleButton.warnings as second argument to show the number of errors
 # and warnings.
-toolboxToggleButton.tooltip		= %1$S、%2$S\nクリックすると開発ツールを切り替えます。
+toolboxToggleButton.tooltip		=%1$S、%2$S\nクリックすると開発ツールを切り替えます。
 
 # LOCALIZATION NOTE (toolbox.titleTemplate): This is the template
 # used to format the title of the toolbox.
 # The name of the selected tool: %1$S.
 # The url of the page being tooled: %2$S.
-toolbox.titleTemplate			= %1$S - %2$S
+toolbox.titleTemplate			=%1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
-toolbox.defaultTitle			= 開発ツール
+toolbox.defaultTitle			=開発ツール
 
 # LOCALIZATION NOTE (toolbox.label): This is used as the label for the
 # toolbox as a whole
-toolbox.label				= 開発ツール
+toolbox.label				=開発ツール
 
 # LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
 # for the options panel tab.
-optionsButton.tooltip			= 開発ツールのオプション
+optionsButton.tooltip			=開発ツールのオプション
 
 # LOCALIZATION NOTE (options.label): This is used as the label of the tab in
 # the devtools window.
-options.label				= オプション
+options.label				=オプション
 
 # LOCALIZATION NOTE (options.panelLabel): This is used as the label for the
 # toolbox panel.
-options.panelLabel			= 開発ツールのオプションパネル
+options.panelLabel			=開発ツールのオプションパネル
 
 # LOCALIZATION NOTE (options.toolNotSupported): This is the template
 # used to add a * marker to the label for the Options Panel tool checkbox for the
 # tool which is not supported for the current toolbox target.
 # The name of the tool: %1$S.
-options.toolNotSupportedMarker		= %1$S *
+options.toolNotSupportedMarker		=%1$S *
 
 # LOCALIZATION NOTE (scratchpad.keycode)
 # Used for opening scratchpad from the detached toolbox window
 # Needs to match scratchpad.keycode from browser.dtd
-scratchpad.keycode			= VK_F4
+scratchpad.keycode			=VK_F4
 
 # LOCALIZATION NOTE (browserConsoleCmd.commandkey)
 # Used for toggling the browser console from the detached toolbox window
 # Needs to match browserConsoleCmd.commandkey from browser.dtd
-browserConsoleCmd.commandkey		= j
+browserConsoleCmd.commandkey		=j
 
 # LOCALIZATION NOTE (pickButton.tooltip)
 # This is the tooltip of the pick button in the toolbox toolbar
-pickButton.tooltip			= ページから要素を選択します
+pickButton.tooltip			=ページから要素を選択します
 
 # LOCALIZATION NOTE (sidebar.showAllTabs.tooltip)
 # This is the tooltip shown when hover over the '…' button in the tabbed side
 # bar, when there's no enough space to show all tabs at once
-sidebar.showAllTabs.tooltip		= すべてのタブ
+sidebar.showAllTabs.tooltip		=すべてのタブ
 
 # LOCALIZATION NOTE (options.darkTheme.label)
 # Used as a label for dark theme
-options.darkTheme.label			= Dark theme
+options.darkTheme.label			=Dark テーマ
 
 # LOCALIZATION NOTE (options.lightTheme.label)
 # Used as a label for light theme
-options.lightTheme.label		= Light theme
+options.lightTheme.label		=Light テーマ
 
 # LOCALIZATION NOTE (toolbox.noContentProcess.message)
 # Used as a message in the alert displayed when trying to open a browser
 # content toolbox and there is no content process running
-toolbox.noContentProcess.message	= 実行中のコンテンツプロセスはありません。
+toolbox.noContentProcess.message	=実行中のコンテンツプロセスはありません。
 
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
 # DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
-toolbox.viewCssSourceInStyleEditor.label	= スタイルエディタでファイルを開く
+toolbox.viewCssSourceInStyleEditor.label	=スタイルエディタでファイルを開く
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a js file in the Debugger tool.
 # DEV NOTE: Mostly used wherever toolbox.viewSourceInDebugger is used.
-toolbox.viewJsSourceInDebugger.label		= デバッガでファイルを開く
+toolbox.viewJsSourceInDebugger.label		=デバッガでファイルを開く
+
+toolbox.resumeOrderWarning		=デバッガの追加後にページを再開できませんでした。ツールボックスを閉じ、開き直してください。
--- a/devtools/client/webConsole.dtd
+++ b/devtools/client/webConsole.dtd
@@ -3,104 +3,99 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- 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. -->
 
-<!ENTITY window.title                             "Web コンソール">
-<!ENTITY browserConsole.title                     "ブラウザコンソール">
-
-<!-- LOCALIZATION NOTE (saveBodies.label): You can see this string in the Web
-   - Console context menu. -->
-<!ENTITY saveBodies.label     "要求ボディと応答ボディを記録">
-<!ENTITY saveBodies.accesskey "L">
+<!ENTITY window.title			"Web コンソール">
+<!ENTITY browserConsole.title		"ブラウザコンソール">
 
 <!-- LOCALIZATION NOTE (openURL.label): You can see this string in the Web
    - Console context menu. -->
-<!ENTITY openURL.label     "URL を新しいタブで開く">
-<!ENTITY openURL.accesskey "T">
+<!ENTITY openURL.label			"URL を新しいタブで開く">
+<!ENTITY openURL.accesskey		"T">
 
 <!-- LOCALIZATION NOTE (btnPageNet.label): This string is used for the menu
   -  button that allows users to toggle the network logging output.
   -  This string and the following strings toggle various kinds of output
   -  filters. -->
-<!ENTITY btnPageNet.label   "ネットワーク">
-<!ENTITY btnPageNet.tooltip "ネットワークアクセスを記録します">
-<!ENTITY btnPageNet.accesskey "N">
+<!ENTITY btnPageNet.label		"ネットワーク">
+<!ENTITY btnPageNet.tooltip		"ネットワークアクセスを記録します">
+<!ENTITY btnPageNet.accesskey		"N">
 <!-- LOCALIZATION NOTE (btnPageNet.accesskeyMacOSX): This string is used as
   -  access key for the menu button that allows users to toggle the network
   -  logging output. On MacOSX accesskeys are available with Ctrl-*. Please make
   -  sure you do not use the following letters: A, E, N and P. These are used
   -  for editing commands in text inputs. -->
-<!ENTITY btnPageNet.accesskeyMacOSX "t">
-<!ENTITY btnPageCSS.label          "CSS">
-<!ENTITY btnPageCSS.tooltip2       "CSS エラーと警告を記録します">
-<!ENTITY btnPageCSS.accesskey      "C">
-<!ENTITY btnPageJS.label           "JS">
-<!ENTITY btnPageJS.tooltip         "JavaScript 例外を記録します">
-<!ENTITY btnPageJS.accesskey       "J">
-<!ENTITY btnPageSecurity.label     "セキュリティ">
-<!ENTITY btnPageSecurity.tooltip   "セキュリティのエラーと警告を記録します">
-<!ENTITY btnPageSecurity.accesskey "u">
+<!ENTITY btnPageNet.accesskeyMacOSX	"t">
+<!ENTITY btnPageCSS.label		"CSS">
+<!ENTITY btnPageCSS.tooltip2		"CSS エラーと警告を記録します">
+<!ENTITY btnPageCSS.accesskey		"C">
+<!ENTITY btnPageJS.label		"JS">
+<!ENTITY btnPageJS.tooltip		"JavaScript 例外を記録します">
+<!ENTITY btnPageJS.accesskey		"J">
+<!ENTITY btnPageSecurity.label		"セキュリティ">
+<!ENTITY btnPageSecurity.tooltip	"セキュリティのエラーと警告を記録します">
+<!ENTITY btnPageSecurity.accesskey	"u">
 
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
-<!ENTITY btnPageLogging.label   "ロギング">
-<!ENTITY btnPageLogging.tooltip "window.console オブジェクトに送信されたメッセージを記録します">
-<!ENTITY btnPageLogging.accesskey3 "L">
-<!ENTITY btnConsoleErrors       "エラー">
-<!ENTITY btnConsoleInfo         "メッセージ">
-<!ENTITY btnConsoleWarnings     "警告">
-<!ENTITY btnConsoleLog          "ログ">
-<!ENTITY btnConsoleXhr          "XHR">
-<!ENTITY btnConsoleReflows      "リフロー">
+<!ENTITY btnPageLogging.label		"ロギング">
+<!ENTITY btnPageLogging.tooltip		"window.console オブジェクトに送信されたメッセージを記録します">
+<!ENTITY btnPageLogging.accesskey3	"L">
+<!ENTITY btnConsoleErrors		"エラー">
+<!ENTITY btnConsoleInfo			"メッセージ">
+<!ENTITY btnConsoleWarnings		"警告">
+<!ENTITY btnConsoleLog			"ログ">
+<!ENTITY btnConsoleXhr			"XHR">
+<!ENTITY btnConsoleReflows		"リフロー">
 
 <!-- LOCALIZATION NOTE (btnServerLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls on the HTTP server. -->
-<!ENTITY btnServerLogging.label       "サーバ">
-<!ENTITY btnServerLogging.tooltip     "Web サーバから受信したログ情報です">
-<!ENTITY btnServerLogging.accesskey   "S">
-<!ENTITY btnServerErrors              "エラー">
-<!ENTITY btnServerInfo                "メッセージ">
-<!ENTITY btnServerWarnings            "警告">
-<!ENTITY btnServerLog                 "ログ">
+<!ENTITY btnServerLogging.label		"サーバ">
+<!ENTITY btnServerLogging.tooltip	"Web サーバから受信したログ情報です">
+<!ENTITY btnServerLogging.accesskey	"S">
+<!ENTITY btnServerErrors		"エラー">
+<!ENTITY btnServerInfo			"メッセージ">
+<!ENTITY btnServerWarnings		"警告">
+<!ENTITY btnServerLog			"ログ">
 
 <!-- LOCALIZATION NODE (btnConsoleSharedWorkers) the term "Shared Workers"
   -  should not be translated. -->
-<!ENTITY btnConsoleSharedWorkers "Shared Worker">
+<!ENTITY btnConsoleSharedWorkers	"Shared Worker">
 <!-- LOCALIZATION NODE (btnConsoleServiceWorkers) the term "Service Workers"
   -  should not be translated. -->
-<!ENTITY btnConsoleServiceWorkers "Service Worker">
+<!ENTITY btnConsoleServiceWorkers	"Service Worker">
 <!-- LOCALIZATION NODE (btnConsoleWindowlessWorkers) the term "Workers"
   -  should not be translated. -->
-<!ENTITY btnConsoleWindowlessWorkers "アドオンまたはブラウザ Worker">
+<!ENTITY btnConsoleWindowlessWorkers	"アドオンまたはブラウザ Worker">
 
-<!ENTITY filterOutput.placeholder "フィルタ出力">
-<!ENTITY btnClear.label        "消去">
-<!ENTITY btnClear.tooltip      "Web コンソールの内容を消去します">
-<!ENTITY btnClear.accesskey    "r">
+<!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 "">
+<!ENTITY fullZoomEnlargeCmd.commandkey 	"+">
+<!ENTITY fullZoomEnlargeCmd.commandkey2	"="> <!-- + is above this key on many keyboards -->
+<!ENTITY fullZoomEnlargeCmd.commandkey3	"">
 
-<!ENTITY fullZoomReduceCmd.commandkey   "-">
-<!ENTITY fullZoomReduceCmd.commandkey2  "">
+<!ENTITY fullZoomReduceCmd.commandkey	"-">
+<!ENTITY fullZoomReduceCmd.commandkey2	"">
 
-<!ENTITY fullZoomResetCmd.commandkey    "0">
-<!ENTITY fullZoomResetCmd.commandkey2   "">
+<!ENTITY fullZoomResetCmd.commandkey	"0">
+<!ENTITY fullZoomResetCmd.commandkey2	"">
 
-<!ENTITY copyURLCmd.label     "リンクの URL をコピー">
-<!ENTITY copyURLCmd.accesskey "a">
+<!ENTITY copyURLCmd.label		"リンクの URL をコピー">
+<!ENTITY copyURLCmd.accesskey		"a">
 
-<!ENTITY closeCmd.key         "W">
-<!ENTITY findCmd.key          "F">
-<!ENTITY clearOutputCtrl.key  "L">
-<!ENTITY openInVarViewCmd.label "変数ビューで開く">
-<!ENTITY openInVarViewCmd.accesskey "V">
-<!ENTITY storeAsGlobalVar.label "グローバル変数として保存">
-<!ENTITY storeAsGlobalVar.accesskey "S">
+<!ENTITY closeCmd.key			"W">
+<!ENTITY findCmd.key			"F">
+<!ENTITY clearOutputCtrl.key		"L">
+<!ENTITY openInVarViewCmd.label		"変数ビューで開く">
+<!ENTITY openInVarViewCmd.accesskey	"V">
+<!ENTITY storeAsGlobalVar.label		"グローバル変数として保存">
+<!ENTITY storeAsGlobalVar.accesskey	"S">
--- a/devtools/client/webide.dtd
+++ b/devtools/client/webide.dtd
@@ -210,8 +210,11 @@
 <!ENTITY simulator_name					"名前">
 <!ENTITY simulator_software				"ソフトウェア">
 <!ENTITY simulator_version				"バージョン">
 <!ENTITY simulator_profile				"プロファイル">
 <!ENTITY simulator_hardware				"ハードウェア">
 <!ENTITY simulator_device				"デバイス">
 <!ENTITY simulator_screenSize				"スクリーン">
 <!ENTITY simulator_pixelRatio				"ピクセル比">
+<!ENTITY simulator_tv_data				"TV シミュレーション">
+<!ENTITY simulator_tv_data_open				"設定データ">
+<!ENTITY simulator_tv_data_open_button			"設定ディレクトリを開く...">