20.0: sync browser with en-US rev123954:4fd7553bfa40
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Sat, 16 Feb 2013 02:25:19 +0900
changeset 977 02481518ae6885e50d2f37b8842995523e6470c5
parent 976 8e34f0cd314b3aa6b93bf0dc89a701ade365becc
child 978 0fa9b40a09cd82f857c34693cfb66c1c2e54f6eb
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs20
20.0: sync browser with en-US rev123954:4fd7553bfa40
browser/chrome/browser/aboutHealthReport.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/baseMenuOverlay.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/connection-screen.dtd
browser/chrome/browser/devtools/connection-screen.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.dtd
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/layoutview.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/styleinspector.dtd
browser/chrome/browser/devtools/styleinspector.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/downloads/downloads.dtd
browser/chrome/browser/downloads/downloads.properties
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/quitDialog.properties
browser/chrome/browser/taskbar.properties
browser/pdfviewer/viewer.properties
browser/searchplugins/google-jp.xml
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/aboutHealthReport.dtd
@@ -0,0 +1,31 @@
+<!-- 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/. -->
+
+<!-- metrics.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
+<!ENTITY abouthealth.locale-direction			"ltr">
+
+<!-- LOCALIZATION NOTE (abouthealth.pagetitle): Firefox Health Report is a proper noun in en-US, please keep this in mind. -->
+<!ENTITY abouthealth.pagetitle				"&brandShortName; ヘルスレポート">
+<!ENTITY abouthealth.header				"&brandFullName; ヘルスレポート">
+
+<!ENTITY abouthealth.intro.title			"&brandShortName; ヘルスレポートとは?">
+
+<!ENTITY abouthealth.intro-enabled			"&brandFullName; はブラウザ体験のさらなる向上のため、コンピュータと利用状況に関するいくつかのデータを収集します。">
+<!ENTITY abouthealth.intro-disabled			"現在、利用状況のデータは &vendorShortName; に送信されていません。[&abouthealth.optin;] ボタンを押すと、ブラウザ体験の向上に協力します。">
+
+<!ENTITY abouthealth.optin				"&brandShortName; をよりよくする">
+<!ENTITY abouthealth.optout				"レポート送信をオフにする">
+
+<!ENTITY abouthealth.optout.confirmationPrompt.title	"データの送信を止めますか?">
+<!ENTITY abouthealth.optout.confirmationPrompt.message	"データの送信を中止して、&vendorShortName; のサーバに保存された匿名データを削除します。よろしいですか?">
+
+<!ENTITY abouthealth.show-raw-data			"詳細を表示">
+<!ENTITY abouthealth.hide-raw-data			"詳細を非表示">
+
+<!ENTITY abouthealth.show-report			"&brandShortName; 詳細を表示する">
+
+<!ENTITY abouthealth.details.description-start		"&brandShortName; ヘルスレポートの機能によって、&brandFullName; が送信したデータです。収集、送信された内容の ">
+<!ENTITY abouthealth.details-link			"詳細">
+<!ENTITY abouthealth.details.description-end		" を確認できます。">
+<!ENTITY abouthealth.no-data-available			"今までに送信された、表示できるデータはありません。あとで確認してください。">
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -3,26 +3,32 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY privatebrowsingpage.title		"プライベートブラウジング">
 <!ENTITY privatebrowsingpage.title.normal	"プライベートブラウジングを開始しますか?">
 
 <!ENTITY privatebrowsingpage.issueDesc		"&brandShortName; はこのセッション中には表示したページの履歴を一切保存しません。">
 <!ENTITY privatebrowsingpage.issueDesc.normal	"&brandShortName; は現在プライベートブラウジングモードではありません。">
 
+<!ENTITY privatebrowsingpage.perwindow.issueDesc	"&brandShortName; はこのウィンドウの履歴を一切保存しません。">
+<!ENTITY privatebrowsingpage.perwindow.issueDesc.normal	"現在プライベートウィンドウではありません。">
+
 <!ENTITY privatebrowsingpage.description	"プライベートブラウジング中に &brandShortName; は表示したページの履歴、検索履歴、ダウンロード履歴、Web フォーム履歴、Cookie、ディスクキャッシュは一切保存しませんが、ダウンロードしたファイルと作成したブックマークは保存されます。">
 
-<!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryBefore): include a trailing space as needed -->
-<!-- LOCALIZATION NOTE (privatebrowsingpage.clearRecentHistoryAfter): include a starting space as needed -->
-<!ENTITY privatebrowsingpage.clearRecentHistoryBefore		"">
-<!ENTITY privatebrowsingpage.clearRecentHistoryInner		"最近の履歴を消去">
-<!ENTITY privatebrowsingpage.clearRecentHistoryAfter		"することもできます。">
+<!ENTITY privatebrowsingpage.perwindow.description	"プライベートブラウジングウィンドウでは、&brandShortName; は表示したページの履歴、検索履歴、ダウンロード履歴、Web フォーム履歴、Cookie、ディスクキャッシュは一切保存しませんが、ダウンロードしたファイルと作成したブックマークは保存されます。">
 
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.label		"プライベートブラウジングを開始">
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.accesskey	"P">
 
+<!ENTITY privatebrowsingpage.openPrivateWindow.label		"プライベートウィンドウを開く">
+<!ENTITY privatebrowsingpage.openPrivateWindow.accesskey	"P">
+
 <!-- LOCALIZATION NOTE (privatebrowsingpage.howToStop2): please leave &basePBMenu.label; intact in the translation -->
 <!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart2): please leave &basePBMenu.label; intact in the translation -->
 <!ENTITY privatebrowsingpage.howToStop2		"プライベートブラウジングを終了するには、[&basePBMenu.label;] メニューの [&privateBrowsingCmd.stop.label;] を選択するか、&brandShortName; を終了してください。">
 <!ENTITY privatebrowsingpage.howToStart2	"プライベートブラウジングは [&basePBMenu.label;] メニューの [&privateBrowsingCmd.start.label;] でも開始できます。">
 
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart3): please leave &basePBMenu.label; intact in the translation -->
+<!ENTITY privatebrowsingpage.howToStart3	"[&basePBMenu.label;] メニューの [&newPrivateWindow.label;] でプライベートブラウジングを開始します。">
+<!ENTITY privatebrowsingpage.howToStop3		"このウィンドウを閉じると、プライベートブラウジングを終了します。">
+
 <!ENTITY privatebrowsingpage.moreInfo		"表示したページの履歴はこのコンピュータには記録されませんが、インターネットサービスプロバイダや会社が記録している可能性はあります。">
 <!ENTITY privatebrowsingpage.learnMore		"詳細を表示">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -17,16 +17,19 @@
 <!ENTITY aboutProduct.label		"&brandShortName; について">
 <!ENTITY aboutProduct.accesskey		"A">
 <!ENTITY productHelp.label		"&brandShortName; ヘルプ">
 <!ENTITY productHelp.accesskey		"H">
 <!ENTITY helpMac.commandkey		"?">
 <!ENTITY helpSafeMode.label		"アドオンを無効にして再起動...">
 <!ENTITY helpSafeMode.accesskey		"R">
 
+<!ENTITY healthReport.label		"&brandShortName; ヘルスレポート">
+<!ENTITY healthReport.accesskey		"e">
+
 <!ENTITY helpTroubleshootingInfo.label	"トラブルシューティング情報...">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
 
 <!ENTITY helpFeedbackPage.label		"フィードバックを送信...">
 <!ENTITY helpFeedbackPage.accesskey	"S">
 
 <!ENTITY preferencesCmdMac.label        "環境設定...">
 <!ENTITY preferencesCmdMac.commandkey	",">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -193,29 +193,25 @@ These should match what Safari and other
 <!ENTITY downloadsUnix.commandkey	"y">
 <!ENTITY addons.label			"アドオン">
 <!ENTITY addons.accesskey		"A">
 <!ENTITY addons.commandkey		"A">
 
 <!ENTITY webDeveloperMenu.label		"Web 開発">
 <!ENTITY webDeveloperMenu.accesskey	"W">
 
+<!ENTITY devtoolsConnect.label		"接続...">
+<!ENTITY devtoolsConnect.accesskey	"e">
+
 <!ENTITY errorConsoleCmd.label		"エラーコンソール">
 <!ENTITY errorConsoleCmd.accesskey	"C">
 <!ENTITY errorConsoleCmd.commandkey	"j">
 
-<!ENTITY webConsoleCmd.label		"Web コンソール">
-<!ENTITY webConsoleCmd.accesskey	"W">
-<!ENTITY webConsoleCmd.commandkey	"k">
 <!ENTITY remoteWebConsoleCmd.label	"リモート Web コンソール">
 
-<!ENTITY inspectMenu.label		"調査">
-<!ENTITY inspectMenu.accesskey		"I">
-<!ENTITY inspectMenu.commandkey		"I">
-
 <!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
@@ -228,60 +224,36 @@ These should match what Safari and other
   -  "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 inspectCloseButton.tooltiptext		"調査を閉じる">
-<!ENTITY inspectSidebarCloseButton.tooltiptext	"サイドバーを閉じる">
-
 <!ENTITY devToolbarCloseButton.tooltiptext	"開発ツールバーを閉じる">
 <!ENTITY devToolbarMenu.label			"開発ツールバー">
 <!ENTITY devToolbarMenu.accesskey		"v">
 <!ENTITY devToolbar.keycode			"VK_F2">
 <!ENTITY devToolbar.keytext			"F2">
-<!ENTITY devToolbarOtherToolsButton.label	"その他のツール">
-
-<!ENTITY inspectorHTMLCopyInner.label		"内側の HTML をコピー">
-<!ENTITY inspectorHTMLCopyInner.accesskey	"I">
-
-<!ENTITY inspectorHTMLCopyOuter.label		"外側の HTML をコピー">
-<!ENTITY inspectorHTMLCopyOuter.accesskey	"O">
-
-<!ENTITY inspectorHTMLDelete.label		"ノードを削除">
-<!ENTITY inspectorHTMLDelete.accesskey		"D">
+<!ENTITY devToolboxMenuItem.label		"開発ツールを表示">
+<!ENTITY devToolboxMenuItem.accesskey		"T">
 
-<!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
-  -  alternate view for the Inspector, creating a 3D visualization of the
-  -  webpage. -->
-<!ENTITY inspect3DViewButton.label	"3D ビュー">
-<!ENTITY inspect3DViewButton.accesskey	"W">
-
-<!ENTITY inspectStyleButton.label	"スタイル">
-<!ENTITY inspectStyleButton.accesskey	"S">
-
-<!-- LOCALIZATION NOTE (styleeditor.label): This menu item label appears
-  -  in the Tools menu. -->
-<!ENTITY styleeditor.label		"スタイルエディタ">
-<!ENTITY styleeditor.accesskey		"y">
-<!ENTITY styleeditor.keycode		"VK_F7">
-<!ENTITY styleeditor.keytext		"F7">
+<!ENTITY devToolbarToolsButton.tooltip		"開発ツールを表示">
+<!ENTITY devToolbarOtherToolsButton.label	"その他のツール">
 
 <!ENTITY getMoreDevtoolsCmd.label	"その他のツールを入手">
 <!ENTITY getMoreDevtoolsCmd.accesskey	"M">
 
 <!ENTITY fileMenu.label			"ファイル">
 <!ENTITY fileMenu.accesskey		"F">
 <!ENTITY newNavigatorCmd.label		"新しいウィンドウ">
 <!ENTITY newNavigatorCmd.key		"N">
 <!ENTITY newNavigatorCmd.accesskey	"N">
-<!ENTITY newPrivateWindow.label		"新しいプライベートブラウジングウィンドウ">
+<!ENTITY newPrivateWindow.label		"新しいプライベートウィンドウ">
 <!ENTITY newPrivateWindow.accesskey	"W">
 
 <!ENTITY editMenu.label			"編集">
 <!ENTITY editMenu.accesskey		"E">
 <!ENTITY undoCmd.label			"元に戻す">
 <!ENTITY undoCmd.key			"Z">
 <!ENTITY undoCmd.accesskey		"U">
 <!ENTITY redoCmd.label			"やり直し">
@@ -378,22 +350,24 @@ These should match what Safari and other
 
  -->
 <!ENTITY searchFocus.commandkey		"k">
 <!ENTITY searchFocus.commandkey2	"e">
 <!ENTITY searchFocusUnix.commandkey	"j">
 
 <!ENTITY tabView.commandkey		"e">
 
+<!ENTITY openLinkCmdInTab.label		"リンクを新しいタブで開く">
+<!ENTITY openLinkCmdInTab.accesskey	"T">
 <!ENTITY openLinkCmd.label		"リンクを新しいウィンドウで開く">
 <!ENTITY openLinkCmd.accesskey		"W">
-<!ENTITY openLinkCmdInTab.label		"リンクを新しいタブで開く">
-<!ENTITY openLinkCmdInTab.accesskey	"T">
-<!ENTITY openLinkCmdInCurrent.label     "選択した URL を開く"><!-- (^m^) Bug 454518  en-US: "Open link" -->
-<!ENTITY openLinkCmdInCurrent.accesskey "O">
+<!ENTITY openLinkInPrivateWindowCmd.label	"リンクを新しいプライベートウィンドウで開く">
+<!ENTITY openLinkInPrivateWindowCmd.accesskey	"P">
+<!ENTITY openLinkCmdInCurrent.label	"選択した URL を開く"><!-- (^m^) Bug 454518  en-US: "Open link" -->
+<!ENTITY openLinkCmdInCurrent.accesskey	"O">
 <!ENTITY openFrameCmd.label		"フレームを新しいウィンドウで開く">
 <!ENTITY openFrameCmd.accesskey		"W">
 <!ENTITY openFrameCmdInTab.label	"フレームを新しいタブで開く">
 <!ENTITY openFrameCmdInTab.accesskey	"T">
 <!ENTITY showOnlyThisFrameCmd.label	"このフレームだけを表示">
 <!ENTITY showOnlyThisFrameCmd.accesskey	"S">
 <!ENTITY reloadCmd.commandkey		"r">
 <!ENTITY reloadFrameCmd.label		"フレームの再読み込み">
@@ -609,18 +583,16 @@ The layout of the identity dialog preven
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!-- (^^; EVSSL の場合のみ identity.runBy の値に組織名を出力 -->
 <!ENTITY identity.runBy				"このサイトの運営者:">
 
 <!ENTITY identity.moreInfoLinkText		"詳細を表示...">
 
-<!ENTITY downloadMonitor2.tooltip		"クリックするとダウンロードウィンドウを開きます">
-
 <!ENTITY allTabs.filter.emptyText		"タブを検索">
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label			"ブラウザタブ"><!-- (^m^) Bug 565042  音声読み上げ用ラベル -->
 
 <!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
 <!ENTITY syncTabsMenu2.label			"他の端末で開いていたタブ">
 
@@ -630,33 +602,34 @@ just addresses the organization to follo
 <!ENTITY syncSetup.accesskey			"Y">
 <!ENTITY syncSyncNowItem.label			"今すぐ同期">
 <!ENTITY syncSyncNowItem.accesskey		"S">
 <!ENTITY syncToolbarButton.label		"Sync">
 
 <!ENTITY addonBarCloseButton.tooltip	"アドオンバーを閉じます">
 <!ENTITY toggleAddonBarCmd.key			"/">
 
-<!-- LOCALIZATION NOTE (markupButton.arialabel): The markup button is the button
-located in front of the breadcrumbs display in the inspector toolbar. The button
-doesn't display any label, but exposes a label to screen-readers with "aria-label".
--->
-<!ENTITY markupButton.arialabel			"マークアップ">
-<!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
-toolbar button -->
-<!ENTITY markupButton.accesskey			"M">
-
 <!ENTITY socialToolbar.title			"ソーシャルツールバーボタン">
 <!ENTITY social.notLoggedIn.label		"ログインしていません">
 
 <!ENTITY social.ok.label			"OK">
 <!ENTITY social.ok.accesskey			"O">
 
 <!ENTITY social.toggleSidebar.label		"サイドバーを表示する">
 <!ENTITY social.toggleSidebar.accesskey		"s">
 
 <!ENTITY social.toggleNotifications.label	"デスクトップ通知を表示する">
 <!ENTITY social.toggleNotifications.accesskey	"n">
 
 <!ENTITY social.activated.undobutton.label	"元に戻す">
 <!ENTITY social.activated.undobutton.accesskey	"U">
 
 <!ENTITY social.chatBar.commandkey		"c">
+<!ENTITY social.chatBar.label			"チャットを入力">
+<!ENTITY social.chatBar.accesskey		"c">
+
+<!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
@@ -232,24 +232,16 @@ identity.unencrypted			= この Web サイトとの通信は暗号化されていません。
 identity.mixed_content			= この Web サイトとの通信は一部しか暗号化されておらず、第三者に盗み見られないようにはなっていません。
 
 identity.unknown.tooltip		= この Web サイトには運営者を証明する証明書がありません
 
 # (^^; EVSSL による認証(法人登記なども確認して実在証明) ではなく通常の SSL 認証(ドメイン真正性のみ検証) の場合:
 #identity.ownerUnknown2			= (運営者は実在認証されていません)
 identity.ownerUnknown2			= (運営者は不明です)
 
-# Downloads Monitor Panel
-# LOCALIZATION NOTE (activeDownloads1, pausedDownloads1): Semi-colon list of plural
-# forms. See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 number of downloads; #2 time left
-# examples: 1 active download (2 minutes remaining); 11 paused downloads
-activeDownloads1			= #1 件のダウンロードが進行中です (#2)
-pausedDownloads1			= #1 件のダウンロードが中断しています
-
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle		= ブックマークに追加しました
 # (^^; ツールメニューのブックマークからは無理...要再検討
 editBookmarkPanel.pageBookmarkedDescription	= %1$0.S今後このページにはブックマークからアクセスできます。
 editBookmarkPanel.bookmarkedRemovedTitle	= ブックマークを削除しました
 editBookmarkPanel.editBookmarkTitle		= ブックマークを編集できます
 
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
@@ -364,26 +356,20 @@ syncPromoNotification.learnMoreLinkText		= 詳細
 # The final space separates this text from the Learn More link.
 syncPromoNotification.addons.description	= %S でアドオンを他の端末と共有できます。
 # LOCALIZATION NOTE (syncPromoNotification.addons-sync-disabled.label):
 # This appears in the add-on install complete panel when Sync is set
 # but addons sync is not. %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.addons-sync-disabled.description	= %S アカウントで複数の端末間でアドオンを同期することができます。
 
-# Telemetry prompt
-# LOCALIZATION NOTE (telemetryOptInPrompt): %1$S will be replaced by
-# brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner
-# preference.
-telemetryOptInPrompt		= %1$S の改善のため、パフォーマンス、ハードウェア、使用状況、設定の情報を %2$S に送信しますか?
-telemetryLinkLabel		= 詳細
-telemetryYesButtonLabel2	= はい、協力します
-telemetryYesButtonAccessKey	= Y
-telemetryNoButtonLabel		= いいえ
-telemetryNoButtonAccessKey	= N
+# 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) に戻しますか?
 
@@ -397,21 +383,16 @@ 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		= アプリケーションをインストールしました
 
-# Telemetry opt-out prompt for Aurora and Nightly
-# LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
-# brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
-telemetryOptOutPrompt		= %1$S の改善のために、パフォーマンスおよびハードウェアの情報、機能の使用状況、ブラウザの設定が %2$S に送信されます。%3$0.S
-
 # 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 を有効にしました。
 
@@ -454,23 +435,23 @@ identity.newIdentity.description	= %S にサインインするメールアドレスを入力してください
 identity.next.label			= 次へ
 identity.next.accessKey			= n
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
 # LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
 identity.loggedIn.description		= %S としてサインインしました
 identity.loggedIn.signOut.label		= サインアウト
 identity.loggedIn.signOut.accessKey	= O
 
-# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
-# LOCALIZATION NOTE (getUserMedia.shareMicrophone.message, getUserMedia.shareSpecificMicrophone.label): %S is the website origin (e.g. www.mozilla.org)
+# 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:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# The number of devices can be either one or two.
 getUserMedia.shareCamera.message		= カメラを %S と共有しますか?
-getUserMedia.shareCamera.label			= カメラを共有
-getUserMedia.shareCamera.accesskey		= S
-getUserMedia.shareSpecificCamera.label		= カメラを共有: %S
 getUserMedia.shareMicrophone.message		= マイクを %S と共有しますか?
-getUserMedia.shareMicrophone.label		= マイクを共有
-getUserMedia.shareMicrophone.accesskey		= S
-getUserMedia.shareSpecificMicrophone.label	= マイクを共有: %S
 getUserMedia.shareCameraAndMicrophone.message	= カメラとマイクを %S と共有しますか?
-getUserMedia.shareCameraAndMicrophone.label	= カメラとマイクを共有
-getUserMedia.shareCameraAndMicrophone.accesskey	= S
+getUserMedia.shareSelectedDevices.label		= 選択したデバイスを共有
+getUserMedia.shareSelectedDevices.accesskey	= S
 getUserMedia.denyRequest.label			= 共有しない
 getUserMedia.denyRequest.accesskey		= D
+getUserMedia.sharingCamera.message		= カメラを %S と共有しています。
+getUserMedia.sharingMicrophone.message		= マイクを %S と共有しています。
+getUserMedia.sharingCameraAndMicrophone.message	= カメラとマイクを %S と共有しています。
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/connection-screen.dtd
@@ -0,0 +1,22 @@
+<!-- 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 Remote Connection strings.
+  - The Remote Connection window can reached from the "connect…" menuitem
+  - in the Web Developer menu.
+  - -->
+
+<!ENTITY title			"接続する">
+<!ENTITY header			"リモート機器に接続する">
+<!ENTITY host			"ホスト:">
+<!ENTITY port			"ポート:">
+<!ENTITY connect		"接続">
+<!ENTITY connecting		"接続中">
+<!ENTITY availableTabs		"利用可能なリモートのタブ:">
+<!ENTITY availableProcesses	"利用可能なリモートのプロセス:">
+<!ENTITY connectionError	"エラー:">
+<!ENTITY errorTimeout		"エラー: 接続がタイムアウトしました。">
+<!ENTITY errorRefused		"エラー: 接続が拒否されました。">
+<!ENTITY errorUnexpected	"予期しないエラー。">
+<!ENTITY help			"Firefox 開発ツールではリモート機器 (Firefox for Android、Firefox OS など) のデバッグが可能です。リモート機器のオプションの [リモートデバッグ] がオンになっているか確認してください。詳しくは <a target='_' href='https://developer.mozilla.org/docs/Tools/Debugger#Remote_Debugging'>ドキュメント</a> をご覧ください。">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/connection-screen.properties
@@ -0,0 +1,9 @@
+# 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 Remote Connection strings.
+# The Remote Connection window can reached from the "connect…" menuitem
+# in the Web Developer menu.
+
+mainProcess	= メインプロセス
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -30,49 +30,104 @@
 <!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
   -  launches the debugger UI. Do not translate this one! -->
 <!ENTITY debuggerMenu.commandkey	"S">
 
 <!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
   -  the button that closes the debugger UI. -->
 <!ENTITY debuggerUI.closeButton.tooltip	"閉じる">
 
+<!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
+  -  the button that toggles the panes visible or hidden in the debugger UI. -->
+<!ENTITY debuggerUI.panesButton.tooltip	"左右のウィンドウを切り替え">
+
 <!-- LOCALIZATION NOTE (debuggerUI.optsButton.tooltip): This is the tooltip for
   -  the button that opens up an options context menu for the debugger UI. -->
 <!ENTITY debuggerUI.optsButton.tooltip	"デバッガオプション">
 
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 <!ENTITY debuggerUI.pauseExceptions	"例外発生で停止">
 <!ENTITY debuggerUI.pauseExceptions.key	"E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showPanesOnInit): This is the label for the
   -  checkbox that toggles visibility of panes when opening the debugger. -->
 <!ENTITY debuggerUI.showPanesOnInit	"起動時にデバッガを開く">
 <!ENTITY debuggerUI.showPanesOnInit.key	"S">
 
-<!-- LOCALIZATION NOTE (debuggerUI.showVarsSearch): This is the label for the
-  -  checkbox that toggles visibility of a designated variables searchbox. -->
-<!ENTITY debuggerUI.showVarsSearch	"変数検索ボックスを表示">
-<!ENTITY debuggerUI.showVarsSearch.key	"V">
+<!-- LOCALIZATION NOTE (debuggerUI.showVarsFilter): This is the label for the
+  -  checkbox that toggles visibility of a designated variables filter box. -->
+<!ENTITY debuggerUI.showVarsFilter	"変数フィルタボックスを表示">
+<!ENTITY debuggerUI.showVarsFilter.key	"V">
 
-<!-- LOCALIZATION NOTE (debuggerUI.showNonEnums): This is the label for the
+<!-- LOCALIZATION NOTE (debuggerUI.showOnlyEnum): This is the label for the
   -  checkbox that toggles visibility of hidden (non-enumerable) variables and
-  -  properties in stack views. -->
-<!ENTITY debuggerUI.showNonEnums	"隠しプロパティを表示">
-<!ENTITY debuggerUI.showNonEnums.key	"P">
+  -  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.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">
+
+<!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
+  -  in the source editor's context menu for the global search operation. -->
+<!ENTITY debuggerUI.searchGlobal	"すべてのファイルを検索">
+<!ENTITY debuggerUI.searchGlobal.key	"F">
+
+<!-- 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. -->
+<!ENTITY debuggerUI.searchLine		"指定行へ移動...">
+<!ENTITY debuggerUI.searchLine.key	"J">
+
+<!-- LOCALIZATION NOTE (debuggerUI.searchVariable): This is the text that appears
+  -  in the source editor's context menu for the variables search operation. -->
+<!ENTITY debuggerUI.searchVariable	"変数をフィルタ">
+<!ENTITY debuggerUI.searchVariable.key	"V">
+
 <!-- LOCALIZATION NOTE (debuggerUI.condBreakPanelTitle): This is the text that
   -  appears in the conditional breakpoint panel popup as a description. -->
 <!ENTITY debuggerUI.condBreakPanelTitle	"以下の式が true のときに、このブレークポイントで停止します">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuBreak): This is the text that
   -  appears in the source editor context menu for adding a breakpoint. -->
 <!ENTITY debuggerUI.seMenuBreak		"ブレークポイントを設置">
+<!ENTITY debuggerUI.seMenuBreak.key	"B">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuCondBreak): This is the text that
   -  appears in the source editor context menu for adding a conditional
   -  breakpoint. -->
 <!ENTITY debuggerUI.seMenuCondBreak	"条件付きブレークポイントを設置">
+<!ENTITY debuggerUI.seMenuCondBreak.key	"B">
+
+<!-- LOCALIZATION NOTE (debuggerUI.seMenuAddWatch): This is the text that
+  -  appears in the source editor context menu for adding an expression. -->
+<!ENTITY debuggerUI.seMenuAddWatch	"選択範囲をウォッチ式へ">
+<!ENTITY debuggerUI.seMenuAddWatch.key	"E">
+
+<!-- LOCALIZATION NOTE (debuggerUI.addWatch): This is the text that
+  -  appears in the watch expressions context menu for adding an expression. -->
+<!ENTITY debuggerUI.addWatch		"ウォッチ式を追加">
+<!ENTITY debuggerUI.addWatch.key	"E">
+
+<!-- LOCALIZATION NOTE (debuggerUI.removeWatch): This is the text that
+  -  appears in the watch expressions context menu for removing all expressions. -->
+<!ENTITY debuggerUI.removeAllWatch	"すべてのウォッチ式を削除">
+<!ENTITY debuggerUI.removeAllWatch.key	"E">
+
+<!-- LOCALIZATION NOTE (debuggerUI.stepping): These are the keycodes that
+  -  control the stepping commands in the debugger (continue, step over,
+  -  step in and step out). -->
+<!ENTITY debuggerUI.stepping.resume	"VK_F6">
+<!ENTITY debuggerUI.stepping.stepOver	"VK_F7">
+<!ENTITY debuggerUI.stepping.stepIn	"VK_F8">
+<!ENTITY debuggerUI.stepping.stepOut	"VK_F8">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -14,16 +14,24 @@
 # 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
+
 # LOCALIZATION NOTE (chromeDebuggerWindowTitle): The title displayed for the
 # chrome (browser) debugger window.
 chromeDebuggerWindowTitle		= ブラウザデバッガ
 
 # LOCALIZATION NOTE (remoteDebuggerWindowTitle): The title displayed for the
 # remote debugger window.
 remoteDebuggerWindowTitle		= リモートデバッガ
 
@@ -168,15 +176,37 @@ scopeLabel				= %S スコープ
 # the watch expressions scope.
 watchExpressionsScopeLabel		= ウォッチ式
 
 # LOCALIZATION NOTE (globalScopeLabel): The name of the global scope. This text
 # is added to scopeLabel and displayed in the variables pane as a header for
 # the global scope.
 globalScopeLabel			= グローバル
 
+# LOCALIZATION NOTE (ToolboxDebugger.label):
+# This string is displayed in the title of the tab when the debugger is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxDebugger.label			= デバッガ
+
+# LOCALIZATION NOTE (ToolboxDebugger.tooltip):
+# This string is displayed in the tooltip of the tab when the debugger is
+# displayed inside the developer tools window..
+ToolboxDebugger.tooltip			= JavaScript デバッガ
+
+# LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
+# in the variables list on an item with an editable name.
+variablesEditableNameTooltip		= ダブルクリックすると編集
+
+# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
+# in the variables list on an item with an editable name.
+variablesEditableValueTooltip		= クリックすると値を変更
+
+# LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed
+# in the variables list on an item with which can be removed.
+variablesCloseButtonTooltip		= クリックすると削除
+
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel			= :
 
 # LOCALIZATION NOTE (watchExpressionsSeparatorLabel): The text that is displayed
 # in the watch expressions list as a separator between the code and evaluation.
 watchExpressionsSeparatorLabel		= \ \u2192
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -187,16 +187,20 @@ tiltManual		= Web ページのさまざまなパーツのつながりを 3D 空間に表示して調べます
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltOpenDesc		= 3D 調査ビューを開きます
 
 # LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
 # command, displayed when the user asks for help on what it does.
 tiltOpenManual		= 3D 調査ビューを初期化して、CSS セレクタで指定されたノードをハイライトします
 
+# LOCALIZATION NOTE (tiltToggleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles Tilt 3D View.
+tiltToggleTooltip	= 3D ビュー
+
 # LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
 # command. See tiltTranslateManual 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.
 tiltTranslateDesc	= 3D オブジェクトを動かします
 
 # LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
 # command, displayed when the user asks for help on what it does.
@@ -297,16 +301,20 @@ tiltResetManual		= 3D オブジェクトに適用された変形処理をリセットします
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltCloseDesc		= 3D 調査ビューを閉じます
 
 # LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
 # command, displayed when the user asks for help on what it does.
 tiltCloseManual		= 3D 調査ビューを閉じて、標準ハイライトの調査ビューに戻ります
 
+# LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
+# to explain that the debugger must be opened first.
+debuggerStopped		= ブレークポイントを設置する前に、スクリプトデバッガを開いてください
+
 # LOCALIZATION NOTE (breakDesc) A very short string used to describe the
 # function of the break command.
 breakDesc		= ブレークポイントを管理します
 
 # LOCALIZATION NOTE (breakManual) A longer description describing the
 # set of commands that control breakpoints.
 breakManual		= ブレークポイントの一覧を表示したり、追加や削除を行います
 
@@ -338,20 +346,16 @@ breakaddFailed		= ブレークポイントを設置できません: %S
 # LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
 # function of the 'break add' command.
 breakaddDesc		= ブレークポイントを設置します
 
 # LOCALIZATION NOTE (breakaddManual) A longer description describing the
 # set of commands that are responsible for adding breakpoints.
 breakaddManual		= 対応しているブレークポイントの種類: 行ブレークポイント
 
-# LOCALIZATION NOTE (breakaddDebuggerStopped) Used in the output of the
-# 'break add' command to explain that the debugger must be opened first.
-breakaddDebuggerStopped	= ブレークポイントを設置する前に、スクリプトデバッガを開いてください
-
 # LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
 # function of the 'break add line' command.
 breakaddlineDesc	= 行ブレークポイントを設置します
 
 # LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
 # the function of the file parameter in the 'break add line' command.
 breakaddlineFileDesc	= JavaScript ファイル URI
 
@@ -474,16 +478,20 @@ resizeModeOnDesc	= レスポンシブデザインモードを起動します
 # alongside the command name, which is why it should be as short as possible.
 resizeModeOffDesc	= レスポンシブデザインモードを終了します
 
 # LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
 # 'resize toggle' 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.
 resizeModeToggleDesc	= レスポンシブデザインモードを切り替えます
 
+# LOCALIZATION NOTE (resizeModeToggleTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles Responsive Design Mode.
+resizeModeToggleTooltip	= レスポンシブデザインモード
+
 # LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
 # 'resize to' 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.
 resizeModeToDesc	= ページのサイズを変更します
 
 # LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
 # 'resize' 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.
@@ -975,8 +983,12 @@ callLogChromeVarNotFoundChrome	= ブラウザウィンドウ内で値が見つかりません。
 # result of the 'calllog chromestart' command with a source type of JavaScript
 # and invalid JavaScript code.
 callLogChromeEvalException	= 評価された JavaScript が以下の例外を送出しました。
 
 # LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
 # result of passing a non-JavaScript object creating source via the
 # 'calllog chromestart javascript' command.
 callLogChromeEvalNeedsObject	= JavaScript ソースは、メソッド呼び出しが記録されるオブジェクトを評価しなければなりません。例: "({a1: function() {this.a2()},a2: function() {}});"
+
+# LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which opens Scratchpad.
+scratchpadOpenTooltip		= スクラッチパッド
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/inspector.dtd
@@ -0,0 +1,10 @@
+<!ENTITY inspectorHTMLCopyInner.label       "内側の HTML をコピー">
+<!ENTITY inspectorHTMLCopyInner.accesskey   "I">
+
+<!ENTITY inspectorHTMLCopyOuter.label       "外側の HTML をコピー">
+<!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
+
+<!ENTITY inspectorHTMLDelete.label          "ノードを削除">
+<!ENTITY inspectorHTMLDelete.accesskey      "D">
+
+<!ENTITY inspector.selectButton.tooltip     "マウスで要素を選択">
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -9,43 +9,34 @@
 # 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 (confirmNavigationAway): Used in the Inspector tool, when
 # the user tries to navigate away from a web page, to confirm the change of
 # page.
-confirmNavigationAway.message			= このページから移動すると、変更内容を破棄して調査を終了します。
+confirmNavigationAway.message2			= このページから移動すると、変更内容は破棄されます。
 confirmNavigationAway.buttonLeave		= 移動する
 confirmNavigationAway.buttonLeaveAccesskey	= L
 confirmNavigationAway.buttonStay		= 移動しない
 confirmNavigationAway.buttonStayAccesskey	= S
 
 breadcrumbs.siblings	= 隣接する要素
-# LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
-# method when registering the HTML panel.
-
-# LOCALIZATION NOTE (inspectButtonWithShortcutKey.tooltip):
-# This button appears in the Inspector Toolbar. inspectButton is stateful,
-# if it's pressed users can select an element with the mouse.
-# %S is the keyboard shortcut.
-inspectButtonWithShortcutKey.tooltip	= マウスで要素を選択 (%S)
-
-# LOCALIZATION NOTE (inspectButton.tooltip):
-# Same as inspectButtonWithShortcutKey.tooltip but used when an add-on
-# overrides the shortcut key.
-inspectButton.tooltip			= マウスで要素を選択
-
-# LOCALIZATION NOTE (markupButton.*):
-# This button is the button located at the beginning of the breadcrumbs
-# in the inspector toolbar. Its tooltip is built dynamically.
-# markupButton.tooltip is used on Mac.
-# On Windows and Linux, we use markupButton.tooltipWithAccesskey, where we append
-# the keyboard shortcut.
-markupButton.tooltip			= マークアップパネル
-markupButton.tooltipWithAccesskey	= マークアップパネル (%S)
-
 
 # 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.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個) を表示
+inspector.tooltip			= DOM とスタイルシートの調査
--- a/browser/chrome/browser/devtools/layoutview.dtd
+++ b/browser/chrome/browser/devtools/layoutview.dtd
@@ -11,12 +11,13 @@
   - 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 (*.tooltip): These tooltips are not regular tooltips.
   -  The text appears on the bottom right corner of the layout view when
   -  the corresponding box is hovered. -->
 
+<!ENTITY title			"ボックスモデル">
 <!ENTITY margins.tooltip	"margin">
 <!ENTITY borders.tooltip	"border">
 <!ENTITY padding.tooltip	"padding">
 <!ENTITY content.tooltip	"要素の内容">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -0,0 +1,21 @@
+# 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 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 (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.tooltip):
+# This string is displayed in the tooltip of the tab when the profiler is
+# displayed inside the developer tools window.
+profiler.tooltip	= プロファイラ
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -112,14 +112,8 @@
 <!ENTITY executeMenu.label		"実行メニュー">
 <!ENTITY executeMenu.accesskey		"X">
 
 <!-- LOCALIZATION NOTE (errorConsoleCmd.commandkey): This command key launches
   -  the browser Error Console, the key should be identical to the property of
   -  the same name in browser.dtd.
   -->
 <!ENTITY errorConsoleCmd.commandkey	"j">
-
-<!-- LOCALIZATION NOTE (webConsoleCmd.commandkey): This command key launches
-  -  the browser WebConsole, the key should be identical to the property of
-  -  the same name in browser.dtd.
-  -->
-<!ENTITY webConsoleCmd.commandkey	"k">
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -47,22 +47,39 @@ 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
 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.
+ToolboxStyleEditor.tooltip	= CSS スタイルシートエディタ
--- a/browser/chrome/browser/devtools/styleinspector.dtd
+++ b/browser/chrome/browser/devtools/styleinspector.dtd
@@ -36,8 +36,12 @@
   -  style property the panel shows the rules which hold that specific property.
   -  For every rule, the rule status is also displayed: a rule can be the best
   -  match, a match, a parent match, or a rule did not match the element the
   -  user has highlighted. -->
 <!ENTITY bestMatch		"適用">
 <!ENTITY matched		"適用候補">
 <!ENTITY parentMatch		"親要素">
 <!ENTITY unmatched		"適用しない">
+
+<!-- FIXME: notes -->
+<!ENTITY computedViewTitle	"計算済み">
+<!ENTITY ruleViewTitle		"ルール">
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -31,23 +31,16 @@ rule.sourceInline		= インライン
 rule.sourceElement		= 要素
 
 # LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
 # that were inherited from a parent node. Will be passed a node
 # identifier of the parent node.
 # e.g "Inherited from body#bodyID"
 rule.inheritedFrom		= %S から継承
 
-# LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
-# sidebar of the Highlighter for the style inspector button.
-# "Computed" refers to the Computed Style of the element.
-style.highlighter.button.label2		= 計算済み
-style.highlighter.accesskey2		= C
-style.highlighter.button.tooltip2	= 要素の計算済みスタイルを調査
-
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
 # quickly jump to the documentation from the Mozilla Developer Network site.
 # This is the link title shown in the hover tooltip.
 helpLinkTitle			= このプロパティに関するドキュメントを開く
 
 # LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
 # entered into the rule view a warning icon is displayed. This text is used for
@@ -121,17 +114,11 @@ rule.contextmenu.copyproperty.accesskey	
 # LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue): The rule view's
 # context menu copy property entry allows a CSS property value to be copied.
 rule.contextmenu.copypropertyvalue		= 値をコピー
 
 # LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue.accesskey): The rule
 # view's context menu copy property value access key.
 rule.contextmenu.copypropertyvalue.accesskey	= U
 
-# LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
-# associated with the Highlighter's CSS Rule View in the Style Sidebar.
-ruleView.label		= ルール
-ruleView.accesskey	= R
-ruleView.tooltiptext	= CSS の確認と編集
-
 # LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
 # first opened and there's no node selected in the rule view.
 rule.empty		= 要素が選択されていません。
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -0,0 +1,9 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY window.title  "開発ツール">
+
+<!ENTITY closeCmd.key  "W">
+
+<!ENTITY toolboxCloseButton.tooltip  "開発ツールを閉じる">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -0,0 +1,3 @@
+toolboxDockButtons.bottom.tooltip	= ブラウザの下側に表示
+toolboxDockButtons.side.tooltip		= ブラウザのサイドに表示
+toolboxDockButtons.window.tooltip	= ウィンドウ表示
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -55,40 +55,19 @@
   -  console.error(). -->
 <!ENTITY btnPageLogging.label			"ロギング">
 <!ENTITY btnPageLogging.tooltip			"window.console オブジェクトに送信されたメッセージを記録します">
 <!ENTITY btnConsoleErrors			"エラー">
 <!ENTITY btnConsoleInfo				"メッセージ">
 <!ENTITY btnConsoleWarnings			"警告">
 <!ENTITY btnConsoleLog				"ログ">
 
-<!-- LOCALIZATION NOTE (btnPosition.label): The label shown for the menu which
-  -  allows the user to toggle between the Web Console positioning types. -->
-<!ENTITY btnPosition.label			"表示位置">
-
-<!-- LOCALIZATION NOTE (btnPosition.tooltip): The tooltip shown when the user
-  -  hovers the Position button in the Web Console toolbar. -->
-<!ENTITY btnPosition.tooltip			"Web コンソールの表示位置を指定します">
-
-<!-- LOCALIZATION NOTE (positionMenu.above): When this option is selected the
-  -  Web Console interface is displayed above the web page. -->
-<!ENTITY positionMenu.above			"上側">
-
-<!-- LOCALIZATION NOTE (positionMenu.below): When this option is selected the
-  -  Web Console interface is displayed below the web page. -->
-<!ENTITY positionMenu.below			"下側">
-
-<!-- LOCALIZATION NOTE (positionMenu.window): When this option is selected the
-  -  Web Console interface is displayed in a floating panel. -->
-<!ENTITY positionMenu.window			"ウィンドウ">
-
 <!ENTITY filterBox.placeholder			"フィルタ">
 <!ENTITY btnClear.label				"消去">
 <!ENTITY btnClear.tooltip			"Web コンソールの内容を消去します">
-<!ENTITY btnClose.tooltip			"Web コンソールを閉じます">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey		"+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2		"="> <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey3		"">
 
 <!ENTITY fullZoomReduceCmd.commandkey		"-">
 <!ENTITY fullZoomReduceCmd.commandkey2		"">
 
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -27,16 +27,18 @@ btnGlobal		= グローバルメッセージ
 tipGlobal		= グローバルメッセージのログ表示を切り替えます
 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.
@@ -162,16 +164,27 @@ 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 (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 (executeEmptyInput): This is displayed when the user tries
 # to execute code, but the input is empty.
 executeEmptyInput		= コマンドが空文字です。
@@ -180,8 +193,12 @@ executeEmptyInput		= コマンドが空文字です。
 # displayed in the network panel when the response body is only partially
 # available.
 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 コンソールを開きなおして、やり直してください。
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -20,30 +20,30 @@
      For example, in English, a long string would be:
 
      59 minutes, 59 seconds remaining - 1022 of 1023 KB
 
      That's 50 characters, so we set the width at 50ch.
      -->
 <!ENTITY downloadDetails.width		"50ch">
 
-<!-- LOCALIZATION NOTE (downloadsSummary.minWidth):
+<!-- LOCALIZATION NOTE (downloadsSummary.minWidth2):
      Minimum width for the main description of the downloads summary,
      which is displayed at the bottom of the Downloads Panel if the
      number of downloads exceeds the limit that the panel can display.
 
-     A good rule of thumb here is to look at the otherDownloads string
+     A good rule of thumb here is to look at the otherDownloads2 string
      in downloads.properties, and make a reasonable estimate of its
      maximum length. For English, this seems like a reasonable limit:
 
-     +999 other current downloads
+     + 999 other downloads
 
-     that's 28 characters, so we set the minimum width to 28ch.
+     that's 21 characters, so we set the minimum width to 21ch.
      -->
-<!ENTITY downloadsSummary.minWidth	"34ch">
+<!ENTITY downloadsSummary.minWidth2	"34ch">
 
 <!ENTITY cmd.pause.label		"中断">
 <!ENTITY cmd.pause.accesskey		"P">
 <!ENTITY cmd.resume.label		"再開">
 <!ENTITY cmd.resume.accesskey		"R">
 <!ENTITY cmd.cancel.label		"キャンセル">
 <!ENTITY cmd.cancel.accesskey		"C">
 <!-- LOCALIZATION NOTE (cmd.show.label, cmd.show.accesskey, cmd.showMac.label,
@@ -55,20 +55,37 @@
 <!ENTITY cmd.show.accesskey		"F">
 <!ENTITY cmd.showMac.label		"Finder に表示">
 <!ENTITY cmd.showMac.accesskey		"F">
 <!ENTITY cmd.retry.label		"再試行">
 <!ENTITY cmd.goToDownloadPage.label	"ダウンロードしたページを表示">
 <!ENTITY cmd.goToDownloadPage.accesskey	"G">
 <!ENTITY cmd.copyDownloadLink.label	"ダウンロードした URL をコピー">
 <!ENTITY cmd.copyDownloadLink.accesskey	"L">
-<!ENTITY cmd.removeFromList.label	"リストから削除">
-<!ENTITY cmd.removeFromList.accesskey	"e">
+<!ENTITY cmd.removeFromHistory.label	"履歴から削除">
+<!ENTITY cmd.removeFromHistory.accesskey	"e">
 <!ENTITY cmd.clearList.label		"履歴の消去">
 <!ENTITY cmd.clearList.accesskey	"a">
+<!ENTITY cmd.clearDownloads.label	"ダウンロードの消去">
+<!ENTITY cmd.clearDownloads.accesskey	"D">
 
 <!-- LOCALIZATION NOTE (downloadsHistory.label, downloadsHistory.accesskey):
      This string is shown at the bottom of the Downloads Panel when all the
      downloads fit in the available space, or when there are no downloads in
      the panel at all.
      -->
 <!ENTITY downloadsHistory.label		"すべての履歴を表示">
 <!ENTITY downloadsHistory.accesskey	"S">
+
+<!ENTITY clearDownloadsButton.label	"ダウンロードの消去">
+<!ENTITY clearDownloadsButton.tooltip	"すべてのダウンロードを消去します">
+
+<!-- LOCALIZATION NOTE (downloadsListEmpty.label):
+     This string is shown when there are no items in the Downloads view, when it
+     is displayed inside a browser tab.
+     -->
+<!ENTITY downloadsListEmpty.label	"ダウンロードはありません。">
+
+<!-- LOCALIZATION NOTE (downloadsListNoMatch.label):
+     This string is shown when some search terms are specified, but there are no
+     results in the Downloads view.
+     -->
+<!ENTITY downloadsListNoMatch.label	"該当するダウンロードが見つかりません。">
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -66,14 +66,14 @@ shortTimeLeftDays			= %1$S 日
 # even for right-to-left languages, unless the defaults are not suitable.
 statusSeparator				= %1$S \u2014 %2$S
 statusSeparatorBeforeNumber		= %1$S \u2014  %2$S
 
 fileExecutableSecurityWarning		= "%S" は実行可能なファイルです。実行可能なファイルにはあなたのコンピュータを破壊するウイルス、その他の悪意あるコードが含まれていることがあります。この形式のファイルを開く場合には注意してください。"%S" を実行してもよろしいですか?
 fileExecutableSecurityWarningTitle	= 実行可能なファイルを開きますか?
 fileExecutableSecurityWarningDontAsk	= 今後も同様に処理する
 
-# LOCALIZATION NOTE (otherDownloads):
+# LOCALIZATION NOTE (otherDownloads2):
 # This is displayed in an item at the bottom of the Downloads Panel when
 # there are more downloads than can fit in the list in the panel. Use a
 # semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
-otherDownloads				= +%1$S個のファイルをダウンロード中
+otherDownloads2				= + %1$S個のファイルをダウンロード中
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -27,20 +27,36 @@
 <!ENTITY checkSpelling.accesskey		"t">
 
 <!ENTITY systemDefaults.label			"既定のブラウザ">
 <!ENTITY alwaysCheckDefault.label		"起動時に &brandShortName; が既定のブラウザであるか確認する"><!--XXX-->
 <!ENTITY alwaysCheckDefault.accesskey		"w">
 <!ENTITY setDefault.label			"&brandShortName; を既定のブラウザに設定する">
 <!ENTITY setDefault.accesskey			"d">
 <!ENTITY isDefault.label			"&brandShortName; は既定のブラウザに設定されています">
-<!ENTITY submitCrashes.label			"クラッシュレポートを送信する">
-<!ENTITY submitCrashes.accesskey		"S">
-<!ENTITY submitTelemetry.label			"パフォーマンス情報を送信する">
-<!ENTITY submitTelemetry.accesskey		"P">
+
+<!ENTITY dataChoicesTab.label			"データの選択">
+
+<!ENTITY healthReportSection.label		"&brandShortName; ヘルスレポート">
+<!ENTITY healthReportDesc.label			"パフォーマンス情報の取得と、ブラウザの健康状態を &vendorShortName; と共有するのに役立ちます">
+<!ENTITY enableHealthReport.label		"&brandShortName; ヘルスレポートを有効にする">
+<!ENTITY enableHealthReport.accesskey		"R">
+<!ENTITY healthReportLearnMore.label		"詳細">
+
+<!ENTITY telemetrySection.label			"パフォーマンス情報の送信">
+<!ENTITY telemetryDesc.label			"&brandShortName; をよりよいものにするため、パフォーマンス情報、使用状況、ハードウェア情報、設定したデータを &vendorShortName; と共有します。">
+<!ENTITY enableTelemetry.label			"パフォーマンス情報の送信を有効にする">
+<!ENTITY enableTelemetry.accesskey		"T">
+<!ENTITY telemetryLearnMore.label		"詳細">
+
+<!ENTITY crashReporterSection.label		"クラッシュレポートの送信">
+<!ENTITY crashReporterDesc.label		"&vendorShortName; をより安定した、セキュアなものにするため、&brandShortName; はクラッシュレポートを &vendorShortName; に送信します。">
+<!ENTITY enableCrashReporter.label		"クラッシュレポートの送信を有効にする">
+<!ENTITY enableCrashReporter.accesskey		"C">
+<!ENTITY crashReporterLearnMore.label		"詳細">
 
 <!ENTITY networkTab.label			"ネットワーク">
 
 <!ENTITY connection.label			"接続">
 
 <!ENTITY connectionDesc.label			"インターネット接続に使用するプロキシを設定します。">
 <!ENTITY connectionSettings.label		"接続設定...">
 <!ENTITY connectionSettings.accesskey		"e">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -121,8 +121,13 @@ actualDiskCacheSize		= 現在の Web ページのディスクキャッシュ量は %1$S %2$S です。
 #   e.g., "Your application cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
 actualAppCacheSize		= 現在のアプリケーションのディスクキャッシュ量は %1$S %2$S です。
 
 syncUnlink.title		= 端末を切り離しますか?
 syncUnlink.label		= この端末は Sync アカウントとの関連付けがなくなります。すべての個人情報は、この端末と Sync アカウントの両方に、そのまま残ります。
 syncUnlinkConfirm.label		= 切り離す
+
+# LOCALIZATION NOTE (featureEnableRequiresRestart, featureDisableRequiresRestart, restartTitle): %S = brandShortName
+featureEnableRequiresRestart	= この機能を有効にするには、%S の再起動が必要です
+featureDisableRequiresRestart	= この機能を無効にするには、%S の再起動が必要です
+shouldRestartTitle		= %S を再起動
--- a/browser/chrome/browser/quitDialog.properties
+++ b/browser/chrome/browser/quitDialog.properties
@@ -1,15 +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/.
 
 quitDialogTitle		= %S の終了
-restartDialogTitle	= %S の再起動
 
 quitTitle		= 終了(&Q)
-restartTitle		= 再起動(&R)
 cancelTitle		= キャンセル(&C)
 saveTitle		= 保存して終了(&S)
 neverAsk		= 次回からは確認しない
 message			= %1$0.S次回起動時に復元できるように、開いているタブやウィンドウを保存しておきますか?
 messageNoWindows	= %1$0.S開いているタブを保存して次回起動時に復元しますか?
-messageRestart		= %S を再起動します。再起動時には開いているタブとウィンドウが可能な限り復元されます。
--- a/browser/chrome/browser/taskbar.properties
+++ b/browser/chrome/browser/taskbar.properties
@@ -5,10 +5,12 @@
 taskbar.tasks.newTab.label		= 新しいタブ
 taskbar.tasks.newTab.description	= 新しいタブを開きます
 taskbar.tasks.newWindow.label		= 新しいウィンドウ
 taskbar.tasks.newWindow.description	= 新しいウィンドウを開きます
 taskbar.tasks.enterPrivacyMode.label	= プライベートブラウジングを開始
 taskbar.tasks.enterPrivacyMode.description	= プライベートブラウジングを開始します。現在のセッションは保存されます
 taskbar.tasks.exitPrivacyMode.label	= プライベートブラウジングを終了
 taskbar.tasks.exitPrivacyMode.description	= プライベートブラウジングを終了して、以前のセッションを復元します
+taskbar.tasks.newPrivateWindow.label		= 新しいプライベートウィンドウ
+taskbar.tasks.newPrivateWindow.description	= プライベートブラウジングモードで新しいウィンドウを開きます
 taskbar.frequent.label			= よく見るページ
 taskbar.recent.label			= 最近見たページ
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -115,8 +115,9 @@ invalid_file_error=無効または破損した PDF ファイル
 # LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # 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=警告: このブラウザでは印刷が完全にサポートされていません
+web_fonts_disabled=Web フォントが無効になっています: 埋め込まれた PDF のフォントを使用することができません
--- a/browser/searchplugins/google-jp.xml
+++ b/browser/searchplugins/google-jp.xml
@@ -11,17 +11,17 @@
 #define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-nightly" falseValue="firefox"/>
 #else
 #define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
 #endif
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Google</ShortName>
 <Description>Google Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABUUlEQVR42pWTzUsCYRCH9y9zu3SooCCkjhIRRLeIykXokiWCJ7PvDpZRlz6si1lIQZ3SQxQdOhREpgSm0JeQvfu0+i6I7LKLh4F5h5nnnRl+o6jTdHn8omAYbVqhXqvYFXcEBKFDwcoZZB8B4LkEB9cwGGmFKHb01A1EU9JXzfdvDYZi1lwLwBcVAIwsNWPesIwls7gDtB2Z7N9ujVe+IX2LO2AgItB1OL9vJqsmILDrOoK02IkBAdYy4FsQJC5h+VQCHQDWTqYSgo8fuHuRxS4Ae3stQ7UGE5ttAHqCUgfxC7m4ryrowOyeO6CxqHwZxtYFqtYc5+kNan/gDTsAeueEIRj7n/rmRQMwueUAGF0VAAT3rQBTC0Y3DoDOGbm00icML4oWHYSTgo0MFqjlmPpDgqMcFCuQf4erBzjOwXjcriu9qHg0uutO2+es6fl67T9ptebvFRjBVgAAAABJRU5ErkJggg==</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl=ja&amp;qu={searchTerms}"/><!-- suggestqueries.google.co.jp doesn't exist and suggestqueries.google.com can handle Japanese too -->
 <Url type="text/html" method="GET" template="https://www.google.co.jp/search">
 #expand   __GOOGLE_PARAMS__
 #expand   __GOOGLE_CLIENT_PARAM__
 </Url>
 <!-- Keyword search URL is the same as the default, but with an additional parameter -->
 <Url type="application/x-moz-keywordsearch" method="GET" template="https://www.google.co.jp/search">
 #expand   __GOOGLE_PARAMS__