24.0: sync browser with en-US rev143410:767c0dbc8cf2
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Mon, 19 Aug 2013 11:10:05 +0900
changeset 1149 dbd9ca962038b9c6b211dd74afacf1b5a45b3e75
parent 1136 bf2823b074e990c2ba0553623aae9779751fff4f
child 1150 c1460ea7f8eb8e7387885de2828bb8736d8bc478
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs24
24.0: sync browser with en-US rev143410:767c0dbc8cf2
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutRobots.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/appcacheutils.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/scratchpad.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/preferences/advanced.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/pdfviewer/viewer.properties
browser/profile/bookmarks.inc
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -31,27 +31,29 @@
 <!ENTITY contribute.end			"">
 
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license		"ライセンス情報">
 
 <!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 <!ENTITY bottomLinks.rights		"あなたの権利について">
 
-<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 <!ENTITY bottomLinks.privacy		"プライバシーポリシー">
 
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingForUpdates	"ソフトウェアの更新を確認...">
 <!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingAddonCompat	"アドオンの互換性を確認中...">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound		"&brandShortName; は最新バージョンです">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled		"システム管理者により、更新が無効化されています">
+<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
+<!ENTITY update.otherInstanceHandlingUpdates	"&brandShortName; は別のプロセスで更新中です">
 
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
      the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
      one line, try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.failed.start		"更新に失敗しました。">
 <!ENTITY update.failed.linkText		"最新バージョンをダウンロード">
@@ -59,16 +61,26 @@
 
 <!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
      all go into one line and have an anchor in between with text that is the same as the link to a site
      to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
      try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.manual.start		"更新が利用可能です ">
 <!ENTITY update.manual.end		"">
 
+<!-- LOCALIZATION NOTE (update.unsupported.start,update.unsupported.linkText,update.unsupported.end):
+     update.unsupported.start, update.unsupported.linkText, and
+     update.unsupported.end all go into one line with linkText being wrapped in
+     an anchor that links to a site to provide additional information regarding
+     why the system is no longer supported. As this is all in one line, try to
+     make the localized text short (see bug 843497 for screenshots). -->
+<!ENTITY update.unsupported.start	"最新バージョンはご使用のシステムに対応していません。">
+<!ENTITY update.unsupported.linkText	"詳細">
+<!ENTITY update.unsupported.end		"">
+
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 <!ENTITY update.downloading.start	"更新をダウンロード中 — ">
 <!ENTITY update.downloading.end		"">
 
--- a/browser/chrome/browser/aboutRobots.dtd
+++ b/browser/chrome/browser/aboutRobots.dtd
@@ -1,16 +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/. -->
 
 <!-- These strings are used in the about:robots page, which ties in with the
-     robots theme used in the Firefox 3 Beta 2/3 first run pages...
-         https://www.mozilla.com/en-US/firefox/3.0b2/firstrun/
-         https://www.mozilla.com/en-US/firefox/3.0b3/firstrun/
+     robots theme used in the Firefox 3 Beta 2/3 first run pages.
      They're just meant to be fun and whimsical, with references to some geeky
      but well-known robots in movies and books. Be creative with translations! -->
 
 <!-- Nonsense line from the movie "The Day The Earth Stood Still". No translation needed. -->
 <!-- 宇宙家族カールビンソン -->
 <!ENTITY robots.pagetitle  "まるちぷるたいたんぱー!">
 <!-- Movie: Logan's Run... Box (cybog): "Welcome Humans! I am ready for you." -->
 <!-- 原文ままの翻訳 -->
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -15,16 +15,21 @@
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix	"(プライベートブラウジング)">
 
 <!-- Tab context menu -->
 <!ENTITY  reloadTab.label		"タブを再読み込み">
 <!ENTITY  reloadTab.accesskey		"R">
 <!ENTITY  reloadAllTabs.label		"すべてのタブを再読み込み">
 <!ENTITY  reloadAllTabs.accesskey	"A">
+<!-- LOCALIZATION NOTE (closeTabsToTheEnd.label): This should indicate the
+direction in which tabs are closed, i.e. locales that use RTL mode should say
+left instead of right. -->
+<!ENTITY  closeTabsToTheEnd.label	"右側のタブをすべて閉じる">
+<!ENTITY  closeTabsToTheEnd.accesskey	"i">
 <!ENTITY  closeOtherTabs.label		"他のタブをすべて閉じる">
 <!ENTITY  closeOtherTabs.accesskey	"o">
 
 <!-- LOCALIZATION NOTE (pinTab.label, unpinTab.label): "Pin" is being
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
 left edge of the tabstrip. Really we just want the string to express the idea
 that this is a lightweight and reversible action that keeps your tab where you
 can reach it easily. -->
@@ -209,21 +214,22 @@ These should match what Safari and other
 <!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 remoteWebConsoleCmd.label	"リモート Web コンソール">
 
 <!ENTITY browserConsoleCmd.label	"ブラウザコンソール">
+<!ENTITY browserConsoleCmd.commandkey	"j">
+<!ENTITY browserConsoleCmd.accesskey	"B">
 
 <!ENTITY inspectContextMenu.label	"要素を調査">
 <!ENTITY inspectContextMenu.accesskey	"Q">
 
 <!ENTITY responsiveDesignTool.label		"レスポンシブデザインビュー">
 <!ENTITY responsiveDesignTool.accesskey		"R">
 <!ENTITY responsiveDesignTool.commandkey	"M">
 
@@ -237,16 +243,20 @@ 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">
 
+<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
+  -  application menu item that opens the browser debugger UI in the Tools menu. -->
+<!ENTITY chromeDebuggerMenu.label		"ブラウザデバッガ">
+
 <!ENTITY devToolbarCloseButton.tooltiptext	"開発ツールバーを閉じる">
 <!ENTITY devToolbarMenu.label			"開発ツールバー">
 <!ENTITY devToolbarMenu.accesskey		"v">
 <!ENTITY devToolbar.keycode			"VK_F2">
 <!ENTITY devToolbar.keytext			"F2">
 <!ENTITY devToolboxMenuItem.label		"開発ツールを表示">
 <!ENTITY devToolboxMenuItem.accesskey		"T">
 
@@ -667,8 +677,16 @@ just addresses the organization to follo
 
 <!ENTITY webrtcIndicatorButton.label		"カメラ、マイクへのアクセス">
 <!ENTITY webrtcIndicatorButton.tooltip		"カメラかマイクを共有しているサイトを表示します">
 
 <!ENTITY mixedContentBlocked.helplink		"詳細">
 <!ENTITY mixedContentBlocked.moreinfo		"ほとんどの Web サイトは、このコンテンツがブロックされても、正しく表示されます。">
 
 <!ENTITY pointerLock.notification.message	"ESC キーを押すと、毎回確認するようになります。">
+
+<!ENTITY pluginNotification.showAll.label	"すべて表示">
+<!ENTITY pluginNotification.showAll.accesskey	"S">
+
+<!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
+<!ENTITY pluginActivateNow.label		"今すぐ許可">
+<!ENTITY pluginActivateAlways.label		"常に許可">
+<!ENTITY pluginBlockNow.label			"プラグインをブロック">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -101,47 +101,74 @@ popupWarningDontShowFromLocationbar	= ポップアップをブロックするとき、通知バーを表示しない
 popupShowPopupPrefix			= '%S' を表示
 
 # missing plugin installer
 installPlugin.message				= このページのメディアの表示に必要なプラグインをインストールしますか?
 installPlugin.button.label			= %S をインストール
 installPlugin.button.accesskey			= I
 installPlugin.ignoreButton.label		= 次回から確認しない
 installPlugin.ignoreButton.accesskey		= N
-outdatedpluginsMessage.title			= このページの表示に使用するプラグインが古いので更新してください。
-outdatedpluginsMessage.updateButton.label	= プラグインを更新...
-outdatedpluginsMessage.updateButton.accesskey	= U
-blockedpluginsMessage.title			= このページを表示するにはプラグインが必要ですが、安全のためにブロックされました。
-blockedpluginsMessage.infoButton.label		= 詳細...
-blockedpluginsMessage.infoButton.accesskey	= D
-blockedpluginsMessage.searchButton.label	= プラグインを更新...
-blockedpluginsMessage.searchButton.accesskey	= U
+
 crashedpluginsMessage.title			= %S プラグインがクラッシュしました。
 crashedpluginsMessage.reloadButton.label	= ページを再読み込み
 crashedpluginsMessage.reloadButton.accesskey	= R
 crashedpluginsMessage.submitButton.label	= クラッシュレポートを送信
 crashedpluginsMessage.submitButton.accesskey	= S
 crashedpluginsMessage.learnMore			= 詳細を確認...
-activatePluginsMessage.message			= このページでプラグインを有効にしますか?
-activateAllPluginsMessage.label			= すべてのプラグインを有効化
-activatePluginsMessage.accesskey		= A
-activatePluginsMessage.always			= このサイトでは常にプラグインを有効にする
-activatePluginsMessage.always.accesskey		= c
-activatePluginsMessage.never			= このサイトではプラグインを無効にする
-activatePluginsMessage.never.accesskey		= N
-activateSinglePlugin				= 有効化
+
+## Plugin doorhanger strings
+# LOCALIZATION NOTE (pluginActivateNw.message): Used for newly-installed
+# plugins which are not known to be unsafe. %1$S is the plugin name and %2$S
+# is the site domain.
+pluginActivateNew.message			= %2$S で "%1$S" の実行を許可しますか?
+pluginActivateMultiple.message			= %S でプラグインの実行を許可しますか?
+pluginActivate.learnMore			= 詳細...
+# LOCALIZATION NOTE (pluginActivateOutdated.message, pluginActivateOutdated.label):
+# These strings are used when an unsafe plugin has an update available.
+# %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
+pluginActivateOutdated.message			= %3$S は %2$S の古いプラグイン "%1$S" の実行をブロックしました。
+pluginActivateOutdated.label			= 古いプラグイン
+pluginActivate.updateLabel			= 今すぐ更新...
+# LOCALIZATION NOTE (pluginActivateVulnerable.message, pluginActivateVulnerable.label):
+# These strings are used when an unsafe plugin has no update available.
+# %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
+pluginActivateVulnerable.message		= %3$S は %2$S の安全ではないプラグイン "%1$S" の実行をブロックしました。
+pluginActivateVulnerable.label			= 安全ではないプラグイン!
+pluginActivate.riskLabel			= 危険性について
+# LOCALIZATION NOTE (pluginActivateBlocked.message): %1$S is the plugin name, %2$S is brandShortName
+pluginActivateBlocked.message			= 保護のため %2$S は "%1$S" をブロックしました。
+pluginActivateBlocked.label			= ブロックによる保護
+pluginActivateDisabled.message			= "%S" は無効化されています。
+pluginActivateDisabled.label			= 無効
+pluginActivateDisabled.manage			= プラグインの管理...
+pluginEnabled.message				= %2$S の "%1$S" は有効です。
+pluginEnabledOutdated.message			= %2$S の古いプラグイン "%1$S" が有効化されています。
+pluginEnabledVulnerable.message			= %2$S の安全ではないプラグイン "%1$S" が有効化されています。
+pluginInfo.unknownPlugin			= 不明
+
+# LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.dtd
+# LOCALIZATION NOTE (pluginActivateNow.label): This button will enable the
+# plugin in the current session for an short time (about an hour), auto-renewed
+# if the site keeps using the plugin.
+pluginActivateNow.label				= 今すぐ許可
+pluginActivateNow.accesskey			= N
+# LOCALIZATION NOTE (pluginActivateAlways.label): This button will enable the
+# plugin for a long while (90 days), auto-renewed if the site keeps using the
+# plugin.
+pluginActivateAlways.label			= 常に許可する
+pluginActivateAlways.accesskey			= R
+pluginBlockNow.label				= プラグインをブロック
+pluginBlockNow.accesskey			= B
+pluginContinue.label				= 許可を続行
+pluginContinue.accesskey			= C
+
+# in-page UI
 PluginClickToActivate				= %S を有効にします。
-# LOCALIZATION NOTE - "vulnerable" indicates there is a security bug in the
-# plugin that is being exploited by attackers.
 PluginVulnerableUpdatable			= このプラグインは安全ではありません。更新してください。
 PluginVulnerableNoUpdate			= このプラグインはセキュリティの問題があります。
-vulnerableUpdatablePluginWarning		= 古いバージョンです!
-vulnerableNoUpdatePluginWarning			= 危険なプラグインです!
-vulnerablePluginsMessage			= いくつかのプラグインはセキュリティに問題があるため無効化されました。
-pluginInfo.unknownPlugin			= 不明
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title	= すべての履歴を消去
 sanitizeButtonOK			= 今すぐ消去
 # LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
@@ -438,33 +465,33 @@ 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, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
+# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
 getUserMedia.shareCamera.message		= カメラを %S と共有しますか?
 getUserMedia.shareMicrophone.message		= マイクを %S と共有しますか?
 getUserMedia.shareCameraAndMicrophone.message	= カメラとマイクを %S と共有しますか?
 getUserMedia.noVideo.label			= 映像なし
 getUserMedia.noAudio.label			= 音声なし
 getUserMedia.shareSelectedDevices.label		= 選択したデバイスを共有
 getUserMedia.shareSelectedDevices.accesskey	= S
 getUserMedia.denyRequest.label			= 共有しない
 getUserMedia.denyRequest.accesskey		= D
-getUserMedia.sharingCamera.message		= カメラを %S と共有しています。
-getUserMedia.sharingMicrophone.message		= マイクを %S と共有しています。
-getUserMedia.sharingCameraAndMicrophone.message	= カメラとマイクを %S と共有しています。
+getUserMedia.sharingCamera.message2		= カメラをこのページと共有しています。
+getUserMedia.sharingMicrophone.message2		= マイクをこのページと共有しています。
+getUserMedia.sharingCameraAndMicrophone.message2	= カメラとマイクをこのページと共有しています。
 
 # Mixed Content Blocker Doorhanger Notification
 # LOCALIZATION NOTE - %S is brandShortName
 mixedContentBlocked.message				= %S は安全でないコンテンツをブロックしました。
 mixedContentBlocked.keepBlockingButton.label		= ブロックを継続
 mixedContentBlocked.keepBlockingButton.accesskey	= B
 mixedContentBlocked.unblock.label			= このページの保護を無効にする
 mixedContentBlocked.unblock.accesskey			= D
--- a/browser/chrome/browser/devtools/appcacheutils.properties
+++ b/browser/chrome/browser/devtools/appcacheutils.properties
@@ -1,123 +1,123 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# LOCALIZATION NOTE These strings are used inside the Inspector
-# which is available from the Web Developer sub-menu -> 'Inspect'.
-#
+# LOCALIZATION NOTE These strings are used inside the Web Console
+# command line which is available from the Web Developer sub-menu
+# -> 'Web Console'.
+# These messages are displayed when an attempt is made to validate a
+# page or a cache manifest using AppCacheUtils.jsm
+
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-# LOCALIZATION NOTE (noManifest): Used when an attempt is made to validate a
-# page using AppCacheUtils.jsm that has no cache manifest.
+# LOCALIZATION NOTE (noManifest): the specified page has no cache manifest.
 noManifest			= 指定のページはマニフェストがありません。
 
-# LOCALIZATION NOTE (notUTF8): Used when an attempt is made to validate a
-# cache manifest using AppCacheUtils.jsm having a character encoding that is not
-# UTF-8.
+# LOCALIZATION NOTE (notUTF8): the associated cache manifest has a character
+# encoding that is not UTF-8. Parameters: %S is the current encoding.
 notUTF8				= マニフェストの文字エンコーディングが %S になっています。UTF-8 であるべきです。
 
-# LOCALIZATION NOTE (badMimeType): Used when an attempt is made to validate a
-# cache manifest using AppCacheUtils.jsm having a mimetype that is not
-# text/cache-manifest.
+# LOCALIZATION NOTE (badMimeType): the associated cache manifest has a
+# mimetype that is not text/cache-manifest. Parameters: %S is the current
+# mimetype.
 badMimeType			= マニフェストの MIME タイプが %S になっています。text/cache-manifest であるべきです。
 
-# LOCALIZATION NOTE (duplicateURI): Used when an attempt is made to validate a
-# page using AppCacheUtils.jsm that has a cache manifest which references the
-# same URI from multiple locations.
-duplicateURI			= URI %S が複数の場所から参照されています。許可されていません: %S
+# LOCALIZATION NOTE (duplicateURI): the associated cache manifest references
+# the same URI from multiple locations. Parameters: %1$S is the URI, %2$S is a
+# list of references to this URI.
+duplicateURI			= URI %1$S が複数の場所から参照されています。許可されていません: %2$S
 
-# LOCALIZATION NOTE (networkBlocksURI): Used when an attempt is made to validate
-# a page using AppCacheUtils.jsm that has a cache manifest which references the
-# same URI in the NETWORK section as it does in other sections.
+# LOCALIZATION NOTE (networkBlocksURI, fallbackBlocksURI): the associated
+# cache manifest references the same URI in the NETWORK (or FALLBACK) section
+# as it does in other sections. Parameters: %1$S is the line number, %2$S is
+# the resource name, %3$S is the line number, %4$S is the resource name, %5$S
+# is the section name.
 networkBlocksURI		= %3$S 行目 (%4$S) の %5$S セクションは %1$S 行目 (%2$S) の NETWORK セクションによりキャッシュされませんでした。
-
-# LOCALIZATION NOTE (fallbackBlocksURI): Used when an attempt is made to
-# validate a page using AppCacheUtils.jsm that has a cache manifest which
-# references the same URI in the FALLBACK section as it does in other sections.
 fallbackBlocksURI		= %3$S 行目 (%4$S) の %5$S セクションは %1$S 行目 (%2$S) の FALLBACK セクションによりキャッシュされませんでした。
 
-# LOCALIZATION NOTE (fileChangedButNotManifest): Used when an attempt is made to
-# validate a page using AppCacheUtils.jsm that has a cache manifest which
+# LOCALIZATION NOTE (fileChangedButNotManifest): the associated cache manifest
 # references a URI that has a file modified after the cache manifest.
-fileChangedButNotManifest	= ファイル %S は %S 以降に更新されました。マニフェスト内のテキストが変更されない限り、キャッシュされたバージョンは %S 行目が使用されます。
+# Parameters: %1$S is the resource name, %2$S is the cache manifest, %3$S is
+# the line number.
+fileChangedButNotManifest	= ファイル %1$S は %2$S 以降に更新されました。マニフェスト内のテキストが変更されない限り、キャッシュされたバージョンは %3$S 行目が使用されます。
 
-# LOCALIZATION NOTE (cacheControlNoStore): Used when an attempt is made to
-# validate a page using AppCacheUtils.jsm that has a header preventing caching
-# or storing information.
-cacheControlNoStore		= %S のキャッシュコントロールは no-store が設定されています。%S 行目のファイルの保存からはアプリケーションキャッシュが抑制されます。
+# LOCALIZATION NOTE (cacheControlNoStore): the specified page has a header
+# preventing caching or storing information. Parameters: %1$S is the resource
+# name, %2$S is the line number.
+cacheControlNoStore		= %1$S のキャッシュコントロールは no-store が設定されています。%2$S 行目のファイルの保存からはアプリケーションキャッシュが抑制されます。
 
-# LOCALIZATION NOTE (notAvailable): Used when an attempt is made to validate a
-# page using AppCacheUtils.jsm that is not available.
-notAvailable			= %S 点のリソースが使用できません: 行 %S
+# LOCALIZATION NOTE (notAvailable): the specified resource is not available.
+# Parameters: %1$S is the resource name, %2$S is the line number.
+notAvailable			= %1$S 点のリソースが使用できません: 行 %2$S
 
-# LOCALIZATION NOTE (invalidURI): Used when an invalid URI is passed to the
-# appcache.
+# LOCALIZATION NOTE (invalidURI): it's used when an invalid URI is passed to
+# the appcache.
 invalidURI			= AppCacheUtils に渡された URI は無効です。
 
-# LOCALIZATION NOTE (noResults) Used when a search returns no results.
+# LOCALIZATION NOTE (noResults): it's used when a search returns no results.
 noResults			= 検索結果はありません。
 
-# LOCALIZATION NOTE (cacheDisabled) Used when the cache is disabled and an
-# attempt is made to view offline data.
+# LOCALIZATION NOTE (cacheDisabled): it's used when the cache is disabled and
+# an attempt is made to view offline data.
 cacheDisabled			= ディスクキャッシュが無効になっています。about:config で browser.cache.disk.enable を true に設定してから試してください。
 
-# LOCALIZATION NOTE (firstLineMustBeCacheManifest): Used when an attempt is made
-# to validate a cache manifest using AppCacheUtils.jsm having a first line that
-# is not "CACHE MANIFEST."
+# LOCALIZATION NOTE (firstLineMustBeCacheManifest): the associated cache
+# manifest has a first line that is not "CACHE MANIFEST". Parameters: %S is
+# the line number.
 firstLineMustBeCacheManifest	= マニフェストの最初の行は "CACHE MANIFEST" であるべきです: 行 %S
 
-# LOCALIZATION NOTE (cacheManifestOnlyFirstLine): Used when an attempt is made
-# to validate a cache manifest using AppCacheUtils.jsm having "CACHE MANIFEST"
-# on a line other than the first line.
-cacheManifestOnlyFirstLine	= "CACHE MANIFEST" は最初の行のみにあるべきです: 行 %S
+# LOCALIZATION NOTE (cacheManifestOnlyFirstLine2): the associated cache
+# manifest has "CACHE MANIFEST" on a line other than the first line.
+# Parameters: %S is the line number where "CACHE MANIFEST" appears.
+cacheManifestOnlyFirstLine2	= "CACHE MANIFEST" は最初の行のみにあるべきですが、%S 行目にあります。
 
-# LOCALIZATION NOTE (asteriskInWrongSection): Used when an attempt is made
-# to validate a cache manifest using AppCacheUtils.jsm having an asterisk (*) in
-# a section other than the network section.
-asteriskInWrongSection		= %2$S 行目の %1$S セクションでアスタリスクがワイルドカードとして使われています。アスタリスク1文字のみ行はオンラインホワイトリストワイルドカードフラグと呼ばれ、NETWORK セクションでのみ有効です。他のセクションでは使用できません。このフラグがある場合は、キャッシュされてない任意の URI は暗黙的にオンラインホワイトリストの名前空間にあるものとして扱われます。このフラグがない場合は、マニフェストで明示されていない URI は使用不可として扱われる、ブロック中の状態を示します。
+# LOCALIZATION NOTE (asteriskInWrongSection2): the associated cache manifest
+# has an asterisk (*) in a section other than the NETWORK section. Parameters:
+# %1$S is the section name, %2$S is the line number.
+asteriskInWrongSection2		= %2$S 行目の %1$S セクションでアスタリスク (*) が使われています。NETWORK セクションにアスタリスク 1 文字のみの行がある場合、マニフェストに列挙されていない任意の URI は、NETWORK セクションに列挙されているものとして扱われます。そうでない場合は、任意の URI は使用不可として扱われます。アスタリスク (*) 以外の文字は使えません。
 
-# LOCALIZATION NOTE (escapeSpaces): Used when an attempt is made to validate a
-# cache manifest using AppCacheUtils.jsm having a space in a URI. Spaces are to
-# be replaced with %20.
+# LOCALIZATION NOTE (escapeSpaces): the associated cache manifest has a space
+# in a URI. Spaces must be replaced with %20. Parameters: %S is the line
+# number where this error occurs.
 escapeSpaces			= URI 内のスペースは %20 で置き換えられるべきです: 行 %S
 
-# LOCALIZATION NOTE (slashDotDotSlashBad): Used when an attempt is made to
-# validate a cache manifest using AppCacheUtils.jsm having a URI containing
-# /../, which is invalid.
+# LOCALIZATION NOTE (slashDotDotSlashBad): the associated cache manifest has a
+# URI containing /../, which is invalid. Parameters: %S is the line number
+# where this error occurs.
 slashDotDotSlashBad		= /../ は URL の先頭として正しくありません: 行 %S
 
-# LOCALIZATION NOTE (tooManyDotDotSlashes): Used when an attempt is made to
-# validate a cache manifest using AppCacheUtils.jsm having a URI containing
-# too many ../ operators. Too many of these operaters mean that the file would
-# be below the root of the site, which is not possible.
+# LOCALIZATION NOTE (tooManyDotDotSlashes): the associated cache manifest has
+# a URI containing too many ../ operators. Too many of these operators mean
+# that the file would be below the root of the site, which is not possible.
+# Parameters: %S is the line number where this error occurs.
 tooManyDotDotSlashes		= ドット ドット スラッシュ (../) が多すぎます: 行 %S
 
-# LOCALIZATION NOTE (fallbackUseSpaces): Used when an attempt is made to
-# validate a cache manifest using AppCacheUtils.jsm having a FALLBACK section
-# containing more or less than the standard two URIs seperated by a single
-# space.
+# LOCALIZATION NOTE (fallbackUseSpaces): the associated cache manifest has a
+# FALLBACK section containing more or less than the standard two URIs
+# separated by a single space. Parameters: %S is the line number where this
+# error occurs.
 fallbackUseSpaces		= FALLBACK セクションでは URL はスペース区切りで2つだけです: 行 %S
 
-# LOCALIZATION NOTE (fallbackAsterisk): Used when an attempt is made to validate
-# a cache manifest using AppCacheUtils.jsm having a FALLBACK section that
-# attempts to use an asterisk (*) as a wildcard. In this section the URI is
-# simply a path prefix.
-fallbackAsterisk		= fallback 名前空間ではアスタリスク (*) はワイルドカードとしては使えません。名前空間は単純にパスの先頭にマッチする必要があります: 行 %S
+# LOCALIZATION NOTE (fallbackAsterisk2): the associated cache manifest has a
+# FALLBACK section that attempts to use an asterisk (*) as a wildcard. In this
+# section the URI is simply a path prefix. Parameters: %S is the line number
+# where this error occurs.
+fallbackAsterisk2		= FALLBACK セクションではアスタリスク (*) は使えません。FALLBACK セクションでの URI は単純に要求 URI の先頭にマッチする必要があります: 行 %S
 
-# LOCALIZATION NOTE (settingsBadValue): Used when an attempt is made to validate
-# a cache manifest using AppCacheUtils.jsm having a SETTINGS section containing
-# something other than the valid "prefer-online" or "fast."
+# LOCALIZATION NOTE (settingsBadValue): the associated cache manifest has a
+# SETTINGS section containing something other than the valid "prefer-online"
+# or "fast". Parameters: %S is the line number where this error occurs.
 settingsBadValue		= SETTINGS セクションは "prefer-online" と "fast" のどちらかのみです: 行 %S
 
-# LOCALIZATION NOTE (invalidSectionName): Used when an attempt is made to
-# validate a cache manifest using AppCacheUtils.jsm containing an invalid
-# section name.
-invalidSectionName		= 名前 (%S) が正しくありません: 行 %S
+# LOCALIZATION NOTE (invalidSectionName): the associated cache manifest
+# contains an invalid section name. Parameters: %1$S is the section name, %2$S
+# is the line number.
+invalidSectionName		= 名前 (%1$S) が正しくありません: 行 %2$S
 
-# LOCALIZATION NOTE (entryNotFound): Used when an attempt is made to view a
-# cache entry that does not exist.
+# LOCALIZATION NOTE (entryNotFound): the requested cache entry that does not
+# exist.
 entryNotFound			= エントリが見つかりません。
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -6,36 +6,16 @@
 <!-- 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 (debuggerMenu.label): This is the label for the
-  -  application menu item that opens the debugger UI. -->
-<!ENTITY debuggerMenu.label2		"デバッガ">
-
-<!-- LOCALIZATION NOTE (debuggerMenu.accesskey): This is accesskey for the
-  -  Tools menu entry of Debugger that opens the debugger UI. -->
-<!ENTITY debuggerMenu.accesskey		"D">
-
-<!-- LOCALIZATION NOTE (remoteDebuggerMenu.label): This is the label for the
-  -  application menu item that opens the remote debugger UI. -->
-<!ENTITY remoteDebuggerMenu.label	"リモートデバッガ">
-
-<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
-  -  application menu item that opens the browser debugger UI. -->
-<!ENTITY chromeDebuggerMenu.label	"ブラウザデバッガ">
-
-<!-- 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	"左右のウィンドウを切り替え">
 
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -5,51 +5,30 @@
 # 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 (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		= リモートデバッガ
+# 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 (remoteDebuggerPromptTitle): The title displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerPromptTitle		= リモート接続
-
-# LOCALIZATION NOTE (remoteDebuggerPromptMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerPromptMessage		= ホスト名とポート番号を入力してください (ホスト:ポート)
+# 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 (remoteDebuggerPromptCheck): The message displayed on the
-# debugger prompt asking if the prompt should be shown again next time.
-remoteDebuggerPromptCheck		= 次回からは確認しない
-
-# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerReconnectMessage		= サーバが見つかりません。やり直しますか? (ホスト:ポート)
-
-# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerConnectionFailedMessage	= 指定されたホスト名とポート番号では、サーバを見つけられませんでした。
+# LOCALIZATION NOTE (debuggerMenu.commandkey, debuggerMenu.accesskey)
+# Used for the menuitem in the tool menu
+debuggerMenu.commandkey			= S
+debuggerMenu.accesskey			= D
 
 # LOCALIZATION NOTE (collapsePanes): This is the tooltip for the button
 # that collapses the left and right panes in the debugger UI.
 collapsePanes				= 左右のウィンドウを非表示
 
 # LOCALIZATION NOTE (expandPanes): This is the tooltip for the button
 # that expands the left and right panes in the debugger UI.
 expandPanes				= 左右のウィンドウを表示
@@ -163,26 +142,16 @@ 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 value.
 variablesEditableValueTooltip		= クリックすると値を変更
 
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -109,16 +109,31 @@ typesNumberMax		= %1$S が設定された最大値 %2$S より大きいです。
 # number, but the number is lower than the smallest allowed number, this error
 # message is displayed.
 typesNumberMin		= %1$S が設定された最小値 %2$S より小さいです。
 
 # LOCALIZATION NOTE (typesNumberNotInt2): When the command line is passed a
 # number, but the number has a decimal part and floats are not allowed.
 typesNumberNotInt2	= "%S" を整数に変換できません。
 
+# LOCALIZATION NOTE (typesDateNan): When the command line is passed a date,
+# however the input string is not a valid date, this error message is
+# displayed.
+typesDateNan		= "%S" を日付に変換できません。
+
+# LOCALIZATION NOTE (typesDateMax): When the command line is passed a date,
+# but the number is later than the latest allowed date, this error message is
+# displayed.
+typesDateMax		= %1$S は日付型の最大値 %2$S より大きいです。
+
+# LOCALIZATION NOTE (typesDateMin): When the command line is passed a date,
+# but the date is earlier than the earliest allowed number, this error message
+# is displayed.
+typesDateMin		= %1$S は日付型の最小値 %2$S より小さいです。
+
 # LOCALIZATION NOTE (typesSelectionNomatch): When the command line is passed
 # an option with a limited number of correct values, but the passed value is
 # not one of them, this error message is displayed.
 typesSelectionNomatch	= '%S' は使用できません。
 
 # LOCALIZATION NOTE (nodeParseSyntax): When the command line is expecting a
 # CSS query string, however the passed string is not valid, this error message
 # is displayed.
@@ -183,22 +198,27 @@ helpListPrefix		= '%1$S' ではじまるコマンド:
 
 # LOCALIZATION NOTE (helpListNone): The heading shown in response to the 'help
 # <search>' command (i.e. with a search string), when there are no matching
 # commands.
 helpListNone		= '%1$S' ではじまるコマンドはありません
 
 # LOCALIZATION NOTE (helpManRequired): When the 'help x' command wants to show
 # the manual for the 'x' command it needs to be able to describe the
-# parameters as either required or optional. See also 'helpManOptional'.
+# parameters as either required or optional, or if they have a default value.
+# See also 'helpManOptional' and 'helpManDefault'.
 helpManRequired		= 必須
 
 # LOCALIZATION NOTE (helpManOptional): See description of 'helpManRequired'
 helpManOptional		= オプション
 
+# LOCALIZATION NOTE (helpManDefault): See description of 'helpManRequired'. %1$
+# S is the default value
+helpManDefault		= オプション, 既定値=%1$S
+
 # LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
 # 'help' command when the command in question has sub-commands, before a list
 # of the matching sub-commands
 subCommands		= サブコマンド
 
 # LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
 # 'help' command when the command in question should have sub-commands but in
 # fact has none
@@ -281,20 +301,31 @@ disconnectDesc		= サーバにコマンドを中継します
 disconnectManual	= サーバに接続して、ローカルのバージョンのコマンドをサーバ上に作成します。リモートのコマンドは、ローカルのコマンドと区別できる接頭辞が設定されます (まずは context コマンドを参照してください)
 
 # LOCALIZATION NOTE (disconnectPrefixDesc): A short description of the
 # 'prefix' parameter to the 'disconnect' command. This string is designed to
 # be shown in a dialog with restricted space, which is why it should be as
 # short as possible.
 disconnectPrefixDesc	= インポートされたコマンドの親接頭辞
 
+# LOCALIZATION NOTE (disconnectForceDesc): A short description of the 'force'
+# parameter to the 'disconnect' command. This string is designed to be shown
+# in a dialog with restricted space, which is why it should be as short as
+# possible.
+disconnectForceDesc	= 未完了の要求を無視
+
 # LOCALIZATION NOTE (disconnectReply): The output of the 'disconnect' command,
 # telling the user what it's done.
 disconnectReply		= %S コマンドを削除しました。
 
+# LOCALIZATION NOTE (disconnectOutstanding): An error message displayed when
+# the user attempts to disconnect before all requests have completed. %1$S is
+# a list of commands which are incomplete
+disconnectOutstanding	= 未完了の要求 (%1$S)
+
 # LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible. See prefManual for a
 # fuller description of what it does.
 prefDesc		= 設定に関するコマンド
 
 # LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
 # Displayed when the user asks for help on what it does.
@@ -467,17 +498,19 @@ introTextF1Escape	= F1/Escape
 # introTextOpening2. The text on the button that dismisses the intro text.
 introTextGo		= はじめる!
 
 # LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro'
 # setting. Displayed when the user asks for help on the settings.
 hideIntroDesc		= 初回メッセージを表示
 
 # LOCALIZATION NOTE (eagerHelperDesc): Short description of the 'eagerHelper'
-# setting. Displayed when the user asks for help on the settings.
+# setting. Displayed when the user asks for help on the settings. eagerHelper
+# allows users to select between showing no tooltips, permanent tooltips, and
+# only important tooltips
 eagerHelperDesc		= ツールチップの表示頻度
 
 # LOCALIZATION NOTE (allowSetDesc): Short description of the 'allowSetDesc'
 # setting. Displayed when the user asks for help on the settings.
 allowSetDesc		= ユーザは 'pref set' コマンドが利用可能になっていますか?
 
 # LOCALIZATION NOTE (introBody): The text displayed at the top of the output
 # for the help command, just before the list of commands. This text is wrapped
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -365,20 +365,16 @@ breakdelDesc		= ブレークポイントを撤去します
 # LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
 # the function of the index parameter in the 'break del' command.
 breakdelBreakidDesc	= ブレークポイントのインデックス
 
 # LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
 # command to explain that a breakpoint was removed.
 breakdelRemoved		= ブレークポイントが撤去されました
 
-# LOCALIZATION NOTE (breakNotFound) Used in the output of the 'break del'
-# command to explain that the breakpoint was not found.
-breakNotFound		= ブレークポイントが見つかりません
-
 # LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
 # function of the dbg command.
 dbgDesc			= デバッガを管理します
 
 # LOCALIZATION NOTE (dbgManual) A longer description describing the
 # set of commands that control the debugger.
 dbgManual		= メインスレッドで割り込みや復帰したり、コードの行をステップイン、ステップアウト、ステップオーバーするコマンドです
 
@@ -1211,28 +1207,42 @@ profilerOpenDesc		= プロファイラウィンドウを開きます
 # LOCALIZATION NOTE (profilerClose) A very short string used to describe the function
 # of the profiler close command.
 profilerCloseDesc		= プロファイラウィンドウを閉じます
 
 # LOCALIZATION NOTE (profilerStart) A very short string used to describe the function
 # of the profiler start command.
 profilerStartDesc		= プロファイリングを開始します
 
+# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerStartManual		= 開始するプロファイルの名前。
+
 # LOCALIZATION NOTE (profilerStop) A very short string used to describe the function
 # of the profiler stop command.
 profilerStopDesc		= プロファイリングを終了します
 
+# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to lookup an existing profile by its name.
+profilerStopManual		= 終了するプロファイルの名前。
+
 # LOCALIZATION NOTE (profilerList) A very short string used to describe the function
 # of the profiler list command.
 profilerListDesc		= すべてのプロファイルを表示します
 
 # LOCALIZATION NOTE (profilerShow) A very short string used to describe the function
 # of the profiler show command.
 profilerShowDesc		= プロファイルを読み込みます
 
+# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerShowManual		= プロファイルの名前
+
 # LOCALIZATION NOTE (profilerAlreadyStarted) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has already
 # been started.
 profilerAlreadyStarted		= このプロファイルはすでにプロファイリングを開始しています。
 
 # LOCALIZATION NOTE (profilerAlreadyFinished) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has already
 # been finished. It also contains a hint to use the 'profile show' command to see
@@ -1261,19 +1271,19 @@ profilerStopping2		= 終了中...
 # LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
 # an operation cannot be completed because the profiler has not been opened yet.
 profilerNotReady		= このコマンドを実行するには、先にプロファイラウィンドウを開いてください
 
 # LOCALIZATION NOTE (listenDesc) A very short string used to describe the
 # function of the 'listen' command.
 listenDesc			= リモートデバッガのポートを開きます
 
-# LOCALIZATION NOTE (listenManual) A longer description of the 'listen'
+# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
 # command.
-listenManual			= Firefox は TCP/IP 経由でリモートデバッガと接続できます。安全のため、既定では無効になっていますが、このコマンドで接続可能になります。
+listenManual2			= %1$S は TCP/IP 経由でリモートデバッガと接続できます。安全のため、既定では無効になっていますが、このコマンドで接続可能になります。
 
 # LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
 # function of 'port' parameter to the 'listen' command.
 listenPortDesc			= 接続を許可する TCP ポート番号
 
 # LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
 # execution of the 'listen' command.
 listenDisabledOutput		= 接続は devtools.debugger.remote-enabled の設定により無効になっています
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -6,19 +6,19 @@
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
-<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice2): This is the label displayed
   -  in the network table when empty. -->
-<!ENTITY netmonitorUI.emptyNotice         "ページを更新すると、ネットワークの稼働状況を確認できます。">
+<!ENTITY netmonitorUI.emptyNotice2        "要求を送信するかページを更新すると、ネットワークの稼働状況を確認できます。">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status): This is the label displayed
   -  in the network table toolbar, above the "status" column. -->
 <!ENTITY netmonitorUI.toolbar.status      "√">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
   -  in the network table toolbar, above the "method" column. -->
 <!ENTITY netmonitorUI.toolbar.method      "メソッド">
@@ -58,16 +58,52 @@
 <!-- LOCALIZATION NOTE (debuggerUI.tab.response): This is the label displayed
   -  in the network details pane identifying the response tab. -->
 <!ENTITY netmonitorUI.tab.response        "応答">
 
 <!-- LOCALIZATION NOTE (debuggerUI.tab.timings): This is the label displayed
   -  in the network details pane identifying the timings tab. -->
 <!ENTITY netmonitorUI.tab.timings         "タイミング">
 
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterAll): This is the label displayed
+  -  in the network details footer for the "All" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterAll    "すべて">
+
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterHTML): This is the label displayed
+  -  in the network details footer for the "HTML" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterHTML   "HTML">
+
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterCSS): This is the label displayed
+  -  in the network details footer for the "CSS" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterCSS    "CSS">
+
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterJS): This is the label displayed
+  -  in the network details footer for the "JS" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterJS     "JS">
+
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterXHR): This is the label displayed
+  -  in the network details footer for the "XHR" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterXHR    "XHR">
+
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterFonts): This is the label displayed
+  -  in the network details footer for the "Fonts" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterFonts  "フォント">
+
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterImages): This is the label displayed
+  -  in the network details footer for the "Images" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterImages "画像">
+
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterMedia): This is the label displayed
+  -  in the network details footer for the "Media" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterMedia  "メディア">
+
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterFlash): This is the label displayed
+  -  in the network details footer for the "Flash" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterFlash  "Flash">
+
 <!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the netmonitor UI. -->
 <!ENTITY netmonitorUI.panesButton.tooltip "ネットワーク状況を切り替える">
 
 <!-- LOCALIZATION NOTE (debuggerUI.summary.url): This is the label displayed
   -  in the network details headers tab identifying the URL. -->
 <!ENTITY netmonitorUI.summary.url         "要求 URL:">
 
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -100,16 +100,27 @@ jsonpScopeName		= JSONP \u2192 コールバック %S()
 # LOCALIZATION NOTE (networkMenu.sortedAsc): This is the tooltip displayed
 # in the network table toolbar, for any column that is sorted ascending.
 networkMenu.sortedAsc	= 昇順
 
 # LOCALIZATION NOTE (networkMenu.sortedDesc): This is the tooltip displayed
 # in the network table toolbar, for any column that is sorted descending.
 networkMenu.sortedDesc	= 降順
 
+# LOCALIZATION NOTE (networkMenu.empty): This is the label displayed
+# in the network table footer when there are no requests available.
+networkMenu.empty	= 要求はありません
+
+# LOCALIZATION NOTE (networkMenu.summary): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This label is displayed in the network table footer providing concise
+# information about all requests. Parameters: #1 is the number of requests,
+# #2 is the size, #3 is the number of seconds.
+networkMenu.summary	= #1 要求, #2 KB, #3 秒
+
 # LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
 # in the network menu specifying the size of a request (in kilobytes).
 networkMenu.sizeKB	= %S KB
 
 # LOCALIZATION NOTE (networkMenu.totalMS): This is the label displayed
 # in the network menu specifying the time for a request to finish (in milliseconds).
 networkMenu.totalMS	= \u2192 %S ms
 
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -15,20 +15,20 @@
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label		= プロファイラ
 
 # LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
 profiler2.commandkey	= VK_F5
 profiler.accesskey	= P
 
-# LOCALIZATION NOTE (profiler.tooltip):
+# LOCALIZATION NOTE (profiler.tooltip2):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
-profiler.tooltip	= プロファイラ
+profiler.tooltip2	= JavaScript プロファイラ
 
 # LOCALIZATION NOTE (profiler.profileName):
 # This string is the default name for new profiles. Its parameter is a number.
 # For example: "Profile 1", "Profile 2", etc.
 profiler.profileName	= プロファイル %S
 
 # LOCALIZATION NOTE (profiler.completeProfile):
 # This string is displayed as a tab in the profiler UI. Clicking on it
@@ -77,8 +77,23 @@ profiler.stop			= 終了
 # This string is displayed above the progress bar when the profiler
 # is busy loading and parsing the report.
 profiler.loading		= プロファイルを読み込み中...
 
 # LOCALIZATION NOTE (profiler.alreadyRunning)
 # This string is displayed in the profiler whenever there is already
 # another running profile. Users can run only one profile at a time.
 profiler.alreadyRunning		= 別のプロファイリングを実行中です。このプロファイリングを実行するには、先にプロファイル %S を終了してください。
+
+# LOCALIZATION NOTE (profiler.stateIdle)
+# This string is used to show that the profile in question is in IDLE
+# state meaning that it hasn't been started yet.
+profiler.stateIdle		= 待機中
+
+# LOCALIZATION NOTE (profiler.stateRunning)
+# This string is used to show that the profile in question is in RUNNING
+# state meaning that it has been started and currently gathering profile data.
+profiler.stateRunning		= 実行中
+
+# LOCALIZATION NOTE (profiler.stateCompleted)
+# This string is used to show that the profile in question is in COMPLETED
+# state meaning that it has been started and stopped already.
+profiler.stateCompleted		= 完了
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -76,8 +76,12 @@ browserContext.notification		= このスクラッチパッドは、ブラウザコンテキストで実行されます。
 
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
 help.openDocumentationPage		= https://developer.mozilla.org/ja/Tools/Scratchpad
 
 # LOCALIZATION NOTE (fileExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification		= このファイルはもう存在しません。
+
+# LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
+# appears in the filter text box for the properties view container.
+propertiesFilterPlaceholder		= プロパティをフィルタ
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -5,42 +5,77 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the Toolbox strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate key -->
 
 <!ENTITY closeCmd.key  "W">
 
 <!ENTITY toolboxCloseButton.tooltip    "開発ツールを閉じる">
 <!ENTITY toolboxOptionsButton.key      "O">
 
-<!-- LOCALIZATION NOTE (options.context.label): This is the label for the
-  -  heading of the group of two about:config preferences to toggle chrome
-  -  and remote debugging in the options panel. -->
-<!ENTITY options.context.label         "詳細な設定 (ブラウザの再起動が必要)">
+<!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
+  -  the heading of the advanced settings group in the options panel. -->
+<!ENTITY options.context.advancedSettings "詳細な設定">
+
+<!-- LOCALIZATION NOTE (options.context.requiresRestart2): This is the requires
+  -  restart label at right of settings that require a browser restart to be
+  -  effective. -->
+<!ENTITY options.context.requiresRestart2  "ブラウザの再起動が必要">
 
-<!-- LOCALIZATION NOTE (options.enableChrome.label): This is the label for the
+<!-- LOCALIZATION NOTE (options.restartButton.label): This is the label for the
+  -  restart button next to options.context.requiresRestart2 label. -->
+<!ENTITY options.restartButton.label  "今すぐ再起動">
+
+<!-- LOCALIZATION NOTE (options.context.triggersPageRefresh2): This is the
+  -  triggers page refresh label next to the settings in the advanced settings
+  -  group in the options panel which trigger page reload. -->
+<!ENTITY options.context.triggersPageRefresh2  "現在のセッションのみ有効。再読み込みで復帰">
+
+<!-- LOCALIZATION NOTE (options.enableChrome.label3): This is the label for the
   -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
   -  boolean preference in about:config, in the options panel. -->
-<!ENTITY options.enableChrome.label    "ブラウザデバッガを有効">
-<!ENTITY options.enableChrome.tooltip  "さまざまな開発ツールがブラウザコンテキストで使えるようになります">
+<!ENTITY options.enableChrome.label3    "ブラウザデバッガを有効">
+<!ENTITY options.enableChrome.tooltip   "さまざまな開発ツールがブラウザコンテキストで使えるようになります">
 
-<!-- LOCALIZATION NOTE (options.enableRemote.label): This is the label for the
+<!-- 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.label    "リモートデバッガを有効">
-<!ENTITY options.enableRemote.tooltip  "Firefox OS などのリモート Firefox インスタンスを、開発ツールでデバッグできるようになります">
+<!ENTITY options.enableRemote.label3    "リモートデバッガを有効">
+<!ENTITY options.enableRemote.tooltip   "Firefox OS などのリモート Firefox インスタンスを、開発ツールでデバッグできるようになります">
+
+<!-- LOCALIZATION NOTE (options.disableJavaScript.label2,
+  -  options.disableJavaScript.tooltip): This is the options panel label and
+  -  tooltip for the checkbox that toggles JavaScript on or off. -->
+<!ENTITY options.disableJavaScript.label2    "JavaScript を無効">
+<!ENTITY options.disableJavaScript.tooltip   "このオプションを有効にすると、現在のタブの JavaScript を無効にします。タブまたはツールボックスを閉じると、この設定は元に戻されます。">
 
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
 <!ENTITY options.selectDefaultTools.label     "標準の Firefox 開発ツール">
 
-<!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
+<!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
   -  added by add-ons. This heading is hidden when there is no developer tool
   -  installed by add-ons. -->
 <!ENTITY options.selectAdditionalTools.label  "開発ツールのアドオン">
 
+<!-- LOCALIZATION NOTE (options.toolNotSupported.label): This is the label for
+  -  the explanation of the * marker on a tool which is currently not supported
+  -  for the target of the toolbox. -->
+<!ENTITY options.toolNotSupported.label  "* 現在のツールボックスには対応していません">
+
 <!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label): This is the label for
   -  the heading of the radiobox corresponding to the theme of the developer
   -  tools. -->
 <!ENTITY options.selectDevToolsTheme.label   "開発ツールのテーマを選択:">
 <!ENTITY options.darkTheme.label             "Dark theme">
 <!ENTITY options.lightTheme.label            "Light theme">
+
+<!-- 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 コンソールの出力を消去しないようになります">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -33,8 +33,14 @@ toolbox.titleTemplate			= %1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
 toolbox.defaultTitle			= 開発ツール
 
 # LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
 # for the optiosn panel tab.
 optionsButton.tooltip			= 開発ツールのオプション
+
+# LOCALIZATION NOTE (options.toolNotSupported): This is the template
+# used to add a * marker to the label for the Options Panel tool checkbox for the
+# tool which is not supported for the current toolbox target.
+# The name of the tool: %1$S.
+options.toolNotSupportedMarker		= %1$S *
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -40,44 +40,58 @@
 <!ENTITY openURL.accesskey			"T">
 
 <!-- LOCALIZATION NOTE (btnPageNet.label): This string is used for the menu
   -  button that allows users to toggle the network logging output.
   -  This string and the following strings toggle various kinds of output
   -  filters. -->
 <!ENTITY btnPageNet.label			"ネットワーク">
 <!ENTITY btnPageNet.tooltip			"ネットワークアクセスを記録します">
+<!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.accesskey			"C">
 <!ENTITY btnPageJS.label			"JS">
 <!ENTITY btnPageJS.tooltip			"JavaScript 例外を記録します">
+<!ENTITY btnPageJS.accesskey			"J">
 <!ENTITY btnPageSecurity.label			"セキュリティ">
 <!ENTITY btnPageSecurity.tooltip		"セキュリティのエラーと警告を記録します">
+<!ENTITY btnPageSecurity.accesskey		"S">
 
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
 <!ENTITY btnPageLogging.label			"ロギング">
 <!ENTITY btnPageLogging.tooltip			"window.console オブジェクトに送信されたメッセージを記録します">
+<!ENTITY btnPageLogging.accesskey		"L">
 <!ENTITY btnConsoleErrors			"エラー">
 <!ENTITY btnConsoleInfo				"メッセージ">
 <!ENTITY btnConsoleWarnings			"警告">
 <!ENTITY btnConsoleLog				"ログ">
 
 <!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 -->
 <!ENTITY fullZoomEnlargeCmd.commandkey3		"">
 
 <!ENTITY fullZoomReduceCmd.commandkey		"-">
 <!ENTITY fullZoomReduceCmd.commandkey2		"">
 
 <!ENTITY fullZoomResetCmd.commandkey		"0">
 <!ENTITY fullZoomResetCmd.commandkey2		"">
 
 <!ENTITY copyURLCmd.label			"リンクの URL をコピー">
 <!ENTITY copyURLCmd.accesskey			"a">
 
 <!ENTITY closeCmd.key				"W">
+<!ENTITY findCmd.key				"F">
+<!ENTITY clearOutputCmd.key			"K">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -36,160 +36,150 @@ cmd.commandkey		= k
 webConsoleCmd.accesskey	= W
 
 # LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
 # %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
 timestampFormat		= %1$02S:%2$02S:%3$02S.%4$03S
 
 helperFuncUnsupportedTypeError	= この種類のオブジェクト上の pprint は呼び出せません。
 NetworkPanel.label	= ネットワーク要求調査
-# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
-#
-# This string is used to show the duration between two network events (e.g
-# request and response header or response header and response body).
+
+# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS): this string is used to
+# show the duration between two network events (e.g request and response
+# header or response header and response body). Parameters: %S is the duration.
 NetworkPanel.durationMS	= %Sms
-# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
-# This string is used to show the duration between the response header and the
-# response body event. It also shows the size of the received or cached image.
-#
-# The first %S is replace by the width of the inspected image.
-# The second %S is replaced by the height of the inspected image.
-# The third %S is replaced by the duration between the response header and the
-# response body event.
-NetworkPanel.imageSizeDeltaDurationMS	= %Sx%Spx, Δ%Sms
-# LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content):
-#
-# This string is displayed within the response body section of the NetworkPanel
-# if the content type of the network request can't be displayed in the
-# NetworkPanel. E.g. any kind of text is easy to display, but some audio or
-# flash data received from the server can't be displayed.
-#
-# The %S is replaced by the content type, that can't be displayed, examples are
-#  o application/x-shockwave-flash
-#  o music/crescendo
+
+# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS): this string is
+# used to show the duration between the response header and the response body
+# event. It also shows the size of the received or cached image. Parameters:
+# %1$S is the width of the inspected image, %2$S is the height of the
+# inspected image, %3$S is the duration between the response header and the
+# response body event. Example: 150x100px, Δ50ms.
+NetworkPanel.imageSizeDeltaDurationMS	= %1$Sx%2$Spx, Δ%3$Sms
+
+# LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content): this
+# string is displayed within the response body section of the NetworkPanel if
+# the content type of the network request can't be displayed. E.g. any kind of
+# text is easy to display, but some audio or flash data received from the
+# server can't be displayed. Parameters: %S is the content type that can't be
+# displayed, examples are application/x-shockwave-flash, music/crescendo.
 NetworkPanel.responseBodyUnableToDisplay.content	= "%S" の応答は表示できません。
+
 ConsoleAPIDisabled			= Web コンソールのログ記録 API (console.log, console.info, console.warn, console.error) は、このページ上のスクリプトにより無効化されています。
 
-# LOCALIZATION NOTE (webConsoleWindowTitleAndURL): The Web Console floating
-# panel title, followed by the web page URL.
-# For RTL languages you need to set the LRM in the string to give the URL
-# the correct direction.
+# LOCALIZATION NOTE (webConsoleWindowTitleAndURL): the Web Console floating
+# panel title. For RTL languages you need to set the LRM in the string to give
+# the URL the correct direction. Parameters: %S is the web page URL.
 webConsoleWindowTitleAndURL	= Web コンソール - %S
 
-# LOCALIZATION NOTE (webConsoleMixedContentWarning): Message displayed after a
-# URL in the Web Console that has been flagged for Mixed Content (i.e. http
-# content in an https page)
+# LOCALIZATION NOTE (webConsoleMixedContentWarning): the message displayed
+# after a URL in the Web Console that has been flagged for Mixed Content (i.e.
+# http content in an https page).
 webConsoleMixedContentWarning	= 混在コンテンツ
 
-# LOCALIZATION NOTE (scratchpad.linkText):
-# The text used in the right hand side of the web console command line when
-# JavaScript is being entered, to indicate how to jump into scratchpad mode
+# LOCALIZATION NOTE (scratchpad.linkText): the text used in the right hand
+# side of the Web Console command line when JavaScript is being entered, to
+# indicate how to jump into scratchpad mode.
 scratchpad.linkText		= Shift+RETURN - スクラッチパッドを開く
 
-# LOCALIZATION NOTE (gcliterm.instanceLabel): The console displays
-# objects using their type (from the constructor function) in this descriptive
-# string
+# LOCALIZATION NOTE (gcliterm.instanceLabel): the console displays objects
+# using their type (from the constructor function) in this descriptive string.
+# Parameters: %S is the object type.
 gcliterm.instanceLabel		= %S のインスタンス
 
-# LOCALIZATION NOTE (stacktrace.anonymousFunction):
-# This string is used to display JavaScript functions that have no given name -
-# they are said to be anonymous. See stacktrace.outputMessage.
+# LOCALIZATION NOTE (stacktrace.anonymousFunction): this string is used to
+# display JavaScript functions that have no given name - they are said to be
+# anonymous. See also stacktrace.outputMessage.
 stacktrace.anonymousFunction	=<匿名関数>
 
-# LOCALIZATION NOTE (stacktrace.outputMessage):
-# This string is used in the Web Console output to identify a web developer call
-# to console.trace(). The stack trace of JavaScript function calls is displayed.
-# In this minimal message we only show the last call.
-# (^m^) %1$S: filename, %2$S: functionName, %3$S: lineNumber
+# LOCALIZATION NOTE (stacktrace.outputMessage): this string is used in the Web
+# Console output to identify a web developer call to console.trace(). The
+# stack trace of JavaScript function calls is displayed. In this minimal
+# message we only show the last call. Parameters: %1$S is the file name, %2$S
+# is the function name, %3$S is the line number.
 stacktrace.outputMessage	=スタックトレース: ファイル: %1$S, 関数: %2$S, 行: %3$S
 
-# LOCALIZATION NOTE (timerStarted):
-# This string is used to display the result of the console.time() call.
-# %S=name of timer
+# LOCALIZATION NOTE (timerStarted): this string is used to display the result
+# of the console.time() call. Parameters: %S is the name of the timer.
 timerStarted			= %S: タイマー開始
 
-# LOCALIZATION NOTE (timeEnd):
-# This string is used to display the result of the console.timeEnd() call.
-# %1$S=name of timer, %2$S=number of milliseconds
+# LOCALIZATION NOTE (timeEnd): this string is used to display the result of
+# the console.timeEnd() call. Parameters: %1$S is the name of the timer, %2$S
+# is the number of milliseconds.
 timeEnd				= %1$S: %2$Sms
 
-# LOCALIZATION NOTE (Autocomplete.blank):
-# This string is used when inputnode string containing anchor doesn't
-# doesn't matches to any property in the content.
+# LOCALIZATION NOTE (Autocomplete.blank): this string is used when inputnode
+# string containing anchor doesn't matches to any property in the content.
 Autocomplete.blank		=  <- 結果なし
 
 maxTimersExceeded		= ページ内で使用可能なタイマー数が上限に達しました。
 
-# LOCALIZATION NOTE (JSTerm.updateNotInspectable):
-# This string is used when the user inspects an evaluation result in the Web
-# Console and tries the Update button, but the new result no longer returns an
-# object that can be inspected.
+# LOCALIZATION NOTE (JSTerm.updateNotInspectable): this string is used when
+# the user inspects an evaluation result in the Web Console and tries the
+# Update button, but the new result no longer returns an object that can be
+# inspected.
 JSTerm.updateNotInspectable	= 入力値が再評価されてしまうと、結果を調査することはできません。
 
-# LOCALIZATION NOTE (remoteWebConsolePromptTitle): The title displayed on the
+# LOCALIZATION NOTE (remoteWebConsolePromptTitle): the title displayed on the
 # Web Console prompt asking for the remote host and port to connect to.
 remoteWebConsolePromptTitle	= リモート接続
 
-# LOCALIZATION NOTE (remoteWebConsolePromptMessage): The message displayed on the
-# Web Console prompt asking for the remote host and port to connect to.
+# LOCALIZATION NOTE (remoteWebConsolePromptMessage): the message displayed on
+# the Web Console prompt asking for the remote host and port to connect to.
 remoteWebConsolePromptMessage	= ホスト名とポート番号を入力してください (ホスト:ポート)
 
-# LOCALIZATION NOTE (remoteWebConsoleSelectTabTitle): The title displayed on the
-# Web Console prompt asking the user to pick a tab to attach to.
+# LOCALIZATION NOTE (remoteWebConsoleSelectTabTitle): the title displayed on
+# the Web Console prompt asking the user to pick a tab to attach to.
 remoteWebConsoleSelectTabTitle	= タブ一覧 - リモート接続
 
-# LOCALIZATION NOTE (remoteWebConsoleSelectTabMessage): The message displayed on the
-# Web Console prompt asking the user to pick a tab to attach to.
+# 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.
+# LOCALIZATION NOTE (listTabs.globalConsoleActor): the string displayed for
+# the global console in the tabs selection.
 listTabs.globalConsoleActor	= *グローバルコンソール*
 
-# LOCALIZATION NOTE (MenuWebconsole.label):
-# This string is displayed in the Tools menu as a shortcut to open the devtools
-# with the web console tab selected.
+# LOCALIZATION NOTE (MenuWebconsole.label): the string displayed in the Tools
+# menu as a shortcut to open the devtools with the Web Console tab selected.
 MenuWebconsole.label		= Web コンソール
 
-# LOCALIZATION NOTE (ToolboxTabWebconsole.label):
-# This string is displayed as the label of the tab in the devtools window.
+# LOCALIZATION NOTE (ToolboxTabWebconsole.label): the string displayed as the
+# label of the tab in the devtools window.
 ToolboxTabWebconsole.label	= コンソール
 
-# LOCALIZATION NOTE (ToolboxWebconsole.tooltip):
-# This string is displayed in the tooltip of the tab when the web console is
-# displayed inside the developer tools window.
+# LOCALIZATION NOTE (ToolboxWebconsole.tooltip): the string displayed in the
+# tooltip of the tab when the Web Console is displayed inside the developer
+# tools window.
 ToolboxWebconsole.tooltip	= Web コンソール
 
-# LOCALIZATION NOTE (longStringEllipsis): The string displayed after a long
-# string. This string is clickable such that the rest of the string is retrieved
-# from the server.
+# LOCALIZATION NOTE (longStringEllipsis): the string displayed after a long
+# string. This string is clickable such that the rest of the string is
+# retrieved from the server.
 longStringEllipsis		= [...]
 
-# LOCALIZATION NOTE (longStringTooLong): The string displayed after the user
+# LOCALIZATION NOTE (longStringTooLong): the string displayed after the user
 # tries to expand a long string.
 longStringTooLong		= 文字列が長すぎるため、Web コンソールで表示すべきではありません。
 
-# LOCALIZATION NOTE (executeEmptyInput): This is displayed when the user tries
-# to execute code, but the input is empty.
-executeEmptyInput		= コマンドが空文字です。
-
-# LOCALIZATION NOTE (NetworkPanel.fetchRemainingResponseContentLink): This is
-# displayed in the network panel when the response body is only partially
-# available.
+# LOCALIZATION NOTE (NetworkPanel.fetchRemainingResponseContentLink): the
+# string  displayed in the network panel when the response body is only
+# partially available. Parameters: %S is the amount of bytes that need to be
+# fetched.
 NetworkPanel.fetchRemainingResponseContentLink	= 残り %1$S バイトを読み込む
 
-# LOCALIZATION NOTE (NetworkPanel.fetchRemainingRequestContentLink): This is
-# displayed in the network panel when the request body is only partially
-# available.
+# LOCALIZATION NOTE (NetworkPanel.fetchRemainingRequestContentLink): the
+# string displayed in the network panel when the request body is only
+# partially available. Parameters: %S is the amount of bytes that need to be
+# fetched.
 NetworkPanel.fetchRemainingRequestContentLink	= 応答ボディ (%1$S バイト) を読み込む
 
-# LOCALIZATION NOTE (connectionTimeout): Message displayed when the Remote Web
+# LOCALIZATION NOTE (connectionTimeout): message displayed when the Remote Web
 # Console fails to connect to the server due to a timeout.
 connectionTimeout				= 接続がタイムアウトしました。原因と思われるエラーメッセージを、エラーコンソールで確認してください。Web コンソールを開きなおして、やり直してください。
 
-# LOCALIZATION NOTE (propertiesFilterPlaceholder): This is the text that
+# LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
-propertiesFilterPlaceholder			= フィルタプロパティ
+propertiesFilterPlaceholder			= プロパティをフィルタ
 
-# LOCALIZATION NOTE (emptyPropertiesList): The text that is displayed in the
+# LOCALIZATION NOTE (emptyPropertiesList): the text that is displayed in the
 # properties pane when there are no properties to display.
 emptyPropertiesList				= 表示できるプロパティはありません
-
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -79,26 +79,33 @@
 <!ENTITY clearOfflineAppCacheNow.label		"今すぐ消去">
 <!ENTITY clearOfflineAppCacheNow.accesskey	"N">
 <!ENTITY overrideSmartCacheSize.label		"キャッシュサイズを制限する">
 <!ENTITY overrideSmartCacheSize.accesskey	"O">
 
 <!ENTITY updateTab.label			"更新">
 
 <!ENTITY updateApp.label			"&brandShortName; の更新:">
-<!ENTITY updateAuto.label			"自動的に更新をインストールする (推奨: セキュリティ向上)">
-<!ENTITY updateAuto.accesskey			"A">
+<!-- Note either updateAuto1 is used or (updateAutoMetro and updateAutoDesktop),
+     so re-using accesss key in updateAuto1 is OK. updateAutoDesktop can be found
+     in preferences.properties -->
+<!ENTITY updateAuto1.label			"更新を自動的にインストールする (推奨: セキュリティ向上)">
+<!ENTITY updateAuto1.accesskey			"A">
+<!ENTITY updateAutoMetro.label			"デスクトップと Windows 8 スタイルの &brandShortName; を自動的に更新する">
+<!ENTITY updateAutoMetro.accesskey		"s">
 <!ENTITY updateCheck.label			"更新の確認は行うが、インストールするかどうかを選択する">
 <!ENTITY updateCheck.accesskey			"C">
 <!ENTITY updateManual.label			"更新の確認は行わない (非推奨: セキュリティリスク)">
 <!ENTITY updateManual.accesskey			"N">
 
 <!ENTITY updateAutoAddonWarn.label		"更新によりアドオンが無効化される場合は警告する">
 <!ENTITY updateAutoAddonWarn.accesskey		"W">
 
+<!ENTITY updateAutoMetroWarn.label		"(Windows 8 スタイルの &brandShortName; はアドオンの互換性を確認しません)">
+
 <!ENTITY updateHistory.label			"更新履歴を表示...">
 <!ENTITY updateHistory.accesskey		"p">
 
 <!ENTITY useService.label			"更新のインストールにバックグラウンドサービスを使用する">
 <!ENTITY useService.accesskey			"b">
 
 <!ENTITY updateOthers.label			"次のソフトウェアを自動的に更新する:">
 <!ENTITY enableSearchUpdate.label		"検索エンジン">
@@ -118,14 +125,12 @@
 <!ENTITY certificateTab.label			"証明書">
 <!ENTITY certSelection.description		"サーバが個人証明書を要求したとき:">
 <!ENTITY certs.auto				"自動的に選択する">
 <!ENTITY certs.auto.accesskey			"l">
 <!ENTITY certs.ask				"毎回自分で選択する">
 <!ENTITY certs.ask.accesskey			"i">
 <!ENTITY viewCerts.label			"証明書を表示...">
 <!ENTITY viewCerts.accesskey			"s">
-<!ENTITY viewCRLs.label				"失効リスト...">
-<!ENTITY viewCRLs.accesskey			"R">
 <!ENTITY verify2.label				"検証...">
 <!ENTITY verify2.accesskey			"V">
 <!ENTITY viewSecurityDevices.label		"セキュリティデバイス...">
 <!ENTITY viewSecurityDevices.accesskey		"y">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -117,16 +117,21 @@ actualDiskCacheSize		= 現在の Web ページのディスクキャッシュ量は %1$S %2$S です。
 
 ####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 です。
 
+###Preferences::Advanced::Update
+#LOCALIZATION NOTE: The next string is for updating in Windows 8 only instead of updateAuto1.label.  %S = brandShortName
+updateAutoDesktop.label		= デスクトップの %S からの更新を自動的にインストールする
+updateAutoDesktop.accessKey	= A
+
 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/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -1,19 +1,19 @@
 <!-- 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 tracking.label			"トラッキング">
 
-<!ENTITY dntTrackingNopref.label	"トラッキングに関する設定は一切サイトに通知しない">
+<!ENTITY dntTrackingNopref.label2	"トラッキングに関する設定は一切サイトに通知しない">
 <!ENTITY dntTrackingNopref.accesskey	"o">
-<!ENTITY dntTrackingNotOkay.label	"トラッキングの拒否をサイトに通知する">
+<!ENTITY dntTrackingNotOkay.label2	"トラッキングの拒否をサイトに通知する">
 <!ENTITY dntTrackingNotOkay.accesskey	"n">
-<!ENTITY dntTrackingOkay.label		"トラッキングの許可をサイトに通知する">
+<!ENTITY dntTrackingOkay.label2		"トラッキングの許可をサイトに通知する">
 <!ENTITY dntTrackingOkay.accesskey	"t">
 <!ENTITY doNotTrackInfo.label		"詳細">
 
 <!ENTITY  history.label			"履歴">
 
 <!ENTITY  locationBar.label		"ロケーションバー">
 
 <!ENTITY  locbar.pre.label		"ロケーションバーには次の中から候補を表示する:">
@@ -22,21 +22,21 @@
 <!ENTITY  locbar.both.label		"履歴とブックマーク">
 <!ENTITY  locbar.history.label		"履歴のみ">
 <!ENTITY  locbar.bookmarks.label	"ブックマークのみ">
 <!ENTITY  locbar.nothing.label		"候補を表示しない">
 
 <!ENTITY  acceptCookies.label		"サイトから送られてきた Cookie を保存する">
 <!ENTITY  acceptCookies.accesskey	"A">
 
-<!ENTITY  acceptThirdParty.pre.label		"サードパーティの Cookie も保存する:">
+<!ENTITY  acceptThirdParty.pre.label		"サードバーティ Cookie の保存:">
 <!ENTITY  acceptThirdParty.pre.accesskey	"c">
-<!ENTITY  acceptThirdParty.always.label		"常に">
-<!ENTITY  acceptThirdParty.never.label		"保存しない">
-<!ENTITY  acceptThirdParty.visited.label	"訪問したサイトのみ">
+<!ENTITY  acceptThirdParty.always.label		"常に許可">
+<!ENTITY  acceptThirdParty.never.label		"常に拒否">
+<!ENTITY  acceptThirdParty.visited.label	"訪問したサイトのみ許可">
 
 <!ENTITY  keepUntil.label		"Cookie を保存する期間:">
 <!ENTITY  keepUntil.accesskey		"K">
 
 <!ENTITY  expire.label			"サイトが指定した期限まで">
 <!ENTITY  close.label			"&brandShortName; を終了するまで">
 <!ENTITY  askEachTime.label		"毎回確認する">
 
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -105,19 +105,20 @@ page_scale_auto=自動ズーム
 page_scale_actual=実際のサイズ
 
 # Loading indicator messages
 loading_error_indicator=エラー
 loading_error=PDF の読み込み中にエラーが発生しました
 invalid_file_error=無効または破損した PDF ファイル
 missing_file_error=PDF ファイルが見つかりません。
 
-# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# LOCALIZATION NOTE (text_annotation_type.alt): 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}} 注釈]
+text_annotation_type.alt=[{{type}} 注釈]
 request_password=PDF はパスワードによって保護されています
+invalid_password=無効なパスワードです
 
 printing_not_supported=警告: このブラウザでは印刷が完全にサポートされていません
 printing_not_ready=警告: PDF を印刷するための読み込みが終了していません
 web_fonts_disabled=Web フォントが無効になっています: 埋め込まれた PDF のフォントを使用することができません
-web_colors_disabled=Web カラーが無効になっています
+document_colors_disabled=PDF 文書は、Web ページが指定した配色を使用することができません: \'Web ページが指定した配色\' はブラウザで無効になっています。
--- a/browser/profile/bookmarks.inc
+++ b/browser/profile/bookmarks.inc
@@ -9,32 +9,32 @@
 
 #define bookmarks_title ブックマーク
 #define bookmarks_heading ブックマーク
 
 #define bookmarks_toolbarfolder ブックマークツールバーフォルダ
 #define bookmarks_toolbarfolder_description このフォルダの中身がブックマークツールバーに表示されます
 
 # LOCALIZATION NOTE (getting_started):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/central/
+# link title for https://www.mozilla.org/en-US/firefox/central/
 #define getting_started Firefox を使いこなそう
 
 # LOCALIZATION NOTE (firefox_heading):
 # Firefox links folder name
 #define firefox_heading Mozilla Firefox
 
 # LOCALIZATION NOTE (firefox_help):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/help/
+# link title for https://www.mozilla.org/en-US/firefox/help/
 #define firefox_help ヘルプとチュートリアル
 
 # LOCALIZATION NOTE (firefox_customize):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/customize/
+# link title for https://www.mozilla.org/en-US/firefox/customize/
 #define firefox_customize Firefox をカスタマイズしてみよう
 
 # LOCALIZATION NOTE (firefox_community):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/community/
+# link title for https://www.mozilla.org/en-US/contribute/
 #define firefox_community Mozilla のコミュニティ
 
 # LOCALIZATION NOTE (firefox_about):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/about/
+# link title for https://www.mozilla.org/en-US/about/
 #define firefox_about Mozilla について
 
 #unfilter emptyLines