45.0: sync devtools with en-US rev298541:d82221ba4219
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Sat, 06 Feb 2016 13:43:59 +0900
changeset 2027 bb7fead231c7bf58ffc8e74148fa121d4907c4e1
parent 2026 c98402dd3222c7f2605b8bf17f44364ad33ca244
child 2028 b5d473a04c13f2afd43588045132bf6f2049870b
push id1104
push useraxel@mozilla.com
push dateMon, 07 Mar 2016 14:30:53 +0000
bugs45
45.0: sync devtools with en-US rev298541:d82221ba4219
devtools/client/aboutdebugging.dtd
devtools/client/aboutdebugging.properties
devtools/client/animationinspector.properties
devtools/client/memory.properties
devtools/client/netmonitor.dtd
devtools/client/webide.dtd
--- a/devtools/client/aboutdebugging.dtd
+++ b/devtools/client/aboutdebugging.dtd
@@ -1,9 +1,10 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY aboutDebugging.title                      "about:debugging">
 <!ENTITY aboutDebugging.addons                     "アドオン">
 <!ENTITY aboutDebugging.addonDebugging.label       "アドオンのデバッグを有効化">
 <!ENTITY aboutDebugging.addonDebugging.tooltip     "このチェックをオンにすると、アドオンとブラウザ UI 部品のデバッグを許可します">
+<!ENTITY aboutDebugging.loadTemporaryAddon         "一時的なアドオンを読み込む">
 <!ENTITY aboutDebugging.workers                    "Worker">
--- a/devtools/client/aboutdebugging.properties
+++ b/devtools/client/aboutdebugging.properties
@@ -1,12 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 debug = デバッグ
 
 extensions = 拡張機能
+selectAddonFromFile = アドオンフォルダまたは XPI ファイルを選択してください
 serviceWorkers = Service Worker
 sharedWorkers = Shared Worker
 otherWorkers = その他の Worker
 
 nothing = まだありません。
--- a/devtools/client/animationinspector.properties
+++ b/devtools/client/animationinspector.properties
@@ -26,16 +26,21 @@ player.transitionNameLabel		= 状態遷移
 # displayed before the animation duration.
 player.animationDurationLabel		= 再生時間:
 
 # LOCALIZATION NOTE (player.animationDelayLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation delay.
 player.animationDelayLabel		= 遅延:
 
+# LOCALIZATION NOTE (player.animationRateLabel):
+# This string is displayed in each animation player widget. It is the label
+# displayed before the animation playback rate.
+player.animationRateLabel		= 再生速度:
+
 # LOCALIZATION NOTE (player.animationIterationCountLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the number of times the animation is set to repeat.
 player.animationIterationCountLabel	= 繰り返し:
 
 # LOCALIZATION NOTE (player.infiniteIterationCount):
 # In case the animation repeats infinitely, this string is displayed next to the
 # player.animationIterationCountLabel string, instead of a number.
--- a/devtools/client/memory.properties
+++ b/devtools/client/memory.properties
@@ -19,16 +19,32 @@ memory.label				= メモリ
 # 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 (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.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 ヒープスナップショット
+
 # 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			= 処理中...
 
@@ -43,60 +59,134 @@ checkbox.recordAllocationStacks		= 割り当てスタックを記録
 # LOCALIZATION NOTE (toolbar.breakdownBy): The label describing the select menu
 # options of the breakdown options.
 toolbar.breakdownBy			= グループ化:
 
 # 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 (diff-snapshots): The label for the button that initiates
+# selecting two snapshots to diff with each other.
+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			= スナップショットを比較します
+
+# LOCALIZATION NOTE (filter.placeholder): The placeholder text used for the
+# memory tool's filter search box.
+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.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			= (有効なスタックはありません)
 
+# LOCALIZATION NOTE (tree-item.nofilename): The label describing the row in the
+# heap tree that represents a row broken down by filename when no filename was
+# available.
+tree-item.nofilename			= (有効なファイル名はありません)
+
 # LOCALIZATION NOTE (tree-item.root): The label describing the row in the heap tree
 # that represents the root of the tree when inverted.
 tree-item.root				= (ルート)
 
 # LOCALIZATION NOTE (tree-item.percent): A percent of bytes or count displayed in the tree view.
 tree-item.percent			= %S%
 
-# LOCALIZATION NOTE (snapshot.state.saving.full): The label describing the snapshot
-# state SAVING, used in the main heap view.
+# LOCALIZATION NOTE (diffing.baseline): The name of the baseline snapshot in a
+# diffing comparison.
+diffing.baseline			= ベースライン
+
+# LOCALIZATION NOTE (diffing.comparison): The name of the snapshot being
+# compared to the baseline in a diffing comparison.
+diffing.comparison			= 比較
+
+# LOCALIZATION NOTE (diffing.prompt.selectBaseline): The prompt to select the
+# first snapshot when doing a diffing comparison.
+diffing.prompt.selectBaseline		= ベースラインスナップショットを選択してください
+
+# LOCALIZATION NOTE (diffing.prompt.selectComparison): The prompt to select the
+# second snapshot when doing a diffing comparison.
+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			= エラー
+
+# 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		= スナップショットの比較でエラーがありました
+
+# 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		= 差分を計算中...
+
+# 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		= 差分を計算しています...
+
+# LOCALIZATION NOTE (diffing.state.selecting): The label describing the diffing
+# state SELECTING.
+diffing.state.selecting			= 比較する 2 つのスナップショットを選択
+
+# LOCALIZATION NOTE (diffing.state.selecting.full): The label describing the
+# diffing state SELECTING, used in the main view when selecting snapshots to
+# diff.
+diffing.state.selecting.full		= 比較する 2 つのスナップショットを選択してください
+
+# LOCALIZATION NOTE (snapshot.state.saving.full): The label describing the
+# snapshot state SAVING, used in the main heap view.
 snapshot.state.saving.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.
+# LOCALIZATION NOTE (snapshot.state.importing.full): The label describing the
+# snapshot state IMPORTING, used in the main heap view.
+snapshot.state.importing.full		= インポートしています...
+
+# LOCALIZATION NOTE (snapshot.state.reading.full): The label describing the
+# snapshot state READING, and SAVED, due to these states being combined
+# visually, used in the main heap view.
 snapshot.state.reading.full		= スナップショットを読み込んでいます...
 
-# LOCALIZATION NOTE (snapshot.state.saving-census.full): The label describing the snapshot
-# state SAVING, used in the main heap view.
+# 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	= 集計結果を保存しています...
 
-# LOCALIZATION NOTE (snapshot.state.error.full): The label describing the snapshot
-# state ERROR, used in the main heap view.
+# LOCALIZATION NOTE (snapshot.state.error.full): The label describing the
+# snapshot state ERROR, used in the main heap view.
 snapshot.state.error.full		= スナップショットの処理中にエラーがありました
 
 # LOCALIZATION NOTE (snapshot.state.saving): The label describing the snapshot
 # state SAVING, used in the snapshot list view
 snapshot.state.saving			= スナップショットの保存中...
 
+# LOCALIZATION NOTE (snapshot.state.importing): The label describing the
+# snapshot state IMPORTING, used in the snapshot list view
+snapshot.state.importing		= スナップショットのインポート中...
+
 # LOCALIZATION NOTE (snapshot.state.reading): The label describing the snapshot
-# state READING, and SAVED, due to these states being combined visually, used
-# in the snapshot list view.
+# state READING, and SAVED, due to these states being combined visually, used in
+# the snapshot list view.
 snapshot.state.reading			= スナップショットの読み込み中...
 
-# LOCALIZATION NOTE (snapshot.state.saving-census): The label describing the snapshot
-# state SAVING, used in snapshot list view.
+# LOCALIZATION NOTE (snapshot.state.saving-census): The label describing the
+# snapshot state SAVING, used in snapshot list view.
 snapshot.state.saving-census		= 集計結果の保存中...
 
 # LOCALIZATION NOTE (snapshot.state.error): The label describing the snapshot
 # state ERROR, used in the snapshot list view.
 snapshot.state.error			= エラー
 
 # LOCALIZATION NOTE (heapview.noAllocationStacks): The message displayed to
 # users when selecting a breakdown by "allocation stack" but no allocation
--- a/devtools/client/netmonitor.dtd
+++ b/devtools/client/netmonitor.dtd
@@ -172,20 +172,16 @@
 <!-- LOCALIZATION NOTE (netmonitorUI.response.dimensions): This is the label displayed
   -  in the network details response tab identifying an image's dimensions. -->
 <!ENTITY netmonitorUI.response.dimensions "寸法:">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.response.mime): This is the label displayed
   -  in the network details response tab identifying an image's mime. -->
 <!ENTITY netmonitorUI.response.mime       "MIME タイプ:">
 
-<!-- LOCALIZATION NOTE (netmonitorUI.response.encoding): This is the label displayed
-  -  in the network details response tab identifying an image's encoding. -->
-<!ENTITY netmonitorUI.response.encoding   "文字エンコーディング:">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.timings.blocked): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "blocked" state. -->
 <!ENTITY netmonitorUI.timings.blocked     "ブロック:">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.timings.dns): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "dns" state. -->
--- a/devtools/client/webide.dtd
+++ b/devtools/client/webide.dtd
@@ -70,27 +70,31 @@
 <!ENTITY key_toggleToolbox				"VK_F12">
 <!-- toggle sidebar -->
 <!ENTITY key_toggleEditor				"B">
 <!-- zoom -->
 <!ENTITY key_zoomin					"+">
 <!ENTITY key_zoomin2					"=">
 <!ENTITY key_zoomout					"-">
 <!ENTITY key_resetzoom					"0">
+<!-- reload WebIDE and devtools from local checkout -->
+<!-- this binding is with accel+alt, whereas all others are just accel -->
+<!ENTITY key_reload_devtools				"R">
 
 <!ENTITY projectPanel_myProjects			"マイプロジェクト">
 <!ENTITY projectPanel_runtimeApps			"ランタイムアプリ">
 <!ENTITY projectPanel_tabs				"タブ">
 <!ENTITY runtimePanel_usb				"USB デバイス">
 <!ENTITY runtimePanel_wifi				"Wi-Fi デバイス">
 <!ENTITY runtimePanel_simulator				"シミュレータ">
 <!ENTITY runtimePanel_other				"その他">
 <!ENTITY runtimePanel_installsimulator			"シミュレータをインストール">
 <!ENTITY runtimePanel_noadbhelper			"ADB Helper をインストール">
 <!ENTITY runtimePanel_nousbdevice			"端末が見つかりませんか?">
+<!ENTITY runtimePanel_refreshDevices_label		"端末をリフレッシュ">
 
 <!-- Lense -->
 <!ENTITY details_valid_header				"有効">
 <!ENTITY details_warning_header				"警告">
 <!ENTITY details_error_header				"エラー">
 <!ENTITY details_description				"説明">
 <!ENTITY details_location				"場所">
 <!ENTITY details_manifestURL				"App ID">