23.0: sync browser with en-US rev138727:e33bd71d1e01
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Thu, 20 Jun 2013 01:39:27 +0900
changeset 1093 519747a6da9655551ae984def5050d23f5e1dff2
parent 1092 e388f7ba727c5eadf459504891e8dfd9ff3f5d66
child 1094 48fea34fa5abb690e9e55b25b87d79ce88da255a
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs23
23.0: sync browser with en-US rev138727:e33bd71d1e01
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/VariablesView.dtd
browser/chrome/browser/devtools/appcacheutils.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/scratchpad.properties
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.properties
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/quitDialog.properties
browser/chrome/browser/syncSetup.properties
browser/installer/nsisstrings.properties
browser/pdfviewer/viewer.properties
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -16,16 +16,18 @@
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
 <!ENTITY abouthome.defaultSnippet1.v1			"Firefox をさらに活用したいときは、<a>使い方のヒント</a> をご覧ください。基本的なキーボードショートカットや主な機能をご説明します。">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1			"<a>Firefox をカスタマイズしてみましょう</a>。たくさんの無料のアドオンの中から気に入ったものを選べば、自分好みのブラウザを作ることができます。">
+<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
+<!ENTITY abouthome.rightsSnippet			"&brandFullName; は非営利団体 Mozilla Foundation が公開している無料のオープンソースソフトウェアです。<a>あなたの権利について...</a>">
 
 <!ENTITY abouthome.bookmarksButton.label		"ブックマーク">
 <!ENTITY abouthome.historyButton.label			"履歴">
 <!ENTITY abouthome.settingsButton.label			"オプション">
 <!ENTITY abouthome.addonsButton.label			"アドオン">
 <!ENTITY abouthome.appsButton.label			"Marketplace">
 <!ENTITY abouthome.downloadsButton.label		"ダウンロード">
 <!ENTITY abouthome.syncButton.label			"&syncBrand.shortName.label;">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -110,17 +110,28 @@ These should match what Safari and other
 
 <!ENTITY closeWindow.label		"ウィンドウを閉じる">
 <!ENTITY closeWindow.accesskey 		"d">
 
 <!ENTITY bookmarksMenu.label		"ブックマーク">
 <!ENTITY bookmarksMenu.accesskey	"B">
 <!ENTITY bookmarkThisPageCmd.label	"このページをブックマーク">
 <!ENTITY bookmarkThisPageCmd.commandkey	"d">
-<!ENTITY sharePageCmd.commandkey	"l">
+<!ENTITY markPageCmd.commandkey		"l">
+<!ENTITY sharePageCmd.label		"このページを共有">
+<!ENTITY sharePageCmd.commandkey	"S">
+<!ENTITY sharePageCmd.accesskey		"s">
+<!ENTITY shareLinkCmd.label		"この URL を共有">
+<!ENTITY shareLinkCmd.accesskey		"s">
+<!ENTITY shareImageCmd.label		"この画像を共有">
+<!ENTITY shareImageCmd.accesskey	"s">
+<!ENTITY shareSelectCmd.label		"選択範囲を共有">
+<!ENTITY shareSelectCmd.accesskey	"s">
+<!ENTITY shareVideoCmd.label		"この動画を共有">
+<!ENTITY shareVideoCmd.accesskey	"s">
 <!ENTITY subscribeToPageMenupopup.label	"このページを購読">
 <!ENTITY subscribeToPageMenuitem.label	"このページを購読...">
 <!ENTITY addCurPagesCmd.label		"すべてのタブをブックマーク...">
 <!ENTITY showAllBookmarks2.label		"すべてのブックマークを表示">
 <!ENTITY unsortedBookmarksCmd.label		"未整理のブックマーク">
 <!ENTITY bookmarksToolbarChevron.tooltip	"残りのブックマークを表示します">
 
 <!ENTITY backCmd.label			"戻る">
@@ -202,16 +213,18 @@ These should match what Safari and other
 <!ENTITY devtoolsConnect.accesskey	"e">
 
 <!ENTITY errorConsoleCmd.label		"エラーコンソール">
 <!ENTITY errorConsoleCmd.accesskey	"C">
 <!ENTITY errorConsoleCmd.commandkey	"j">
 
 <!ENTITY remoteWebConsoleCmd.label	"リモート Web コンソール">
 
+<!ENTITY browserConsoleCmd.label	"ブラウザコンソール">
+
 <!ENTITY inspectContextMenu.label	"要素を調査">
 <!ENTITY inspectContextMenu.accesskey	"Q">
 
 <!ENTITY responsiveDesignTool.label		"レスポンシブデザインビュー">
 <!ENTITY responsiveDesignTool.accesskey		"R">
 <!ENTITY responsiveDesignTool.commandkey	"M">
 
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
@@ -219,20 +232,20 @@ These should match what Safari and other
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
-<!ENTITY scratchpad.label             "スクラッチパッド">
-<!ENTITY scratchpad.accesskey         "s">
-<!ENTITY scratchpad.keycode           "VK_F4">
-<!ENTITY scratchpad.keytext           "F4">
+<!ENTITY scratchpad.label			"スクラッチパッド">
+<!ENTITY scratchpad.accesskey			"s">
+<!ENTITY scratchpad.keycode			"VK_F4">
+<!ENTITY scratchpad.keytext			"F4">
 
 <!ENTITY devToolbarCloseButton.tooltiptext	"開発ツールバーを閉じる">
 <!ENTITY devToolbarMenu.label			"開発ツールバー">
 <!ENTITY devToolbarMenu.accesskey		"v">
 <!ENTITY devToolbar.keycode			"VK_F2">
 <!ENTITY devToolbar.keytext			"F2">
 <!ENTITY devToolboxMenuItem.label		"開発ツールを表示">
 <!ENTITY devToolboxMenuItem.accesskey		"T">
@@ -451,29 +464,29 @@ items are mutually exclusive. -->
 <!ENTITY mediaPause.accesskey		"P">
 <!-- LOCALIZATION NOTE: The access keys for "Mute" and
 "Unmute" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaMute.label		"ミュート">
 <!ENTITY mediaMute.accesskey		"M">
 <!ENTITY mediaUnmute.label		"ミュート解除">
 <!ENTITY mediaUnmute.accesskey		"m">
-<!ENTITY mediaPlaybackRate.label		"再生スピード">
-<!ENTITY mediaPlaybackRate.accesskey		"l">
-<!ENTITY mediaPlaybackRate050x.label		"スローモーション (0.5×)">
-<!ENTITY mediaPlaybackRate050x.accesskey	"S">
-<!ENTITY mediaPlaybackRate100x.label		"通常">
-<!ENTITY mediaPlaybackRate100x.accesskey	"N">
-<!ENTITY mediaPlaybackRate150x.label		"早送り (1.5×)">
-<!ENTITY mediaPlaybackRate150x.accesskey	"H">
+<!ENTITY mediaPlaybackRate.label                "再生スピード">
+<!ENTITY mediaPlaybackRate.accesskey            "l">
+<!ENTITY mediaPlaybackRate050x.label            "スローモーション (0.5倍)">
+<!ENTITY mediaPlaybackRate050x.accesskey        "S">
+<!ENTITY mediaPlaybackRate100x.label            "通常">
+<!ENTITY mediaPlaybackRate100x.accesskey        "N">
+<!ENTITY mediaPlaybackRate150x.label            "早送り (1.5倍)">
+<!ENTITY mediaPlaybackRate150x.accesskey        "H">
 <!-- LOCALIZATION NOTE: "Ludicrous Speed" is a reference to the
 movie "Space Balls" and is meant to say that this speed is very
 fast. -->
-<!ENTITY mediaPlaybackRate200x.label		"なんて速さだ! (2×)">
-<!ENTITY mediaPlaybackRate200x.accesskey	"L">
+<!ENTITY mediaPlaybackRate200x.label            "ウルトラスーパーハイ (2倍)">
+<!ENTITY mediaPlaybackRate200x.accesskey        "L">
 <!-- LOCALIZATION NOTE: The access keys for "Show Controls" and
 "Hide Controls" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaShowControls.label	"コントロールを表示">
 <!ENTITY mediaShowControls.accesskey	"C">
 <!ENTITY mediaHideControls.label	"コントロールを隠す">
 <!ENTITY mediaHideControls.accesskey	"C">
 <!ENTITY videoFullScreen.label		"全画面表示">
@@ -531,17 +544,18 @@ you can use these alternative items. Oth
 
 <!ENTITY quitApplicationCmdWin.label	"終了">
 <!ENTITY quitApplicationCmdWin.accesskey	"x">
 <!ENTITY goBackCmd.commandKey		"[">
 <!ENTITY goForwardCmd.commandKey	"]">
 <!ENTITY quitApplicationCmd.label	"終了">
 <!ENTITY quitApplicationCmd.accesskey	"Q">
 <!ENTITY quitApplicationCmdMac.label	"&brandShortName; を終了">
-<!ENTITY quitApplicationCmdMac.key	"Q">
+<!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX builds. -->
+<!ENTITY quitApplicationCmdUnix.key	"Q">
 
 <!ENTITY closeCmd.label			"閉じる">
 <!ENTITY closeCmd.key			"W">
 <!ENTITY closeCmd.accesskey		"C">
 
 <!ENTITY pageStyleMenu.label		"スタイルシート">
 <!ENTITY pageStyleMenu.accesskey	"y">
 <!ENTITY pageStyleNoStyle.label		"スタイルシートを使用しない">
@@ -626,23 +640,31 @@ just addresses the organization to follo
 <!ENTITY social.toggleSidebar.label		"サイドバーを表示する">
 <!ENTITY social.toggleSidebar.accesskey		"s">
 
 <!ENTITY social.addons.label			"サービスを管理...">
 
 <!ENTITY social.toggleNotifications.label	"デスクトップ通知を表示する">
 <!ENTITY social.toggleNotifications.accesskey	"n">
 
-<!ENTITY social.activated.undobutton.label	"元に戻す">
-<!ENTITY social.activated.undobutton.accesskey	"U">
+<!ENTITY social.activated.description		"<label/> からのサービスが有効になりました。<label class='text-link'>アドオンマネージャ</label>のサービスで、設定を変更できます。">
+<!ENTITY social.activated.undo.label		"元に戻す">
+<!ENTITY social.activated.undo.accesskey	"U">
+<!ENTITY social.learnMore.label			"詳細...">
+<!ENTITY social.learnMore.accesskey		"l">
+<!ENTITY social.closeNotificationItem.label	"後で">
 
 <!ENTITY social.chatBar.commandkey		"c">
 <!ENTITY social.chatBar.label			"チャットを入力">
 <!ENTITY social.chatBar.accesskey		"c">
 
+<!-- labels are set dynamically, see browser.properties -->
+<!ENTITY social.markpage.accesskey		"m">
+<!ENTITY social.marklink.accesskey		"M">
+
 <!ENTITY getUserMedia.selectCamera.label		"共有するカメラ:">
 <!ENTITY getUserMedia.selectCamera.accesskey		"C">
 <!ENTITY getUserMedia.selectMicrophone.label		"共有するマイク:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey	"M">
 
 <!ENTITY webrtcIndicatorButton.label		"カメラ、マイクへのアクセス">
 <!ENTITY webrtcIndicatorButton.tooltip		"カメラかマイクを共有しているサイトを表示します">
 
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -27,27 +27,27 @@ xpinstallPromptAllowButton		= 許可
 # See http://www.mozilla.org/access/keyboard/accesskey for details
 xpinstallPromptAllowButton.accesskey	= A
 xpinstallDisabledMessageLocked		= ソフトウェアのインストールはシステム管理者により無効化されています。
 xpinstallDisabledMessage		= ソフトウェアのインストールは現在無効になっています。[有効にする] をクリックしてからもう一度やり直してください。
 xpinstallDisabledButton			= 有効にする
 xpinstallDisabledButton.accesskey	= n
 
 # LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled, addonDownloadRestart):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Also see https://bugzilla.mozilla.org/show_bug.cgi?id=570012 for mockups
 addonDownloading			= アドオンをダウンロード中
 addonDownloadCancelled			= アドオンのダウンロードはキャンセルされました。
 addonDownloadRestart			= ダウンロードを再開
 addonDownloadRestart.accessKey		= R
 addonDownloadCancelTooltip		= キャンセル
 
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 first add-on's name, #2 number of add-ons, #3 application name
 # (^m^) 要修正 https://bugzilla.mozilla.org/show_bug.cgi?id=658191
 addonsInstalled				= #1 がインストールされました。;#2 個のアドオンがインストールされました。
 addonsInstalledNeedsRestart		= #1 は #3 の再起動後にインストールされます。;#2 個のアドオンは #3 の再起動後にインストールされます。
 addonInstallRestartButton		= 今すぐ再起動
 addonInstallRestartButton.accesskey	= R
 
@@ -82,32 +82,35 @@ lwthemePostInstallNotification.manageBut
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message		= %S は再起動後にインストールされます。
 lwthemeNeedsRestart.button		= 今すぐ再起動
 lwthemeNeedsRestart.accesskey		= R
 
 # LOCALIZATION NOTE (popupWarning.message): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName and #2 is the number of pop-ups blocked.
 popupWarning.message			= #2 個のポップアップがブロックされました。
 popupWarningButton			= 設定
 popupWarningButton.accesskey		= O
 popupWarningButtonUnix			= 設定
 popupWarningButtonUnix.accesskey	= P
 popupAllow				= このサイト (%S) によるポップアップを許可する
 popupBlock				= このサイト (%S) によるポップアップを禁止する
 popupWarningDontShowFromMessage		= ポップアップをブロックするとき、このメッセージを表示しない
 popupWarningDontShowFromLocationbar	= ポップアップをブロックするとき、通知バーを表示しない
 popupShowPopupPrefix			= '%S' を表示
 
 # missing plugin installer
-missingpluginsMessage.title			= このページをすべて表示するにはプラグインを追加する必要があります。
-missingpluginsMessage.button.label		= プラグインを追加...
-missingpluginsMessage.button.accesskey		= I
+installPlugin.message				= このページのメディアの表示に必要なプラグインをインストールしますか?
+installPlugin.button.label			= %S をインストール
+installPlugin.button.accesskey			= I
+installPlugin.ignoreButton.label		= 次回から確認しない
+installPlugin.ignoreButton.accesskey		= N
 outdatedpluginsMessage.title			= このページの表示に使用するプラグインが古いので更新してください。
 outdatedpluginsMessage.updateButton.label	= プラグインを更新...
 outdatedpluginsMessage.updateButton.accesskey	= U
 blockedpluginsMessage.title			= このページを表示するにはプラグインが必要ですが、安全のためにブロックされました。
 blockedpluginsMessage.infoButton.label		= 詳細...
 blockedpluginsMessage.infoButton.accesskey	= D
 blockedpluginsMessage.searchButton.label	= プラグインを更新...
 blockedpluginsMessage.searchButton.accesskey	= U
@@ -136,16 +139,21 @@ vulnerablePluginsMessage			= いくつかのプラグインはセキュリティに問題があるため無効化されました。
 pluginInfo.unknownPlugin			= 不明
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title	= すべての履歴を消去
 sanitizeButtonOK			= 今すぐ消去
+# LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
+# button between the user clicking it and the window closing.  Indicates the
+# items are being cleared.
+sanitizeButtonClearing			= 消去中
+
 # LOCALIZATION NOTE (sanitizeEverythingWarning2): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has not modified the default set of history items to clear.
 sanitizeEverythingWarning2		= すべての履歴が消去されます。
 # LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has modified the default set of history items to clear.
 sanitizeSelectedWarning			= 選択した項目の履歴がすべて消去されます。
@@ -174,17 +182,17 @@ feedShowFeedNew				= '%S' を購読...
 
 menuOpenAllInTabs.label			= タブですべて開く
 
 # History menu
 menuRestoreAllTabs.label		= すべてのタブを復元
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
 # see bug 394759
 menuRestoreAllWindows.label		= すべてのウィンドウを復元
-# LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 Window Title, #2 Number of tabs
 menuUndoCloseWindowLabel		= #1 (その他 #2 個のタブ)
 menuUndoCloseWindowSingleTabLabel	= #1
 
 # Unified Back-/Forward Popup
 tabHistory.current			= 現在のページです
 tabHistory.goBack			= このページに戻ります
@@ -237,19 +245,19 @@ identity.ownerUnknown2			= (運営者は不明です)
 
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle		= ブックマークに追加しました
 # (^^; ツールメニューのブックマークからは無理...要再検討
 editBookmarkPanel.pageBookmarkedDescription	= %1$0.S今後このページにはブックマークからアクセスできます。
 editBookmarkPanel.bookmarkedRemovedTitle	= ブックマークを削除しました
 editBookmarkPanel.editBookmarkTitle		= ブックマークを編集できます
 
-# LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
-# Semi-colon list of plural forms. Replacement for #1 is
-# the number of bookmarks to be removed.
+# LOCALIZATION NOTE (editBookmark.removeBookmarks.label): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# Replacement for #1 is the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
 # (^a^) Workaround for Bug 473706
 # en-US: Remove Bookmark;Remove Bookmarks (#1)
 # editBookmark.removeBookmarks.label		= ブックマークを削除;複数 (#1) のブックマークを削除
 editBookmark.removeBookmarks.label		= この URL のブックマーク (#1 個) を削除
 
 # Post Update Notifications
@@ -281,24 +289,24 @@ webNotifications.showForSession.accesske
 webNotifications.alwaysShow			= 常に通知を表示する
 webNotifications.alwaysShow.accesskey		= A
 webNotifications.neverShow			= 通知をブロックする
 webNotifications.neverShow.accesskey		= N
 webNotifications.showFromSite			= %S からの通知を表示しますか?
 
 # Pointer lock UI
 
-pointerLock.allow				= マウスポインタを隠す
-pointerLock.allow.accesskey			= H
+pointerLock.allow2				= マウスポインタを隠す
+pointerLock.allow2.accesskey			= H
 pointerLock.alwaysAllow				= 常に許可
 pointerLock.alwaysAllow.accesskey		= A
 pointerLock.neverAllow				= 常に許可しない
 pointerLock.neverAllow.accesskey		= N
-pointerLock.title				= %S ではマウスポインタを非表示にしますか?
-pointerLock.autoLock.title			= %S ではマウスポインタを隠します。
+pointerLock.title2				= %S ではマウスポインタを非表示にしますか?
+pointerLock.autoLock.title2			= %S ではマウスポインタを非表示にします。
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
 # The two button strings will never be shown at the same time, so
 # it's okay for them to have the same access key
 safebrowsing.getMeOutOfHereButton.label		= スタートページに戻る
 safebrowsing.getMeOutOfHereButton.accessKey	= G
 safebrowsing.reportedWebForgery			= 偽装サイトとして報告されています!
@@ -317,17 +325,17 @@ ctrlTab.showAll.label				= すべて (#1 ページ) のタブを表示
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 # (^^; イマイチ
 addKeywordTitleAutoFill				= 検索: %S
 
 # TabView
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
 tabview.title					= %S - タブグループ
-# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the page title of the first tab in the unnamed group, 
 # #2 is the number of remaining tabs.
 tabview.moveToUnnamedGroup.label		= #1 と #2 個のタブ
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name		= デフォルト
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description	= 標準設定のテーマです。
 
@@ -366,53 +374,51 @@ syncPromoNotification.addons.description	= %S でアドオンを他の端末と共有できます。
 # The final space separates this text from the Learn More link.
 syncPromoNotification.addons-sync-disabled.description	= %S アカウントで複数の端末間でアドオンを同期することができます。
 
 # Mozilla data reporting notification (Telemetry, Firefox Health Report, etc)
 dataReportingNotification.message		= ユーザ体験の向上のため、%1$S は自動的にいくつかのデータを %2$S に送信します。
 dataReportingNotification.button.label		= 共有する
 dataReportingNotification.button.accessKey	= C
 
-# Keyword.URL reset prompt
-# LOCALIZATION NOTE (keywordPrompt.message):
-#  - %1$S is brandShortName
-#  - %2$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
-#  - %3$S is the name of the default search engine (e.g. "Google")
-keywordPrompt.message			= %1$S はロケーションバーからの検索に '%2$S' を使っています。既定の検索エンジン (%3$S) に戻しますか?
-
-# LOCALIZATION NOTE (keywordPrompt.yesButton): %1$S is the name of the default search engine
-keywordPrompt.yesButton			= はい、%1$S に戻します
-keywordPrompt.yesButton.accessKey	= Y
-
-# LOCALIZATION NOTE (keywordPrompt.noButton): %1$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
-keywordPrompt.noButton			= いいえ、'%1$S' のままにします
-keywordPrompt.noButton.accessKey	= N
-
 # Webapps notification popup
 webapps.install			= インストール
 webapps.install.accesskey	= I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall		= このサイト (%2$S) から "%1$S" をインストールしますか?
 webapps.install.success		= アプリケーションをインストールしました
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered		= %S は現在全画面表示モードです。
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision	= %S での全画面表示の設定を保存する
 
-# LOCALIZATION NOTE (social.activated.description): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
-social.activated.description		= %1$S for %2$S を有効にしました。
+service.toolbarbutton.label		= サービス
+service.toolbarbutton.tooltiptext	= サービス
+
+# LOCALIZATION NOTE (social.install.description): %1$S is the hostname of the social provider, %2$S is brandShortName (e.g. Firefox)
+service.install.description		= %1$S からのサービスを有効にして %2$S のツールバーとサイドバーに表示しますか?
+service.install.ok.label		= サービスを有効にする
+service.install.ok.accesskey		= E
+service.install.learnmore		= 詳細...
 
 # LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
 social.turnOff.label			= %S をオフにする
 social.turnOff.accesskey		= T
 # LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
 social.turnOn.label			= %S をオンにする
 social.turnOn.accesskey			= T
 
+# LOCALIZATION NOTE (social.markpage.label): %S is the name of the social provider
+social.markpage.label			= ページを %S へ送る
+social.unmarkpage.label			= %S からページを削除する
+# LOCALIZATION NOTE (social.marklink.label): %S is the name of the social provider
+social.marklink.label			= URLを %S へ送る
+social.unmarklink.label			= %S から URL を削除する
+
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message			= %1$S は現在 %2$S に接続できません。
 social.error.tryAgain.label		= 再接続
 social.error.tryAgain.accesskey		= T
 social.error.closeSidebar.label		= サイドバーを閉じる
 social.error.closeSidebar.accesskey	= C
 
 # LOCALIZATION NOTE: %1$S is the label for the toolbar button, %2$S is the associated badge numbering that the social provider may provide.
@@ -434,17 +440,17 @@ 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, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
-# Semi-colon list of plural forms. See:
+# 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		= 選択したデバイスを共有
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/VariablesView.dtd
@@ -0,0 +1,12 @@
+<!-- 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 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 PropertiesViewWindowTitle "プロパティ">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/appcacheutils.properties
@@ -0,0 +1,123 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Inspector
+# which is available from the Web Developer sub-menu -> 'Inspect'.
+#
+# 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 (noManifest): Used when an attempt is made to validate a
+# page using AppCacheUtils.jsm that has no cache manifest.
+noManifest			= 指定のページはマニフェストがありません。
+
+# LOCALIZATION NOTE (notUTF8): Used when an attempt is made to validate a
+# cache manifest using AppCacheUtils.jsm having a character encoding that is not
+# UTF-8.
+notUTF8				= マニフェストの文字エンコーディングが %S になっています。UTF-8 であるべきです。
+
+# LOCALIZATION NOTE (badMimeType): Used when an attempt is made to validate a
+# cache manifest using AppCacheUtils.jsm having a mimetype that is not
+# text/cache-manifest.
+badMimeType			= マニフェストの MIME タイプが %S になっています。text/cache-manifest であるべきです。
+
+# LOCALIZATION NOTE (duplicateURI): Used when an attempt is made to validate a
+# page using AppCacheUtils.jsm that has a cache manifest which references the
+# same URI from multiple locations.
+duplicateURI			= URI %S が複数の場所から参照されています。許可されていません: %S
+
+# LOCALIZATION NOTE (networkBlocksURI): Used when an attempt is made to validate
+# a page using AppCacheUtils.jsm that has a cache manifest which references the
+# same URI in the NETWORK section as it does in other sections.
+networkBlocksURI		= %3$S 行目 (%4$S) の %5$S セクションは %1$S 行目 (%2$S) の NETWORK セクションによりキャッシュされませんでした。
+
+# LOCALIZATION NOTE (fallbackBlocksURI): Used when an attempt is made to
+# validate a page using AppCacheUtils.jsm that has a cache manifest which
+# references the same URI in the FALLBACK section as it does in other sections.
+fallbackBlocksURI		= %3$S 行目 (%4$S) の %5$S セクションは %1$S 行目 (%2$S) の FALLBACK セクションによりキャッシュされませんでした。
+
+# LOCALIZATION NOTE (fileChangedButNotManifest): Used when an attempt is made to
+# validate a page using AppCacheUtils.jsm that has a cache manifest which
+# references a URI that has a file modified after the cache manifest.
+fileChangedButNotManifest	= ファイル %S は %S 以降に更新されました。マニフェスト内のテキストが変更されない限り、キャッシュされたバージョンは %S 行目が使用されます。
+
+# LOCALIZATION NOTE (cacheControlNoStore): Used when an attempt is made to
+# validate a page using AppCacheUtils.jsm that has a header preventing caching
+# or storing information.
+cacheControlNoStore		= %S のキャッシュコントロールは no-store が設定されています。%S 行目のファイルの保存からはアプリケーションキャッシュが抑制されます。
+
+# LOCALIZATION NOTE (notAvailable): Used when an attempt is made to validate a
+# page using AppCacheUtils.jsm that is not available.
+notAvailable			= %S 点のリソースが使用できません: 行 %S
+
+# LOCALIZATION NOTE (invalidURI): Used when an invalid URI is passed to the
+# appcache.
+invalidURI			= AppCacheUtils に渡された URI は無効です。
+
+# LOCALIZATION NOTE (noResults) Used when a search returns no results.
+noResults			= 検索結果はありません。
+
+# LOCALIZATION NOTE (cacheDisabled) Used when the cache is disabled and an
+# attempt is made to view offline data.
+cacheDisabled			= ディスクキャッシュが無効になっています。about:config で browser.cache.disk.enable を true に設定してから試してください。
+
+# LOCALIZATION NOTE (firstLineMustBeCacheManifest): Used when an attempt is made
+# to validate a cache manifest using AppCacheUtils.jsm having a first line that
+# is not "CACHE MANIFEST."
+firstLineMustBeCacheManifest	= マニフェストの最初の行は "CACHE MANIFEST" であるべきです: 行 %S
+
+# LOCALIZATION NOTE (cacheManifestOnlyFirstLine): Used when an attempt is made
+# to validate a cache manifest using AppCacheUtils.jsm having "CACHE MANIFEST"
+# on a line other than the first line.
+cacheManifestOnlyFirstLine	= "CACHE MANIFEST" は最初の行のみにあるべきです: 行 %S
+
+# LOCALIZATION NOTE (asteriskInWrongSection): Used when an attempt is made
+# to validate a cache manifest using AppCacheUtils.jsm having an asterisk (*) in
+# a section other than the network section.
+asteriskInWrongSection		= %2$S 行目の %1$S セクションでアスタリスクがワイルドカードとして使われています。アスタリスク1文字のみ行はオンラインホワイトリストワイルドカードフラグと呼ばれ、NETWORK セクションでのみ有効です。他のセクションでは使用できません。このフラグがある場合は、キャッシュされてない任意の URI は暗黙的にオンラインホワイトリストの名前空間にあるものとして扱われます。このフラグがない場合は、マニフェストで明示されていない URI は使用不可として扱われる、ブロック中の状態を示します。
+
+# LOCALIZATION NOTE (escapeSpaces): Used when an attempt is made to validate a
+# cache manifest using AppCacheUtils.jsm having a space in a URI. Spaces are to
+# be replaced with %20.
+escapeSpaces			= URI 内のスペースは %20 で置き換えられるべきです: 行 %S
+
+# LOCALIZATION NOTE (slashDotDotSlashBad): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm having a URI containing
+# /../, which is invalid.
+slashDotDotSlashBad		= /../ は URL の先頭として正しくありません: 行 %S
+
+# LOCALIZATION NOTE (tooManyDotDotSlashes): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm having a URI containing
+# too many ../ operators. Too many of these operaters mean that the file would
+# be below the root of the site, which is not possible.
+tooManyDotDotSlashes		= ドット ドット スラッシュ (../) が多すぎます: 行 %S
+
+# LOCALIZATION NOTE (fallbackUseSpaces): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm having a FALLBACK section
+# containing more or less than the standard two URIs seperated by a single
+# space.
+fallbackUseSpaces		= FALLBACK セクションでは URL はスペース区切りで2つだけです: 行 %S
+
+# LOCALIZATION NOTE (fallbackAsterisk): Used when an attempt is made to validate
+# a cache manifest using AppCacheUtils.jsm having a FALLBACK section that
+# attempts to use an asterisk (*) as a wildcard. In this section the URI is
+# simply a path prefix.
+fallbackAsterisk		= fallback 名前空間ではアスタリスク (*) はワイルドカードとしては使えません。名前空間は単純にパスの先頭にマッチする必要があります: 行 %S
+
+# LOCALIZATION NOTE (settingsBadValue): Used when an attempt is made to validate
+# a cache manifest using AppCacheUtils.jsm having a SETTINGS section containing
+# something other than the valid "prefer-online" or "fast."
+settingsBadValue		= SETTINGS セクションは "prefer-online" と "fast" のどちらかのみです: 行 %S
+
+# LOCALIZATION NOTE (invalidSectionName): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm containing an invalid
+# section name.
+invalidSectionName		= 名前 (%S) が正しくありません: 行 %S
+
+# LOCALIZATION NOTE (entryNotFound): Used when an attempt is made to view a
+# cache entry that does not exist.
+entryNotFound			= エントリが見つかりません。
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -60,16 +60,22 @@
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOnlyEnum): This is the label for the
   -  checkbox that toggles visibility of hidden (non-enumerable) variables and
   -  properties in stack views. The "enumerable" flag is a state of a property
   -  defined in JavaScript. When in doubt, leave untranslated. -->
 <!ENTITY debuggerUI.showOnlyEnum	"計算可能なプロパティのみ表示">
 <!ENTITY debuggerUI.showOnlyEnum.key	"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.key  "O">
+
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
   -  appears in the filter panel popup as a description. -->
 <!ENTITY debuggerUI.searchPanelTitle	"検索演算子">
 
 <!-- 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">
@@ -79,17 +85,16 @@
   -  in the source editor's context menu for the global search operation. -->
 <!ENTITY debuggerUI.searchGlobal	"すべてのファイルを検索">
 <!ENTITY debuggerUI.searchGlobal.key	"F">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFunction): This is the text that appears
   -  in the source editor's context menu for the function search operation. -->
 <!ENTITY debuggerUI.searchFunction	"関数定義を検索">
 <!ENTITY debuggerUI.searchFunction.key	"D">
-<!ENTITY debuggerUI.searchFunction.altkey	"O">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchToken): This is the text that appears
   -  in the source editor's context menu for the token search operation. -->
 <!ENTITY debuggerUI.searchToken		"検索">
 <!ENTITY debuggerUI.searchToken.key	"F">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -5,25 +5,16 @@
 # LOCALIZATION NOTE These strings are used inside the Debugger
 # which is available from the Web Developer sub-menu -> 'Debugger'.
 # 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 (confirmTabSwitch): The messages displayed for all the
-# title and buttons on the notification shown when a user attempts to open a
-# debugger in a new tab while a different tab is already being debugged.
-confirmTabSwitch.message		= ほかのタブですでにデバッガを開いています。このまま続けると、ほかのタブのデバッガを閉じます。
-confirmTabSwitch.buttonSwitch		= デバッグ中のタブに移動
-confirmTabSwitch.buttonSwitch.accessKey	= S
-confirmTabSwitch.buttonOpen		= とにかく開く
-confirmTabSwitch.buttonOpen.accessKey	= O
-
 # LOCALIZATION NOTE (open.commandkey): The key used to open the debugger in
 # combination to e.g. ctrl + shift
 open.commandkey				= S
 
 # LOCALIZATION NOTE (debuggerMenu.accesskey): The access key used to open the
 # debugger.
 debuggerMenu.accesskey			= D
 
@@ -210,8 +201,15 @@ variablesSeparatorLabel			= :
 # LOCALIZATION NOTE (watchExpressionsSeparatorLabel): The text that is displayed
 # in the watch expressions list as a separator between the code and evaluation.
 watchExpressionsSeparatorLabel		= \ \u2192
 
 # LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed
 # in the functions search panel as a separator between function's inferred name
 # and its real name (if available).
 functionSearchSeparatorLabel		= \u2190
+
+# LOCALIZATION NOTE (resumptionOrderPanelTitle): This is the text that appears
+# as a description in the notification panel popup, when multiple debuggers are
+# open in separate tabs and the user tries to resume them in the wrong order.
+# The substitution parameter is the URL of the last paused window that must be
+# resumed first.
+resumptionOrderPanelTitle		= ほかのデバッガが停止しています。最後の停止させたデバッガを復帰させてください: %S
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -14,16 +14,30 @@
 # LOCALIZATION NOTE (canonDescNone): Short string used to describe any command
 # or command parameter when no description has been provided.
 canonDescNone		= (説明はありません)
 
 # LOCALIZATION NOTE (canonDefaultGroupName): The default name for a group of
 # parameters.
 canonDefaultGroupName	= オプション
 
+# LOCALIZATION NOTE (canonProxyDesc): A very short description of a set of
+# remote commands. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible. See
+# canonProxyManual for a fuller description of what it does.
+canonProxyDesc		= %S でコマンドを実行します
+
+# LOCALIZATION NOTE (canonProxyManual): A fuller description of a set of
+# remote commands. Displayed when the user asks for help on what it does.
+canonProxyManual	= コマンドのセットはリモートで実行されます。%S を経由します。
+
+# LOCALIZATION NOTE (canonProxyExists): An error message displayed when we try
+# to add new command (via a proxy) where one already exists in that name.
+canonProxyExists	= '%S' というコマンドはすでに存在します
+
 # LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
 # of JavaScript like traditional developer tool command lines. This describes
 # the '{' command.
 cliEvalJavascript	= JavaScript を直接実行します
 
 # LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
 # than the current command can understand this is the error message shown to
 # the user.
@@ -185,16 +199,102 @@ helpManOptional		= オプション
 # of the matching sub-commands
 subCommands		= サブコマンド
 
 # LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
 # 'help' command when the command in question should have sub-commands but in
 # fact has none
 subCommandsNone		= なし
 
+# LOCALIZATION NOTE (contextDesc): A very short description of the 'context'
+# 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. See contextManual for
+# a fuller description of what it does.
+contextDesc		= 省略コマンドを設定します
+
+# LOCALIZATION NOTE (contextManual): A fuller description of the 'context'
+# command. Displayed when the user asks for help on what it does.
+contextManual		= タイプしなくても入力したと見なせる省略コマンドを設定します。たとえば、'context addon' とすると 'addon list' ではなく 'list' とタイプして実行できます。
+
+# LOCALIZATION NOTE (contextPrefixDesc): A short description of the 'prefix'
+# parameter to the 'context' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+contextPrefixDesc	= 省略するコマンド
+
+# LOCALIZATION NOTE (contextNotParentError): An error message displayed during
+# the processing of the 'context' command, when the found command is not a
+# parent command.
+contextNotParentError	= '%1$S' は親コマンドではないため、省略コマンドとして使用できません。
+
+# LOCALIZATION NOTE (contextReply): A message displayed during the processing
+# of the 'context' command, to indicate success.
+contextReply		= 省略コマンドとして %1$S を使用します
+
+# LOCALIZATION NOTE (contextEmptyReply): A message displayed during the
+# processing of the 'context' command, to indicate that there is no command
+# prefix
+contextEmptyReply	= 省略コマンドを解除しました
+
+# LOCALIZATION NOTE (connectDesc): A very short description of the 'connect'
+# 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. See connectManual for
+# a fuller description of what it does.
+connectDesc		= サーバにコマンドを中継します
+
+# LOCALIZATION NOTE (connectManual): A fuller description of the 'connect'
+# command. Displayed when the user asks for help on what it does.
+connectManual		= サーバに接続して、ローカルのバージョンのコマンドをサーバ上に作成します。リモートのコマンドは、ローカルのコマンドと区別できる接頭辞が設定されます (まずは context コマンドを参照してください)
+
+# LOCALIZATION NOTE (connectPrefixDesc): A short description of the 'prefix'
+# parameter to the 'connect' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+connectPrefixDesc	= インポートされたコマンドの親接頭辞
+
+# LOCALIZATION NOTE (connectPortDesc): A short description of the 'port'
+# parameter to the 'connect' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+connectPortDesc		= 接続を許可する TCP ポート番号
+
+# LOCALIZATION NOTE (connectHostDesc): A short description of the 'host'
+# parameter to the 'connect' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+connectHostDesc		= 接続するホスト名
+
+# LOCALIZATION NOTE (connectDupReply): An error condition from executing the
+# 'connect' command
+connectDupReply		= %S にはすでに接続しています。
+
+# LOCALIZATION NOTE (connectReply): The output of the 'connect' command,
+# telling the user what it has done.
+connectReply		= %S コマンドを追加しました。
+
+# LOCALIZATION NOTE (disconnectDesc): A very short description of the
+# 'disconnect' 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.
+# See connectManual for a fuller description of what it does.
+disconnectDesc		= サーバにコマンドを中継します
+
+# LOCALIZATION NOTE (disconnectManual): A fuller description of the
+# 'disconnect' command. Displayed when the user asks for help on what it does.
+disconnectManual	= サーバに接続して、ローカルのバージョンのコマンドをサーバ上に作成します。リモートのコマンドは、ローカルのコマンドと区別できる接頭辞が設定されます (まずは context コマンドを参照してください)
+
+# LOCALIZATION NOTE (disconnectPrefixDesc): A short description of the
+# 'prefix' parameter to the 'disconnect' command. This string is designed to
+# be shown in a dialog with restricted space, which is why it should be as
+# short as possible.
+disconnectPrefixDesc	= インポートされたコマンドの親接頭辞
+
+# LOCALIZATION NOTE (disconnectReply): The output of the 'disconnect' command,
+# telling the user what it's done.
+disconnectReply		= %S コマンドを削除しました。
+
 # LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
 # 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. See prefManual for a
 # fuller description of what it does.
 prefDesc		= 設定に関するコマンド
 
 # LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
 # Displayed when the user asks for help on what it does.
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -7,24 +7,16 @@
 # -> 'Web Console'.
 #
 # 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 (echoDesc) A very short string used to describe the
-# function of the echo command.
-echoDesc		= メッセージを表示します
-
-# LOCALIZATION NOTE (echoMessageDesc) A very short string used to describe the
-# message parameter to the echo command.
-echoMessageDesc		= メッセージ
-
 # LOCALIZATION NOTE (helpDesc) A very short string used to describe the
 # function of the help command.
 helpDesc		= 使用可能なコマンドのヘルプを表示します
 
 # LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
 # explain the contents of the command help table.
 helpAvailable		= 使用可能なコマンド
 
@@ -325,28 +317,23 @@ breakDesc		= ブレークポイントを管理します
 # LOCALIZATION NOTE (breakManual) A longer description describing the
 # set of commands that control breakpoints.
 breakManual		= ブレークポイントの一覧を表示したり、追加や削除を行います
 
 # LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
 # function of the 'break list' command.
 breaklistDesc		= 既存のブレークポイントを表示します
 
-# LOCALIZATION NOTE (breaklistLineEntry) Used in the output of the 'break list'
-# command to display a single line breakpoint.
-# %1$S=script URL, %2$S=line number
-breaklistLineEntry	= 行ブレークポイント: %1$S:%2$S
-
 # LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
 # command to explain that the list is empty.
 breaklistNone		= 設置されているブレークポイントはありません
 
-# LOCALIZATION NOTE (breaklistIntro) Used in the output of the 'break list'
-# command to preface the list contents.
-breaklistIntro		= 次のブレークポイントが設置されています:
+# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
+# 'break list' command on a button which can be used to remove breakpoints
+breaklistOutRemove	= 削除
 
 # LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
 # command to explain that a breakpoint was added.
 breakaddAdded		= 設置されたブレークポイント
 
 # LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
 # command to explain that a breakpoint could not be added.
 breakaddFailed		= ブレークポイントを設置できません: %S
@@ -546,16 +533,38 @@ addonListTypeDesc	= アドオンの種類を選択します
 addonListDictionaryHeading	= 現在、以下の辞書がインストールされています:
 addonListExtensionHeading	= 現在、以下の拡張機能がインストールされています:
 addonListLocaleHeading		= 現在、以下の言語がインストールされています:
 addonListPluginHeading		= 現在、以下のプラグインがインストールされています:
 addonListThemeHeading		= 現在、以下のテーマがインストールされています:
 addonListAllHeading		= 現在、以下のアドオンがインストールされています:
 addonListUnknownHeading		= 現在、以下の選択された種類のアドオンがインストールされています:
 
+# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
+# output of the 'addon list' command as the labels for the enable/disable
+# action buttons in the listing. This string is designed to be shown in a
+# small action button next to the addon name, which is why it should be as
+# short as possible.
+addonListOutEnable		= 有効化
+addonListOutDisable		= 無効化
+
+# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
+# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
+# the output of the 'addon list' command as the descriptions of pending
+# addon operations. addonPending is used as a prefix for a list of pending
+# actions (named by the other lookup variables). These strings are designed
+# to be shown alongside addon names, which is why they should be as short
+# as possible.
+addonPending			= 再起動待ち
+addonPendingEnable		= 有効化
+addonPendingDisable		= 無効化
+addonPendingUninstall		= 削除
+addonPendingInstall		= インストール
+addonPendingUpgrade		= 更新
+
 # LOCALIZATION NOTE (addonNameDesc) A very short description of the
 # name parameter of numerous add-on commands. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 addonNameDesc		= アドオンの名前
 
 # LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
 # command when a search for add-ons of a particular type were not found.
@@ -715,16 +724,64 @@ pagemodRemoveAttributeRootDesc			= CSS セレクタのルートノード
 # to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
 # command, which is displayed in a dialog when the user is using this command.
 pagemodRemoveAttributeIgnoreCaseDesc		= 大文字と小文字を区別しない
 
 # LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
 # result of the 'pagemod remove attribute' command.
 pagemodRemoveAttributeResult			= セレクタにマッチした要素: %1$S. 削除した属性: %2$S.
 
+# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
+# command, the parent command for tool-hacking commands.
+# The argument (%1$S) is the browser name.
+toolsDesc2					= %1$S 開発ツールをハックします
+
+# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
+# command. The argument (%1$S) is the browser name.
+toolsManual2					= %1$S 開発ツールを直接ハックするためのさまざまなコマンドです。
+
+# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
+# command, for pointing your developer tools loader at a mozilla-central source tree.
+toolsSrcdirDesc					= mozilla-central からツールを読み込みます
+
+# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
+# an invalid srcdir.
+toolsSrcdirNotFound				= %1$s が見つかりません。または mozilla-central ではありません。
+
+# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
+# 'tools srcdir' command.
+toolsSrcdirReloaded				= %1$s からツールを読み込みました。
+
+# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
+# command. The argument (%1$S) is the browser name.
+toolsSrcdirManual2				= 完全な mozilla-central のソースツリーから %1$S 開発ツールを読み込みます。
+
+# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
+toolsSrcdirDir					= mozilla-central のソースツリー
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
+# command, which overrides a previous 'tools srcdir' command.
+toolsBuiltinDesc				= 組み込みのツールを使います
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
+# command.
+toolsBuiltinManual				= srcdir コマンドで上書きされる前の、組み込みのツールを使うようにします。
+
+# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
+# 'tools builtin' command.
+toolsBuiltinReloaded				= 組み込みのツールを読み込みました。
+
+# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
+# which will reload the tools from the current srcdir.
+toolsReloadDesc					= 開発ツールを再読み込みします
+
+# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
+# reload' command.
+toolsReloaded2					= ツールを再読み込みしました。
+
 # LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
 # command. See cookieManual 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.
 cookieDesc		= Cookie を表示、変更します
 
 # LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
 # command, displayed when the user asks for help on what it does.
@@ -1059,16 +1116,91 @@ paintflashingChromeDesc		= ブラウザウィンドウ
 # LOCALIZATION NOTE (paintflashingManual) A longer description describing the
 # set of commands that control paint flashing.
 paintflashingManual		= 再描画された領域を違う色で塗りつぶします
 
 # LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
 # tooltip of button in devtools toolbox which toggles paint flashing.
 paintflashingTooltip		= 描画された領域をハイライトします
 
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingToggleDesc		= ハイライトを切り替えます
+
+# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
+# function of the "appcache" command
+appCacheDesc			= アプリケーションキャッシュユーティリティ
+
+# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
+# the function of the "appcache validate" command.
+appCacheValidateDesc		= キャッシュのマニフェストを検証します
+
+# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
+# 'validate' parameter to the 'appcache' command, displayed when the user asks
+# for help on what it does.
+appCacheValidateManual		= キャッシュのマニフェストとファイルに関する問題を検索し、参照します
+
+# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
+# the function of the "uri" parameter of the appcache validate" command.
+appCacheValidateUriDesc		= 検証する URI
+
+# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
+# command when it has been successfully validated.
+appCacheValidatedSuccessfully	= 検証は成功しました。
+
+# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
+# the function of the "appcache clear" command.
+appCacheClearDesc		= アプリケーションキャッシュからエントリを消去します
+
+# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
+# 'appcache clear' command, displayed when the user asks for help on what it does.
+appCacheClearManual		= アプリケーションキャッシュから1つ以上のエントリを消去します
+
+# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
+# command when entries are successfully cleared.
+appCacheClearCleared		= エントリの消去に成功しました。
+
+# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
+# the function of the "appcache list" command.
+appCacheListDesc		= アプリケーションキャッシュのエントリの一覧を表示します。
+
+# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
+# 'appcache list' command, displayed when the user asks for help on what it does.
+appCacheListManual		= アプリケーションキャッシュのエントリの一覧をすべて表示します。検索パラメータが指定された場合は、検索語句が含まれているエントリを表示します。
+
+# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
+# the function of the "search" parameter of the appcache list" command.
+appCacheListSearchDesc		= 検索語句
+
+# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
+appCacheListKey			= 名前:
+appCacheListDataSize		= サイズ:
+appCacheListDeviceID		= デバイス ID:
+appCacheListExpirationTime	= 有効期限:
+appCacheListFetchCount		= アクセス回数:
+appCacheListLastFetched		= アクセス日時:
+appCacheListLastModified	= 更新日時:
+
+# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
+# of the 'appcache list' command.
+appCacheListViewEntry		= エントリを確認
+
+# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
+# the function of the "appcache viewentry" command.
+appCacheViewEntryDesc		= 指定されたキャッシュのエントリ情報を新しいタブで開きます。
+
+# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
+# 'appcache viewentry' command, displayed when the user asks for help on what it
+# does.
+appCacheViewEntryManual		= 指定されたキャッシュのエントリ情報を新しいタブで開きます。
+
+# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
+# the function of the "key" parameter of the 'appcache viewentry' command.
+appCacheViewEntryKey		= 表示するエントリの名前。
+
 # LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
 # function of the profiler command.
 profilerDesc			= プロファイラを管理します
 
 # LOCALIZATION NOTE (profilerManual) A longer description describing the
 # set of commands that control the profiler.
 profilerManual			= JavaScript プロファイラを開始または終了するコマンドです
 
@@ -1111,21 +1243,45 @@ profilerAlreadyFinished		= このプロファイルはすでにプロファイリングを終了しています。'profile show' で結果を確認してください。
 # an operation cannot be completed because the profile in question could not be
 # found.
 profilerNotFound		= プロファイルが見つかりません
 
 # LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has not been
 # started yet. It also contains a hint to use the 'profile start' command to
 # start the profiler.
-profilerNotStarted		= このプロファイルはまだプロファイリングが開始されていません。'profile start' でプロファイリングを開始してください
+profilerNotStarted2		= このプロファイルはまだプロファイリングが開始されていません。'profile start' でプロファイリングを開始してください
 
 # LOCALIZATION NOTE (profilerStarting) A very short string that indicates that
 # we're starting the profiler.
-profilerStarting		= 開始中...
+profilerStarting2		= 開始中...
 
 # LOCALIZATION NOTE (profilerStopping) A very short string that indicates that
 # we're stopping the profiler.
-profilerStopping		= 終了中...
+profilerStopping2		= 終了中...
 
 # LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
 # an operation cannot be completed because the profiler has not been opened yet.
 profilerNotReady		= このコマンドを実行するには、先にプロファイラウィンドウを開いてください
+
+# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
+# function of the 'listen' command.
+listenDesc			= リモートデバッガのポートを開きます
+
+# LOCALIZATION NOTE (listenManual) A longer description of the 'listen'
+# command.
+listenManual			= Firefox は TCP/IP 経由でリモートデバッガと接続できます。安全のため、既定では無効になっていますが、このコマンドで接続可能になります。
+
+# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
+# function of 'port' parameter to the 'listen' command.
+listenPortDesc			= 接続を許可する TCP ポート番号
+
+# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenDisabledOutput		= 接続は devtools.debugger.remote-enabled の設定により無効になっています
+
+# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
+# execution of the 'listen' command. %1$S is a port number
+listenInitOutput		= ポート番号 %1$S で接続待機中
+
+# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenNoInitOutput		= デバッガサーバが初期されていません
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -29,17 +29,17 @@ debuggerPausedWarning.message		= デバッガが停止しています。マウスによる選択のような一部の機能は動作しません。
 # LOCALIZATION NOTE (nodeMenu.tooltiptext)
 # This menu appears in the Infobar (on top of the highlighted node) once
 # the node is selected.
 nodeMenu.tooltiptext			= ノードの操作
 
 
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
-inspector.label				= 調査
+inspector.label				= インスペクタ
 inspector.commandkey			= I
 inspector.accesskey			= I
 
 # 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個) を表示
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -0,0 +1,134 @@
+<!-- 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 Network Monitor strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
+
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice): This is the label displayed
+  -  in the network table when empty. -->
+<!ENTITY netmonitorUI.emptyNotice         "ページを更新すると、ネットワークの稼働状況を確認できます。">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status): This is the label displayed
+  -  in the network table toolbar, above the "status" column. -->
+<!ENTITY netmonitorUI.toolbar.status      "√">
+
+<!-- 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        "ファイル">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.domain): This is the label displayed
+  -  in the network table toolbar, above the "domain" column. -->
+<!ENTITY netmonitorUI.toolbar.domain      "ドメイン">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.type): This is the label displayed
+  -  in the network table toolbar, above the "type" column. -->
+<!ENTITY netmonitorUI.toolbar.type        "タイプ">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.size): This is the label displayed
+  -  in the network table toolbar, above the "size" column. -->
+<!ENTITY netmonitorUI.toolbar.size        "サイズ">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.waterfall): This is the label displayed
+  -  in the network table toolbar, above the "waterfall" column. -->
+<!ENTITY netmonitorUI.toolbar.waterfall   "タイムライン">
+
+<!-- LOCALIZATION NOTE (debuggerUI.tab.headers): This is the label displayed
+  -  in the network details pane identifying the headers tab. -->
+<!ENTITY netmonitorUI.tab.headers         "ヘッダ">
+
+<!-- LOCALIZATION NOTE (debuggerUI.tab.cookies): This is the label displayed
+  -  in the network details pane identifying the cookies tab. -->
+<!ENTITY netmonitorUI.tab.cookies         "Cookie">
+
+<!-- LOCALIZATION NOTE (debuggerUI.tab.params): This is the label displayed
+  -  in the network details pane identifying the params tab. -->
+<!ENTITY netmonitorUI.tab.params          "パラメータ">
+
+<!-- LOCALIZATION NOTE (debuggerUI.tab.response): This is the label displayed
+  -  in the network details pane identifying the response tab. -->
+<!ENTITY netmonitorUI.tab.response        "応答">
+
+<!-- LOCALIZATION NOTE (debuggerUI.tab.timings): This is the label displayed
+  -  in the network details pane identifying the timings tab. -->
+<!ENTITY netmonitorUI.tab.timings         "タイミング">
+
+<!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
+  -  the button that toggles the panes visible or hidden in the netmonitor UI. -->
+<!ENTITY netmonitorUI.panesButton.tooltip "ネットワーク状況を切り替える">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.url): This is the label displayed
+  -  in the network details headers tab identifying the URL. -->
+<!ENTITY netmonitorUI.summary.url         "要求 URL:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.method): This is the label displayed
+  -  in the network details headers tab identifying the method. -->
+<!ENTITY netmonitorUI.summary.method      "要求メソッド:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.status): This is the label displayed
+  -  in the network details headers tab identifying the status code. -->
+<!ENTITY netmonitorUI.summary.status      "ステータスコード:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.version): This is the label displayed
+  -  in the network details headers tab identifying the http version. -->
+<!ENTITY netmonitorUI.summary.version     "バージョン:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.size): This is the label displayed
+  -  in the network details headers tab identifying the headers size. -->
+<!ENTITY netmonitorUI.summary.size        "ヘッダサイズ:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.response.name): This is the label displayed
+  -  in the network details response tab identifying an image's file name. -->
+<!ENTITY netmonitorUI.response.name       "名前:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.response.dimensions): This is the label displayed
+  -  in the network details response tab identifying an image's dimensions. -->
+<!ENTITY netmonitorUI.response.dimensions "大きさ:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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 (debuggerUI.response.encoding): This is the label displayed
+  -  in the network details response tab identifying an image's encoding. -->
+<!ENTITY netmonitorUI.response.encoding   "文字エンコーディング:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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 (debuggerUI.timings.dns): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "dns" state. -->
+<!ENTITY netmonitorUI.timings.dns         "DNS 解決:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.timings.connect): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "connect" state. -->
+<!ENTITY netmonitorUI.timings.connect     "接続:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.timings.send): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "send" state. -->
+<!ENTITY netmonitorUI.timings.send        "送信:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.timings.wait): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "wait" state. -->
+<!ENTITY netmonitorUI.timings.wait        "待機:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.timings.receive): This is the label displayed
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "receive" state. -->
+<!ENTITY netmonitorUI.timings.receive     "受信:">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -0,0 +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/.
+
+# LOCALIZATION NOTE These strings are used inside the Network Monitor
+# which is available from the Web Developer sub-menu -> 'Network Monitor'.
+# 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 (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.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.
+netmonitor.tooltip	= ネットワークモニタ
+
+# 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	= 要求の詳細を表示
+
+# LOCALIZATION NOTE (headersEmptyText): This is the text displayed in the
+# headers tab of the network details pane when there are no headers available.
+headersEmptyText	= この要求にはヘッダがありません
+
+# LOCALIZATION NOTE (headersFilterText): This is the text displayed in the
+# headers tab of the network details pane for the filtering input.
+headersFilterText	= ヘッダを検索
+
+# LOCALIZATION NOTE (cookiesEmptyText): This is the text displayed in the
+# cookies tab of the network details pane when there are no cookies available.
+cookiesEmptyText	= この要求には Cookie がありません
+
+# LOCALIZATION NOTE (cookiesFilterText): This is the text displayed in the
+# cookies tab of the network details pane for the filtering input.
+cookiesFilterText	= Cookie を検索
+
+# LOCALIZATION NOTE (paramsEmptyText): This is the text displayed in the
+# params tab of the network details pane when there are no params available.
+paramsEmptyText		= この要求にはパラメータがありません
+
+# LOCALIZATION NOTE (paramsFilterText): This is the text displayed in the
+# params tab of the network details pane for the filtering input.
+paramsFilterText	= 要求パラメータを検索
+
+# LOCALIZATION NOTE (paramsQueryString): This is the label displayed
+# in the network details params tab identifying the query string.
+paramsQueryString	= クエリ文字列
+
+# LOCALIZATION NOTE (paramsFormData): This is the label displayed
+# in the network details params tab identifying the form data.
+paramsFormData		= フォームデータ
+
+# LOCALIZATION NOTE (paramsPostPayload): This is the label displayed
+# in the network details params tab identifying the request payload.
+paramsPostPayload	= 要求ペイロード
+
+# LOCALIZATION NOTE (requestHeaders): This is the label displayed
+# in the network details headers tab identifying the request headers.
+requestHeaders		= 要求ヘッダ
+
+# LOCALIZATION NOTE (responseHeaders): This is the label displayed
+# in the network details headers tab identifying the response headers.
+responseHeaders		= 応答ヘッダ
+
+# LOCALIZATION NOTE (requestCookies): This is the label displayed
+# in the network details params tab identifying the request cookies.
+requestCookies		= 要求 Cookie
+
+# LOCALIZATION NOTE (responseCookies): This is the label displayed
+# in the network details params tab identifying the response cookies.
+responseCookies		= 応答 Cookie
+
+# LOCALIZATION NOTE (jsonFilterText): This is the text displayed
+# in the response tab of the network details pane for the JSON filtering input.
+jsonFilterText		= プロパティを検索
+
+# LOCALIZATION NOTE (jsonScopeName): This is the text displayed
+# in the response tab of the network details pane for a JSON scope.
+jsonScopeName		= JSON
+
+# LOCALIZATION NOTE (jsonpScopeName): This is the text displayed
+# in the response tab of the network details pane for a JSONP scope.
+jsonpScopeName		= JSONP \u2192 コールバック %S()
+
+# LOCALIZATION NOTE (networkMenu.sortedAsc): This is the tooltip displayed
+# in the network table toolbar, for any column that is sorted ascending.
+networkMenu.sortedAsc	= 昇順
+
+# LOCALIZATION NOTE (networkMenu.sortedDesc): This is the tooltip displayed
+# in the network table toolbar, for any column that is sorted descending.
+networkMenu.sortedDesc	= 降順
+
+# LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
+# in the network menu specifying the size of a request (in kilobytes).
+networkMenu.sizeKB	= %S KB
+
+# 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.divisionMS): This is the label displayed
+# in the network menu specifying timing interval divisions (in milliseconds).
+networkMenu.divisionMS	= %S ms
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -10,19 +10,19 @@
 # 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.commandkey, profiler.accesskey)
+# LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
-profiler.commandkey	= VK_F5
+profiler2.commandkey	= VK_F5
 profiler.accesskey	= P
 
 # LOCALIZATION NOTE (profiler.tooltip):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
 profiler.tooltip	= プロファイラ
 
 # LOCALIZATION NOTE (profiler.profileName):
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -6,22 +6,16 @@
 # which is available from the Web Developer sub-menu -> 'Scratchpad'.
 #
 # 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  (propertyPanel.updateButton.label): Used in the Property
-# Panel that is opened by the Scratchpad window when inspecting an object. This
-# is the Update button label.
-propertyPanel.updateButton.label	= 更新
-propertyPanel.updateButton.accesskey	= U
-
 # LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
 # the user attempts to save to an already existing file.
 export.fileOverwriteConfirmation	= ファイルがすでに存在します。上書きしますか?
 
 # LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
 # when Scratchpad does not find any recently active window of navigator:browser
 # type.
 browserWindow.unavailable		= コードを実行するブラウザウィンドウが見つかりません。
--- a/browser/chrome/browser/devtools/styleeditor.dtd
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -5,55 +5,37 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the Style Editor window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 <!-- LOCALIZATION NOTE : The correct localization of this file might be to keep
      it in English, or another language commonly spoken among web developers.
      You want to make that choice consistent across the developer tools.
      A good criteria is the language in which you'd find the best documentation
      on web development on the web. -->
 
-<!-- LOCALIZATION NOTE (window.title): This is the default title for Style Editor
-     main window. NB: the property chromeWindowTitle in styleeditor.properties
-     is used to dynamically update the Style Editor window title with the title
-     of the web page it is editing. -->
-<!ENTITY window.title			"スタイルエディタ">
-
 <!ENTITY newButton.label		"新規作成">
 <!ENTITY newButton.tooltip		"新しいスタイルシートを作成して、ドキュメントにインポートする">
 <!ENTITY newButton.accesskey		"N">
-<!ENTITY newButton.commandkey		"n">
 
 <!ENTITY importButton.label		"インポート...">
 <!ENTITY importButton.tooltip		"既存のスタイルシートをドキュメントにインポートする">
 <!ENTITY importButton.accesskey		"I">
-<!ENTITY importButton.commandkey	"i">
 
 <!ENTITY visibilityToggle.tooltip	"スタイルシートのオン/オフを切り替える">
-<!ENTITY visibilityToggle.accesskey	"V">
 
 <!ENTITY saveButton.label		"保存">
 <!ENTITY saveButton.tooltip		"このスタイルシートをファイルに保存する">
 <!ENTITY saveButton.accesskey		"S">
-<!ENTITY saveButton.commandkey		"s">
-
-<!-- (^^h 画面未確認 -->
-<!-- LOCALICATION NOTE  (scoped.label): This is shown in a stylesheets list item
-     when the stylesheet uses the scoped attribute on the <style> element. -->
-<!ENTITY scoped.label			"Scoped.">
 
 <!ENTITY editorTextbox.placeholder	"ここに CSS を入力します。">
 
 <!-- LOCALICATION NOTE  (noStyleSheet.label): This is shown when a page has no
      stylesheet. -->
 <!ENTITY noStyleSheet.label		"このページにはスタイルシートがありません。">
 
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-start.label): This is the start of a
      tip sentence shown when there is no stylesheet. It suggests to create a new
      stylesheet and provides an action link to do so. -->
 <!ENTITY noStyleSheet-tip-start.label	"それとも、">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-action.label): This is text for the
      link that triggers creation of a new stylesheet. -->
 <!ENTITY noStyleSheet-tip-action.label	"新しいスタイルシートを追加">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-end.label): End of the tip sentence -->
 <!ENTITY noStyleSheet-tip-end.label	"しますか?">
-
-<!-- LOCALIZATION NOTE  (closeCmd.key): Accel + this key closes the window. -->
-<!ENTITY closeCmd.key			"W">
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -20,65 +20,55 @@ chromeWindowTitle		= スタイルエディタ [%S]
 # the argument is the index (order) of the containing <style> element in the
 # document.
 inlineStyleSheet		= <インラインスタイルシート #%S>
 
 # LOCALIZATION NOTE  (newStyleSheet): This is the default name for a new
 # user-created style sheet.
 newStyleSheet			= 新しいスタイルシート #%S
 
-# LOCALIZATION NOTE  (ruleCount.label): Semi-colon list of plural forms.
+# LOCALIZATION NOTE  (ruleCount.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # This is shown in the style sheets list.
 # #1 rule.
 # example: 111 rules.
-ruleCount.label			= #1 個のルール;#1 個のルール
+ruleCount.label			= #1 個のルール
 
-# LOCALIZATION NOTE  (error-load.label): This is shown when loading fails.
+# LOCALIZATION NOTE  (error-load): This is shown when loading fails.
 error-load			= スタイルシートをロードできませんでした。
 
-# LOCALIZATION NOTE  (error-save.label): This is shown when saving fails.
+# LOCALIZATION NOTE  (error-save): This is shown when saving fails.
 error-save			= スタイルシートを保存できませんでした。
 
 # LOCALIZATION NOTE  (importStyleSheet.title): This is the file picker title,
 # when you import a style sheet into the Style Editor.
 importStyleSheet.title		= スタイルシートのインポート
 
-# LOCALIZATION NOTE  (importStyleSheet.title): This is the *.css filter title
+# LOCALIZATION NOTE  (importStyleSheet.filter): This is the *.css filter title
 importStyleSheet.filter		= CSS ファイル
 
 # LOCALIZATION NOTE  (saveStyleSheet.title): This is the file picker title,
 # when you save a style sheet from the Style Editor.
 saveStyleSheet.title		= スタイルシートを保存
 
-# LOCALIZATION NOTE  (saveStyleSheet.title): This is the *.css filter title
+# LOCALIZATION NOTE  (saveStyleSheet.filter): This is the *.css filter title
 saveStyleSheet.filter		= CSS ファイル
 
 # LOCALIZATION NOTE  (open.commandkey): This the key to use in
 # conjunction with shift to open the style editor
 open.commandkey			= VK_F7
 
 # LOCALIZATION NOTE (open.accesskey): The access key used to open the style
 # editor.
 open.accesskey			= y
 
 # LOCALIZATION NOTE  (saveStyleSheet.commandkey): This the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey	= S
 
-# LOCALIZATION NOTE  (undo.commandkey): This the key to use in
-# conjunction with accel (Command on Mac or Ctrl on other platforms) to Undo a
-# change in the editor.
-undo.commandkey			= Z
-
-# LOCALIZATION NOTE  (redo.commandkey): This the key to use in
-# conjunction with accel+shift (accel is Command on Mac or Ctrl on other
-# platforms) to Redo a change in the editor.
-redo.commandkey			= Z
-
 # LOCALIZATION NOTE (ToolboxStyleEditor.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.
 ToolboxStyleEditor.label	= スタイルエディタ
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.tooltip):
 # This string is displayed in the tooltip of the tab when the debugger is
 # displayed inside the developer tools window.
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -1,7 +1,46 @@
 <!-- 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 Toolbox strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate key -->
+
 <!ENTITY closeCmd.key  "W">
 
-<!ENTITY toolboxCloseButton.tooltip  "開発ツールを閉じる">
+<!ENTITY toolboxCloseButton.tooltip    "開発ツールを閉じる">
+<!ENTITY toolboxOptionsButton.key      "O">
+
+<!-- LOCALIZATION NOTE (options.context.label): This is the label for the
+  -  heading of the group of two about:config preferences to toggle chrome
+  -  and remote debugging in the options panel. -->
+<!ENTITY options.context.label         "詳細な設定 (ブラウザの再起動が必要)">
+
+<!-- LOCALIZATION NOTE (options.enableChrome.label): This is the label for the
+  -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
+  -  boolean preference in about:config, in the options panel. -->
+<!ENTITY options.enableChrome.label    "ブラウザデバッガを有効">
+<!ENTITY options.enableChrome.tooltip  "さまざまな開発ツールがブラウザコンテキストで使えるようになります">
+
+<!-- LOCALIZATION NOTE (options.enableRemote.label): This is the label for the
+  -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
+  -  boolean preference in about:config, in the options panel. -->
+<!ENTITY options.enableRemote.label    "リモートデバッガを有効">
+<!ENTITY options.enableRemote.tooltip  "Firefox OS などのリモート Firefox インスタンスを、開発ツールでデバッグできるようになります">
+
+<!-- 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.selectDefaultTools.label): This is the label for
+  -  the heading of group of checkboxes corresponding to the developer tools
+  -  added by add-ons. This heading is hidden when there is no developer tool
+  -  installed by add-ons. -->
+<!ENTITY options.selectAdditionalTools.label  "開発ツールのアドオン">
+
+<!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label): This is the label for
+  -  the heading of the radiobox corresponding to the theme of the developer
+  -  tools. -->
+<!ENTITY options.selectDevToolsTheme.label   "開発ツールのテーマを選択:">
+<!ENTITY options.darkTheme.label             "Dark theme">
+<!ENTITY options.lightTheme.label            "Light theme">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -29,8 +29,12 @@ toolboxToggleButton.tooltip		= %1$S、%2$S\nクリックすると開発ツールを切り替えます。
 # 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
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
 toolbox.defaultTitle			= 開発ツール
+
+# LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
+# for the optiosn panel tab.
+optionsButton.tooltip			= 開発ツールのオプション
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -4,16 +4,17 @@
 
 <!-- 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			"ブラウザコンソール">
 
 <!ENTITY networkPanel.requestURLColon		"要求 URL:">
 <!ENTITY networkPanel.requestMethodColon	"要求メソッド:">
 <!ENTITY networkPanel.statusCodeColon		"ステータスコード:">
 
 <!ENTITY networkPanel.requestHeaders		"要求ヘッダ">
 <!ENTITY networkPanel.requestCookie		"送信 Cookie">
 <!ENTITY networkPanel.requestBody		"要求ボディ">
@@ -43,36 +44,40 @@
   -  This string and the following strings toggle various kinds of output
   -  filters. -->
 <!ENTITY btnPageNet.label			"ネットワーク">
 <!ENTITY btnPageNet.tooltip			"ネットワークアクセスを記録します">
 <!ENTITY btnPageCSS.label			"CSS">
 <!ENTITY btnPageCSS.tooltip			"CSS パースエラーを記録します">
 <!ENTITY btnPageJS.label			"JS">
 <!ENTITY btnPageJS.tooltip			"JavaScript 例外を記録します">
+<!ENTITY btnPageSecurity.label			"セキュリティ">
+<!ENTITY btnPageSecurity.tooltip		"セキュリティのエラーと警告を記録します">
 
 <!-- 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 btnConsoleErrors			"エラー">
 <!ENTITY btnConsoleInfo				"メッセージ">
 <!ENTITY btnConsoleWarnings			"警告">
 <!ENTITY btnConsoleLog				"ログ">
 
-<!ENTITY filterBox.placeholder			"フィルタ">
+<!ENTITY filterOutput.placeholder		"フィルタ出力">
 <!ENTITY btnClear.label				"消去">
 <!ENTITY btnClear.tooltip			"Web コンソールの内容を消去します">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey		"+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2		"="> <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey3		"">
 
 <!ENTITY fullZoomReduceCmd.commandkey		"-">
 <!ENTITY fullZoomReduceCmd.commandkey2		"">
 
 <!ENTITY fullZoomResetCmd.commandkey		"0">
 <!ENTITY fullZoomResetCmd.commandkey2		"">
 
 <!ENTITY copyURLCmd.label			"リンクの URL をコピー">
 <!ENTITY copyURLCmd.accesskey			"a">
+
+<!ENTITY closeCmd.key				"W">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -29,38 +29,17 @@ localConsole		= ローカルコンソール
 clearConsoleCmd.label		= ログ消去
 clearConsoleCmd.accesskey	= e
 close.button		= 閉じる
 close.accesskey		= C
 update.button		= 更新
 update.accesskey	= U
 cmd.commandkey		= k
 webConsoleCmd.accesskey	= W
-# LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
-#
-# The "PropertyPanel" is used to display a JS object to the user.
-# If it is clear which object is being inspected (e.g., window, document object)
-# the title of the panel is based on the `jsPropertyInspectTitle` string.
-# If it isn't clear which object is being inspected, the `jsPropertyTitle` string
-# gets used. This can be the case when the user logs an object to the WebConsole
-# output using the console.log(aObjectToInspect) method.
-#
-# You can find a screenshot of the PropertyPanel here:
-#   https://bug585030.bugzilla.mozilla.org/attachment.cgi?id=464034
-jsPropertyTitle		= オブジェクトインスペクタ
-# LOCALIZATION NOTE (jsPropertyInspectTitle):
-#
-# The %S is replaced by the evaluated code the user clicked on in the console.
-#
-# Example: The user executed `window.document` in the WebConsole. The `document`
-# object is written to the output. If the user clicks on the `document` output
-# in the console, a PropertyPanel will show up. The title of the PropertyPanel
-# is set to `Inspect: window.document` because the clicked `document` object was
-# evaluated based on the `window.document` string.
-jsPropertyInspectTitle	= 調査: %S
+
 # LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
 # %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
 timestampFormat		= %1$02S:%2$02S:%3$02S.%4$03S
 
 helperFuncUnsupportedTypeError	= この種類のオブジェクト上の pprint は呼び出せません。
 NetworkPanel.label	= ネットワーク要求調査
 # LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
 #
@@ -160,32 +139,39 @@ remoteWebConsoleSelectTabTitle	= タブ一覧 - リモート接続
 # LOCALIZATION NOTE (remoteWebConsoleSelectTabMessage): The message displayed on the
 # Web Console prompt asking the user to pick a tab to attach to.
 remoteWebConsoleSelectTabMessage	= アタッチしたいタブを選択してください。またはグローバルコンソールを選択してください。
 
 # LOCALIZATION NOTE (listTabs.globalConsoleActor): The string displayed for the
 # global console in the tabs selection.
 listTabs.globalConsoleActor	= *グローバルコンソール*
 
-# LOCALIZATION NOTE (ToolboxWebconsole.label):
-# This string is displayed in the title of the tab when the web console is
-# displayed inside the developer tools window it is probably the same string
-# as webConsoleWindowTitleAndURL before the '-'
-ToolboxWebconsole.label		= Web コンソール
+# LOCALIZATION NOTE (MenuWebconsole.label):
+# This string is 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):
+# This string is displayed as the label of the tab in the devtools window.
+ToolboxTabWebconsole.label	= コンソール
 
 # LOCALIZATION NOTE (ToolboxWebconsole.tooltip):
 # This string is 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.
 longStringEllipsis		= [...]
 
+# LOCALIZATION NOTE (longStringTooLong): The string displayed after the user
+# tries to expand a long string.
+longStringTooLong		= 文字列が長すぎるため、Web コンソールで表示すべきではありません。
+
 # LOCALIZATION NOTE (executeEmptyInput): This is displayed when the user tries
 # to execute code, but the input is empty.
 executeEmptyInput		= コマンドが空文字です。
 
 # LOCALIZATION NOTE (NetworkPanel.fetchRemainingResponseContentLink): This is
 # displayed in the network panel when the response body is only partially
 # available.
 NetworkPanel.fetchRemainingResponseContentLink	= 残り %1$S バイトを読み込む
@@ -193,8 +179,17 @@ NetworkPanel.fetchRemainingResponseContentLink	= 残り %1$S バイトを読み込む
 # LOCALIZATION NOTE (NetworkPanel.fetchRemainingRequestContentLink): This is
 # displayed in the network panel when the request body is only partially
 # available.
 NetworkPanel.fetchRemainingRequestContentLink	= 応答ボディ (%1$S バイト) を読み込む
 
 # LOCALIZATION NOTE (connectionTimeout): Message displayed when the Remote Web
 # Console fails to connect to the server due to a timeout.
 connectionTimeout				= 接続がタイムアウトしました。原因と思われるエラーメッセージを、エラーコンソールで確認してください。Web コンソールを開きなおして、やり直してください。
+
+# LOCALIZATION NOTE (propertiesFilterPlaceholder): This is the text that
+# appears in the filter text box for the properties view container.
+propertiesFilterPlaceholder			= フィルタプロパティ
+
+# LOCALIZATION NOTE (emptyPropertiesList): The text that is displayed in the
+# properties pane when there are no properties to display.
+emptyPropertiesList				= 表示できるプロパティはありません
+
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -10,16 +10,18 @@ sourceNameSafari	= Safari
 sourceNameChrome	= Google Chrome
 sourceNameFirefox	= Mozilla Firefox
 
 importedBookmarksFolder	= %S から
 
 importedSafariReadingList	= リストを読み込む (Safari から)
 
 # Import Sources
+# Note: When adding an import source for profile reset, add the string name to
+# resetProfile.js if it should be listed in the reset dialog.
 1_ie		= インターネットオプション
 1_safari	= 設定
 1_chrome	= 設定
 
 2_ie		= Cookie
 2_safari	= Cookie
 2_chrome	= Cookie
 2_firefox	= Cookie
@@ -42,9 +44,9 @@ 16_firefox	= 保存されているパスワード
 
 32_ie		= お気に入り
 32_safari	= ブックマーク
 32_chrome	= ブックマーク
 
 64_ie		= その他のデータ
 64_safari	= その他のデータ
 64_chrome	= その他のデータ
-64_firefox	= ブックマークのバックアップ
+64_firefox_other= その他のデータ
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -61,17 +61,17 @@
 <!ENTITY  permImage			"画像の読み込み">
 <!ENTITY  permPopup			"ポップアップウィンドウを開く">
 <!ENTITY  permCookie			"Cookie データの保存">
 <!ENTITY  permNotifications		"サイトからの通知の表示">
 <!ENTITY  permInstall			"拡張機能やテーマのインストール">
 <!ENTITY  permGeo			"位置情報の送信">
 <!ENTITY  permPlugins			"プラグインの実行">
 <!ENTITY  permFullscreen		"全画面表示に切り替え">
-<!ENTITY  permPointerLock		"マウスポインタを隠す">
+<!ENTITY  permPointerLock2		"マウスポインタを隠す">
 
 <!ENTITY  permIndexedDB			"オフラインストレージの維持">
 <!ENTITY  permClearStorage		"ストレージを消去">
 <!ENTITY  permClearStorage.accesskey	"C">
 
 <!ENTITY  securityTab			"セキュリティ">
 <!ENTITY  securityTab.accesskey		"S">
 <!ENTITY  securityHeader		"このページのセキュリティ情報">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -52,17 +52,17 @@ tabs.openWarningTitle		= 同時に複数のタブを開く確認
 tabs.openWarningMultipleBranded	= 同時に複数 (%S) のタブを開こうとしています。ページの読み込み中は %S の動作が遅くなることがあります。本当に開いてもよろしいですか?
 tabs.openButtonMultiple		= タブで開く
 tabs.openWarningPromptMeBranded	= 同時に複数のタブを開いて %S の動作が遅くなるときは確認する
 
 SelectImport			= ブックマークファイルのインポート
 EnterExport			= ブックマークファイルのエクスポート
 
 detailsPane.noItems		= 項目がありません
-# LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of items
 # example: 111 items
 # Thanks Feedback! http://forums.mozillazine.jp/viewtopic.php?t=13122
 detailsPane.itemsCountLabel	= 項目の数: #1 個
 
 # (^^; ブックマークツールバー直下のフォルダになったから短く: 表示回数の多いページ、よく表示するページ、よく見るページ、表示回数順 etc...
 mostVisitedTitle		= よく見るページ
--- a/browser/chrome/browser/preferences/aboutPermissions.properties
+++ b/browser/chrome/browser/preferences/aboutPermissions.properties
@@ -1,9 +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/.
 
-# LOCALIZATION NOTE (visitCount): #1 is the number of history visits for a site
+# LOCALIZATION NOTE (visitCount): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of history visits for a site
 visitCount	= #1 回 表示
 
+# LOCALIZATION NOTE (passwordsCount, cookiesCount): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 passwordsCount	= このサイトで #1 個のパスワードを保存
 cookiesCount	= このサイトで #1 個の Cookie を保存
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -110,24 +110,17 @@
 <!ENTITY offlineNotifyExceptions.accesskey	"x">
 
 <!ENTITY offlineAppsList2.label			"オフライン作業用のデータの保存を許可している Web サイト:">
 <!ENTITY offlineAppsList.height			"7em"><!-- en-US: 7em -->
 <!ENTITY offlineAppsListRemove.label		"削除...">
 <!ENTITY offlineAppsListRemove.accesskey	"R">
 <!ENTITY offlineAppRemove.confirm		"オフライン作業用データの削除">
 
-<!ENTITY encryptionTab.label			"暗号化">
-
-<!ENTITY protocols.label			"プロトコル">
-<!ENTITY useSSL3.label				"SSL 3.0 を使用する">
-<!ENTITY useSSL3.accesskey			"3">
-<!ENTITY useTLS1.label				"TLS 1.0 を使用する">
-<!ENTITY useTLS1.accesskey			"1">
-<!ENTITY certificates.label			"証明書">
+<!ENTITY certificateTab.label			"証明書">
 <!ENTITY certSelection.description		"サーバが個人証明書を要求したとき:">
 <!ENTITY certs.auto				"自動的に選択する">
 <!ENTITY certs.auto.accesskey			"l">
 <!ENTITY certs.ask				"毎回自分で選択する">
 <!ENTITY certs.ask.accesskey			"i">
 <!ENTITY viewCerts.label			"証明書を表示...">
 <!ENTITY viewCerts.accesskey			"s">
 <!ENTITY viewCRLs.label				"失効リスト...">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -2,30 +2,16 @@
    - 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  blockPopups.label		"ポップアップウィンドウをブロックする">
 <!ENTITY  blockPopups.accesskey		"B">
 <!ENTITY  popupExceptions.label		"許可サイト..."><!-- en-US: Exceptions -->
 <!ENTITY  popupExceptions.accesskey	"E">
 
-<!ENTITY  loadImages.label		"画像を自動的に読み込む">
-<!ENTITY  loadImages.accesskey		"I">
-<!ENTITY  exceptions.label		"例外サイト...">
-<!ENTITY  exceptions.accesskey		"x">
-
-<!ENTITY  enableJavaScript.label	"JavaScript を有効にする">
-<!ENTITY  enableJavaScript.accesskey	"J">
-<!ENTITY  advancedJS.label		"詳細設定...">
-<!ENTITY  advancedJS.accesskey		"v">
-
-<!ENTITY  enableJava.label		"Java を有効にする">
-<!ENTITY  enableJava.accesskey		"n">
-
-
 <!ENTITY  fontsAndColors.label		"フォントと配色">
 
 <!ENTITY  defaultFont.label		"既定のフォント:">
 <!ENTITY  defaultFont.accesskey		"D">
 <!ENTITY  defaultSize.label		"サイズ:">
 <!ENTITY  defaultSize.accesskey		"S">
 
 <!ENTITY  advancedFonts.label		"詳細設定...">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -16,18 +16,16 @@ labelDefaultFont		= 既定 (%S)
 #### Permissions Manager
 
 cookiepermissionstext		= Cookie の使用を許可するかどうかサイトごとに指定できます。個別に設定するサイトの正確なアドレスを入力して [不許可]、[現在のセッションのみ]、[許可] のいずれかをクリックしてください。
 cookiepermissionstitle		= Cookie フィルタ
 addonspermissionstext		= アドオンのインストールを許可するサイトを指定できます。許可するサイトの正確なアドレスを入力して [許可] をクリックしてください。
 addons_permissions_title	= 許可サイト - アドオンのインストール
 popuppermissionstext		= ポップアップウィンドウを開くことを許可するサイトを指定できます。許可するサイトの正確なアドレスを入力して [許可] をクリックしてください。
 popuppermissionstitle		= 許可サイト - ポップアップ
-imagepermissionstext		= 画像の読み込みを許可するかどうかサイトごとに指定できます。個別に設定するサイトの正確なアドレスを入力して [不許可] または [許可] をクリックしてください。
-imagepermissionstitle		= 例外サイト - 画像の読み込み
 invalidURI			= 有効なホスト名を入力してください
 invalidURITitle			= 無効なホスト名が入力されました
 
 #### Master Password
 
 pw_change2empty_in_fips_mode	= 現在 FIPS モードです。FIPS モードではマスターパスワードを空には設定できません。
 pw_change_failed_title		= パスワードを変更できませんでした
 
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -6,19 +6,16 @@
 <!ENTITY newWindowsAsTabs.accesskey	"t">
 
 <!ENTITY warnCloseMultipleTabs.label	"同時に複数のタブを閉じるときは確認する">
 <!ENTITY warnCloseMultipleTabs.accesskey "m">
 
 <!ENTITY warnOpenManyTabs.label		"同時に複数のタブを開いて &brandShortName; の動作が遅くなるときは確認する">
 <!ENTITY warnOpenManyTabs.accesskey	"o">
 
-<!ENTITY showTabBar.label		"常にタブバーを表示する">
-<!ENTITY showTabBar.accesskey		"b">
-
 <!ENTITY restoreTabsOnDemand.label	"タブが選択されるまでページを読み込まない">
 <!ENTITY restoreTabsOnDemand.accesskey	"l">
 
 <!ENTITY switchToNewTabs.label		"リンクを新しいタブで開いたとき、すぐにそのタブに切り替える">
 <!ENTITY switchToNewTabs.accesskey	"s">
 
 <!ENTITY showTabsInTaskbar.label	"タスクバーにタブのプレビューを表示する">
 <!ENTITY showTabsInTaskbar.accesskey	"k">
--- a/browser/chrome/browser/quitDialog.properties
+++ b/browser/chrome/browser/quitDialog.properties
@@ -2,11 +2,11 @@
 # 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/.
 
 quitDialogTitle		= %S の終了
 
 quitTitle		= 終了(&Q)
 cancelTitle		= キャンセル(&C)
 saveTitle		= 保存して終了(&S)
-neverAsk		= 次回からは確認しない
+neverAsk2		= 次回からは確認しない(&D)
 message			= %1$0.S次回起動時に復元できるように、開いているタブやウィンドウを保存しておきますか?
 messageNoWindows	= %1$0.S開いているタブを保存して次回起動時に復元しますか?
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -8,36 +8,37 @@ button.syncOptionsCancel.label = キャンセル
 
 invalidEmail.label          = メールアドレスが間違っています
 serverInvalid.label         = 正しいサーバ URL を入力してください
 usernameNotAvailable.label  = すでに使用されています
 
 verifying.label = 確認中...
 
 # LOCALIZATION NOTE (additionalClientCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of additional clients (was %S for a short while, use #1 instead, even if both work)
 additionalClientCount.label = と #1 個の端末
 # LOCALIZATION NOTE (bookmarksCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of bookmarks (was %S for a short while, use #1 instead, even if both work)
 bookmarksCount.label        = #1 個のブックマーク
 # LOCALIZATION NOTE (historyDaysCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of days (was %S for a short while, use #1 instead, even if both work)
 historyDaysCount.label      = #1 日分の履歴
 # LOCALIZATION NOTE (passwordsCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of passwords (was %S for a short while, use #1 instead, even if both work)
 passwordsCount.label        = #1 個のパスワード
-# LOCALIZATION NOTE (addonsCount.label):
+# LOCALIZATION NOTE (addonsCount.label): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of add-ons, see the link above for forms
 addonsCount.label        = #1 個のアドオン
 
 save.recoverykey.title           = リカバリキーを保存
 save.recoverykey.defaultfilename = Firefox Recovery Key.html
 
 newAccount.action.label		= Firefox Sync は、すべてのブラウザデータを自動的に同期するよう設定されました。
 newAccount.change.label		= 下の同期オプションで、同期する項目を個別に選択することもできます。
--- a/browser/installer/nsisstrings.properties
+++ b/browser/installer/nsisstrings.properties
@@ -15,32 +15,31 @@
 # for double ampersand) and prevents the letter following the ampersand from
 # being used as an accesskey.
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
 
 WIN_CAPTION			= $BrandShortName セットアップ
 
-INTRO_BLURB			= $BrandFullName をお選びいただきまして、ありがとうございます。[インストール] をクリックしてください。
+INTRO_BLURB1			= $BrandFullName をお選びいただきまして、ありがとうございます。[インストール] をクリックしてください。
 INSTALL_BLURB1			= 常に最新のスピード、柔軟性、セキュリティを、$BrandShortName では体験できます。
 INSTALL_BLURB2			= また、より良いブラウジングや Web を作るために、$BrandShortName は非営利で作られています。
 INSTALL_BLURB3			= あなたもすでに、最も優れたブラウザを作るために活動しているユーザ、貢献者、開発者のグローバルなコミュニティの一員です。
 
 WARN_MIN_SUPPORTED_OS_MSG	= 申し訳ありませんが、$BrandShortName をインストールできませんでした。このバージョンの $BrandShortName を使用するには ${MinSupportedVer} またはそれ以降のバージョンが必要です。
 WARN_WRITE_ACCESS		= インストールディレクトリへの書き込み権限がありません。\n\n[OK] をクリックして別のディレクトリを選択してください。
 WARN_DISK_SPACE			= この場所にインストールするには十分なディスク容量がありません。\n\n[OK] をクリックして別の場所を選択してください。
 WARN_ROOT_INSTALL		= ディスクの直下にはインストールできません。\n\n[OK] をクリックして別の場所を選択してください。
 WARN_MANUALLY_CLOSE_APP_LAUNCH	= $BrandShortName はすでに実行中です。インストールしたバージョンの $BrandShortName を起動する前に $BrandShortName を終了させてください。
 
 ERROR_DOWNLOAD			= ダウンロードが中断されました。\n\n[OK] ボタンを押して再開してください。
 
 INSTALL_BUTTON			= インストール(&I)
 UPGRADE_BUTTON			= アップグレード(&U)
-BACK_BUTTON			= 戻る(&B)
 CANCEL_BUTTON			= キャンセル
 OPTIONS_BUTTON			= オプション(&O)
 
 MAKE_DEFAULT			= $BrandShortName を既定のブラウザに設定する(&M)
 CREATE_SHORTCUTS		= $BrandShortName アイコンの作成先:
 ADD_SC_TASKBAR			= タスクバー(&T)
 ADD_SC_QUICKLAUNCHBAR		= クイック起動ツールバー(&Q)
 ADD_CheckboxShortcutInStartMenu	= スタートメニューのプログラムフォルダ(&S)
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -48,19 +48,16 @@ toggle_sidebar.title=サイドバーの切り替え
 toggle_sidebar_label=サイドバーの切り替え
 outline.title=文書の目次
 outline_label=文書の目次
 thumbs.title=縮小版
 thumbs_label=縮小版
 findbar.title=検索
 findbar_label=検索
 
-# Document outline messages
-no_outline=利用可能な目次はありません
-
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
 thumb_page_title={{page}} ページ
 # LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
 # number.
 thumb_page_canvas=ページの縮小版 {{page}}
 
@@ -118,8 +115,9 @@ missing_file_error=PDF ファイルが見つかりません。
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} 注釈]
 request_password=PDF はパスワードによって保護されています
 
 printing_not_supported=警告: このブラウザでは印刷が完全にサポートされていません
 printing_not_ready=警告: PDF を印刷するための読み込みが終了していません
 web_fonts_disabled=Web フォントが無効になっています: 埋め込まれた PDF のフォントを使用することができません
+web_colors_disabled=Web カラーが無効になっています