22.0: sync browser with en-US rev133624:581ea0e6531e FIREFOX_22_0b2_BUILD1 FIREFOX_22_0b2_RELEASE FIREFOX_22_0b3_BUILD1 FIREFOX_22_0b3_RELEASE FIREFOX_22_0b4_BUILD1 FIREFOX_22_0b4_RELEASE FIREFOX_22_0b5_BUILD1 FIREFOX_22_0b5_RELEASE FIREFOX_22_0b6_BUILD1 FIREFOX_22_0b6_RELEASE
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Mon, 13 May 2013 01:33:57 +0900
changeset 1070 45bef68bcbe9e8ce566263fa7df68531170beed3
parent 1069 8db4738b514586573649365f8e5ad1b0bce9deba
child 1071 7a095bf89a486612cf5dbd31c0d4806681348b7f
child 1076 62c8d1000f62f39cb9e71d86a515b60e9545ab1d
child 1079 771b6c6a48b112adc4c5139493e757f26c2220ba
child 1081 0c2b3eace51aa0ead0a1b23bfcfce43c76faa6e5
child 1083 b5aa1d4e1d429175c517a987cc2211e315b0c6dd
child 1086 d7e86582d42152907abb2dfe7761b3721229870d
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs22
22.0: sync browser with en-US rev133624:581ea0e6531e
browser/chrome/browser/aboutHealthReport.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/font-inspector.dtd
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/responsiveUI.properties
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/styleinspector.dtd
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/syncSetup.dtd
browser/pdfviewer/viewer.properties
--- a/browser/chrome/browser/aboutHealthReport.dtd
+++ b/browser/chrome/browser/aboutHealthReport.dtd
@@ -1,31 +1,6 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!-- metrics.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
-<!ENTITY abouthealth.locale-direction			"ltr">
-
 <!-- LOCALIZATION NOTE (abouthealth.pagetitle): Firefox Health Report is a proper noun in en-US, please keep this in mind. -->
 <!ENTITY abouthealth.pagetitle				"&brandShortName; ヘルスレポート">
-<!ENTITY abouthealth.header				"&brandFullName; ヘルスレポート">
-
-<!ENTITY abouthealth.intro.title			"&brandShortName; ヘルスレポートとは?">
-
-<!ENTITY abouthealth.intro-enabled			"&brandFullName; はブラウザ体験のさらなる向上のため、コンピュータと利用状況に関するいくつかのデータを収集します。">
-<!ENTITY abouthealth.intro-disabled			"現在、利用状況のデータは &vendorShortName; に送信されていません。[&abouthealth.optin;] ボタンを押すと、ブラウザ体験の向上に協力します。">
-
-<!ENTITY abouthealth.optin				"&brandShortName; をよりよくする">
-<!ENTITY abouthealth.optout				"レポート送信をオフにする">
-
-<!ENTITY abouthealth.optout.confirmationPrompt.title	"データの送信を止めますか?">
-<!ENTITY abouthealth.optout.confirmationPrompt.message	"データの送信を中止して、&vendorShortName; のサーバに保存された匿名データを削除します。よろしいですか?">
-
-<!ENTITY abouthealth.show-raw-data			"詳細を表示">
-<!ENTITY abouthealth.hide-raw-data			"詳細を非表示">
-
-<!ENTITY abouthealth.show-report			"&brandShortName; 詳細を表示する">
-
-<!ENTITY abouthealth.details.description-start		"&brandShortName; ヘルスレポートの機能によって、&brandFullName; が送信したデータです。収集、送信された内容の ">
-<!ENTITY abouthealth.details-link			"詳細">
-<!ENTITY abouthealth.details.description-end		" を確認できます。">
-<!ENTITY abouthealth.no-data-available			"今までに送信された、表示できるデータはありません。あとで確認してください。">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -451,16 +451,29 @@ items are mutually exclusive. -->
 <!ENTITY mediaPause.accesskey		"P">
 <!-- LOCALIZATION NOTE: The access keys for "Mute" and
 "Unmute" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaMute.label		"ミュート">
 <!ENTITY mediaMute.accesskey		"M">
 <!ENTITY mediaUnmute.label		"ミュート解除">
 <!ENTITY mediaUnmute.accesskey		"m">
+<!ENTITY mediaPlaybackRate.label		"再生スピード">
+<!ENTITY mediaPlaybackRate.accesskey		"l">
+<!ENTITY mediaPlaybackRate050x.label		"スローモーション (0.5×)">
+<!ENTITY mediaPlaybackRate050x.accesskey	"S">
+<!ENTITY mediaPlaybackRate100x.label		"通常">
+<!ENTITY mediaPlaybackRate100x.accesskey	"N">
+<!ENTITY mediaPlaybackRate150x.label		"早送り (1.5×)">
+<!ENTITY mediaPlaybackRate150x.accesskey	"H">
+<!-- LOCALIZATION NOTE: "Ludicrous Speed" is a reference to the
+movie "Space Balls" and is meant to say that this speed is very
+fast. -->
+<!ENTITY mediaPlaybackRate200x.label		"なんて速さだ! (2×)">
+<!ENTITY mediaPlaybackRate200x.accesskey	"L">
 <!-- LOCALIZATION NOTE: The access keys for "Show Controls" and
 "Hide Controls" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaShowControls.label	"コントロールを表示">
 <!ENTITY mediaShowControls.accesskey	"C">
 <!ENTITY mediaHideControls.label	"コントロールを隠す">
 <!ENTITY mediaHideControls.accesskey	"C">
 <!ENTITY videoFullScreen.label		"全画面表示">
@@ -608,16 +621,18 @@ just addresses the organization to follo
 <!ENTITY social.notLoggedIn.label		"ログインしていません">
 
 <!ENTITY social.ok.label			"OK">
 <!ENTITY social.ok.accesskey			"O">
 
 <!ENTITY social.toggleSidebar.label		"サイドバーを表示する">
 <!ENTITY social.toggleSidebar.accesskey		"s">
 
+<!ENTITY social.addons.label			"サービスを管理...">
+
 <!ENTITY social.toggleNotifications.label	"デスクトップ通知を表示する">
 <!ENTITY social.toggleNotifications.accesskey	"n">
 
 <!ENTITY social.activated.undobutton.label	"元に戻す">
 <!ENTITY social.activated.undobutton.accesskey	"U">
 
 <!ENTITY social.chatBar.commandkey		"c">
 <!ENTITY social.chatBar.label			"チャットを入力">
@@ -628,8 +643,10 @@ just addresses the organization to follo
 <!ENTITY getUserMedia.selectMicrophone.label		"共有するマイク:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey	"M">
 
 <!ENTITY webrtcIndicatorButton.label		"カメラ、マイクへのアクセス">
 <!ENTITY webrtcIndicatorButton.tooltip		"カメラかマイクを共有しているサイトを表示します">
 
 <!ENTITY mixedContentBlocked.helplink		"詳細">
 <!ENTITY mixedContentBlocked.moreinfo		"ほとんどの Web サイトは、このコンテンツがブロックされても、正しく表示されます。">
+
+<!ENTITY pointerLock.notification.message	"ESC キーを押すと、毎回確認するようになります。">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -81,18 +81,19 @@ lwthemePostInstallNotification.manageButton		= テーマを管理...
 lwthemePostInstallNotification.manageButton.accesskey	= M
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message		= %S は再起動後にインストールされます。
 lwthemeNeedsRestart.button		= 今すぐ再起動
 lwthemeNeedsRestart.accesskey		= R
 
-popupWarning				= %1$0.Sポップアップがブロックされました。
-popupWarningMultiple			= %2$S 個のポップアップがブロックされました。%1$0.S
+# LOCALIZATION NOTE (popupWarning.message): Semicolon-separated list of plural forms.
+# #1 is brandShortName and #2 is the number of pop-ups blocked.
+popupWarning.message			= #2 個のポップアップがブロックされました。
 popupWarningButton			= 設定
 popupWarningButton.accesskey		= O
 popupWarningButtonUnix			= 設定
 popupWarningButtonUnix.accesskey	= P
 popupAllow				= このサイト (%S) によるポップアップを許可する
 popupBlock				= このサイト (%S) によるポップアップを禁止する
 popupWarningDontShowFromMessage		= ポップアップをブロックするとき、このメッセージを表示しない
 popupWarningDontShowFromLocationbar	= ポップアップをブロックするとき、通知バーを表示しない
@@ -111,19 +112,16 @@ blockedpluginsMessage.infoButton.accessk
 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			= 詳細を確認...
-carbonFailurePluginsMessage.message		= このページを表示するにはプラグインが 32 ビットモードである必要があります。
-carbonFailurePluginsMessage.restartButton.label	= 32 ビットモードで再起動
-carbonFailurePluginsMessage.restartButton.accesskey	= R
 activatePluginsMessage.message			= このページでプラグインを有効にしますか?
 activateAllPluginsMessage.label			= すべてのプラグインを有効化
 activatePluginsMessage.accesskey		= A
 activatePluginsMessage.always			= このサイトでは常にプラグインを有効にする
 activatePluginsMessage.always.accesskey		= c
 activatePluginsMessage.never			= このサイトではプラグインを無効にする
 activatePluginsMessage.never.accesskey		= N
 activateSinglePlugin				= 有効化
@@ -273,16 +271,35 @@ geolocation.alwaysShareLocation.accesske
 geolocation.neverShareLocation			= 常に許可しない
 geolocation.neverShareLocation.accesskey	= N
 geolocation.shareWithSite			= %S に位置情報の共有を許可しますか?
 geolocation.shareWithFile			= ファイル %S に位置情報の共有を許可しますか?
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
 geolocation.learnMore				= 詳細を表示...
 
+webNotifications.showForSession			= このセッションでは表示する
+webNotifications.showForSession.accesskey	= s
+webNotifications.alwaysShow			= 常に通知を表示する
+webNotifications.alwaysShow.accesskey		= A
+webNotifications.neverShow			= 通知をブロックする
+webNotifications.neverShow.accesskey		= N
+webNotifications.showFromSite			= %S からの通知を表示しますか?
+
+# Pointer lock UI
+
+pointerLock.allow				= マウスポインタを隠す
+pointerLock.allow.accesskey			= H
+pointerLock.alwaysAllow				= 常に許可
+pointerLock.alwaysAllow.accesskey		= A
+pointerLock.neverAllow				= 常に許可しない
+pointerLock.neverAllow.accesskey		= N
+pointerLock.title				= %S ではマウスポインタを非表示にしますか?
+pointerLock.autoLock.title			= %S ではマウスポインタを隠します。
+
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
 # The two button strings will never be shown at the same time, so
 # it's okay for them to have the same access key
 safebrowsing.getMeOutOfHereButton.label		= スタートページに戻る
 safebrowsing.getMeOutOfHereButton.accessKey	= G
 safebrowsing.reportedWebForgery			= 偽装サイトとして報告されています!
 safebrowsing.notAForgeryButton.label		= 偽装サイトの誤報告を指摘...
@@ -379,38 +396,27 @@ webapps.install.success		= アプリケーションをインストールしました
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered		= %S は現在全画面表示モードです。
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision	= %S での全画面表示の設定を保存する
 
 # LOCALIZATION NOTE (social.activated.description): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
 social.activated.description		= %1$S for %2$S を有効にしました。
 
-# LOCALIZATION NOTE (social.removeProvider.label): %S is the name of the social provider
-social.removeProvider.label		= %S を削除する
-social.removeProvider.accesskey		= R
-# LOCALIZATION NOTE (social.remove.confirmationLabel): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
-social.remove.confirmationLabel		= %2$S から %1$S を削除しますか?
-# LOCALIZATION NOTE (social.remove.confirmationOK): %S is the name of the social provider
-social.remove.confirmationOK		= %S を削除
-
-
 # LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
 social.turnOff.label			= %S をオフにする
 social.turnOff.accesskey		= T
 # LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
 social.turnOn.label			= %S をオンにする
 social.turnOn.accesskey			= T
 
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message			= %1$S は現在 %2$S に接続できません。
 social.error.tryAgain.label		= 再接続
 social.error.tryAgain.accesskey		= T
-social.error.ok.label			= OK
-social.error.ok.accesskey		= O
 social.error.closeSidebar.label		= サイドバーを閉じる
 social.error.closeSidebar.accesskey	= C
 
 # LOCALIZATION NOTE: %1$S is the label for the toolbar button, %2$S is the associated badge numbering that the social provider may provide.
 social.aria.toolbarButtonBadgeText	= %1$S (%2$S)
 
 # Identity notifications popups
 identity.termsOfService			= 利用規約
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -68,22 +68,29 @@
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
   -  appears in the filter panel popup as a description. -->
 <!ENTITY debuggerUI.searchPanelTitle	"検索演算子">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
 <!ENTITY debuggerUI.searchFile		"スクリプトをフィルタ">
 <!ENTITY debuggerUI.searchFile.key	"P">
+<!ENTITY debuggerUI.searchFile.altkey	"O">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
   -  in the source editor's context menu for the global search operation. -->
 <!ENTITY debuggerUI.searchGlobal	"すべてのファイルを検索">
 <!ENTITY debuggerUI.searchGlobal.key	"F">
 
+<!-- LOCALIZATION NOTE (debuggerUI.searchFunction): This is the text that appears
+  -  in the source editor's context menu for the function search operation. -->
+<!ENTITY debuggerUI.searchFunction	"関数定義を検索">
+<!ENTITY debuggerUI.searchFunction.key	"D">
+<!ENTITY debuggerUI.searchFunction.altkey	"O">
+
 <!-- LOCALIZATION NOTE (debuggerUI.searchToken): This is the text that appears
   -  in the source editor's context menu for the token search operation. -->
 <!ENTITY debuggerUI.searchToken		"検索">
 <!ENTITY debuggerUI.searchToken.key	"F">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
 <!ENTITY debuggerUI.searchLine		"指定行へ移動...">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -78,39 +78,31 @@ stepOverTooltip				= ステップオーバー (%S)
 # LOCALIZATION NOTE (stepInTooltip): The label that is displayed on the
 # button that steps into a function call.
 stepInTooltip				= ステップイン (%S)
 
 # LOCALIZATION NOTE (stepOutTooltip): The label that is displayed on the
 # button that steps out of a function call.
 stepOutTooltip				= ステップアウト (%S)
 
-# LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
-# frames list when there are no frames to display.
-emptyStackText				= 表示できるスタックはありません
-
-# LOCALIZATION NOTE (emptyBreakpointsText): The text that is displayed in the
-# breakpoints list when there are no breakpoints to display.
-emptyBreakpointsText			= 表示できるブレークポイントはありません
-
 # LOCALIZATION NOTE (emptyGlobalsText): The text to display in the menulist
 # when there are no chrome globals available.
 noGlobalsText				= グローバル変数はありません
 
-# LOCALIZATION NOTE (noMatchingScriptsText): The text to display in the
+# LOCALIZATION NOTE (noMatchingGlobalsText): The text to display in the
 # menulist when there are no matching chrome globals after filtering.
 noMatchingGlobalsText			= 一致するグローバル変数がありません
 
-# LOCALIZATION NOTE (noScriptsText): The text to display in the menulist
+# LOCALIZATION NOTE (noSourcesText): The text to display in the sources menu
 # when there are no scripts.
-noScriptsText				= スクリプトはありません
+noSourcesText				= このページにソースはありません。
 
-# LOCALIZATION NOTE (noMatchingScriptsText): The text to display in the
-# menulist when there are no matching scripts after filtering.
-noMatchingScriptsText			= 一致するスクリプトはありません
+# LOCALIZATION NOTE (noMatchingSourcesText): The text to display in the
+# sources menu when there are no matching scripts after filtering.
+noMatchingSourcesText			= 一致するソースはありません。
 
 # LOCALIZATION NOTE (noMatchingStringsText): The text to display in the
 # global search results when there are no matching strings after filtering.
 noMatchingStringsText			= 一致する文字列はありません
 
 # LOCALIZATION NOTE (emptyFilterText): This is the text that appears in the
 # filter text box when it is empty and the scripts container is selected.
 emptyFilterText				= ファイル名を検索 (%S)
@@ -123,16 +115,20 @@ emptyChromeGlobalsFilterText		= ブラウザコンテキストを検索 (%S)
 # LOCALIZATION NOTE (emptyVariablesFilterText): This is the text that
 # appears in the filter text box for the variables view container.
 emptyVariablesFilterText		= 変数を検索
 
 # LOCALIZATION NOTE (searchPanelGlobal): This is the text that appears in the
 # filter panel popup for the global search operation.
 searchPanelGlobal			= すべてのファイルを検索 (%S)
 
+# LOCALIZATION NOTE (searchPanelFunction): This is the text that appears in the
+# filter panel popup for the function search operation.
+searchPanelFunction			= 関数定義を検索 (%S)
+
 # LOCALIZATION NOTE (searchPanelToken): This is the text that appears in the
 # filter panel popup for the token search operation.
 searchPanelToken			= このファイルを検索 (%S)
 
 # LOCALIZATION NOTE (searchPanelLine): This is the text that appears in the
 # filter panel popup for the line search operation.
 searchPanelLine				= 指定行へ移動 (%S)
 
@@ -209,8 +205,13 @@ variablesEditButtonTooltip		= クリックして値を設定
 
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel			= :
 
 # LOCALIZATION NOTE (watchExpressionsSeparatorLabel): The text that is displayed
 # in the watch expressions list as a separator between the code and evaluation.
 watchExpressionsSeparatorLabel		= \ \u2192
+
+# LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed
+# in the functions search panel as a separator between function's inferred name
+# and its real name (if available).
+functionSearchSeparatorLabel		= \u2190
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/font-inspector.dtd
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : FILE This file contains the Font Inspector strings.
+  - The Font Inspector is the panel accessible in the Inspector sidebar. -->
+
+<!ENTITY title		"フォント">
+<!ENTITY showAllFonts	"このページのすべてのフォントを表示">
+<!ENTITY usedAs		"フォント名: ">
+<!ENTITY system		"システム">
+<!ENTITY remote		"リモート">
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -10,16 +10,20 @@
 # 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 (canonDescNone): Short string used to describe any command
 # or command parameter when no description has been provided.
 canonDescNone		= (説明はありません)
 
+# LOCALIZATION NOTE (canonDefaultGroupName): The default name for a group of
+# parameters.
+canonDefaultGroupName	= オプション
+
 # LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
 # of JavaScript like traditional developer tool command lines. This describes
 # the '{' command.
 cliEvalJavascript	= JavaScript を直接実行します
 
 # LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
 # than the current command can understand this is the error message shown to
 # the user.
@@ -87,16 +91,20 @@ typesNumberNan		= "%S" を数値に変換できません。
 # message is displayed.
 typesNumberMax		= %1$S が設定された最大値 %2$S より大きいです。
 
 # LOCALIZATION NOTE (typesNumberMin): When the command line is passed a
 # 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 (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.
@@ -230,16 +238,21 @@ prefShowManual		= 指定された設定項目の値を表示します
 # as possible.
 prefShowSettingDesc	= 表示する設定項目
 
 # LOCALIZATION NOTE (prefShowSettingManual): A fuller description of the
 # 'setting' parameter to the 'pref show' command. Displayed when the user asks
 # for help on what it does.
 prefShowSettingManual	= 表示する設定項目の名前
 
+# LOCALIZATION NOTE (prefShowSettingValue): This is used to show the
+# preference name and the associated preference value. %1$S is replaced with
+# the preference name and %2$S is replaced with the preference value.
+prefShowSettingValue	= %1$S: %2$S
+
 # LOCALIZATION NOTE (prefSetDesc): A very short description of the 'pref set'
 # 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 prefSetManual for
 # a fuller description of what it does.
 prefSetDesc		= 設定を変更
 
 # LOCALIZATION NOTE (prefSetManual): A fuller description of the 'pref set'
 # command. Displayed when the user asks for help on what it does.
@@ -324,39 +337,39 @@ prefOutputValue		= 値
 # name, which is why it should be as short as possible. See introManual for a
 # fuller description of what it does.
 introDesc		= 初回メッセージを表示
 
 # LOCALIZATION NOTE (introManual): A fuller description of the 'intro'
 # command. Displayed when the user asks for help on what it does.
 introManual		= 'はじめる!' ボタンがクリックされるまで新しいユーザに表示されていた、初回メッセージを再表示します
 
-# LOCALIZATION NOTE (introTextOpening): The 'intro text' opens when the user
+# LOCALIZATION NOTE (introTextOpening2): The 'intro text' opens when the user
 # first opens the developer toolbar to explain the command line, and is shown
 # each time it is opened until the user clicks the 'Got it!' button. This
 # string is the opening paragraph of the intro text.
-introTextOpening	= Firefox コマンドラインは開発者向けに設計されました。JavaScript 構文の入力と、単純出力以上の豊富な表示のスピードに注力しています。
+introTextOpening2	= このコマンドラインは開発者向けに設計されました。JavaScript 構文の入力と、単純出力以上の豊富な表示のスピードに注力しています。
 
 # LOCALIZATION NOTE (introTextCommands): For information about the 'intro
-# text' see introTextOpening. The second paragraph is in 2 sections, the first
-# section points the user to the 'help' command.
+# text' see introTextOpening2. The second paragraph is in 2 sections, the
+# first section points the user to the 'help' command.
 introTextCommands	= コマンド一覧は次のコマンドを入力してください
 
-# LOCALIZATION NOTE (introTextKeys): For information about the 'intro text'
-# see introTextOpening. The second section in the second paragraph points the
+# LOCALIZATION NOTE (introTextKeys2): For information about the 'intro text'
+# see introTextOpening2. The second section in the second paragraph points the
 # user to the F1/Escape keys which show and hide hints.
-introTextKeys		= コマンドのヒントを表示または隠すには、次のキーを押してください
+introTextKeys2		= コマンドのヒントを表示または隠すには、次のキーを押してください
 
 # LOCALIZATION NOTE (introTextF1Escape): For information about the 'intro
-# text' see introTextOpening. This string is used with introTextKeys, and
+# text' see introTextOpening2. This string is used with introTextKeys2, and
 # contains the keys that are pressed to open and close hints.
 introTextF1Escape	= F1/Escape
 
 # LOCALIZATION NOTE (introTextGo): For information about the 'intro text' see
-# introTextOpening. The text on the button that dismisses the intro text.
+# 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.
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -69,22 +69,24 @@ screenshotClipboardDesc		= 画像をクリップボードにコピーするか? (true/false)
 # LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
 # 'clipboard' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
 screenshotClipboardManual	= True を指定すると、ファイルに保存する代わりに、クリップボードにコピーします。
 
 # LOCALIZATION NOTE (screenshotChromeDesc) A very short string to describe
 # the 'chrome' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
-screenshotChromeDesc		= ブラウザウィンドウも含めるか? (true/false)
+# The argument (%1$S) is the browser name.
+screenshotChromeDesc2		= ブラウザウィンドウも含めるか? (true/false)
 
 # LOCALIZATION NOTE (screenshotChromeManual) A fuller description of the
 # 'chrome' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
-screenshotChromeManual		= True を指定すると、ブラウザウィンドウも画像に含めます。
+# The argument (%1$S) is the browser name.
+screenshotChromeManual2		= True を指定すると、ブラウザウィンドウも画像に含めます。
 
 # LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
 # the screenshot command.
 screenshotGroupOptions		= オプション
 
 # LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
 # the 'delay' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
@@ -127,33 +129,35 @@ screenshotSavedToFile		= 保存しました
 # LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
 # encountering error while copying the screenshot to clipboard.
 screenshotErrorCopying		= クリップボードへのコピー時にエラーがありました。
 
 # LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
 # screenshot is successfully copied to the clipboard.
 screenshotCopied		= クリップボードにコピーしました。
 
-# LOCALIZATION NOTE (restartFirefoxDesc) A very short description of the
+# LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
 # 'restart' command. This string is designed to be shown in a menu alongside the
 # command name, which is why it should be as short as possible.
-restartFirefoxDesc		= Firefox を再起動します
+# The argument (%1$S) is the browser name.
+restartBrowserDesc		= %1$S を再起動します
 
-# LOCALIZATION NOTE (restartFirefoxNocacheDesc) A very short string to
+# LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
 # describe the 'nocache' parameter to the 'restart' command, which is
 # displayed in a dialog when the user is using this command.
-restartFirefoxNocacheDesc	= キャッシュからページを読み込ませずに再起動します
+restartBrowserNocacheDesc	= キャッシュからページを読み込ませずに再起動します
 
-# LOCALIZATION NOTE (restartFirefoxRequestCancelled) A string displayed to the
+# LOCALIZATION NOTE (restartBrowserRequestCancelled) A string displayed to the
 # user when a scheduled restart has been aborted by the user.
-restartFirefoxRequestCancelled	= ユーザによって再起動が取り消されました。
+restartBrowserRequestCancelled	= ユーザによって再起動が取り消されました。
 
-# LOCALIZATION NOTE (restartFirefoxRestarting) A string displayed to the
+# LOCALIZATION NOTE (restartBrowserRestarting) A string displayed to the
 # user when a restart has been initiated without a delay.
-restartFirefoxRestarting	= Firefox を再起動しています...
+# The argument (%1$S) is the browser name.
+restartBrowserRestarting	= %1$S を再起動しています...
 
 # LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
 # command. See inspectManual 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.
 inspectDesc		= ノードを調査します
 
 # LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
@@ -502,17 +506,18 @@ resizeModeToDesc	= ページのサイズを変更します
 
 # LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
 # 'resize' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 resizeModeDesc		= レスポンシブデザインモードを操作します
 
 # LOCALIZATION NOTE (resizeModeManual) A fuller description of the 'resize'
 # command, displayed when the user asks for help on what it does.
-resizeModeManual	= レスポンシブな Web サイトとは、モバイルディスプレイからシネマディスプレイまでのすべての環境に適応する Web サイトです。レスポンシブデザインモードでは、ブラウザすべてをサイズ変更することなく、Firefox で様々なページサイズを簡単にテストできます。
+# The argument (%1$S) is the browser name.
+resizeModeManual2	= レスポンシブな Web サイトとは、モバイルディスプレイからシネマディスプレイまでのすべての環境に適応する Web サイトです。レスポンシブデザインモードでは、ブラウザすべてをサイズ変更することなく、%1$S で様々なページサイズを簡単にテストできます。
 
 # LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
 # 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.
 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
@@ -729,27 +734,42 @@ cookieManual		= 現在のドメインの Cookie を表示したり、作成、削除、変更するコマンドです。
 # 'cookie list' 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.
 cookieListDesc		= Cookie を表示します
 
 # LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
 # command, displayed when the user asks for help on what it does.
 cookieListManual	= 現在のページと関係のある Cookie を表示します。
 
-# LOCALIZATION NOTE (cookieListOutKey) A heading used in the output from the
-# 'cookie list' command above a list of cookie keys
-cookieListOutKey	= 名前
+# LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
+# The 'cookie list' command has a number of headings for cookie properties.
+# Particular care should be taken in translating these strings as they have
+# references to names in the cookies spec.
+cookieListOutHost	= ホスト:
+cookieListOutPath	= パス:
+cookieListOutExpires	= 有効期限:
+cookieListOutAttributes	= 属性:
+
+# LOCALIZATION NOTE (cookieListOutNone) The output of the 'cookie list' command
+# uses this string when no cookie attributes (like httpOnly, secure, etc) apply
+cookieListOutNone	= なし
 
-# LOCALIZATION NOTE (cookieListOutValue) A heading used in the output from the
-# 'cookie list' command above a list of cookie values
-cookieListOutValue	= 内容
+# LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
+# command uses this string to describe a cookie with an expiry value of '0'
+# that is to say it is a session cookie
+cookieListOutSession	= ブラウザを終了するまで (セッション)
 
-# LOCALIZATION NOTE (cookieListOutActions) A heading used in the output from the
-# 'cookie list' command above a list of actions to take on cookies
-cookieListOutActions	= アクション
+# LOCALIZATION NOTE (cookieListOutNonePage) The output of the 'cookie list'
+# command uses this string for pages like 'about:blank' which can't contain
+# cookies
+cookieListOutNonePage	= このページの Cookie はありません
+
+# LOCALIZATION NOTE (cookieListOutNoneHost) The output of the 'cookie list'
+# command uses this string when there are no cookies on a given web page
+cookieListOutNoneHost	= ホスト %1$S の Cookie はありません
 
 # LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
 # 'cookie list' command on a button which can be used to edit cookie values
 cookieListOutEdit	= 編集
 
 # LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
 # 'cookie list' command on a button which can be used to remove cookies
 cookieListOutRemove	= 削除
@@ -801,16 +821,31 @@ cookieSetPathDesc	= Cookie に設定するパス
 # when the user is using this command.
 cookieSetDomainDesc	= Cookie に設定するドメイン
 
 # LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
 # 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetSecureDesc	= https での送信に限定する
 
+# LOCALIZATION NOTE (cookieSetHttpOnlyDesc) A very short string to describe the
+# 'httpOnly' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetHttpOnlyDesc	= クライアントサイドスクリプトからアクセス不可
+
+# LOCALIZATION NOTE (cookieSetSessionDesc) A very short string to describe the
+# 'session' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSessionDesc	= ブラウザセッションの生存期間のみ有効
+
+# LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
+# 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetExpiresDesc	= Cookie の有効期限となる日時 (RFC2822 または ISO 8601 の引用符つき日時)
+
 # LOCALIZATION NOTE (jsbDesc) A very short description of the
 # 'jsb' 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.
 jsbDesc				= JavaScript を整形します
 
 # LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
 # 'jsb <url>' parameter. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
@@ -863,26 +898,30 @@ jsbPreserveMaxNewlinesManual	= 連続する改行を保持する最大数
 # possible.
 jsbJslintHappyDesc		= jslint-stricter モードを強制するか?
 
 # LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
 # 'jsb <jslintHappy>' parameter, displayed when the user asks for help
 # on what it does.
 jsbJslintHappyManual		= true に設定した場合は、jslint-stricter モードを強制します
 
-# LOCALIZATION NOTE (jsbBraceStyleDesc) A very short description of the
+# LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
 # 'jsb <braceStyle>' parameter. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
-jsbBraceStyleDesc		= Collapse, expand, end-expand, expand-strict
+jsbBraceStyleDesc2		= 括弧のコーディングスタイルを選択
 
-# LOCALIZATION NOTE (jsbBraceStyleManual) A fuller description of the
+# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
 # 'jsb <braceStyle>' parameter, displayed when the user asks for help
 # on what it does.
-jsbBraceStyleManual		= 括弧のコーディングスタイル。次のどれかを選択します: collapse, expand, end-expand, expand-strict
+#
+# NOTES: The keywords collapse, expand, end-expand and expand-strict should not
+# be translated. "even if it will break your code" means that the resulting code
+# may no longer be functional.
+jsbBraceStyleManual2		= 括弧のコーディングスタイルを選択: collapse - 制御ステートメントと同じ行に括弧を置く; expand - 括弧を新しい行に置く (オールマン / ANSI スタイル); end-expand - 閉じ括弧を新しい行に置く; expand-strict - コードが壊れる場合でも括弧を新しい行に置く
 
 # LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
 # of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
 # be shown in a menu alongside the command name, which is why it should be as
 # short as possible.
 jsbNoSpaceBeforeConditionalDesc	= 条件分岐ステートメントの前にスペースを入れない
 
 # LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
@@ -995,8 +1034,98 @@ callLogChromeEvalException	= 評価された JavaScript が以下の例外を送出しました。
 # LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
 # result of passing a non-JavaScript object creating source via the
 # 'calllog chromestart javascript' command.
 callLogChromeEvalNeedsObject	= JavaScript ソースは、メソッド呼び出しが記録されるオブジェクトを評価しなければなりません。例: "({a1: function() {this.a2()},a2: function() {}});"
 
 # LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
 # tooltip of button in devtools toolbox which opens Scratchpad.
 scratchpadOpenTooltip		= スクラッチパッド
+
+# LOCALIZATION NOTE (paintflashingDesc) A very short string used to describe the
+# function of the "paintflashing" command
+paintflashingDesc		= 描画された領域をハイライトします
+
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingOnDesc		= ハイライトをオンにします
+
+# LOCALIZATION NOTE (paintflashingOffDesc) A very short string used to describe the
+# function of the "paintflashing off" command.
+paintflashingOffDesc		= ハイライトをオフにします
+
+# LOCALIZATION NOTE (paintflashingChrome) A very short string used to describe the
+# function of the "paintflashing on/off chrome" command.
+paintflashingChromeDesc		= ブラウザウィンドウ
+
+# LOCALIZATION NOTE (paintflashingManual) A longer description describing the
+# set of commands that control paint flashing.
+paintflashingManual		= 再描画された領域を違う色で塗りつぶします
+
+# LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles paint flashing.
+paintflashingTooltip		= 描画された領域をハイライトします
+
+# LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
+# function of the profiler command.
+profilerDesc			= プロファイラを管理します
+
+# LOCALIZATION NOTE (profilerManual) A longer description describing the
+# set of commands that control the profiler.
+profilerManual			= JavaScript プロファイラを開始または終了するコマンドです
+
+# LOCALIZATION NOTE (profilerOpen) A very short string used to describe the function
+# of the profiler open command.
+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 (profilerStop) A very short string used to describe the function
+# of the profiler stop command.
+profilerStopDesc		= プロファイリングを終了します
+
+# 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 (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
+# the profiling results.
+profilerAlreadyFinished		= このプロファイルはすでにプロファイリングを終了しています。'profile show' で結果を確認してください。
+
+# LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
+# an operation cannot be completed because the profile in question could not be
+# found.
+profilerNotFound		= プロファイルが見つかりません
+
+# LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
+# an operation cannot be completed because the profile in question has not been
+# started yet. It also contains a hint to use the 'profile start' command to
+# start the profiler.
+profilerNotStarted		= このプロファイルはまだプロファイリングが開始されていません。'profile start' でプロファイリングを開始してください
+
+# LOCALIZATION NOTE (profilerStarting) A very short string that indicates that
+# we're starting the profiler.
+profilerStarting		= 開始中...
+
+# LOCALIZATION NOTE (profilerStopping) A very short string that indicates that
+# we're stopping the profiler.
+profilerStopping		= 終了中...
+
+# LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
+# an operation cannot be completed because the profiler has not been opened yet.
+profilerNotReady		= このコマンドを実行するには、先にプロファイラウィンドウを開いてください
--- a/browser/chrome/browser/devtools/inspector.dtd
+++ b/browser/chrome/browser/devtools/inspector.dtd
@@ -1,12 +1,12 @@
-<!ENTITY inspectorHTMLCopyInner.label       "内側の HTML をコピー">
+<!ENTITY inspectorHTMLCopyInner.label       "innerHTML をコピー">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "I">
 
-<!ENTITY inspectorHTMLCopyOuter.label       "外側の HTML をコピー">
+<!ENTITY inspectorHTMLCopyOuter.label       "outerHTML をコピー">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
 
 <!ENTITY inspectorCopyUniqueSelector.label       "一意なセレクタをコピー">
 <!ENTITY inspectorCopyUniqueSelector.accesskey   "U">
 
 <!ENTITY inspectorHTMLDelete.label          "ノードを削除">
 <!ENTITY inspectorHTMLDelete.accesskey      "D">
 
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -12,17 +12,17 @@
 
 # LOCALIZATION NOTE (profiler.label):
 # This string is displayed in the title of the tab when the profiler is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label		= プロファイラ
 
 # LOCALIZATION NOTE (profiler.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
-profiler.commandkey	= Y
+profiler.commandkey	= VK_F5
 profiler.accesskey	= P
 
 # LOCALIZATION NOTE (profiler.tooltip):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
 profiler.tooltip	= プロファイラ
 
 # LOCALIZATION NOTE (profiler.profileName):
--- a/browser/chrome/browser/devtools/responsiveUI.properties
+++ b/browser/chrome/browser/devtools/responsiveUI.properties
@@ -30,11 +30,14 @@ responsiveUI.customResolution	= %S (指定値)
 # in the menulist of the toolbar.
 # For example: "320x480 (phone)".
 responsiveUI.namedResolution	= %S (%S)
 
 # LOCALIZATION NOTE  (responsiveUI.customNamePromptTitle): prompt title when asking
 # the user to specify a name for a new custom preset.
 responsiveUI.customNamePromptTitle	= レスポンシブデザインビュー
 
+# LOCALIZATION NOTE (responsiveUI.close): tooltip text of the close button.
+responsiveUI.close			= レスポンシブデザインビューを終了する
+
 # LOCALIZATION NOTE  (responsiveUI.customNamePromptMsg): prompt message when asking
 # the user to specify a name for a new custom preset.
 responsiveUI.customNamePromptMsg	= プリセット %Sx%S の名前を入力してください
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -78,8 +78,16 @@ redo.commandkey			= Z
 # This string is displayed in the title of the tab when the debugger is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxStyleEditor.label	= スタイルエディタ
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.tooltip):
 # This string is displayed in the tooltip of the tab when the debugger is
 # displayed inside the developer tools window.
 ToolboxStyleEditor.tooltip	= CSS スタイルシートエディタ
+
+# LOCALIZATION NOTE (confirmNavigationAway): Shown in a notification box when
+# the user tries to navigate away from a web page.
+confirmNavigationAway.message			= このページから移動すると、スタイルエディタで変更した未保存の内容が破棄されます。
+confirmNavigationAway.buttonLeave		= このページから移動する
+confirmNavigationAway.buttonLeaveAccesskey	= L
+confirmNavigationAway.buttonStay		= このページに留まる
+confirmNavigationAway.buttonStayAccesskey	= S
--- a/browser/chrome/browser/devtools/styleinspector.dtd
+++ b/browser/chrome/browser/devtools/styleinspector.dtd
@@ -22,19 +22,11 @@
   -  tree. -->
 <!ENTITY selectedElementLabel	"選択要素:">
 
 <!-- LOCALIZATION NOTE (noPropertiesFound): In the case where there are no CSS
   -  properties to display e.g. due to search criteria this message is
   -  displayed. -->
 <!ENTITY noPropertiesFound	"CSS プロパティはありません。">
 
-<!-- LOCALIZATION NOTE (bestMatch, matched, parentMatch): For each style
-  -  property the panel shows the rules containing that property. For every
-  -  rule, the rule status is also displayed: a rule can be the best match, a
-  -  match or a parent match. -->
-<!ENTITY bestMatch		"適用">
-<!ENTITY matched		"適用候補">
-<!ENTITY parentMatch		"親要素">
-
 <!-- FIXME: notes -->
 <!ENTITY computedViewTitle	"計算済み">
 <!ENTITY ruleViewTitle		"ルール">
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -41,83 +41,11 @@ rule.inheritedFrom		= %S から継承
 # This is the link title shown in the hover tooltip.
 helpLinkTitle			= このプロパティに関するドキュメントを開く
 
 # LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
 # entered into the rule view a warning icon is displayed. This text is used for
 # the title attribute of the warning icon.
 rule.warning.title				= 無効な値
 
-# LOCALIZATION NOTE (style.contextmenu.copyselection): The computed view's
-# context menu copy entry.
-style.contextmenu.copyselection			= 選択範囲をコピー
-
-# LOCALIZATION NOTE (style.contextmenu.copyselection.accesskey): The computed
-# view's context menu copy entry access key.
-style.contextmenu.copyselection.accesskey	= C
-
-# LOCALIZATION NOTE (style.contextmenu.copydeclaration): The style inspector's
-# context menu copy property entry allows a complete CSS property to be copied.
-style.contextmenu.copydeclaration		= 宣言行をコピー
-
-# LOCALIZATION NOTE (style.contextmenu.copydeclaration.accesskey): The style
-# inspector's context menu copy property access key.
-style.contextmenu.copydeclaration.accesskey	= D
-
-# LOCALIZATION NOTE (style.contextmenu.copyproperty): The style inspector's
-# context menu copy property name entry allows a CSS property name to be copied.
-style.contextmenu.copyproperty			= プロパティをコピー
-
-# LOCALIZATION NOTE (style.contextmenu.copyproperty.accesskey): The style
-# inspector's context menu copy property name access key.
-style.contextmenu.copyproperty.accesskey	= P
-
-# LOCALIZATION NOTE (style.contextmenu.copypropertyvalue): The style inspector's
-# context menu copy property value entry allows a CSS property name to be copied.
-style.contextmenu.copypropertyvalue		= 値をコピー
-
-# LOCALIZATION NOTE (style.contextmenu.copypropertyvalue.accesskey): The style
-# inspector's context menu copy property value access key.
-style.contextmenu.copypropertyvalue.accesskey	= U
-
-# LOCALIZATION NOTE (rule.contextmenu.copyselection): The rule view's context
-# menu copy entry.
-rule.contextmenu.copyselection			= 選択範囲をコピー
-
-# LOCALIZATION NOTE (rule.contextmenu.copyselection.accesskey): The rule view's
-# context menu copy entry access key.
-rule.contextmenu.copyselection.accesskey	= C
-
-# LOCALIZATION NOTE (rule.contextmenu.copyrule): The rule view's context menu
-# copy rule entry allows a complete CSS rule to be copied.
-rule.contextmenu.copyrule			= ルールをコピー
-
-# LOCALIZATION NOTE (rule.contextmenu.copyrule.accesskey): The rule view's
-# context menu copy rule access key.
-rule.contextmenu.copyrule.accesskey		= R
-
-# LOCALIZATION NOTE (rule.contextmenu.copydeclaration): The rule view's context
-# menu copy property entry allows a complete CSS property to be copied.
-rule.contextmenu.copydeclaration		= 宣言行をコピー
-
-# LOCALIZATION NOTE (rule.contextmenu.copydeclaration.accesskey): The rule view's
-# context menu copy property access key.
-rule.contextmenu.copydeclaration.accesskey	= D
-
-# LOCALIZATION NOTE (rule.contextmenu.copyproperty): The rule view's context
-# menu copy property entry allows a CSS property name to be copied.
-rule.contextmenu.copyproperty			= プロパティをコピー
-
-# LOCALIZATION NOTE (rule.contextmenu.copyproperty.accesskey): The rule
-# view's context menu copy property name access key.
-rule.contextmenu.copyproperty.accesskey		= P
-
-# LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue): The rule view's
-# context menu copy property entry allows a CSS property value to be copied.
-rule.contextmenu.copypropertyvalue		= 値をコピー
-
-# LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue.accesskey): The rule
-# view's context menu copy property value access key.
-rule.contextmenu.copypropertyvalue.accesskey	= U
-
 # LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
 # first opened and there's no node selected in the rule view.
 rule.empty		= 要素が選択されていません。
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -1,9 +1,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY window.title  "開発ツール">
-
 <!ENTITY closeCmd.key  "W">
 
 <!ENTITY toolboxCloseButton.tooltip  "開発ツールを閉じる">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -1,8 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 toolboxDockButtons.bottom.tooltip	= ブラウザの下側に表示
 toolboxDockButtons.side.tooltip		= ブラウザのサイドに表示
 toolboxDockButtons.window.tooltip	= ウィンドウ表示
 
 # LOCALIZATION NOTE (toolboxToggleButton.errors): Semi-colon list of plural
 # forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of errors in the current web page
@@ -15,8 +19,18 @@ toolboxToggleButton.errors		= #1 個のエラー
 toolboxToggleButton.warnings		= #1 個の警告
 
 # LOCALIZATION NOTE (toolboxToggleButton.tooltip): This string is shown
 # as tooltip in the developer toolbar to open/close the developer tools.
 # It's using toolboxToggleButton.errors as first and
 # toolboxToggleButton.warnings as second argument to show the number of errors
 # and warnings.
 toolboxToggleButton.tooltip		= %1$S、%2$S\nクリックすると開発ツールを切り替えます。
+
+# LOCALIZATION NOTE (toolbox.titleTemplate): This is the template
+# used to format the title of the toolbox.
+# The name of the selected tool: %1$S.
+# The url of the page being tooled: %2$S.
+toolbox.titleTemplate			= %1$S - %2$S
+
+# LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
+# name when no tool is selected.
+toolbox.defaultTitle			= 開発ツール
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -105,20 +105,16 @@ webConsoleMixedContentWarning	= 混在コンテンツ
 # 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
 gcliterm.instanceLabel		= %S のインスタンス
 
-# LOCALIZATION NOTE (Autocomplete.label):
-# The autocomplete popup panel label/title.
-Autocomplete.label		= 自動補完ポップアップ
-
 # 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.
 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.
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -56,20 +56,22 @@
 <!ENTITY  permAskAlways			"毎回確認する">
 <!ENTITY  permAllow			"許可">
 <!ENTITY  permAllowSession		"セッション中のみ許可">
 <!ENTITY  permBlock			"ブロック">
 <!ENTITY  permissionsFor		"対象サイト:">
 <!ENTITY  permImage			"画像の読み込み">
 <!ENTITY  permPopup			"ポップアップウィンドウを開く">
 <!ENTITY  permCookie			"Cookie データの保存">
+<!ENTITY  permNotifications		"サイトからの通知の表示">
 <!ENTITY  permInstall			"拡張機能やテーマのインストール">
 <!ENTITY  permGeo			"位置情報の送信">
 <!ENTITY  permPlugins			"プラグインの実行">
 <!ENTITY  permFullscreen		"全画面表示に切り替え">
+<!ENTITY  permPointerLock		"マウスポインタを隠す">
 
 <!ENTITY  permIndexedDB			"オフラインストレージの維持">
 <!ENTITY  permClearStorage		"ストレージを消去">
 <!ENTITY  permClearStorage.accesskey	"C">
 
 <!ENTITY  securityTab			"セキュリティ">
 <!ENTITY  securityTab.accesskey		"S">
 <!ENTITY  securityHeader		"このページのセキュリティ情報">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -65,11 +65,12 @@
 
 <!-- default font type -->
 <!ENTITY  useDefaultFontSerif.label	"明朝体 (Serif)">
 <!ENTITY  useDefaultFontSansSerif.label	"ゴシック体 (Sans-serif)">
 
 <!ENTITY  allowPagesToUse.label		"Web ページが指定したフォントを優先する">
 <!ENTITY  allowPagesToUse.accesskey	"A">
 
-<!ENTITY languages.customize.Charset.grouplabel		"文字エンコーディング">
-<!ENTITY languages.customize.DefaultCharset.label	"既定の文字エンコーディング:">
-<!ENTITY languages.customize.DefaultCharset.accesskey	"C">
+<!ENTITY languages.customize.Fallback.grouplabel	"古い Web ページでの文字エンコーディング">
+<!ENTITY languages.customize.Fallback.label		"代替文字エンコーディング:">
+<!ENTITY languages.customize.Fallback.accesskey		"C">
+<!ENTITY languages.customize.Fallback.desc		"この文字エンコーディングは、文字エンコーディングが宣言されていない古い Web ページで使用されます。">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -83,16 +83,17 @@ typeDescriptionWithType		= %S (%S)
 #### Cookie Viewer
 
 hostColon			= ホスト:
 domainColon			= ドメイン:
 forSecureOnly			= 暗号化された通信のみ
 forAnyConnection		= 暗号化の有無によらず常に送信
 expireAtEndOfSession		= セッション終了時
 can				= 許可
+canAccessFirstParty		= ファーストパーティのみ
 canSession			= 現在のセッションのみ
 cannot				= 不許可
 noCookieSelected		= <Cookie が選択されていません>
 cookiesAll			= 以下の Cookie が保存されています:
 cookiesFiltered			= 以下の Cookie が検索にマッチしました:
 
 #### Offline apps
 offlineAppRemoveTitle		= オフライン作業用データの削除
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -22,18 +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.label	"サードパーティの Cookie も保存する">
-<!ENTITY  acceptThirdParty.accesskey	"c">
+<!ENTITY  acceptThirdParty.pre.label		"サードパーティの Cookie も保存する:">
+<!ENTITY  acceptThirdParty.pre.accesskey	"c">
+<!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/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ b/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
@@ -1,27 +1,15 @@
 <!-- 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 safeb.palm.warning.title	"偽装サイトの疑いがあります">
-
-<!ENTITY safeb.palm.message.p1		"このページは利用者の個人情報やクレジットカード番号などを盗み取る目的で作られた、偽装サイト(フィッシング詐欺サイト)であると報告されています。このページで個人情報を入力してしまうと、なりすましや詐欺などの被害に遭う恐れがあります。 &#160;">
-<!ENTITY safeb.palm.message.p1.linkText	"詳細 »">
-<!ENTITY safeb.palm.p1.linkStatusText	"詳しい説明を表示します">
-
-<!ENTITY safeb.palm.message.p2.start	"この種の偽装サイトはフィッシングと呼ばれる詐欺に使われています。本物のサイトに見せかけた詐欺ページを作り、あなたに信頼させようとしているのです。詳しくはフィッシング詐欺サイト警告機能の">
-<!ENTITY safeb.palm.message.p2.linkText	"解説ページ"><!-- (^^; このリンク中は改行されないので短く -->
-<!ENTITY safeb.palm.message.p2.end	"をご覧ください。">
-
 <!-- (^^; ユーザのホームページではなく検索エンジンのホームへのリンク -->
 <!ENTITY safeb.palm.accept.label	"スタートページに戻る"><!-- en-US: Get me out of here! -->
-<!ENTITY safeb.palm.accept.statustext	"スタートページに移動します"><!-- en-US: Navigate to my home page -->
 <!ENTITY safeb.palm.decline.label	"この警告を無視する">
-<!ENTITY safeb.palm.decline.statustext	"警告を閉じます">
 <!ENTITY safeb.palm.notforgery.label2	"誤警告を報告..."><!-- en-US: This isn't a web forgery -->
 <!ENTITY safeb.palm.reportPage.label	"このサイトがブロックされる理由">
 
 <!ENTITY safeb.blocked.malwarePage.title	"攻撃サイトとして報告されています!">
 <!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.malwarePage.shortDesc	"この Web ページ (<span id='malware_sitename'/>) は攻撃サイトであると報告されており、セキュリティ設定に従いブロックされました。">
 <!ENTITY safeb.blocked.malwarePage.longDesc	"<p>攻撃サイトはあなたの個人情報を盗んだり、コンピュータを乗っ取って他のコンピュータへの攻撃に利用したり、あなたのシステムを破壊するためのプログラムをインストールしようとします。</p><p>一部の攻撃サイトでは意図的に有害なソフトウェアを配布していますが、多くの場合は運営者が知らずにまたは許可なく有害なソフトウェアの配布に不正利用されています。</p>">
 
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -27,39 +27,36 @@ that require it.  -->
      of the "Details" progressive disclosure button.  See UI mockup at bug
      480169 -->
 <!ENTITY detailsProgressiveDisclosure.label		"消去する項目">
 <!ENTITY detailsProgressiveDisclosure.accesskey		"e">
 
 <!ENTITY historySection.label			"履歴">
 <!ENTITY dataSection.label			"データ">
 
-<!-- LOCALIZATION NOTE (item*): itemHistoryAndDownloads.* and
-     itemBrowsingHistory.* will never be used at the same time, so they can
-     have the same accesskey. -->
 <!ENTITY itemHistoryAndDownloads.label		"表示したページとダウンロードの履歴">
 <!ENTITY itemHistoryAndDownloads.accesskey	"B">
-<!ENTITY itemBrowsingHistory.label		"表示したページの履歴">
-<!ENTITY itemBrowsingHistory.accesskey		"B">
 <!ENTITY itemFormSearchHistory.label		"検索やフォームの入力履歴">
 <!ENTITY itemFormSearchHistory.accesskey	"F">
 <!ENTITY itemPasswords.label			"保存されているパスワード">
 <!ENTITY itemPasswords.accesskey		"P">
 <!ENTITY itemCookies.label			"Cookie">
 <!ENTITY itemCookies.accesskey			"C">
 <!ENTITY itemCache.label			"キャッシュ">
 <!ENTITY itemCache.accesskey			"A">
 <!ENTITY itemOfflineApps.label			"Web サイトのオフライン作業用データ">
 <!ENTITY itemOfflineApps.accesskey		"O">
-<!ENTITY itemDownloadHistory.label		"ダウンロード履歴">
-<!ENTITY itemDownloadHistory.accesskey		"D">
 <!ENTITY itemActiveLogins.label			"現在のログイン情報">
 <!ENTITY itemActiveLogins.accesskey		"L">
 <!ENTITY itemSitePreferences.label		"サイトの設定">
 <!ENTITY itemSitePreferences.accesskey		"S">
 
 <!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
      that appears when "Time range to clear" is set to "Everything".  See UI
      mockup at bug 480169 -->
 <!ENTITY sanitizeEverythingUndoWarning		"この操作は取り消せません。">
 
-<!ENTITY dialog.width				"34em"><!-- en-US: 28em -->
-<!ENTITY column.width				"16.5em"><!-- en-US: 14em -->
+<!-- LOCALIZATION NOTE (dialog.width2): width of the Clear Recent History and
+     Clear History on Shutdown dialogs.  Should be large enough to contain
+     the item* strings above on a single line.  The column width should be set
+     at half of the dialog width. -->
+<!ENTITY dialog.width2				"34em"><!-- en-US: 34em -->
+<!ENTITY column.width2				"16.5em"><!-- en-US: 17em -->
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -28,16 +28,19 @@
 <!-- New Account Page 1: Basic Account Info -->
 <!ENTITY setup.newAccountDetailsPage.title.label  "アカウントの詳細">
 <!ENTITY setup.emailAddress.label     "メールアドレス">
 <!ENTITY setup.emailAddress.accesskey "E">
 <!ENTITY setup.choosePassword.label      "パスワードを入力">
 <!ENTITY setup.choosePassword.accesskey  "P">
 <!ENTITY setup.confirmPassword.label  "パスワードを再度入力">
 <!ENTITY setup.confirmPassword.accesskey  "m">
+<!ENTITY setup.setupMetro.label     "Windows 8 スタイルで &brandShortName; を同期">
+<!ENTITY setup.setupMetro.accesskey "S">
+
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
 <!ENTITY setup.tosAgree1.label      "私は">
 <!ENTITY setup.tosAgree1.accesskey  "a">
 <!ENTITY setup.tosLink.label        "利用規約">
 <!ENTITY setup.tosAgree2.label      "と">
 <!ENTITY setup.ppLink.label         "プライバシーポリシー">
 <!ENTITY setup.tosAgree3.label      "に同意します">
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -116,9 +116,10 @@ missing_file_error=PDF ファイルが見つかりません。
 # LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} 注釈]
 request_password=PDF はパスワードによって保護されています
 
 printing_not_supported=警告: このブラウザでは印刷が完全にサポートされていません
+printing_not_ready=警告: PDF を印刷するための読み込みが終了していません
 web_fonts_disabled=Web フォントが無効になっています: 埋め込まれた PDF のフォントを使用することができません