33.0: sync browser with en-US rev209315:98d705a709c7
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Mon, 01 Sep 2014 00:06:46 +0900
changeset 1515 185272614df7d991639fd07f89d529a3bad6ea58
parent 1514 f3898dff6e51471b04254c17e881ea44f960f091
child 1516 6381b8af502eb32dc7607d8ba4614ea4c547feec
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs33
33.0: sync browser with en-US rev209315:98d705a709c7
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/app-manager.properties
browser/chrome/browser/devtools/canvasdebugger.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/projecteditor.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/shadereditor.properties
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webaudioeditor.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/loop/loop.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/translation.dtd
browser/chrome/browser/webrtcIndicator.properties
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -77,16 +77,23 @@ when there are no windows but Firefox is
 
 <!ENTITY menubarCmd.label		"メニューバー">
 <!ENTITY menubarCmd.accesskey		"M">
 <!ENTITY navbarCmd.label		"ナビゲーションツールバー">
 <!ENTITY personalbarCmd.label		"ブックマークツールバー">
 <!ENTITY personalbarCmd.accesskey	"B">
 <!ENTITY bookmarksToolbarItem.label	"ブックマークツールバーの項目">
 
+<!ENTITY toolbarContextMenu.reloadAllTabs.label		"すべてのタブを再読み込み">
+<!ENTITY toolbarContextMenu.reloadAllTabs.accesskey	"A">
+<!ENTITY toolbarContextMenu.bookmarkAllTabs.label	"すべてのタブをブックマーク...">
+<!ENTITY toolbarContextMenu.bookmarkAllTabs.accesskey	"T">
+<!ENTITY toolbarContextMenu.undoCloseTab.label		"閉じたタブを元に戻す">
+<!ENTITY toolbarContextMenu.undoCloseTab.accesskey	"U">
+
 <!ENTITY pageSourceCmd.label		"ページのソース">
 <!ENTITY pageSourceCmd.accesskey	"o">
 <!ENTITY pageSourceCmd.commandkey	"u">
 <!ENTITY pageInfoCmd.label		"ページの情報">
 <!ENTITY pageInfoCmd.accesskey		"I">
 <!ENTITY pageInfoCmd.commandkey		"i">
 <!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
 These should match what Safari and other Apple applications use on OS X Lion. -->
@@ -254,16 +261,18 @@ These should match what Safari and other
 <!ENTITY browserToolboxMenu.label     "ブラウザツールボックス">
 <!ENTITY browserToolboxMenu.accesskey "e">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "開発ツールバーを閉じる">
 <!ENTITY devToolbarMenu.label              "開発ツールバー">
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devAppMgrMenu.label               "アプリマネージャ">
 <!ENTITY devAppMgrMenu.accesskey           "A">
+<!ENTITY webide.label                      "WebIDE">
+<!ENTITY webide.accesskey                  "W">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolboxMenuItem.label          "開発ツールを表示">
 <!ENTITY devToolboxMenuItem.accesskey      "T">
 <!ENTITY devToolboxMenuItem.keytext        "I">
 
 <!ENTITY devToolbarToolsButton.tooltip     "開発ツールを表示">
 <!ENTITY devToolbarOtherToolsButton.label  "その他のツール">
@@ -696,22 +705,27 @@ just addresses the organization to follo
 
 <!ENTITY social.markpageMenu.accesskey		"P">
 <!ENTITY social.markpageMenu.label		"ページを保存する...">
 <!ENTITY social.marklinkMenu.accesskey		"L">
 <!ENTITY social.marklinkMenu.label		"リンクを保存する...">
 
 <!ENTITY getUserMedia.selectCamera.label		"共有するカメラ:">
 <!ENTITY getUserMedia.selectCamera.accesskey		"C">
+<!ENTITY getUserMedia.selectWindowOrScreen.label	"共有するウィンドウまたは画面:">
+<!ENTITY getUserMedia.selectWindowOrScreen.accesskey	"W">
 <!ENTITY getUserMedia.selectMicrophone.label		"共有するマイク:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey	"M">
+<!ENTITY getUserMedia.allWindowsShared.message		"画面に表示されているすべてのウィンドウを共有します。">
 
 <!ENTITY webrtcIndicatorButton.label		"カメラ、マイクへのアクセス">
 <!ENTITY webrtcIndicatorButton.tooltip		"カメラかマイクを共有しているサイトを表示します">
 
+<!ENTITY loopCallButton.tooltip			"通話に招待します">
+
 <!ENTITY mixedContentBlocked.moreinfo		"ほとんどの Web サイトは、このコンテンツがブロックされても、正しく表示されます。">
 
 <!ENTITY pointerLock.notification.message	"ESC キーを押すと、毎回確認するようになります。">
 
 <!ENTITY pluginNotification.showAll.label	"すべて表示">
 <!ENTITY pluginNotification.showAll.accesskey	"S">
 
 <!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -109,16 +109,27 @@ installPlugin.ignoreButton.accesskey		= 
 
 crashedpluginsMessage.title			= %S プラグインがクラッシュしました。
 crashedpluginsMessage.reloadButton.label	= ページを再読み込み
 crashedpluginsMessage.reloadButton.accesskey	= R
 crashedpluginsMessage.submitButton.label	= クラッシュレポートを送信
 crashedpluginsMessage.submitButton.accesskey	= S
 crashedpluginsMessage.learnMore			= 詳細を確認...
 
+# Keyword fixup messages
+# LOCALIZATION NOTE (keywordURIFixup.message): Used when the user tries to visit
+# a local host page, by the time the DNS request recognizes it, we have already
+# loaded a search page for the given word.  An infobar then asks to the user
+# whether he rather wanted to visit the host.  %S is the recognized host.
+keywordURIFixup.message				= %S に移動しようとしましたか?
+keywordURIFixup.goTo				= はい、%S に移動します
+keywordURIFixup.goTo.accesskey			= Y
+keywordURIFixup.dismiss				= いいえ
+keywordURIFixup.dismiss.accesskey		= N
+
 ## Plugin doorhanger strings
 # LOCALIZATION NOTE (pluginActivateNw.message): Used for newly-installed
 # plugins which are not known to be unsafe. %1$S is the plugin name and %2$S
 # is the site domain.
 pluginActivateNew.message			= %2$S で "%1$S" の実行を許可しますか?
 pluginActivateMultiple.message			= %S でプラグインの実行を許可しますか?
 pluginActivate.learnMore			= 詳細...
 # LOCALIZATION NOTE (pluginActivateOutdated.message, pluginActivateOutdated.label):
@@ -290,20 +301,16 @@ identity.identified.state_and_country	= 
 
 identity.encrypted2			= この Web サイトとの通信は安全です。
 identity.mixed_display_loaded		= この Web サイトとのすべての通信が暗号化されていません。画像などの暗号化されてない要素が含まれています。
 identity.mixed_active_loaded2		= この Web サイトは、暗号化されてないスクリプトなどのインタラクティブなコンテンツが含まれています。第三者に情報を盗み見られたり、Web サイトの動作を改ざんされる可能性があります。
 identity.unencrypted			= この Web サイトとの通信は暗号化されていません。
 
 identity.unknown.tooltip		= この Web サイトには運営者を証明する証明書がありません
 
-# (^^; EVSSL による認証(法人登記なども確認して実在証明) ではなく通常の SSL 認証(ドメイン真正性のみ検証) の場合:
-#identity.ownerUnknown2			= (運営者は実在認証されていません)
-identity.ownerUnknown2			= (運営者は不明です)
-
 # LOCALIZATION NOTE (identity.chrome): %S is replaced with the brandShortName.
 identity.chrome				= %S のシステムページです。
 
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle		= ブックマークに追加しました
 # (^^; ツールメニューのブックマークからは無理...要再検討
 editBookmarkPanel.pageBookmarkedDescription	= %1$0.S今後このページにはブックマークからアクセスできます。
 editBookmarkPanel.bookmarkedRemovedTitle	= ブックマークを削除しました
@@ -491,37 +498,49 @@ identity.newIdentity.description	= %S にサインインするメールアドレスを入力してください
 identity.next.label			= 次へ
 identity.next.accessKey			= n
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
 # LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
 identity.loggedIn.description		= %S としてサインインしました
 identity.loggedIn.signOut.label		= サインアウト
 identity.loggedIn.signOut.accessKey	= O
 
-# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
+# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message,
+#                    getUserMedia.shareScreen.message, getUserMedia.shareCameraAndMicrophone.message,
+#                    getUserMedia.shareScreenAndMicrophone.message):
+#  %S is the website origin (e.g. www.mozilla.org)
+getUserMedia.shareCamera.message		= カメラを %S と共有しますか?
+getUserMedia.shareMicrophone.message		= マイクを %S と共有しますか?
+getUserMedia.shareScreen.message		= 画面を %S と共有しますか?
+getUserMedia.shareCameraAndMicrophone.message	= カメラとマイクを %S と共有しますか?
+getUserMedia.shareScreenAndMicrophone.message	= 画面とマイクを %S と共有しますか?
+getUserMedia.noVideo.label			= 映像なし
+getUserMedia.noWindowOrScreen.label		= ウィンドウまたは画面なし
+getUserMedia.noAudio.label			= 音声なし
+getUserMedia.shareEntireScreen.label		= 全画面
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
-getUserMedia.shareCamera.message		= カメラを %S と共有しますか?
-getUserMedia.shareMicrophone.message		= マイクを %S と共有しますか?
-getUserMedia.shareCameraAndMicrophone.message	= カメラとマイクを %S と共有しますか?
-getUserMedia.noVideo.label			= 映像なし
-getUserMedia.noAudio.label			= 音声なし
 getUserMedia.shareSelectedDevices.label		= 選択したデバイスを共有
 getUserMedia.shareSelectedDevices.accesskey	= S
+getUserMedia.shareScreen.label			= 画面を共有
+getUserMedia.shareWindow.label			= 選択したウィンドウを共有
+getUserMedia.shareSelectedItems.label		= 選択した項目を共有
 getUserMedia.always.label			= 常に共有
 getUserMedia.always.accesskey			= A
 getUserMedia.denyRequest.label			= 共有しない
 getUserMedia.denyRequest.accesskey		= D
 getUserMedia.never.label			= 常に共有しない
 getUserMedia.never.accesskey			= N
 getUserMedia.sharingCamera.message2		= カメラをこのページと共有しています。
 getUserMedia.sharingMicrophone.message2		= マイクをこのページと共有しています。
 getUserMedia.sharingCameraAndMicrophone.message2	= カメラとマイクをこのページと共有しています。
+getUserMedia.sharingScreen.message		= 画面をこのページと共有しています。
+getUserMedia.sharingWindow.message		= ウィンドウをこのページと共有しています。
 getUserMedia.continueSharing.label		= 共有を続行
 getUserMedia.continueSharing.accesskey		= C
 getUserMedia.stopSharing.label			= 共有を中止
 getUserMedia.stopSharing.accesskey		= S
 
 # Mixed Content Blocker Doorhanger Notification
 # LOCALIZATION NOTE - %S is brandShortName
 mixedContentBlocked.message				= %S は安全でないコンテンツをブロックしました。
--- a/browser/chrome/browser/devtools/app-manager.properties
+++ b/browser/chrome/browser/devtools/app-manager.properties
@@ -24,17 +24,17 @@ validator.noAccessManifestURL		=manifest ファイルが読めません: %1$S URI: %2$S
 # LOCALIZATION NOTE (validator.invalidHostedManifestURL): %1$S is the URI of
 # the manifest, %2$S is the error message.
 validator.invalidHostedManifestURL	=ホストされた不正な manifest URL '%1$S': %2$S
 validator.invalidProjectType		=未知のプロジェクト形式 '%S'
 # LOCALIZATION NOTE (validator.missNameManifestProperty, validator.missIconsManifestProperty):
 # don't translate 'icons' and 'name'.
 validator.missNameManifestProperty	=Manifest に必須の 'name' 項目が足りません。
 validator.missIconsManifestProperty	=Manifest に 'icons' 項目が足りません。
-validator.missIconMarketplace		=Marketplace に投稿するアプリは 128px 以上のサイズのアイコンが必要です
+validator.missIconMarketplace2		=Marketplace に投稿するアプリは 128px のサイズのアイコンが必要です
 validator.invalidAppType		=未知のアプリ形式: '%S'.
 validator.invalidHostedPriviledges	=ホストされたアプリは '%S' の形式にできません
 validator.noCertifiedSupport		='certified' アプリはまだアプリマネージャで完全にサポートされていません。
 validator.nonAbsoluteLaunchPath		=起動パスは '/' で始まる絶対パスである必要があります: '%S'
 validator.accessFailedLaunchPath	=起動時のドキュメント '%S' にアクセスできません
 # LOCALIZATION NOTE (validator.accessFailedLaunchPathBadHttpCode): %1$S is the URI of
 # the launch document, %2$S is the http error code.
 validator.accessFailedLaunchPathBadHttpCode	=起動時のドキュメント '%1$S' にアクセスできません。HTTP コード: %2$S
--- a/browser/chrome/browser/devtools/canvasdebugger.properties
+++ b/browser/chrome/browser/devtools/canvasdebugger.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxCanvasDebugger.label):
 # This string is displayed in the title of the tab when the Shader Editor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxCanvasDebugger.label		= Canvas
 
+# LOCALIZATION NOTE (ToolboxCanvasDebugger.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxCanvasDebugger.panelLabel	= Canvas パネル
+
 # LOCALIZATION NOTE (ToolboxCanvasDebugger.tooltip):
 # This string is displayed in the tooltip of the tab when the Shader Editor is
 # displayed inside the developer tools window.
 ToolboxCanvasDebugger.tooltip		= <canvas> コンテキスト調査、デバッグツール
 
 # LOCALIZATION NOTE (noSnapshotsText): The text to display in the snapshots menu
 # when there are no recorded snapshots yet.
 noSnapshotsText				= スナップショットはまだありません。
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -90,16 +90,22 @@
 <!ENTITY debuggerUI.showOnlyEnum.accesskey "P">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
   -  the checkbox that toggles the display of original or sourcemap-derived
   -  sources. -->
 <!ENTITY debuggerUI.showOriginalSource           "元のソースを表示">
 <!ENTITY debuggerUI.showOriginalSource.accesskey "O">
 
+<!-- LOCALIZATION NOTE (debuggerUI.autoBlackBox): This is the label for
+  -  the checkbox that toggles whether sources that we suspect are minified are
+  -  automatically black boxed or not. -->
+<!ENTITY debuggerUI.autoBlackBox           "圧縮されたソースを自動的にブラックボックス化する">
+<!ENTITY debuggerUI.autoBlackBox.accesskey "B">
+
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelOperators): This is the text that
   -  appears in the filter panel popup as a header for the operators part. -->
 <!ENTITY debuggerUI.searchPanelOperators    "検索演算子:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
 <!ENTITY debuggerUI.searchFile           "スクリプトをフィルタ">
 <!ENTITY debuggerUI.searchFile.key       "P">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxDebugger.label):
 # This string is displayed in the title of the tab when the debugger is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxDebugger.label			= デバッガ
 
+# LOCALIZATION NOTE (ToolboxDebugger.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxDebugger.panelLabel		= デバッガパネル
+
 # LOCALIZATION NOTE (DebuggerWindowTitle):
 # The title displayed for the debugger window.
 DebuggerWindowTitle			= ブラウザデバッガ
 
 # LOCALIZATION NOTE (DebuggerWindowScriptTitle):
 # The title displayed for the debugger window when a script is selected.
 DebuggerWindowScriptTitle		= ブラウザデバッガ - %S
 
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -163,25 +163,29 @@ helpListNone		= '%1$S' ではじまるコマンドはありません
 # LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
 # the 'help x' command wants to show the manual for the 'x' command, it needs
 # to be able to describe the parameters as either required or optional, or if
 # they have a default value.
 helpManRequired		= 必須
 helpManOptional		= 任意
 helpManDefault		= 任意, 既定値=%1$S
 
-# LOCALIZATION NOTE (helpIntro): This forms part of the output from the 'help'
-# command. 'GCLI' is a project name and should be left untranslated.
+# LOCALIZATION NOTE: This forms part of the output from the 'help' command.
+# 'GCLI' is a project name and should be left untranslated.
 helpIntro		= GCLI は Web 開発者に高度に適したコマンドラインを提供する実験的な機能です。
 
 # LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
 # when the command in question has sub-commands, before a list of the matching
 # sub-commands.
 subCommands		= サブコマンド
 
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# cannot find a match for the parse types.
+commandParseError	= コマンドライン構文エラー
+
 # LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
 # strings are used to describe the 'context' command and its 'prefix'
 # parameter. See localization comment for 'connect' for an explanation about
 # 'prefix'.
 contextDesc		= 省略コマンドを設定します
 contextManual		= タイプしなくても入力したと見なせる省略コマンドを設定します。たとえば、'context addon' とすると 'addon list' ではなく 'list' とタイプして実行できます。
 contextPrefixDesc	= 省略するコマンド
 
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -123,16 +123,123 @@ screenshotErrorCopying		= クリップボードへのコピー時にエラーが発生しました。
 
 # LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
 # screenshot is successfully copied to the clipboard.
 screenshotCopied		= クリップボードにコピーしました。
 
 # LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
 screenshotTooltip		= ページ全体のスクリーンショットを撮影します
 
+# LOCALIZATION NOTE (highlightDesc) A very short description of the
+# 'highlight' command. See highlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+highlightDesc			= ノードをハイライトします
+
+# LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
+# command, displayed when the user asks for help on what it does.
+highlightManual			= ページ内でセレクタにマッチするノードをハイライトします
+
+# LOCALIZATION NOTE (highlightSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'highlight' command, which is displayed in
+# a dialog when the user is using this command.
+highlightSelectorDesc		= CSS セレクタ
+
+# LOCALIZATION NOTE (highlightSelectorManual) A fuller description of the
+# 'selector' parameter to the 'highlight' command, displayed when the user
+# asks for help on what it does.
+highlightSelectorManual		= ページ内のノードにマッチさせる CSS セレクタ
+
+# LOCALIZATION NOTE (highlightOptionsDesc) The title of a set of options to
+# the 'highlight' command, displayed as a heading to the list of option.
+highlightOptionsDesc		= オプション
+
+# LOCALIZATION NOTE (highlightHideGuidesDesc) A very short string to describe
+# the 'hideguides' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightHideGuidesDesc		= ガイド線を非表示
+
+# LOCALIZATION NOTE (highlightHideGuidesManual) A fuller description of the
+# 'hideguides' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightHideGuidesManual	= ハイライトしたノードのガイド線を非表示にします
+
+# LOCALIZATION NOTE (highlightShowInfoBarDesc) A very short string to describe
+# the 'showinfobar' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowInfoBarDesc	= ノードの情報を表示
+
+# LOCALIZATION NOTE (highlightShowInfoBarManual) A fuller description of the
+# 'showinfobar' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowInfoBarManual	= ハイライトしたノードの情報を表示します。( タグ名と属性とサイズが表示されます )
+
+# LOCALIZATION NOTE (highlightShowAllDesc) A very short string to describe
+# the 'showall' option parameter to the 'highlight' command, which is
+# displayed in a dialog when the user is using this command.
+highlightShowAllDesc		= マッチしたものをすべて表示
+
+# LOCALIZATION NOTE (highlightShowAllManual) A fuller description of the
+# 'showall' option parameter to the 'highlight' command, displayed when the
+# user asks for help on what it does.
+highlightShowAllManual		= 多くのノードがマッチした場合は、ページ表示のスローダウンを防ぐため、最初の 100 個だけ表示します。このオプションを指定すると、マッチしたものをすべて表示します。
+
+# LOCALIZATION NOTE (highlightRegionDesc) A very short string to describe the
+# 'region' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightRegionDesc		= ボックスモデル
+
+# LOCALIZATION NOTE (highlightRegionManual) A fuller description of the 'region'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightRegionManual		= ボックスモデルをハイライトします: 'content', 'padding', 'border', 'margin'
+
+# LOCALIZATION NOTE (highlightFillDesc) A very short string to describe the
+# 'fill' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightFillDesc		= 塗りつぶし
+
+# LOCALIZATION NOTE (highlightFillManual) A fuller description of the 'fill'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightFillManual		= 指定した色で塗りつぶします
+
+# LOCALIZATION NOTE (highlightKeepDesc) A very short string to describe the
+# 'keep' option parameter to the 'highlight' command, which is displayed in a
+# dialog when the user is using this command.
+highlightKeepDesc		= ハイライトを維持します
+
+# LOCALIZATION NOTE (highlightKeepManual) A fuller description of the 'keep'
+# option parameter to the 'highlight' command, displayed when the user asks for
+# help on what it does.
+highlightKeepManual		= 既定では、コマンドを実行するとハイライトが非表示にされますが、このオプションを指定すると表示されたままになります。
+
+# LOCALIZATION NOTE (highlightOutputConfirm) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and how
+# to turn highlighting off
+highlightOutputConfirm		= %1$S 個のノードをハイライトしました
+
+# LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
+# 'highlight' command, displayed to the user once the command has been entered,
+# informing the user how many nodes have been highlighted successfully and that
+# some nodes could not be highlighted due to the maximum number of nodes being
+# reached, and how to turn highlighting off
+highlightOutputMaxReached	= %1$S 個のノードがマッチしましたが、%2$S 個のノードしか表示していません。'--showall' を指定するとすべて表示します。
+
+# LOCALIZATION NOTE (unhighlightDesc) A very short description of the
+# 'unhighlight' command. See unhighlightManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+unhighlightDesc			= ハイライトをすべて消去します
+
+# LOCALIZATION NOTE (unhighlightManual) A fuller description of the 'unhighlight'
+# command, displayed when the user asks for help on what it does.
+unhighlightManual		= 'highlight' コマンドで以前に表示したノードのハイライトを消去します
+
 # LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
 # 'restart' command. This string is designed to be shown in a menu alongside the
 # command name, which is why it should be as short as possible.
 # The argument (%1$S) is the browser name.
 restartBrowserDesc		= %1$S を再起動します
 
 # LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
 # describe the 'nocache' parameter to the 'restart' command, which is
@@ -1386,8 +1493,34 @@ listenNoInitOutput		= DebuggerServer が初期化されていません
 # LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
 # mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
 # the 'media' commands and all available parameters.
 mediaDesc			= CSS メディアタイプエミュレーション
 mediaEmulateDesc		= 指定の CSS メディアタイプをエミュレーションします
 mediaEmulateManual		= 指定のメディアタイプに対応するデバイス上で描画されたようにページを表示します。関連する CSS ルールも適用されます。
 mediaEmulateType		= エミュレートするメディアタイプ
 mediaResetDesc			= メディアタイプのエミュレートを終了します
+
+# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
+# injectFailed) These strings describe the 'inject' commands and all available
+# parameters.
+injectDesc			= ページにライブラリを差し込みます
+injectManual2			= コンソールからアクセスできるページの内容にライブラリを差し込みます。
+injectLibraryDesc		= 差し込むライブラリを選択、またはスクリプトの URL を入力
+injectLoaded			= %1$S が読み込まれました
+injectFailed			= %1$S は読み込めませんでした - 無効なURLです
+
+# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
+# folderOpenProfileDesc) These strings describe the 'folder' commands and
+# all available parameters.
+folderDesc			= フォルダを開きます
+folderOpenDesc			= 開くフォルダのパス
+folderOpenDir			= ディレクトリのパス
+folderOpenProfileDesc		= プロファイルディレクトリを開く
+
+# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
+# of the 'folder open' command with an invalid folder path.
+folderInvalidPath		= 正しいパスを入力してください
+
+# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
+# describe the result of the 'folder open' command.
+# The argument (%1$S) is the folder path.
+folderOpenDirResult		= %1$S を開きました
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -32,17 +32,25 @@ debuggerPausedWarning.message		= デバッガが停止しています。マウスによる選択のような一部の機能は動作しません。
 nodeMenu.tooltiptext			= ノードの操作
 
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
 inspector.label				= インスペクタ
 inspector.commandkey			= C
 inspector.accesskey			= I
 
+# LOCALIZATION NOTE (inspector.panelLabel.*)
+# Labels applied to the panel and views within the panel in the toolbox
+inspector.panelLabel			= インスペクタパネル
+inspector.panelLabel.markupView		= マークアップビュー
+
 # LOCALIZATION NOTE (markupView.more.*)
 # When there are too many nodes to load at once, we will offer to
 # show all the nodes.
 markupView.more.showing			= いくつかのノードは隠されています。
 markupView.more.showAll			= すべてのノード (%S個) を表示
 inspector.tooltip			= DOM とスタイルシートの調査
 
 #LOCALIZATION NOTE: Used in the image preview tooltip when the image could not be loaded
 previewTooltip.image.brokenImage	= 画像をロードできません
+
+#LOCALIZATION NOTE: Used in the image preview tooltip when the image could not be loaded
+eventsTooltip.openInDebugger		= デバッガで開く
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -11,19 +11,21 @@
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 <!-- LOCALIZATION NOTE (netmonitorUI.perfNotice1/2): These are the labels displayed
   -  in the network table when empty to start performance analysis. -->
 <!ENTITY netmonitorUI.perfNotice1         "• ">
 <!ENTITY netmonitorUI.perfNotice2         "ボタンをクリックすると、パフォーマンス解析を開始します。">
 
-<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice3): This is the label displayed
-  -  in the network table when empty. -->
-<!ENTITY netmonitorUI.emptyNotice3        "• 要求を送信するかページを更新すると、ネットワークの稼働状況を確認できます。">
+<!-- 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     "✓">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
   -  in the network table toolbar, above the "method" column. -->
 <!ENTITY netmonitorUI.toolbar.method      "メソッド">
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (netmonitor.label):
 # 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)
 # Used for the menuitem in the tool menu
 netmonitor.commandkey	= Q
 netmonitor.accesskey	= N
 
 # LOCALIZATION NOTE (netmonitor.tooltip):
 # This string is displayed in the tooltip of the tab when the Network Monitor is
 # displayed inside the developer tools window.
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (profiler.label):
 # This string is displayed in the title of the tab when the profiler is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label		= プロファイラ
 
+# LOCALIZATION NOTE (profiler.panelLabel):
+# This is used as the label for the toolbox panel.
+profiler.panelLabel	= プロファイラパネル
+
 # LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
 profiler2.commandkey	= VK_F5
 profiler.accesskey	= P
 
 # LOCALIZATION NOTE (profiler.tooltip2):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
--- a/browser/chrome/browser/devtools/projecteditor.properties
+++ b/browser/chrome/browser/devtools/projecteditor.properties
@@ -8,42 +8,66 @@
 # 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.deleteLabel):
 # This string is displayed as a context menu item for allowing the selected
-# file / folder to be deleted
+# 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 context menu item for adding a new file to
-# the directory
+# This string is displayed as a menu item for adding a new file to
+# the directory.
 projecteditor.newLabel		= 新規作成...
 
+# 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
+# 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
+# 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
+# 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
+# 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"
+# 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
+# create a new file.
 projecteditor.new.commandkey	= N
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -90,12 +90,16 @@ propertiesFilterPlaceholder		= プロパティをフィルタ
 # fails to connect to the server due to a timeout.
 connectionTimeout			= 接続がタイムアウトしました。原因と思われるエラーメッセージを、エラーコンソールで確認してください。スクラッチパッドを開きなおして、やり直してください。
 
 # LOCALIZATION NOTE (scratchpad.label): this string is displayed in the title of
 # the tab when the Scratchpad is displayed inside the developer tools window and
 # in the Developer Tools Menu.
 scratchpad.label			= スクラッチパッド
 
+# LOCALIZATION NOTE (scratchpad.panelLabel): this is used as the
+# label for the toolbox panel.
+scratchpad.panelLabel			= スクラッチパッドパネル
+
 # LOCALIZATION NOTE (scratchpad.tooltip):  This string is displayed in the
 # tooltip of the tab when the Scratchpad is displayed inside the developer tools
 # window.
 scratchpad.tooltip			= スクラッチパッド
--- a/browser/chrome/browser/devtools/shadereditor.properties
+++ b/browser/chrome/browser/devtools/shadereditor.properties
@@ -10,16 +10,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxShaderEditor.label):
 # This string is displayed in the title of the tab when the Shader Editor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxShaderEditor.label	= シェーダエディタ
 
+# LOCALIZATION NOTE (ToolboxShaderEditor.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxShaderEditor.panelLabel	= シェーダエディタパネル
+
 # LOCALIZATION NOTE (ToolboxShaderEditor.tooltip):
 # This string is displayed in the tooltip of the tab when the Shader Editor is
 # displayed inside the developer tools window.
 ToolboxShaderEditor.tooltip	= WebGL 向けライブ GLSL シェーダ言語エディタ
 
 # LOCALIZATION NOTE (shadersList.programLabel):
 # This string is displayed in the programs list of the Shader Editor,
 # identifying a set of linked GLSL shaders.
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -13,17 +13,17 @@
 # A good criteria is the language in which you'd find the best documentation
 # on web development on the web.
 
 # LOCALIZATION NOTE  (findCmd.promptTitle): This is the dialog title used
 # when the user wants to search for a string in the code. You can
 # access this feature by pressing Ctrl-F on Windows/Linux or Cmd-F on Mac.
 findCmd.promptTitle		= 検索...
 
-# LOCALIZATION NOTE  (gotoLineCmd.promptMessage): This is the message shown when
+# LOCALIZATION NOTE  (findCmd.promptMessage): This is the message shown when
 # the user wants to search for a string in the code. You can
 # access this feature by pressing Ctrl-F on Windows/Linux or Cmd-F on Mac.
 findCmd.promptMessage		= 検索:
 
 # LOCALIZATION NOTE  (gotoLineCmd.promptTitle): This is the dialog title used
 # when the user wants to jump to a specific line number in the code. You can
 # access this feature by pressing Ctrl-J on Windows/Linux or Cmd-J on Mac.
 gotoLineCmd.promptTitle		= 指定行へ移動...
@@ -44,16 +44,25 @@ annotation.breakpoint.title	= ブレークポイント: %S
 annotation.currentLine		= 現在の行
 
 # LOCALIZATION NOTE  (annotation.debugLocation.title): This is the text shown in
 # a tooltip displayed in any of the editor gutters when the user hovers the
 # current debugger location. The debugger can pause the JavaScript execution at
 # user-defined lines.
 annotation.debugLocation.title	= 現在のステップ: %S
 
+# LOCALIZATION NOTE  (autocompletion.docsLink): This is the text shown on
+# the link inside of the documentation popup.  If you type 'document' in Scratchpad
+# then press Shift+Space you can see the popup.
+autocompletion.docsLink		= ドキュメント
+
+# LOCALIZATION NOTE  (autocompletion.notFound): This is the text shown in
+# the documentation popup if Tern fails to find a type for the object.
+autocompletion.notFound		= 見つかりません
+
 # LOCALIZATION NOTE  (jumpToLine.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to jump to
 # a specific line in the editor.
 jumpToLine.commandkey		= J
 
 # LOCALIZATION NOTE  (toggleComment.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to either
 # comment or uncomment selected lines in the editor.
@@ -82,11 +91,11 @@ moveLineUp.commandkey		= Alt-Up
 # LOCALIZATION NOTE  (moveLineDown.commandkey): This is the key to use to move
 # the selected lines down.
 moveLineDown.commandkey		= Alt-Down
 
 # LOCALIZATION NOTE  (autocomplete.commandkey): This is the key to use
 # in conjunction with Ctrl for autocompletion.
 autocompletion.commandkey	= Space
 
-# LOCALIZATION NOTE  (showInformation.commandkey): This is the key to use to
+# LOCALIZATION NOTE  (showInformation2.commandkey): This is the key to use to
 # show more information, like type inference.
-showInformation.commandkey	= Shift-Space
+showInformation2.commandkey	= Shift-Ctrl-Space
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -68,16 +68,20 @@ open.accesskey			= l
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey	= S
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.label):
 # This string is displayed in the title of the tab when the style editor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxStyleEditor.label	= スタイルエディタ
 
+# LOCALIZATION NOTE (ToolboxStyleEditor.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxStyleEditor.panelLabel	= スタイルエディタパネル
+
 # LOCALIZATION NOTE (ToolboxStyleEditor.tooltip2):
 # This string is displayed in the tooltip of the tab when the style editor is
 # displayed inside the developer tools window.
 ToolboxStyleEditor.tooltip2	= スタイルシートエディタ (CSS)
 
 # LOCALIZATION NOTE (confirmNavigationAway): Shown in a notification box when
 # the user tries to navigate away from a web page.
 confirmNavigationAway.message			= このページから移動すると、スタイルエディタで変更した未保存の内容が破棄されます。
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -81,18 +81,18 @@
   -  options.disableJavaScript.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles JavaScript on or off. -->
 <!ENTITY options.disableJavaScript.label     "JavaScript を無効 *">
 <!ENTITY options.disableJavaScript.tooltip   "このオプションを有効にすると、現在のタブの JavaScript を無効にします。タブまたはツールボックスを閉じると、この設定は元に戻されます。">
 
 <!-- LOCALIZATION NOTE (options.disableCache.label,
   -  options.disableCache.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles the cache on or off. -->
-<!ENTITY options.disableCache.label     "キャッシュを無効 *">
-<!ENTITY options.disableCache.tooltip   "このオプションを有効にすると、現在のタブのキャッシュを無効にします。タブまたはツールボックスを閉じると、この設定は元に戻されます。">
+<!ENTITY options.disableCache.label2     "キャッシュを無効 (ツールボックスを開いているとき)">
+<!ENTITY options.disableCache.tooltip2   "このオプションを有効にすると、ツールボックスを開いているときはすべてのタブのキャッシュを無効にします。">
 
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
 <!ENTITY options.selectDefaultTools.label     "標準の Firefox 開発ツール">
 
 <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
@@ -159,8 +159,24 @@
 <!ENTITY options.enablePersistentLogs.tooltip  "このオプションを有効にすると、新しいページに誘導させられた場合でも Web コンソールとネットワークモニタの出力を消去しないようになります">
 
 <!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
   -  label for the checkbox that toggles the display of the platform data in the,
   -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
   -  in about:config, in the options panel. -->
 <!ENTITY options.showPlatformData.label    "Gecko プラットフォームのデータを表示">
 <!ENTITY options.showPlatformData.tooltip  "このオプションを有効にすると、JavaScript プロファイラの出力に Gecko プラットフォームのシンボルが含まれるようになります">
+
+<!-- LOCALIZATION NOTE (options.sourceeditor.*): Options under the editor
+  -  section. -->
+
+<!ENTITY options.sourceeditor.label                     "エディタ設定">
+<!ENTITY options.sourceeditor.detectindentation.label   "インデントを検知">
+<!ENTITY options.sourceeditor.detectindentation.tooltip "ソースの内容からインデントを推測します">
+<!ENTITY options.sourceeditor.autoclosebrackets.label   "閉じ括弧自動入力">
+<!ENTITY options.sourceeditor.autoclosebrackets.tooltip "閉じ括弧を自動的に入力します">
+<!ENTITY options.sourceeditor.expandtab.label           "インデントにスペース文字を使う">
+<!ENTITY options.sourceeditor.expandtab.tooltip         "タブ文字の代わりにスペース文字を使います">
+<!ENTITY options.sourceeditor.tabsize.label             "タブの長さ">
+<!ENTITY options.sourceeditor.tabsize.accesskey         "T">
+<!ENTITY options.sourceeditor.keybinding.label          "キーバインド">
+<!ENTITY options.sourceeditor.keybinding.accesskey      "K">
+<!ENTITY options.sourceeditor.keybinding.default.label  "既定">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -30,20 +30,28 @@ toolboxToggleButton.tooltip		= %1$S、%2$S\nクリックすると開発ツールを切り替えます。
 # The name of the selected tool: %1$S.
 # The url of the page being tooled: %2$S.
 toolbox.titleTemplate			= %1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
 toolbox.defaultTitle			= 開発ツール
 
+# LOCALIZATION NOTE (toolbox.label): This is used as the label for the
+# toolbox as a whole
+toolbox.label				= 開発ツール
+
 # LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
 # for the options panel tab.
 optionsButton.tooltip			= 開発ツールのオプション
 
+# LOCALIZATION NOTE (options.panelLabel): This is used as the label for the
+# toolbox panel.
+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 *
 
 # LOCALIZATION NOTE (scratchpad.keycode)
 # Used for opening scratchpad from the detached toolbox window
--- a/browser/chrome/browser/devtools/webaudioeditor.properties
+++ b/browser/chrome/browser/devtools/webaudioeditor.properties
@@ -11,16 +11,20 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxWebAudioEditor1.label):
 # This string is displayed in the title of the tab when the Web Audio Editor
 # is displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxWebAudioEditor1.label	= Web Audio
 
+# LOCALIZATION NOTE (ToolboxWebAudioEditor1.panelLabel):
+# This is used as the label for the toolbox panel.
+ToolboxWebAudioEditor1.panelLabel	= Web Audio パネル
+
 # LOCALIZATION NOTE (ToolboxWebAudioEditor1.tooltip):
 # This string is displayed in the tooltip of the tab when the Web Audio Editor is
 # displayed inside the developer tools window.
 ToolboxWebAudioEditor1.tooltip	= Web Audio コンテキストビジュアライザとオーディオノードインスペクタ
 
 # LOCALIZATION NOTE (collapseInspector): This is the tooltip for the button
 # that collapses the inspector in the web audio tool UI.
 collapseInspector		= インスペクタを閉じる
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -162,16 +162,20 @@ listTabs.globalConsoleActor	= *グローバルコンソール*
 # LOCALIZATION NOTE (MenuWebconsole.label): the string displayed in the Tools
 # menu as a shortcut to open the devtools with the Web Console tab selected.
 MenuWebconsole.label		= Web コンソール
 
 # LOCALIZATION NOTE (ToolboxTabWebconsole.label): the string displayed as the
 # label of the tab in the devtools window.
 ToolboxTabWebconsole.label	= コンソール
 
+# LOCALIZATION NOTE (ToolboxWebConsole.panelLabel): the string used as the
+# label for the toolbox panel.
+ToolboxWebConsole.panelLabel	= コンソールパネル
+
 # LOCALIZATION NOTE (ToolboxWebconsole.tooltip): the string displayed in the
 # tooltip of the tab when the Web Console is displayed inside the developer
 # tools window.
 ToolboxWebconsole.tooltip	= Web コンソール
 
 # 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.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/loop/loop.properties
@@ -0,0 +1,39 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Panel Strings
+
+share_link_header_text			= リンクを共有して通話に招待:
+
+# Status text
+display_name_dnd_status			= 起こさないでください
+display_name_available_status		= 通話できます
+
+unable_retrieve_url			= 申し訳ありません。通話 URL を取得できませんでした。
+
+# Conversation Window Strings
+
+incoming_call_title			= 着信...
+incoming_call				= 着信
+incoming_call_answer_button		= 応答
+incoming_call_decline_button		= 切断
+incoming_call_ignore_button		= 無視
+incoming_call_block_button		= 着信拒否
+hangup_button_title			= ハングアップ
+mute_local_audio_button_title		= 音声をミュート
+unmute_local_audio_button_title		= 音声を戻す
+mute_local_video_button_title		= 映像をミュート
+unmute_local_video_button_title		= 映像を戻す
+
+peer_ended_conversation			= 先方が通話を終了しました。
+call_has_ended				= 通話を終了しました。
+close_window				= ウィンドウを閉じる
+
+cannot_start_call_session_not_ready	= 通話を開始できません。セッションが準備できていません。
+network_disconnected			= ネットワーク接続が急に切断されました。
+
+connection_error_see_console_notification	= 通話できませんでした。詳細はコンソールを確認してください。
+## LOCALIZATION NOTE (legal_text_and_links): In this item, don't translate the
+## part between {{..}}
+legal_text_and_links			= この機能を使うには、<a target="_blank" href="{{terms_of_use_url}}">利用規約</a> と <a href="{{privacy_notice_url}}">プライバシーポリシー</a> に同意する必要があります。
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -20,18 +20,16 @@
 <!ENTITY  generalMode			"描画モード:">
 <!ENTITY  generalSize			"サイズ:">
 <!ENTITY  generalReferrer		"参照元 URL:">
 <!ENTITY  generalSource			"キャッシュソース:">
 <!ENTITY  generalModified		"更新日時:">
 <!ENTITY  generalEncoding		"文字エンコーディング:">
 <!ENTITY  generalMetaName		"名前">
 <!ENTITY  generalMetaContent		"値">
-<!ENTITY  generalSecurityDetails	"詳細">
-<!ENTITY  generalSecurityDetails.accesskey	"D">
 
 <!ENTITY  mediaTab			"メディア">
 <!ENTITY  mediaTab.accesskey		"M">
 <!ENTITY  mediaLocation			"アドレス (URL):">
 <!ENTITY  mediaText			"関連テキスト:"><!-- (^^; Associated Text -->
 <!ENTITY  mediaAltHeader		"代替テキスト">
 <!ENTITY  mediaAddress			"URL">
 <!ENTITY  mediaType			"種類">
@@ -60,17 +58,16 @@
 <!ENTITY  permissionsFor		"対象サイト:">
 <!ENTITY  permPlugins			"プラグインの実行">
 
 <!ENTITY  permClearStorage		"ストレージを消去">
 <!ENTITY  permClearStorage.accesskey	"C">
 
 <!ENTITY  securityTab			"セキュリティ">
 <!ENTITY  securityTab.accesskey		"S">
-<!ENTITY  securityHeader		"このページのセキュリティ情報">
 <!ENTITY  securityView.certView		"証明書を表示...">
 <!ENTITY  securityView.accesskey	"V">
 <!ENTITY  securityView.unknown		"不明">
 
 
 <!ENTITY  securityView.identity.header		"Web サイトの識別情報">
 <!ENTITY  securityView.identity.owner		"運営者:">
 <!ENTITY  securityView.identity.domain		"Web サイト:">
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -34,17 +34,16 @@ mediaDimensions		= %Spx × %Spx
 mediaDimensionsScaled	= %Spx × %Spx (%Spx × %Spx で表示)
 
 # (^^; 個人的には "後方互換" とかいう表記は止めておきたい、IE8 では "互換表示"
 generalQuirksMode	= Quirks (後方互換) モード
 generalStrictMode	= Standards Compliant (標準準拠) モード
 generalSize		= %S KB (%S バイト)
 generalMetaTag		= meta 要素一覧 (1 要素)
 generalMetaTags		= meta 要素一覧 (%S 要素)
-generalSiteIdentity	= この Web サイトの運営者: %S\n認証局: %S
 
 feedRss			= RSS
 feedAtom		= Atom
 feedXML			= XML
 
 securityNoOwner		= 検証され信頼できる運営者情報はありません
 securityOneVisit	= はい (1 回)
 securityNVisits		= はい (%S 回)
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -123,14 +123,14 @@
 <!ENTITY offlineAppRemove.confirm        "オフライン作業用データの削除">
 
 <!ENTITY certificateTab.label            "証明書">
 <!ENTITY certSelection.description       "サーバが個人証明書を要求したとき:">
 <!ENTITY certs.auto                      "自動的に選択する">
 <!ENTITY certs.auto.accesskey            "S">
 <!ENTITY certs.ask                       "毎回自分で選択する">
 <!ENTITY certs.ask.accesskey             "A">
+<!ENTITY enableOCSP.label                "OCSP レスポンダに問い合わせてデジタル証明書の有効性をリアルタイムに確認する">
+<!ENTITY enableOCSP.accesskey            "Q">
 <!ENTITY viewCerts.label                 "証明書を表示...">
 <!ENTITY viewCerts.accesskey             "C">
-<!ENTITY verify2.label                   "検証...">
-<!ENTITY verify2.accesskey               "V">
 <!ENTITY viewSecurityDevices.label       "セキュリティデバイス...">
 <!ENTITY viewSecurityDevices.accesskey   "D">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -27,8 +27,18 @@
 <!ENTITY chooseLanguage.label         "Web ページの表示に使用する言語の優先順位を設定できます。">
 <!ENTITY chooseButton.label           "言語設定...">
 <!ENTITY chooseButton.accesskey       "o">
 
 <!ENTITY translateWebPages.label      "Web ページを翻訳">
 <!ENTITY translateWebPages.accesskey  "T">
 <!ENTITY translateExceptions.label    "例外...">
 <!ENTITY translateExceptions.accesskey "x">
+
+<!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo,
+  -                     translation.options.attribution.afterLogo):
+  -  These 2 strings are displayed before and after a 'Microsoft Translator'
+  -  logo.
+  -  The translations for these strings should match the translations in
+  -  browser/translation.dtd
+  -->
+<!ENTITY translation.options.attribution.beforeLogo "翻訳: ">
+<!ENTITY translation.options.attribution.afterLogo "">
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -1,27 +1,29 @@
 <!-- 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  prefWindow.titleWin		"オプション">
-<!ENTITY  prefWindow.titleGNOME		"&brandShortName; の設定">
+<!ENTITY  prefWindow.titleWin     "オプション">
+<!ENTITY  prefWindow.title        "設定">
+<!-- LOCALIZATION NOTE (prefWindow.titleGNOME): This is not used for in-content preferences -->
+<!ENTITY  prefWindow.titleGNOME   "&brandShortName; の設定">
 <!-- When making changes to prefWindow.styleWin test both Windows Classic and
      Luna since widget heights are different based on the OS theme -->
-<!ENTITY  prefWinMinSize.styleWin2	"width: 49em; min-height: 41em;"><!-- width: 42em; min-height: 37.5em; -->
-<!ENTITY  prefWinMinSize.styleMac	"width: 51em; min-height: 40em;"><!-- width: 47em; min-height: 40em; -->
-<!ENTITY  prefWinMinSize.styleGNOME	"width: 49em; min-height: 40.5em;"><!-- width: 42em; min-height: 40.5em; -->
+<!ENTITY  prefWinMinSize.styleWin2      "width: 49em; min-height: 41em;"><!-- width: 42em; min-height: 37.5em; -->
+<!ENTITY  prefWinMinSize.styleMac       "width: 51em; min-height: 40em;"><!-- width: 47em; min-height: 40em; -->
+<!ENTITY  prefWinMinSize.styleGNOME     "width: 49em; min-height: 40.5em;"><!-- width: 42em; min-height: 40.5em; -->
 
-<!ENTITY  paneGeneral.title		"一般">
-<!ENTITY  paneTabs.title		"タブ">
-<!ENTITY  paneContent.title		"コンテンツ">
-<!ENTITY  paneApplications.title	"プログラム">
-<!ENTITY  panePrivacy.title		"プライバシー">
-<!ENTITY  paneSecurity.title		"セキュリティ">
-<!ENTITY  paneAdvanced.title		"詳細">
+<!ENTITY  paneGeneral.title       "一般">
+<!ENTITY  paneTabs.title          "タブ">
+<!ENTITY  paneContent.title       "コンテンツ">
+<!ENTITY  paneApplications.title  "プログラム">
+<!ENTITY  panePrivacy.title       "プライバシー">
+<!ENTITY  paneSecurity.title      "セキュリティ">
+<!ENTITY  paneAdvanced.title      "詳細">
 
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
-<!ENTITY  paneSync.title		"Sync">
-<!ENTITY  buttonForward.tooltip		"1 ページ進む">
-<!ENTITY  buttonBack.tooltip		"1 ページ戻る">
+<!ENTITY  paneSync.title          "Sync">
+<!ENTITY  buttonForward.tooltip   "1 ページ進む">
+<!ENTITY  buttonBack.tooltip      "1 ページ戻る">
 
-<!ENTITY  helpButton.label		"ヘルプ">
+<!ENTITY  helpButton.label        "ヘルプ">
--- a/browser/chrome/browser/translation.dtd
+++ b/browser/chrome/browser/translation.dtd
@@ -51,8 +51,16 @@
   -                     translation.options.preferences.accesskey):
   -  The accesskey values used here should not clash with the value used for
   -  translation.options.neverForLanguage.accesskey in translation.properties
   -->
 <!ENTITY translation.options.neverForSite.label "このサイトは翻訳しない">
 <!ENTITY translation.options.neverForSite.accesskey "e">
 <!ENTITY translation.options.preferences.label  "翻訳の設定">
 <!ENTITY translation.options.preferences.accesskey "T">
+
+<!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo,
+  -                     translation.options.attribution.afterLogo):
+  -  These 2 strings are displayed before and after a 'Microsoft Translator'
+  -  logo.
+  -->
+<!ENTITY translation.options.attribution.beforeLogo "翻訳: ">
+<!ENTITY translation.options.attribution.afterLogo "">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/webrtcIndicator.properties
@@ -0,0 +1,37 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE : FILE This file contains the webrtc global indicator strings
+
+# LOCALIZATION NOTE (webrtcIndicator.windowtitle): %S is the brand name (e.g. Firefox).
+# This string is used so that the window has a title in tools that enumerate/look for window
+# titles. It is not normally visible anywhere.
+webrtcIndicator.windowtitle = %S - 共有インジケータ
+
+webrtcIndicator.sharingCameraAndMicrophone.tooltip = カメラとマイクが共有されています。クリックすると共有を設定できます。
+webrtcIndicator.sharingCamera.tooltip              = カメラが共有されています。クリックすると共有を設定できます。
+webrtcIndicator.sharingMicrophone.tooltip          = マイクが共有されています。クリックすると共有を設定できます。
+webrtcIndicator.sharingScreen.tooltip = 画面が共有されています。クリックすると共有を設定できます。
+webrtcIndicator.sharingWindow.tooltip = ウィンドウが共有されています。クリックすると共有を設定できます。
+
+
+# LOCALIZATION NOTE : The following strings are only used on Mac for
+# menus attached to icons near the clock on the mac menubar.
+
+# LOCALIZATION NOTE (webrtcIndicator.sharing*With.menuitem):
+# %S is the title of the tab using the share.
+webrtcIndicator.sharingCameraWith.menuitem		= "%S" でカメラを共有中
+webrtcIndicator.sharingMicrophoneWith.menuitem		= "%S" でマイクを共有中
+webrtcIndicator.sharingScreenWith.menuitem		= "%S" で画面を共有中
+webrtcIndicator.sharingWindowWith.menuitem		= "%S" でウィンドウを共有中
+webrtcIndicator.controlSharing.menuitem			= 共有の設定
+# LOCALIZATION NOTE (webrtcIndicator.sharing*WithNTabs.menuitem):
+# Semicolon-separated list of plural forms.
+webrtcIndicator.sharingCameraWithNTabs.menuitem		= #1 個のタブでカメラを共有中
+webrtcIndicator.sharingMicrophoneWithNTabs.menuitem	= #1 個のタブでマイクを共有中
+webrtcIndicator.sharingScreenWithNTabs.menuitem		= #1 個のタブで画面を共有中
+webrtcIndicator.sharingWindowWithNTabs.menuitem		= #1 個のタブでウィンドウを共有中
+# LOCALIZATION NOTE (webrtcIndicator.controlSharingOn.menuitem):
+# %S is the title of the tab using the share.
+webrtcIndicator.controlSharingOn.menuitem		= "%S" の共有の設定