31.0: sync browser with en-US rev192905:7c17cea2508b
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Wed, 04 Jun 2014 00:20:07 +0900
changeset 1420 b2eefca9cd4991cffd4310676220548716fbc41c
parent 1419 a1966c6d1862162d23ff5bc35a7af6b632e6ba67
child 1421 705e4e92163600d7b4089b2b5274534149a3b277
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs31
31.0: sync browser with en-US rev192905:7c17cea2508b
browser/chrome/browser/browser.dtd
browser/chrome/browser/customizableui/customizableWidgets.properties
browser/chrome/browser/devtools/app-manager.dtd
browser/chrome/browser/devtools/canvasdebugger.dtd
browser/chrome/browser/devtools/canvasdebugger.properties
browser/chrome/browser/devtools/connection-screen.dtd
browser/chrome/browser/devtools/eyedropper.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/layoutview.dtd
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webaudioeditor.dtd
browser/chrome/browser/devtools/webaudioeditor.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/downloads/downloads.dtd
browser/chrome/browser/newTab.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/translation.dtd
browser/installer/custom.properties
browser/installer/nsisstrings.properties
browser/pdfviewer/viewer.properties
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -227,16 +227,19 @@ These should match what Safari and other
 
 <!ENTITY inspectContextMenu.label     "要素を調査">
 <!ENTITY inspectContextMenu.accesskey "Q">
 
 <!ENTITY responsiveDesignTool.label		"レスポンシブデザインビュー">
 <!ENTITY responsiveDesignTool.accesskey		"R">
 <!ENTITY responsiveDesignTool.commandkey	"M">
 
+<!ENTITY eyedropper.label			"スポイト">
+<!ENTITY eyedropper.accesskey			"Y">
+
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  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
@@ -251,17 +254,17 @@ These should match what Safari and other
   -  application menu item that opens the browser toolbox UI in the Tools menu. -->
 <!ENTITY browserToolboxMenu.label     "ブラウザツールボックス">
 <!ENTITY browserToolboxMenu.accesskey "e">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "開発ツールバーを閉じる">
 <!ENTITY devToolbarMenu.label              "開発ツールバー">
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devAppMgrMenu.label               "アプリマネージャ">
-<!ENTITY devAppMgrMenu.accesskey           "a">
+<!ENTITY devAppMgrMenu.accesskey           "A">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolboxMenuItem.label          "開発ツールを表示">
 <!ENTITY devToolboxMenuItem.accesskey      "T">
 <!ENTITY devToolboxMenuItem.keytext        "I">
 
 <!ENTITY devToolbarToolsButton.tooltip     "開発ツールを表示">
 <!ENTITY devToolbarOtherToolsButton.label  "その他のツール">
@@ -439,17 +442,16 @@ These should match what Safari and other
 <!ENTITY bookmarkPageCmd2.label			"このページをブックマーク">
 <!ENTITY bookmarkPageCmd2.accesskey		"m">
 <!ENTITY bookmarkThisLinkCmd.label		"このリンクをブックマーク">
 <!ENTITY bookmarkThisLinkCmd.accesskey		"L">
 <!ENTITY bookmarkThisFrameCmd.label		"このフレームをブックマーク">
 <!ENTITY bookmarkThisFrameCmd.accesskey		"m">
 <!ENTITY emailPageCmd.label           "ページの URL をメールで送信...">
 <!ENTITY emailPageCmd.accesskey       "E">
-<!ENTITY switchToMetroCmd.label       "Windows 8 スタイルの &brandShortName; に切り替え">
 <!ENTITY savePageCmd.label            "名前を付けてページを保存...">
 <!ENTITY savePageCmd.accesskey        "A">
 <!-- alternate for content area context menu -->
 <!ENTITY savePageCmd.accesskey2       "P">
 <!ENTITY savePageCmd.commandkey       "s">
 <!ENTITY saveFrameCmd.label           "名前を付けてフレームを保存...">
 <!ENTITY saveFrameCmd.accesskey       "F">
 <!ENTITY printFrameCmd.label          "フレームを印刷...">
@@ -732,51 +734,11 @@ just addresses the organization to follo
 
 <!ENTITY tabCrashed.header			"クラッシュしたタブ">
 <!ENTITY tabCrashed.message			"申し訳ありません。Web ページを表示しようとしましたが、応答がありませんでした。">
 <!ENTITY tabCrashed.checkSendReport		"&vendorShortName; にクラッシュ内容を送信する。">
 <!ENTITY tabCrashed.tryAgain			"再試行">
 
 <!ENTITY uiTour.infoPanel.close			"閉じる">
 
-<!-- LOCALIZATION NOTE: the following strings are unused in Australis, they're
-     kept here to avoid warnings from l10n tools like compare-locales on
-     l10n-central. They will be definitely removed when Australis is ready
-     for mozilla-aurora. -->
+<!ENTITY appMenuSidebars.label         "サイドバー">
 
-<!ENTITY navbarCmd.accesskey           "N">
-<!ENTITY addonBarCmd.label             "アドオンバー">
-<!ENTITY addonBarCmd.accesskey         "A">
-<!ENTITY throbberItem.title            "読み込み中アイコン">
-<!ENTITY appMenuButton.label           "メニュー">
-<!ENTITY appMenuButton.tooltip         "&brandShortName; メニューを開く">
-<!ENTITY feedButton.label              "購読">
-<!ENTITY feedButton.tooltip            "このページのフィードを購読します...">
-<!ENTITY bookmarksButton.tooltip       "ブックマークをサイドバーに表示します">
-<!ENTITY historyButton.tooltip         "最近表示したページの履歴をサイドバーに表示します">
-<!ENTITY viewTabsOnTop.label           "タブを上部に表示">
-<!ENTITY viewTabsOnTop.accesskey       "T">
-<!ENTITY appMenuEdit.label             "編集">
-<!ENTITY appMenuToolbarLayout.label    "ツールバーのカスタマイズ...">
-<!ENTITY appMenuSidebars.label         "サイドバー">
-<!ENTITY appMenuFind.label             "ページ内検索...">
-<!ENTITY appMenuUnsorted.label         "未整理のブックマーク">
-<!ENTITY appMenuWebDeveloper.label     "Web 開発">
-<!ENTITY appMenuGettingStarted.label   "使いこなそう">
-<!ENTITY appMenuSafeMode.label         "アドオンを無効にして再起動...">
-<!ENTITY appMenuSafeMode.accesskey     "R">
-<!ENTITY cutButton.tooltip             "切り取り">
-<!ENTITY copyButton.tooltip            "コピー">
-<!ENTITY pasteButton.tooltip           "貼り付け">
-<!ENTITY zoomOutButton.tooltip         "縮小">
-<!ENTITY zoomInButton.tooltip          "拡大">
-<!ENTITY zoomControls.label            "拡大/縮小コントロール">
-<!ENTITY addonBarCloseButton.tooltip   "アドオンバーを閉じます">
-<!ENTITY toggleAddonBarCmd.key         "/">
-<!ENTITY backForwardItem.title         "戻る/進む">
-<!ENTITY viewBookmarksSidebar.label    "ブックマークをサイドバーに表示します">
-<!ENTITY bookmarksItem.title           "ブックマーク">
-<!ENTITY openLocationCmd.label         "URL を開く...">
-<!ENTITY openLocationCmd.accesskey     "L">
-<!ENTITY bookmarksMenuButton.tooltip   "ブックマークを表示します">
 <!ENTITY switchToMetroCmd2.label       "&brandShortName; for Windows 8 タッチ に切り替え">
-<!ENTITY tabGroupsButton.tooltip       "タブをグループ分けして管理できます">
-<!-- end of strings to be removed post-Australis -->
--- a/browser/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -6,55 +6,52 @@ history-panelmenu.label			= 履歴
 # LOCALIZATION NOTE(history-panelmenu.tooltiptext2): %S is the keyboard shortcut
 history-panelmenu.tooltiptext2		= 履歴を表示します (%S)
 
 privatebrowsing-button.label		= 新しいプライベートウィンドウ
 # LOCALIZATION NOTE(privatebrowsing-button.tooltiptext): %S is the keyboard shortcut
 privatebrowsing-button.tooltiptext	= 新しいプライベートブラウジングウィンドウを開きます (%S)
 
 save-page-button.label			= ページを保存
-# LOCALIZATION NOTE(save-page-button.tooltiptext2): %S is the keyboard shortcut
-# Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
-save-page-button.tooltiptext2		= このページを保存します... (%S)
+# LOCALIZATION NOTE(save-page-button.tooltiptext3): %S is the keyboard shortcut
+save-page-button.tooltiptext3		= このページを保存します (%S)
 
 find-button.label			= 検索
-# LOCALIZATION NOTE(find-button.tooltiptext2): %S is the keyboard shortcut.
-# Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
-find-button.tooltiptext2		= このページを検索します... (%S)
+# LOCALIZATION NOTE(find-button.tooltiptext3): %S is the keyboard shortcut.
+find-button.tooltiptext3		= このページを検索します (%S)
 
 open-file-button.label			= ファイルを開く
-# LOCALIZATION NOTE (open-file-button.tooltiptext2): %S is the keyboard shortcut.
-# Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
-open-file-button.tooltiptext2		= ファイルを開きます... (%S)
+# LOCALIZATION NOTE (open-file-button.tooltiptext3): %S is the keyboard shortcut.
+open-file-button.tooltiptext3		= ファイルを開きます (%S)
 
 developer-button.label			= 開発ツール
 # LOCALIZATION NOTE(developer-button.tooltiptext): %S is the keyboard shortcut
-developer-button.tooltiptext		= Web 開発ツール (%S)
+developer-button.tooltiptext2		= Web 開発ツールを開きます (%S)
 
 sidebar-button.label			= サイドバー
-sidebar-button.tooltiptext		= サイドバーを表示します
+sidebar-button.tooltiptext2		= サイドバーを表示します
 
 add-ons-button.label			= アドオン
-# LOCALIZATION NOTE(add-ons-button.tooltiptext2): %S is the keyboard shortcut
-add-ons-button.tooltiptext2		= アドオンマネージャを開きます (%S)
+# LOCALIZATION NOTE(add-ons-button.tooltiptext3): %S is the keyboard shortcut
+add-ons-button.tooltiptext3		= アドオンを管理します (%S)
 
 switch-to-metro-button2.label		= Windows 8 タッチ
 # LOCALIZATION NOTE(switch-to-metro-button2.tooltiptext): %S is the brand short name
 switch-to-metro-button2.tooltiptext	= %S for Windows 8 タッチに切り替えます
 
 preferences-button.label		= 設定
 preferences-button.tooltiptext2		= 設定を開きます
 preferences-button.tooltiptext.withshortcut	= 設定を開きます (%S)
 # LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options
 preferences-button.labelWin		= オプション
 # LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options
 preferences-button.tooltipWin2		= オプションを開きます
 
 zoom-controls.label			= 拡大/縮小
-zoom-controls.tooltiptext		= 拡大/縮小
+zoom-controls.tooltiptext2		= 拡大/縮小
 
 zoom-out-button.label			= 縮小
 # LOCALIZATION NOTE(zoom-out-button.tooltiptext2): %S is the keyboard shortcut.
 zoom-out-button.tooltiptext2		= 縮小 (%S)
 
 # LOCALIZATION NOTE(zoom-reset-button.label): %S is the current zoom level,
 # %% will be displayed as a single % character (% is commonly used to define
 # format specifiers, so it needs to be escaped).
@@ -62,44 +59,40 @@ zoom-reset-button.label			= %S%%
 # LOCALIZATION NOTE(zoom-reset-button.tooltiptext2): %S is the keyboard shortcut.
 zoom-reset-button.tooltiptext2		= 拡大/縮小をリセット (%S)
 
 zoom-in-button.label			= 拡大
 # LOCALIZATION NOTE(zoom-in-button.tooltiptext2): %S is the keyboard shortcut.
 zoom-in-button.tooltiptext2		= 拡大 (%S)
 
 edit-controls.label			= 編集メニュー
-edit-controls.tooltiptext		= 編集メニュー
+edit-controls.tooltiptext2		= 編集メニュー
 
 cut-button.label			= 切り取り
 # LOCALIZATION NOTE(cut-button.tooltiptext2): %S is the keyboard shortcut.
 cut-button.tooltiptext2			= 切り取り (%S)
 
 copy-button.label			= コピー
 # LOCALIZATION NOTE(copy-button.tooltiptext2): %S is the keyboard shortcut.
 copy-button.tooltiptext2		= コピー (%S)
 
 paste-button.label			= 貼り付け
 # LOCALIZATION NOTE(paste-button.tooltiptext2): %S is the keyboard shortcut.
 paste-button.tooltiptext2		= 貼り付け (%S)
 
-# LOCALIZATION NOTE (feed-button.tooltiptext): Use the unicode ellipsis char,
-# \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
 feed-button.label			= 購読
-feed-button.tooltiptext			= このページを購読します...
+feed-button.tooltiptext2		= このページを購読します
 
 # LOCALIZATION NOTE (characterencoding-button.label): The \u00ad character at the beginning
 # of the string is used to disable auto hyphenation on the button text when it is displayed
 # in the menu panel.
 characterencoding-button.label		= \u00ad文字エンコーディング
 characterencoding-button.tooltiptext2	= 文字エンコーディングのオプションを表示します
 
-email-link-button.label			= メールアドレス
-# LOCALIZATION NOTE (email-link-button.tooltiptext2): Use the unicode ellipsis char,
-# \u2026, or use "..." if \u2026 doesn't suit traditions in your locale.
-email-link-button.tooltiptext2		= メールアドレス
+email-link-button.label			= ページの URL をメールで送信
+email-link-button.tooltiptext3		= このページの URL をメールで送信します
 
 # LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.linux2		= %1$S を終了します (%2$S)
 # LOCALIZATION NOTE(quit-button.tooltiptext.mac): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.mac		= %1$S を終了します (%2$S)
--- a/browser/chrome/browser/devtools/app-manager.dtd
+++ b/browser/chrome/browser/devtools/app-manager.dtd
@@ -2,16 +2,18 @@
    - 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 index.title			"アプリマネージャ">
 <!ENTITY index.projects2		"アプリ">
 <!ENTITY index.device2			"端末">
 <!ENTITY index.help			"ヘルプ">
 
+<!ENTITY device.debugMainProcess	"メインプロセスをデバッグ">
+<!ENTITY device.debugMainProcessTooltip	"端末上のメインプロセスに接続した開発ツールを開きます">
 <!ENTITY device.screenshot		"スクリーンショット">
 <!ENTITY device.screenshotTooltip	"端末の現在の状態のスクリーンショットを新しいタブに開きます。">
 <!ENTITY device.title			"端末コントロールセンタ">
 <!ENTITY device.notConnected		"接続されていません。以下の端末と接続してください。">
 <!ENTITY device.startApp		"開始">
 <!ENTITY device.startAppTooltip		"端末上のこのアプリを開始します。">
 <!ENTITY device.stopApp			"停止">
 <!ENTITY device.stopAppTooltip		"端末上のこのアプリを停止します。">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/canvasdebugger.dtd
@@ -0,0 +1,45 @@
+<!-- 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 Debugger 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 (canvasDebuggerUI.reloadNotice1): This is the label shown
+  -  on the button that triggers a page refresh. -->
+<!ENTITY canvasDebuggerUI.reloadNotice1   "再読み込み">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.reloadNotice2): This is the label shown
+  -  along with the button that triggers a page refresh. -->
+<!ENTITY canvasDebuggerUI.reloadNotice2   "すると、&lt;canvas&gt; コンテキストをデバッグできるようになります。">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.emptyNotice1/2): This is the label shown
+  -  in the call list view when empty. -->
+<!ENTITY canvasDebuggerUI.emptyNotice1    "">
+<!ENTITY canvasDebuggerUI.emptyNotice2    "ボタンをクリックすると、アニメーションフレームのコールスタックを記録します。">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.reloadNotice1): This is the label shown
+  -  in the call list view while loading a snapshot. -->
+<!ENTITY canvasDebuggerUI.importNotice    "読み込み中...">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.recordSnapshot): This string is displayed
+  -  on a button that starts a new snapshot. -->
+<!ENTITY canvasDebuggerUI.recordSnapshot.tooltip "アニメーションループの次のフレームを記録します。">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.importSnapshot): This string is displayed
+  -  on a button that opens a dialog to import a saved snapshot data file. -->
+<!ENTITY canvasDebuggerUI.importSnapshot "インポート...">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.clearSnapshots): This string is displayed
+  -  on a button that remvoes all the snapshots. -->
+<!ENTITY canvasDebuggerUI.clearSnapshots "消去">
+
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.searchboxPlaceholder): This string is displayed
+  -  as a placeholder of the search box that filters the calls list. -->
+<!ENTITY canvasDebuggerUI.searchboxPlaceholder "コールスタックを検索">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/canvasdebugger.properties
@@ -0,0 +1,74 @@
+# 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 Canvas Debugger
+# which is available from the Web Developer sub-menu -> 'Canvas'.
+# 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 (ToolboxCanvasDebugger.label):
+# This string is displayed in the title of the tab when the Shader Editor is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxCanvasDebugger.label		= Canvas
+
+# LOCALIZATION NOTE (ToolboxCanvasDebugger.tooltip):
+# This string is displayed in the tooltip of the tab when the Shader Editor is
+# displayed inside the developer tools window.
+ToolboxCanvasDebugger.tooltip		= <canvas> コンテキスト調査、デバッグツール
+
+# LOCALIZATION NOTE (noSnapshotsText): The text to display in the snapshots menu
+# when there are no recorded snapshots yet.
+noSnapshotsText				= スナップショットはまだありません。
+
+# LOCALIZATION NOTE (snapshotsList.itemLabel):
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# identifying a set of function calls of a recorded animation frame.
+snapshotsList.itemLabel			= スナップショット #%S
+
+# LOCALIZATION NOTE (snapshotsList.loadingLabel):
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# for an item that has not finished loading.
+snapshotsList.loadingLabel		= 読み込み中...
+
+# LOCALIZATION NOTE (snapshotsList.saveLabel):
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# for saving an item to disk.
+snapshotsList.saveLabel			= 保存
+
+# LOCALIZATION NOTE (snapshotsList.savingLabel):
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# while saving an item to disk.
+snapshotsList.savingLabel		= 保存中...
+
+# LOCALIZATION NOTE (snapshotsList.loadedLabel):
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# for an item which was loaded from disk
+snapshotsList.loadedLabel		= ディスクからの読み込み
+
+# LOCALIZATION NOTE (snapshotsList.saveDialogTitle):
+# This string is displayed as a title for saving a snapshot to disk.
+snapshotsList.saveDialogTitle		= アニメーションのスナップショットを保存...
+
+# LOCALIZATION NOTE (snapshotsList.saveDialogJSONFilter):
+# This string is displayed as a filter for saving a snapshot to disk.
+snapshotsList.saveDialogJSONFilter	= JSON ファイル
+
+# LOCALIZATION NOTE (snapshotsList.saveDialogAllFilter):
+# This string is displayed as a filter for saving a snapshot to disk.
+snapshotsList.saveDialogAllFilter	= すべてのファイル
+
+# LOCALIZATION NOTE (snapshotsList.drawCallsLabel):
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# as a generic description about how many draw calls were made.
+snapshotsList.drawCallsLabel		= #1 描画
+
+# LOCALIZATION NOTE (snapshotsList.functionCallsLabel):
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This string is displayed in the snapshots list of the Canvas Debugger,
+# as a generic description about how many function calls were made in total.
+snapshotsList.functionCallsLabel	= #1 命令
--- a/browser/chrome/browser/devtools/connection-screen.dtd
+++ b/browser/chrome/browser/devtools/connection-screen.dtd
@@ -8,16 +8,17 @@
   - -->
 
 <!ENTITY title			"接続する">
 <!ENTITY header			"リモート機器に接続する">
 <!ENTITY host			"ホスト:">
 <!ENTITY port			"ポート:">
 <!ENTITY connect		"接続">
 <!ENTITY connecting		"接続中">
+<!ENTITY availableAddons	"利用可能なリモートのアドオン:">
 <!ENTITY availableTabs		"利用可能なリモートのタブ:">
 <!ENTITY availableProcesses	"利用可能なリモートのプロセス:">
 <!ENTITY connectionError	"エラー:">
 <!ENTITY errorTimeout		"エラー: 接続がタイムアウトしました。">
 <!ENTITY errorRefused		"エラー: 接続が拒否されました。">
 <!ENTITY errorUnexpected	"予期しないエラー。">
 
 <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/eyedropper.properties
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used in the Eyedropper color tool.
+# 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  (colorValue.copied): This text is displayed when the user selects a
+# color with the eyedropper and it's copied to the clipboard.
+colorValue.copied=コピーしました
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -160,16 +160,30 @@ inspectManual		= CSS セレクタで DOM をハイライトし、要素の大きさとプロパティを調べます
 # when the user is using this command.
 inspectNodeDesc		= CSS セレクタ
 
 # LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
 # parameter to the 'inspect' command, displayed when the user asks for help
 # on what it does.
 inspectNodeManual	= document.querySelector() で一意に識別可能な CSS セレクタ
 
+# LOCALIZATION NOTE (eyedropperDesc) A very short description of the 'eyedropper'
+# command. See eyedropperManual 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.
+eyedropperDesc		= ページから色を選択します
+
+# LOCALIZATION NOTE (eyedropperManual) A fuller description of the 'eyedropper'
+# command, displayed when the user asks for help on what it does.
+eyedropperManual	= ページの一部分を拡大したパネルを開きます。ピクセルを選択すると色の値をコピーします
+
+# LOCALIZATION NOTE (eyedropperTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the Eyedropper tool.
+eyedropperTooltip	= ページから色を選択します
+
 # LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
 # command. See tiltManual 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.
 tiltDesc		= Web ページを 3D 表示します
 
 # LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
 # command, displayed when the user asks for help on what it does.
@@ -557,20 +571,19 @@ resizeModeManual2	= レスポンシブな Web サイトとは、モバイルディスプレイからシネマディスプレイまでのすべての環境に適応する Web サイトです。レスポンシブデザインモードでは、ブラウザごとサイズ変更せずに %1$S 内で様々なページサイズを簡単にテストできます。
 # name, which is why it should be as short as possible.
 cmdDesc			= コマンドを操作します
 
 # LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
 # 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.
 cmdRefreshDesc		= mozcmd ディレクトリを再読み込みします
 
-# LOCALIZATION NOTE (cmdStatus) When the we load new commands from mozcmd
-# directory, we report on how many we loaded. %1$S is a count of the number
-# of loaded commands, and %2$S is the directory we loaded from.
-cmdStatus		= %1$S コマンドを '%2$S' から読み込みます
+# LOCALIZATION NOTE (cmdStatus2) When the we load new commands from mozcmd
+# directory, we report where we loaded from using %1$S.
+cmdStatus2		= コマンドを '%1$S' から読み込みます
 
 # LOCALIZATION NOTE (cmdSetdirDesc) 
 cmdSetdirDesc		= mozcmd ディレクトリをセットアップします
 
 # LOCALIZATION NOTE (cmdSetdirManual) 
 cmdSetdirManual		= 'mozcmd' ディレクトリは、Firefox のコマンドライン用の独自のコマンドを簡単に作成する手段です。詳細は <a href="https://developer.mozilla.org/ja/docs/Tools/GCLI/Customization">MDN ドキュメント</a> をご覧ください。
 
 # LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
--- a/browser/chrome/browser/devtools/layoutview.dtd
+++ b/browser/chrome/browser/devtools/layoutview.dtd
@@ -11,13 +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	"要素の内容">
+<!ENTITY title                  "ボックスモデル">
+<!ENTITY margin.tooltip         "margin">
+<!ENTITY border.tooltip         "border">
+<!ENTITY padding.tooltip        "padding">
+<!ENTITY content.tooltip        "要素の内容">
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -197,16 +197,22 @@
 <!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
   -  for the performance analysis menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.context.perfTools.accesskey "S">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
   -  on the context menu that copies the selected request's url -->
 <!ENTITY netmonitorUI.context.copyUrl     "URL をコピー">
 
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCurl): This is the label displayed
+  -  on the context menu that copies the selected request as a cURL command.
+  -  The capitalization is part of the official name and should be used throughout all languages.
+  -  http://en.wikipedia.org/wiki/CURL -->
+<!ENTITY netmonitorUI.context.copyAsCurl    "cURL としてコピー">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
   -  for the Copy URL menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.context.copyUrl.accesskey "C">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri): This is the label displayed
   -  on the context menu that copies the selected image as data uri -->
 <!ENTITY netmonitorUI.context.copyImageAsDataUri "画像をデータ URI としてコピー">
 
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -136,25 +136,35 @@ networkMenu.millisecond	= %S ms
 # LOCALIZATION NOTE (networkMenu.second): This is the label displayed
 # in the network menu specifying timing interval divisions (in seconds).
 networkMenu.second	= %S 秒
 
 # LOCALIZATION NOTE (networkMenu.minute): This is the label displayed
 # in the network menu specifying timing interval divisions (in minutes).
 networkMenu.minute	= %S 分
 
-# LOCALIZATION NOTE (pieChart.empty): This is the label displayed
+# LOCALIZATION NOTE (pieChart.loading): This is the label displayed
 # for pie charts (e.g., in the performance analysis view) when there is
 # no data available yet.
-pieChart.empty		= ロード中
+pieChart.loading	= ロード中
 
-# LOCALIZATION NOTE (tableChart.empty): This is the label displayed
+# LOCALIZATION NOTE (pieChart.unavailable): This is the label displayed
+# for pie charts (e.g., in the performance analysis view) when there is
+# no data available, even after loading it.
+pieChart.unavailable	= なし
+
+# LOCALIZATION NOTE (tableChart.loading): This is the label displayed
 # for table charts (e.g., in the performance analysis view) when there is
 # no data available yet.
-tableChart.empty	= お待ちください...
+tableChart.loading	= お待ちください...
+
+# LOCALIZATION NOTE (tableChart.unavailable): This is the label displayed
+# for table charts (e.g., in the performance analysis view) when there is
+# no data available, even after loading it.
+tableChart.unavailable	= データがありません
 
 # LOCALIZATION NOTE (charts.sizeKB): This is the label displayed
 # in pie or table charts specifying the size of a request (in kilobytes).
 charts.sizeKB		= %S KB
 
 # LOCALIZATION NOTE (charts.totalS): This is the label displayed
 # in pie or table charts specifying the time for a request to finish (in seconds).
 charts.totalS		= %S 秒
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -45,16 +45,40 @@
 
 <!ENTITY saveFileAsCmd.label          "名前を付けて保存...">
 <!ENTITY saveFileAsCmd.accesskey      "A">
 
 <!ENTITY closeCmd.label               "閉じる">
 <!ENTITY closeCmd.key                 "W">
 <!ENTITY closeCmd.accesskey           "C">
 
+<!ENTITY viewMenu.label               "表示">
+<!ENTITY viewMenu.accesskey           "V">
+
+<!ENTITY lineNumbers.label             "行数を表示">
+<!ENTITY lineNumbers.accesskey         "L">
+
+<!ENTITY wordWrap.label                "テキストを折り返す">
+<!ENTITY wordWrap.accesskey            "W">
+
+<!ENTITY highlightTrailingSpace.label     "末尾のスペースを強調">
+<!ENTITY highlightTrailingSpace.accesskey "H">
+
+<!ENTITY largerFont.label             "大きいフォント">
+<!ENTITY largerFont.accesskey         "a">
+<!ENTITY largerFont.commandkey        "+">
+
+<!ENTITY smallerFont.label            "小さいフォント">
+<!ENTITY smallerFont.accesskey        "M">
+<!ENTITY smallerFont.commandkey       "-">
+
+<!ENTITY normalSize.label             "通常のサイズ">
+<!ENTITY normalSize.accesskey         "N">
+<!ENTITY normalSize.commandkey        "0">
+
 <!ENTITY editMenu.label               "編集">
 <!ENTITY editMenu.accesskey           "E">
 
 <!ENTITY run.label                    "実行">
 <!ENTITY run.accesskey                "R">
 <!ENTITY run.key                      "r">
 
 <!ENTITY inspect.label                "調査">
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -53,17 +53,17 @@ saveStyleSheet.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
+open.accesskey			= l
 
 # 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  (showOriginalSources.label): This is the label on the context
 # menu item to toggle showing original sources in the editor.
 showOriginalSources.label	= 元のソースを表示
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -52,21 +52,21 @@
   -  -->
 <!ENTITY options.defaultColorUnit.name		"色の名前">
 
 <!-- LOCALIZATION NOTE (options.context.triggersPageRefresh): This is the
   -  triggers page refresh footnote under the advanced settings group in the
   -  options panel and is used for settings that trigger page reload. -->
 <!ENTITY options.context.triggersPageRefresh  "* 現在のセッションのみ有効。再読み込みで復帰">
 
-<!-- LOCALIZATION NOTE (options.enableChrome.label3): This is the label for the
+<!-- LOCALIZATION NOTE (options.enableChrome.label4): 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.label3    "ブラウザデバッガを有効">
-<!ENTITY options.enableChrome.tooltip   "さまざまな開発ツールがブラウザコンテキストで使えるようになります">
+<!ENTITY options.enableChrome.label4    "ブラウザとアドオンのデバッガを有効">
+<!ENTITY options.enableChrome.tooltip2  "さまざまな開発ツールがブラウザコンテキストとアドオンマネージャからのアドオンデバッグで使えるようになります">
 
 <!-- LOCALIZATION NOTE (options.enableRemote.label3): 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.label3    "リモートデバッガを有効">
 <!ENTITY options.enableRemote.tooltip   "Firefox OS などのリモート Firefox インスタンスを、開発ツールでデバッグできるようになります">
 
 <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
@@ -108,23 +108,16 @@
 <!ENTITY options.selectDevToolsTheme.label   "開発ツールのテーマを選択:">
 <!ENTITY options.darkTheme.label             "Dark theme">
 <!ENTITY options.lightTheme.label            "Light theme">
 
 <!-- LOCALIZATION NOTE (options.webconsole.label): This is the label for the
   -  heading of the group of Web Console preferences in the options panel. -->
 <!ENTITY options.webconsole.label            "Web コンソール">
 
-<!-- LOCALIZATION NOTE (options.enablePersistentLogging.label): This is the
-  -  label for the checkbox that toggles persistent logs in the Web Console,
-  -  i.e. devtools.webconsole.persistlog a boolean preference in about:config,
-  -  in the options panel. -->
-<!ENTITY options.enablePersistentLogging.label    "ログ出力を残す">
-<!ENTITY options.enablePersistentLogging.tooltip  "このオプションを有効にすると、新しいページに誘導させられた場合でも Web コンソールの出力を消去しないようになります">
-
 <!-- LOCALIZATION NOTE (options.timestampMessages.label): This is the
    - label for the checkbox that toggles timestamps in the Web Console -->
 <!ENTITY options.timestampMessages.label      "タイムスタンプを表示">
 <!ENTITY options.timestampMessages.tooltip    "このオプションを有効にすると、Web コンソールにタイムスタンプを表示します">
 
 <!-- LOCALIZATION NOTE (options.styleeditor.label): This is the label for the
   -  heading of the group of Style Editor preferences in the options
   -  panel. -->
@@ -140,14 +133,26 @@
 <!ENTITY options.stylesheetAutocompletion.label      "CSS 自動補完">
 <!ENTITY options.stylesheetAutocompletion.tooltip    "スタイルエディタで CSS プロパティ、値、セレクタ入力時に自動補完">
 
 <!-- LOCALIZATION NOTE (options.profiler.label): This is the label for the
   -  heading of the group of JavaScript Profiler preferences in the options
   -  panel. -->
 <!ENTITY options.profiler.label            "JavaScript プロファイラ">
 
+<!-- LOCALICATION NOTE (options.commonprefs): This is the label for the heading
+      of all preferences that affect both the Web Console and the Network
+      Monitor -->
+<!ENTITY options.commonPrefs.label           "共通設定">
+
+<!-- LOCALIZATION NOTE (options.enablePersistentLogging.label): This is the
+  -  label for the checkbox that toggles persistent logs in the Web Console and
+  -  network monitor,  i.e. devtools.webconsole.persistlog a boolean preference in
+  -  about:config, in the options panel. -->
+<!ENTITY options.enablePersistentLogging.label    "ログ出力を残す">
+<!ENTITY options.enablePersistentLogging.tooltip  "このオプションを有効にすると、新しいページに誘導させられた場合でも Web コンソールとネットワークモニタの出力を消去しないようになります">
+
 <!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
   -  label for the checkbox that toggles the display of the platform data in the,
   -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
   -  in about:config, in the options panel. -->
 <!ENTITY options.showPlatformData.label    "Gecko プラットフォームのデータを表示">
 <!ENTITY options.showPlatformData.tooltip  "このオプションを有効にすると、JavaScript プロファイラの出力に Gecko プラットフォームのシンボルが含まれるようになります">
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -48,17 +48,17 @@
 <!ENTITY btnPageNet.accesskey "N">
 <!-- LOCALIZATION NOTE (btnPageNet.accesskeyMacOSX): This string is used as
   -  access key for the menu button that allows users to toggle the network
   -  logging output. On MacOSX accesskeys are available with Ctrl-*. Please make
   -  sure you do not use the following letters: A, E, N and P. These are used
   -  for editing commands in text inputs. -->
 <!ENTITY btnPageNet.accesskeyMacOSX "t">
 <!ENTITY btnPageCSS.label          "CSS">
-<!ENTITY btnPageCSS.tooltip        "CSS パースエラーを記録します">
+<!ENTITY btnPageCSS.tooltip        "CSS エラーと警告を記録します">
 <!ENTITY btnPageCSS.accesskey      "C">
 <!ENTITY btnPageJS.label           "JS">
 <!ENTITY btnPageJS.tooltip         "JavaScript 例外を記録します">
 <!ENTITY btnPageJS.accesskey       "J">
 <!ENTITY btnPageSecurity.label     "セキュリティ">
 <!ENTITY btnPageSecurity.tooltip   "セキュリティのエラーと警告を記録します">
 <!ENTITY btnPageSecurity.accesskey "u">
 
@@ -68,16 +68,17 @@
   -  console.error(). -->
 <!ENTITY btnPageLogging.label   "ロギング">
 <!ENTITY btnPageLogging.tooltip "window.console オブジェクトに送信されたメッセージを記録します">
 <!ENTITY btnPageLogging.accesskey3 "L">
 <!ENTITY btnConsoleErrors       "エラー">
 <!ENTITY btnConsoleInfo         "メッセージ">
 <!ENTITY btnConsoleWarnings     "警告">
 <!ENTITY btnConsoleLog          "ログ">
+<!ENTITY btnConsoleReflows      "再描画">
 
 <!ENTITY filterOutput.placeholder "フィルタ出力">
 <!ENTITY btnClear.label        "消去">
 <!ENTITY btnClear.tooltip      "Web コンソールの内容を消去します">
 <!ENTITY btnClear.accesskey    "r">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/webaudioeditor.dtd
@@ -0,0 +1,24 @@
+<!-- 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 Debugger 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 (webAudioEditorUI.reloadNotice1): This is the label shown
+  -  on the button that triggers a page refresh. -->
+<!ENTITY webAudioEditorUI.reloadNotice1   "再読み込み">
+
+<!-- LOCALIZATION NOTE (webAudioEditorUI.reloadNotice2): This is the label shown
+  -  along with the button that triggers a page refresh. -->
+<!ENTITY webAudioEditorUI.reloadNotice2   "すると、オーディオコンテキストを表示、編集できるようになります。">
+
+<!-- LOCALIZATION NOTE (webAudioEditorUI.emptyNotice): This is the label shown
+  -  while the page is refreshing and the tool waits for a audio context. -->
+<!ENTITY webAudioEditorUI.emptyNotice     "オーディオコンテキスト生成の待機中です...">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/webaudioeditor.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 (ToolboxWebAudioEditor.label):
+# This string is displayed in the title of the tab when the Web Audio Editor
+# is displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxWebAudioEditor.label	= Web Audio エディタ
+
+# LOCALIZATION NOTE (ToolboxWebAudioEditor.tooltip):
+# This string is displayed in the tooltip of the tab when the Web Audio Editor is
+# displayed inside the developer tools window.
+ToolboxWebAudioEditor.tooltip	= Web Audio コンテキストビジュアライザとエディタ
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -217,8 +217,13 @@ messageRepeats.tooltip2				= #1 回
 # LOCALIZATION NOTE (openNodeInInspector): the text that is displayed in a
 # tooltip when hovering over the inspector icon next to a DOM Node in the console
 # output
 openNodeInInspector				= クリックするとインスペクタでノードを選択します
 
 # LOCALIZATION NOTE (cdFunctionInvalidArgument): the text that is displayed when
 # cd() is invoked with an invalid argument.
 cdFunctionInvalidArgument			= 指定のウィンドウに cd() できません。引数が不正です。
+
+# LOCALIZATION NOTE (messageToggleDetails): the text that is displayed when
+# you hover the arrow for expanding/collapsing the message details. For
+# console.error() and other messages we show the stacktrace.
+messageToggleDetails				= メッセージの詳細を表示、または隠します。
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -1,16 +1,16 @@
 <!-- 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 (downloads.title):
      Used by screen readers to describe the Downloads Panel.
      -->
-<!ENTITY downloads.title		"ダウンロード">
+<!ENTITY downloads.title                  "ダウンロード">
 
 <!-- LOCALIZATION NOTE (downloadDetails.width):
      Width of details for a Downloads Panel item (which directly influences the
      width of the Downloads Panel) expressed using a CSS unit. The longest
      labels that should fit in the item width are usually those of in-progress
      downloads and those of blocked downloads.
 
      A good rule of thumb is to try to determine the longest string possible
@@ -18,74 +18,79 @@
      units.
 
      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">
+<!ENTITY downloadDetails.width            "50ch">
 
 <!-- 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 otherDownloads2 string
      in downloads.properties, and make a reasonable estimate of its
      maximum length. For English, this seems like a reasonable limit:
 
      + 999 other downloads
 
      that's 21 characters, so we set the minimum width to 21ch.
      -->
-<!ENTITY downloadsSummary.minWidth2	"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">
+<!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,
      cmd.showMac.accesskey):
      The show and showMac commands are never shown together, thus they can share
      the same access key (though the two access keys can also be different).
      -->
-<!ENTITY cmd.show.label			"保存フォルダを開く">
-<!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.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">
+<!ENTITY cmd.show.label                   "保存フォルダを開く">
+<!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.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 downloadsHistory.label           "すべての履歴を表示">
+<!ENTITY downloadsHistory.accesskey       "S">
 
-<!ENTITY clearDownloadsButton.label	"ダウンロードの消去">
-<!ENTITY clearDownloadsButton.tooltip	"完了、キャンセル、失敗したダウンロードを消去します">
+<!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	"ダウンロードはありません。">
+<!ENTITY downloadsListEmpty.label         "ダウンロードはありません。">
+
+<!-- LOCALIZATION NOTE (downloadsPanelEmpty.label):
+     This string is shown when there are no items in the Downloads Panel.
+     -->
+<!ENTITY downloadsPanelEmpty.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	"該当するダウンロードが見つかりません。">
+<!ENTITY downloadsListNoMatch.label       "該当するダウンロードが見つかりません。">
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -3,8 +3,11 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle		"新しいタブ">
 <!ENTITY newtab.undo.removedLabel	"サムネイルを削除しました。">
 <!ENTITY newtab.undo.undoButton		"元に戻す。">
 <!ENTITY newtab.undo.restoreButton	"すべて復元する。">
 <!ENTITY newtab.undo.closeTooltip	"閉じる">
+<!ENTITY newtab.sponsored.release.message	"このスポンサーサイトは、楽しさと Mozilla のミッションを支えるために提案されました。">
+<!ENTITY newtab.sponsored.trial.message		"このスポンサーサイトは試験的な機能です。楽しさと Mozilla のミッションを支えるために提案されました。">
+<!ENTITY newtab.panel.link.text		"詳細">
--- a/browser/chrome/browser/newTab.properties
+++ b/browser/chrome/browser/newTab.properties
@@ -2,8 +2,9 @@
 # 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/.
 
 newtab.pin	= このサイトをこの位置にピン留め
 newtab.unpin	= このサイトのピン留めを外す
 newtab.block	= このサイトを削除
 newtab.show	= 新しいタブページを表示
 newtab.hide	= 新しいタブページを閉じる
+newtab.sponsored	= スポンサータイルの情報を表示
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -109,16 +109,17 @@ offlinepermissionstext		= 次のサイトではオフライン作業用データの保存は許可されていません:
 offlinepermissionstitle		= オフラインデータ
 
 ####Preferences::Advanced::Network
 #LOCALIZATION NOTE: The next string is for the disk usage of the web content cache.
 #   e.g., "Your web content cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
 actualDiskCacheSize		= 現在の Web ページのディスクキャッシュ量は %1$S %2$S です。
+actualDiskCacheSizeCalculated	= Web ページのディスクキャッシュ量を計算しています...
 
 ####Preferences::Advanced::Network
 #LOCALIZATION NOTE: The next string is for the disk usage of the application cache.
 #   e.g., "Your application cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
 actualAppCacheSize		= 現在のアプリケーションのディスクキャッシュ量は %1$S %2$S です。
 
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/translation.dtd
@@ -0,0 +1,47 @@
+<!-- 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 (translation.thisPageIsIn.label,
+  -                     translation.translateThisPage.label):
+  -  These 2 strings are used to construct a sentence that contains a dropdown
+  -  showing the detected language of the current web page.
+  -  In en-US it looks like this:
+  -    This page is in [detected language] Translate this page?
+  -  "detected language" here is a language name coming from the
+  -  global/languageNames.properties file; for some locales it may not be in
+  -  the correct grammar case to keep the same structure of the original
+  -  sentence. -->
+<!ENTITY translation.thisPageIsIn.label         "このページは">
+<!ENTITY translation.translateThisPage.label    "です。翻訳しますか?">
+<!ENTITY translation.translate.button           "翻訳">
+<!ENTITY translation.notNow.button              "後で">
+
+<!ENTITY translation.translatingContent.label   "ページ内容を翻訳しています...">
+
+<!-- LOCALIZATION NOTE (translation.translatedFrom.label,
+  -                     translation.translatedTo.label,
+  -                     translation.translatedToSuffix.label):
+  -  These 3 strings are used to construct a sentence that contains 2 dropdowns
+  -  showing the source and target language of a translated web page.
+  -  In en-US it looks like this:
+  -    This page has been translated from [from language] to [to language]
+  -  "from language" and "to language" here are language names coming from the
+  -  global/languageNames.properties file; for some locales they may not be in
+  -  the correct grammar case to keep the same structure of the original
+  -  sentence.
+  -
+  -  translation.translatedToSuffix.label (empty in en-US) is for locales that
+  -  need to display some text after the second drop down for the sentence to
+  -  be grammatically correct. -->
+<!ENTITY translation.translatedFrom.label       "このページは">
+<!ENTITY translation.translatedTo.label         "から">
+<!ENTITY translation.translatedToSuffix.label   "に翻訳されました。">
+
+<!ENTITY translation.showOriginal.button        "元のページを表示">
+<!ENTITY translation.showTranslation.button     "翻訳を表示">
+
+<!ENTITY translation.errorTranslating.label     "このページの翻訳でエラーがありました。">
+<!ENTITY translation.tryAgain.button            "再試行">
+
+<!ENTITY translation.options.menu               "オプション">
--- a/browser/installer/custom.properties
+++ b/browser/installer/custom.properties
@@ -54,18 +54,16 @@ WARN_RESTART_REQUIRED_UNINSTALL=前回の $BrandShortName のアンインストールを完了させるためにコンピュータを再起動させる必要があります。今すぐ再起動しますか?
 WARN_RESTART_REQUIRED_UPGRADE=前回の $BrandShortName の更新を完了させるためにコンピュータを再起動させる必要があります。今すぐ再起動しますか?
 ERROR_CREATE_DIRECTORY_PREFIX=ディレクトリを作成できませんでした:
 ERROR_CREATE_DIRECTORY_SUFFIX=[キャンセル] をクリックしてインストールを中止するか、\n[再試行] をクリックして再度試してください。
 
 UN_CONFIRM_PAGE_TITLE=$BrandFullName のアンインストール
 UN_CONFIRM_PAGE_SUBTITLE=コンピュータから $BrandShortName を削除します。
 UN_CONFIRM_UNINSTALLED_FROM=次の場所の $BrandShortName をアンインストールします:
 UN_CONFIRM_CLICK=[削除] をクリックするとアンインストールを開始します。
-UN_REMOVE_PROFILES=ユーザの設定とデータも削除する(&R)
-UN_REMOVE_PROFILES_DESC=これをオンにするとあなたのブックマーク、保存されているパスワード、Cookie や設定情報が完全に削除されます。あとで別のバージョンの $BrandShortName をインストールする場合はこれらの情報は残しておきましょう。
 
 BANNER_CHECK_EXISTING=現在の設定を確認しています...
 
 STATUS_INSTALL_APP=$BrandShortName をインストールしています...
 STATUS_INSTALL_LANG=言語ファイル (${AB_CD}) をインストールしています...
 STATUS_UNINSTALL_MAIN=$BrandShortName をアンインストールしています...
 STATUS_CLEANUP=お掃除しています...
 
--- a/browser/installer/nsisstrings.properties
+++ b/browser/installer/nsisstrings.properties
@@ -41,25 +41,25 @@ OPTIONS_BUTTON			= オプション(&O)
 MAKE_DEFAULT			= $BrandShortName を既定のブラウザに設定する(&M)
 CREATE_SHORTCUTS		= $BrandShortName アイコンの作成先:
 ADD_SC_TASKBAR			= タスクバー(&T)
 ADD_SC_QUICKLAUNCHBAR		= クイック起動ツールバー(&Q)
 ADD_CheckboxShortcutInStartMenu	= スタートメニューのプログラムフォルダ(&S)
 ADD_CheckboxShortcutOnDesktop	= デスクトップ(&D)
 SPACE_REQUIRED			= 必要な容量:
 SPACE_AVAILABLE			= 空き容量:
-ONE_MOMENT			= インストールが完了次第、$BrandShortName を起動します...
+ONE_MOMENT_INSTALL		= インストールが完了次第、$BrandShortName を起動します...
+ONE_MOMENT_UPGRADE		= 更新が完了次第、$BrandShortName を起動します...
 INSTALL_MAINT_SERVICE		= $BrandShortName バックグラウンドアップデートサービスをインストールする(&I)
 SEND_PING			= インストールに関する情報を Mozilla に送信する(&S)
 BROWSE_BUTTON			= 参照(&R)...
 DEST_FOLDER			= インストール先フォルダ
 
-DOWNLOADING_IN_PROGRESS		= ダウンロード中...
-DOWNLOADING_DONE		= ダウンロード完了
-INSTALLING_TO_BE_DONE		= インストール完了
-INSTALLING_IN_PROGRESS		= インストール中...
+DOWNLOADING_LABEL		= $BrandShortName をダウンロード中...
+INSTALLING_LABEL		= $BrandShortName をインストール中...
+UPGRADING_LABEL			= $BrandShortName を更新中...
 
 SELECT_FOLDER_TEXT		= $BrandShortName をインストールするフォルダを選択してください。
 
 BYTE				= B
 KILO				= K
 MEGA				= M
 GIGA				= G
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -84,16 +84,18 @@ document_properties_close=閉じる
 
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=サイドバーの切り替え
 toggle_sidebar_label=サイドバーの切り替え
 outline.title=文書の目次
 outline_label=文書の目次
+attachments.title=添付ファイル
+attachments_label=添付ファイル
 thumbs.title=縮小版
 thumbs_label=縮小版
 findbar.title=検索
 findbar_label=検索
 
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.