15.0: sync browser with en-US rev98343:6926dd115351 FIREFOX_15_0b1_BUILD1 FIREFOX_15_0b1_RELEASE FIREFOX_15_0b2_BUILD1 FIREFOX_15_0b2_RELEASE FIREFOX_15_0b3_BUILD1 FIREFOX_15_0b3_RELEASE FIREFOX_15_0b4_BUILD1 FIREFOX_15_0b4_RELEASE FIREFOX_15_0b5_BUILD1 FIREFOX_15_0b5_RELEASE
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Tue, 10 Jul 2012 22:22:45 +0900
changeset 721 3a2f7fa4f51268ba1b9feef75014f0d3256ddbfe
parent 720 5ff424a163965bc3699062590719616b1197db1f
child 722 55cce2e1c3fc754465b0529f8fe6212e6125456e
child 724 bfd4f8ea049ab937355c10291701d6ba43e217c5
child 735 d7239190ea57fdc8b5bf15828dcb14ad0a1fa4f3
child 746 e4369ddcce0f870e4c8347b9b18c06fce3ff5938
child 751 954f6965fe26f1ea4d4baec51a95980436286afe
child 756 3227d0e1efd1e5f4046fe84b1dce9dfb5a3a7a05
child 769 6f88795cafff506c1aa2ba6f90e042b11865bf03
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs15
15.0: sync browser with en-US rev98343:6926dd115351
browser/chrome/browser/aboutDialog.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/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/layoutview.dtd
browser/chrome/browser/devtools/responsiveUI.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/safeMode.dtd
browser/pdfviewer/chrome.properties
browser/pdfviewer/viewer.properties
browser/webapp-uninstaller/webapp-uninstaller.properties
browser/webapprt/webapp.properties
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -64,13 +64,15 @@
 <!-- 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		"">
 
+<!ENTITY update.applying		"更新を適用中...">
+
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
 <!ENTITY channel.description.start	"現在のアップデートチャンネルは ">
 <!ENTITY channel.description.end	" です。 ">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -72,30 +72,42 @@ can reach it easily. -->
 <!ENTITY addonBarCmd.accesskey		"A">
 
 <!ENTITY pageSourceCmd.label		"ページのソース">
 <!ENTITY pageSourceCmd.accesskey	"o">
 <!ENTITY pageSourceCmd.commandkey	"u">
 <!ENTITY pageInfoCmd.label		"ページの情報">
 <!ENTITY pageInfoCmd.accesskey		"I">
 <!ENTITY pageInfoCmd.commandkey		"i">
+<!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
+These should match what Safari and other Apple applications use on OS X Lion. -->
+<!ENTITY enterFullScreenCmd.label	"全画面表示にする">
+<!ENTITY enterFullScreenCmd.accesskey	"F">
+<!ENTITY exitFullScreenCmd.label	"全画面表示から戻る">
+<!ENTITY exitFullScreenCmd.accesskey	"F">
 <!ENTITY fullScreenCmd.label		"全画面表示">
 <!ENTITY fullScreenCmd.accesskey	"F">
 <!ENTITY fullScreenCmd.macCommandKey	"f">
 <!ENTITY showAllTabsCmd.label		"すべてのタブを表示">
 <!ENTITY showAllTabsCmd.accesskey	"A">
 
 <!ENTITY fullScreenMinimize.tooltip	"最小化">
 <!ENTITY fullScreenRestore.tooltip	"元に戻す">
 <!ENTITY fullScreenClose.tooltip	"閉じる">
 <!ENTITY fullScreenAutohide.label	"ツールバーを隠す">
 <!ENTITY fullScreenAutohide.accesskey	"H">
 <!ENTITY fullScreenExit.label		"全画面表示モードを終了">
 <!ENTITY fullScreenExit.accesskey	"F">
-<!ENTITY domFullScreenWarning.label	"全画面表示モードを終了するには、ESC キーを押してください">
+<!ENTITY fullscreenAllowButton.label	"許可">
+<!ENTITY fullscreenExitButton.label	"拒否">
+<!ENTITY fullscreenApproval.value	"全画面表示モードを許可しますか?">
+
+<!ENTITY fullscreenExitHint.value	"ESC キーを押すと、全画面表示モードを終了します。">
+<!ENTITY leaveDOMFullScreen.label	"全画面表示モードを終了">
+<!ENTITY leaveDOMFullScreen.accesskey	"u">
 
 <!ENTITY closeWindow.label		"ウィンドウを閉じる">
 <!ENTITY closeWindow.accesskey 		"d">
 
 <!ENTITY bookmarksMenu.label		"ブックマーク">
 <!ENTITY bookmarksMenu.accesskey	"B">
 <!ENTITY bookmarkThisPageCmd.label	"このページをブックマーク">
 <!ENTITY bookmarkThisPageCmd.commandkey	"d">
@@ -193,16 +205,20 @@ can reach it easily. -->
 
 <!ENTITY inspectMenu.label		"調査">
 <!ENTITY inspectMenu.accesskey		"T">
 <!ENTITY inspectMenu.commandkey		"I">
 
 <!ENTITY inspectContextMenu.label	"要素を調査">
 <!ENTITY inspectContextMenu.accesskey	"Q">
 
+<!ENTITY responsiveDesignTool.label		"レスポンシブデザインビュー">
+<!ENTITY responsiveDesignTool.accesskey		"R">
+<!ENTITY responsiveDesignTool.commandkey	"M">
+
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
@@ -210,25 +226,44 @@ can reach it easily. -->
   -  "simple discardable text editor". -->
 <!ENTITY scratchpad.label             "スクラッチパッド">
 <!ENTITY scratchpad.accesskey         "s">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectCloseButton.tooltiptext	"調査を閉じる">
 
+<!ENTITY devToolbarCloseButton.tooltiptext	"開発ツールバーを閉じる">
+<!ENTITY devToolbarMenu.label			"開発ツールバー">
+<!ENTITY devToolbarMenu.accesskey		"v">
+<!ENTITY devToolbar.commandkey			"v">
+
+<!ENTITY webConsoleButton.label			"Web コンソール">
+<!ENTITY inspectorButton.label			"調査">
+<!ENTITY scriptsButton.label			"デバッガ">
+
 <!ENTITY inspectorHTMLCopyInner.label		"内側の HTML をコピー">
 <!ENTITY inspectorHTMLCopyInner.accesskey	"I">
 
 <!ENTITY inspectorHTMLCopyOuter.label		"外側の HTML をコピー">
 <!ENTITY inspectorHTMLCopyOuter.accesskey	"O">
 
 <!ENTITY inspectorHTMLDelete.label		"ノードを削除">
 <!ENTITY inspectorHTMLDelete.accesskey		"D">
 
+<!-- LOCALIZATION NOTE (inspectOptionButton.*): The menu in the Inspector
+  -  toolbar.  -->
+<!ENTITY inspectOptionButton.tooltiptext	"調査オプション">
+
+<!-- LOCALIZATION NOTE: These are for the menu in the Inspector Toolbar -->
+<!ENTITY inspectorToggleVeil.label		"ページを暗転">
+<!ENTITY inspectorToggleVeil.accesskey		"D">
+<!ENTITY inspectorToggleInfobar.label		"ノードの情報を表示">
+<!ENTITY inspectorToggleInfobar.accesskey	"S">
+
 <!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
   -  alternate view for the Inspector, creating a 3D visualization of the
   -  webpage. -->
 <!ENTITY inspect3DViewButton.label	"3D ビュー">
 <!ENTITY inspect3DViewButton.accesskey	"W">
 
 <!ENTITY inspectStyleButton.label	"スタイル">
 <!ENTITY inspectStyleButton.accesskey	"S">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -147,18 +147,18 @@ sanitizeSelectedWarning			= 選択した項目の履歴がすべて消去されます。
 # directly under the Firefox version in the about dialog (see bug 596813 for
 # screenshots).
 update.checkInsideButton.label			= ソフトウェアの更新を確認
 update.checkInsideButton.accesskey		= C
 update.resumeButton.label			= ダウンロードを再開: %S...
 update.resumeButton.accesskey			= D
 update.openUpdateUI.applyButton.label		= ダウンロードした更新を適用...
 update.openUpdateUI.applyButton.accesskey	= A
-update.restart.applyButton.label		= ダウンロードした更新を適用...
-update.restart.applyButton.accesskey		= A
+update.restart.updateButton.label		= 再起動して更新を完了
+update.restart.updateButton.accesskey		= R
 update.openUpdateUI.upgradeButton.label		= ダウンロードした更新を今すぐ適用...
 update.openUpdateUI.upgradeButton.accesskey	= U
 update.restart.upgradeButton.label		= ダウンロードした更新を今すぐ適用
 update.restart.upgradeButton.accesskey		= U
 
 # RSS Pretty Print
 feedShowFeedNew				= '%S' を購読...
 
@@ -307,17 +307,23 @@ privateBrowsingNeverAsk				= 今後はこのメッセージを表示しない(&D)
 ctrlTab.showAll.label				= すべて (#1 ページ) のタブを表示
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 # (^^; イマイチ
 addKeywordTitleAutoFill				= 検索: %S
 
 # TabView
-tabView2.title					= %S - タブグループ
+# LOCALIZATION NOTE (tabview.title): %S is the application name.
+tabview.title					= %S - タブグループ
+# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the page title of the first tab in the unnamed group, 
+# #2 is the number of remaining tabs.
+tabview.moveToUnnamedGroup.label		= #1 と #2 個のタブ
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name		= デフォルト
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description	= 標準設定のテーマです。
 
 # safeModeRestart
 safeModeRestartPromptTitle			= アドオンを無効にして再起動
 safeModeRestartPromptMessage			= すべてのアドオンを無効にして再起動します。よろしいですか?
 safeModeRestartButton				= 再起動
@@ -358,8 +364,13 @@ webapps.install			= インストール
 webapps.install.accesskey	= I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall		= このサイト (%2$S) から "%1$S" をインストールしますか?
 
 # Telemetry opt-out prompt for Aurora and Nightly
 # LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt		= %1$S の改善のために、パフォーマンスおよびハードウェアの情報、機能の使用状況、ブラウザの設定が %2$S に送信されます。%3$0.S
+
+# LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
+fullscreen.entered		= %S は現在全画面表示モードです。
+# LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
+fullscreen.rememberDecision	= %S での全画面表示の設定を保存する
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -1,46 +1,66 @@
-<!-- LOCALIZATION NOTE : FILE This file contains the Script Debugger strings -->
+<!-- LOCALIZATION NOTE : FILE This file contains the Debugger strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 <!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
   -  application menu item that opens the debugger UI. -->
-<!ENTITY debuggerMenu.label		"スクリプトデバッガ">
+<!ENTITY debuggerMenu.label2		"デバッガ">
+
+<!-- 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): This is the label for the
-  -  button that closes the debugger UI. -->
-<!ENTITY debuggerUI.closeButton		"閉じる">
+<!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
+  -  the button that closes the debugger UI. -->
+<!ENTITY debuggerUI.closeButton.tooltip		"閉じる">
 
-<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton): This is the label for the
-  -  button that steps over a function call. -->
-<!ENTITY debuggerUI.stepOverButton	"ステップオーバー">
+<!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
+  -  checkbox that toggles pausing on exceptions. -->
+<!ENTITY debuggerUI.pauseExceptions		"例外発生で停止">
 
-<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the label for the
-  -  button that steps into a function call. -->
-<!ENTITY debuggerUI.stepInButton	"ステップイン">
+<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton.tooltip): This is the tooltip for
+  -  the button that steps over a function call. -->
+<!ENTITY debuggerUI.stepOverButton.tooltip	"ステップオーバー">
 
-<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the label for the
+<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the tooltip for the
+  -  button that steps into a function call. -->
+<!ENTITY debuggerUI.stepInButton.tooltip	"ステップイン">
+
+<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the tooltip for the
   -  button that steps out of a function call. -->
-<!ENTITY debuggerUI.stepOutButton	"ステップアウト">
+<!ENTITY debuggerUI.stepOutButton.tooltip	"ステップアウト">
 
 <!-- LOCALIZATION NOTE (debuggerUI.stackTitle): This is the label for the
   -  widget that displays the call stack frames in the debugger. -->
 <!ENTITY debuggerUI.stackTitle		"コールスタック">
 
 <!-- LOCALIZATION NOTE (debuggerUI.scriptTitle): This is the label for the
   -  widget that displays the source code for the script that is currently
   -  being inspected in the debugger. -->
 <!ENTITY debuggerUI.scriptTitle		"スクリプト">
 
 <!-- LOCALIZATION NOTE (debuggerUI.propertiesTitle): This is the label for the
   -  widget that displays the variables in the various available scopes in the
   -  debugger. -->
 <!ENTITY debuggerUI.propertiesTitle	"スコープ内の変数">
+
+<!-- LOCALIZATION NOTE (debuggerUI.emptyFilterText): This is the text that
+  -  appears in the filter text box when it is empty. -->
+<!ENTITY debuggerUI.emptyFilterText	"ファイル名を検索">
+
+<!-- LOCALIZATION NOTE (emptyScriptText): The text to display in the menulist when
+  - there are no scripts. -->
+<!ENTITY debuggerUI.emptyScriptText	"見つかりません。">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -1,54 +1,90 @@
-# LOCALIZATION NOTE These strings are used inside the Script Debugger
-# which is available from the Web Developer sub-menu -> 'Script Debugger'.
+# LOCALIZATION NOTE These strings are used inside the Debugger
+# which is available from the Web Developer sub-menu -> 'Debugger'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
+# LOCALIZATION NOTE (confirmTabSwitch): The messages displayed for all the
+# title and buttons on the notification shown when a user attempts to open a
+# debugger in a new tab while a different tab is already being debugged.
+confirmTabSwitch.message		= ほかのタブですでにデバッガを開いています。このまま続けると、ほかのタブのデバッガを閉じます。
+confirmTabSwitch.buttonSwitch		= デバッグ中のタブに移動
+confirmTabSwitch.buttonSwitch.accessKey	= S
+confirmTabSwitch.buttonOpen		= とにかく開く
+confirmTabSwitch.buttonOpen.accessKey	= O
+
+# LOCALIZATION NOTE (remoteDebuggerWindowTitle): The title displayed for the
+# remote debugger window.
+remoteDebuggerWindowTitle		= リモートデバッガ
+
+# 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 (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 (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
-pauseLabel	= 停止
+pauseTooltip	= クリックすると停止
 
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
-resumeLabel	= 復帰
-
-# LOCALIZATION NOTE (pausedState): The label that is displayed when the
-# debugger is in a paused state.
-pausedState	= 停止中
-
-# LOCALIZATION NOTE (runningState): The label that is displayed when the
-# debugger is in a running state.
-runningState	= 実行中
-
-# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
-# pane as a header on the local scope container.
-localScope	= ローカル
+resumeTooltip	= クリックすると復帰
 
-# LOCALIZATION NOTE (globalScope): The label that is displayed in the variables
-# pane as a header on the globel scope container.
-globalScope	= グローバル
-
-# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
-# pane as a header on the container for identifiers in a with block.
-withScope	= with ブロック
-
-# LOCALIZATION NOTE (closureScope): The label that is displayed in the variables
-# pane as a header on container for identifiers in a closure scope.
-closureScope	= クロージャ
-
-# LOCALIZATION NOTE (emptyText): The text that is displayed in the stack frames
-# list when there are no frames to display.
-emptyText	= (空)
+# LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
+# frames list when there are no frames to display.
+emptyStackText	= 表示できるスタックはありません。
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the laoding process has started but there is no file to display
 # yet.
 loadingText	= ロード中...
 
 # LOCALIZATION NOTE (loadingError):
 # This is the error message that is displayed on failed attempts to load an
 # external resource file.
 # %1$S=URL, %2$S=status code
 loadingError	= ロード時エラー %1$S: %2$S
+
+# LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptTitle	= リモートデバッグの受信
+
+# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptMessage	= リモートデバッグの接続要求の受け付けを検知しました。リモートクライアントはあなたのブラウザを操作できるようになります! 接続を許可しますか?
+
+# LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
+# third button in the incoming connection dialog that lets the user disable the
+# remote debugger server.
+remoteIncomingPromptDisable	= 無効にする
+
+# LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
+# variables pane when there are no variables to display.
+emptyVariablesText	= 表示できる変数はありません。
+
+# LOCALIZATION NOTE (scopeLabel): The text that is displayed in the variables
+# pane as a header for each variable scope (e.g. "Global scope, "With scope",
+# etc.).
+scopeLabel		= %S スコープ
+
+# 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	= グローバル
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -105,20 +105,21 @@ helpDesc		= 使用可能なコマンドのヘルプ
 helpManual		= 特定のコマンド (検索文字列が一致した場合) または使用可能なコマンド (検索文字列がない、または一致するものがない場合) のヘルプを表示します。
 
 # LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
 # parameter to the 'help' command. See helpSearchManual for a fuller
 # description of what it does. This string is designed to be shown in a dialog
 # with restricted space, which is why it should be as short as possible.
 helpSearchDesc		= コマンドを検索する
 
-# LOCALIZATION NOTE (helpSearchManual): A fuller description of the 'search'
+# LOCALIZATION NOTE (helpSearchManual2): A fuller description of the 'search'
 # parameter to the 'help' command. Displayed when the user asks for help on
-# what it does.
-helpSearchManual	= ユーザ向けに表示されるコマンドの候補を絞り込むための検索文字列を指定します。部分一致が可能です。正規表現はサポートしません。
+# what it does. Inline HTML (e.g. <strong>) can be used to emphasize the core
+# concept.
+helpSearchManual2	= コマンドを絞り込む<strong>検索文字列</strong>を指定します。正規表現は使えません。
 
 # LOCALIZATION NOTE (helpManSynopsis): A heading shown at the top of a help
 # page for a command in the console It labels a summary of the parameters to
 # the command
 helpManSynopsis		= 概要
 
 # LOCALIZATION NOTE (helpManDescription): A heading shown in a help page for a
 # command in the console. This heading precedes the top level description.
@@ -127,17 +128,207 @@ helpManDescription	= 詳細
 # LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
 # in a help page for a command in the console.
 helpManParameters	= パラメータ
 
 # LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
 # heading in a help page for a command which has no parameters.
 helpManNone		= なし
 
-# LOCALIZATION NOTE (introHeader): The heading displayed at the top of the
-# output for the help command
-introHeader		= Firefox 開発ツールへようこそ
+# 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
+subCommandsNone		= なし
+
+# 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.
+prefManual		= GCLI や環境の設定を、表示または変更するコマンドです
+
+# LOCALIZATION NOTE (prefListDesc): A very short description of the 'pref
+# 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. See
+# prefListManual for a fuller description of what it does.
+prefListDesc		= 利用可能な設定値を表示する
+
+# LOCALIZATION NOTE (prefListManual): A fuller description of the 'pref list'
+# command. Displayed when the user asks for help on what it does.
+prefListManual		= 設定値の一覧を表示します。'search' パラメータで検索が可能です
+
+# LOCALIZATION NOTE (prefListSearchDesc): A short description of the 'search'
+# parameter to the 'pref list' command. See prefListSearchManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefListSearchDesc	= 設定値の一覧から検索する
+
+# LOCALIZATION NOTE (prefListSearchManual): A fuller description of the
+# 'search' parameter to the 'pref list' command. Displayed when the user asks
+# for help on what it does.
+prefListSearchManual	= 入力された文字列で、利用可能な設定値を検索します
+
+# LOCALIZATION NOTE (prefShowDesc): A very short description of the 'pref
+# show' 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
+# prefShowManual for a fuller description of what it does.
+prefShowDesc		= 設定を表示
+
+# LOCALIZATION NOTE (prefShowManual): A fuller description of the 'pref show'
+# command. Displayed when the user asks for help on what it does.
+prefShowManual		= 指定された設定項目の値を表示します
+
+# LOCALIZATION NOTE (prefShowSettingDesc): A short description of the
+# 'setting' parameter to the 'pref show' command. See prefShowSettingManual
+# for a fuller description of what it does. This string is designed to be
+# shown in a dialog with restricted space, which is why it should be as short
+# 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 (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.
+prefSetManual		= 環境で定義された設定を変更します
+
+# LOCALIZATION NOTE (prefSetSettingDesc): A short description of the 'setting'
+# parameter to the 'pref set' command. See prefSetSettingManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefSetSettingDesc	= 変更する設定項目
+
+# LOCALIZATION NOTE (prefSetSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref set' command. Displayed when the user asks
+# for help on what it does.
+prefSetSettingManual	= 変更する設定項目の名前
+
+# LOCALIZATION NOTE (prefSetValueDesc): A short description of the 'value'
+# parameter to the 'pref set' command. See prefSetValueManual for a fuller
+# description of what it does. This string is designed to be shown in a dialog
+# with restricted space, which is why it should be as short as possible.
+prefSetValueDesc	= 新しい値
+
+# LOCALIZATION NOTE (prefSetValueManual): A fuller description of the 'value'
+# parameter to the 'pref set' command. Displayed when the user asks for help
+# on what it does.
+prefSetValueManual	= 指定された設定項目の新しい値
+
+# LOCALIZATION NOTE (prefSetCheckHeading): Title displayed to the user the
+# first time they try to alter a setting This is displayed directly above
+# prefSetCheckBody and prefSetCheckGo.
+prefSetCheckHeading	= 動作保証対象外になります!
+
+# LOCALIZATION NOTE (prefSetCheckBody): The main text of the warning displayed
+# to the user the first time they try to alter a setting. See also
+# prefSetCheckHeading and prefSetCheckGo.
+prefSetCheckBody	= プログラムの高度な設定を変更すると、安定性、セキュリティ、パフォーマンスに深刻な問題を引き起こす恐れがあります。設定変更による影響を完全に理解している場合に限ってご利用ください。
+
+# LOCALIZATION NOTE (prefSetCheckGo): The text to enable preference editing.
+# Displayed in a button directly under prefSetCheckHeading and
+# prefSetCheckBody
+prefSetCheckGo		= 細心の注意を払って使用する
+
+# LOCALIZATION NOTE (prefResetDesc): A very short description of the 'pref
+# reset' 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
+# prefResetManual for a fuller description of what it does.
+prefResetDesc		= 設定をリセット
+
+# LOCALIZATION NOTE (prefResetManual): A fuller description of the 'pref
+# reset' command. Displayed when the user asks for help on what it does.
+prefResetManual		= 設定項目の値をシステムの既定値にリセットします
+
+# LOCALIZATION NOTE (prefResetSettingDesc): A short description of the
+# 'setting' parameter to the 'pref reset' command. See prefResetSettingManual
+# for a fuller description of what it does. This string is designed to be
+# shown in a dialog with restricted space, which is why it should be as short
+# as possible.
+prefResetSettingDesc	= リセットする設定項目
+
+# LOCALIZATION NOTE (prefResetSettingManual): A fuller description of the
+# 'setting' parameter to the 'pref reset' command. Displayed when the user
+# asks for help on what it does.
+prefResetSettingManual	= システムの既定値にリセットする設定項目の名前
+
+# LOCALIZATION NOTE (prefOutputFilter): Displayed in the output from the 'pref
+# list' command as a label to an input element that allows the user to filter
+# the results
+prefOutputFilter	= フィルタ
+
+# LOCALIZATION NOTE (prefOutputName): Displayed in the output from the 'pref
+# list' command as a heading to a table. The column contains the names of the
+# available preferences
+prefOutputName		= 名前
+
+# LOCALIZATION NOTE (prefOutputValue): Displayed in the output from the 'pref
+# list' command as a heading to a table. The column contains the values of the
+# available preferences
+prefOutputValue		= 値
+
+# LOCALIZATION NOTE (introDesc): A very short description of the 'intro'
+# 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 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
+# 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 構文の入力と、単純出力以上の豊富な表示のスピードに注力しています。
+
+# 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.
+introTextCommands	= コマンド一覧は次のコマンドを入力してください
+
+# LOCALIZATION NOTE (introTextKeys): For information about the 'intro text'
+# see introTextOpening. The second section in the second paragraph points the
+# user to the F1/Escape keys which show and hide hints.
+introTextKeys		= コマンドのヒントを表示または隠すには、次のキーを押してください
+
+# LOCALIZATION NOTE (introTextF1Escape): For information about the 'intro
+# text' see introTextOpening. This string is used with introTextKeys, 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.
+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.
+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
 # inside a link to a localized MDN article
 introBody		= 詳しくは MDN をご覧ください。
 
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -32,16 +32,56 @@ consoleDesc		= コンソールを操作するコマンドです
 # set of commands that control the console.
 consoleManual		= コンソールにフィルタをかけたり\
 内容を消去したり、閉じたりします
 
 # LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
 # function of the 'console clear' command.
 consoleclearDesc	= コンソールの内容を消去します
 
+# LOCALIZATION NOTE (screenshotDesc) A very short description of the
+# 'screenshot' command. See screenshotManual 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.
+screenshotDesc			= ページの画像を保存
+
+# LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
+# command, displayed when the user asks for help on what it does.
+screenshotManual		= 表示されているウィンドウ全体の画像を PNG 形式で保存します (タイマーも設定できます)
+
+# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
+# the 'filename' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFilenameDesc		= 保存ファイル名
+
+# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
+# 'filename' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFilenameManual	= 画像を保存する (拡張子が '.png' となっている) ファイルの名前
+
+# 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.
+screenshotDelayDesc		= タイマー (秒)
+
+# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
+# 'delay' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotDelayManual		= 保存するタイミングをずらすタイマーを設定します (秒単位)
+
+# LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
+# the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotFullPageDesc		= Web ページ全体か? (true/false)
+
+# LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
+# 'fullscreen' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotFullPageManual	= True を指定すると、現在のスクロール範囲外の領域も画像に含まれます。
+
 # 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'
 # command, displayed when the user asks for help on what it does.
@@ -262,16 +302,21 @@ breakdelRemoved		= ブレークポイントが撤去されました
 # command to explain that the breakpoint was not found.
 breakNotFound		= ブレークポイントが見つかりません
 
 # LOCALIZATION NOTE (consolecloseDesc) A very short description of the
 # 'console close' 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.
 consolecloseDesc	= コンソールを閉じます
 
+# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
+# 'console open' 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.
+consoleopenDesc		= コンソールを開きます
+
 # LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
 # command. See editManual 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.
 editDesc		= Web ページを微調整します
 
 # LOCALIZATION NOTE (editManual) A fuller description of the 'edit' command,
 # displayed when the user asks for help on what it does.
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -15,21 +15,26 @@ confirmNavigationAway.buttonLeave		= 移動する
 confirmNavigationAway.buttonLeaveAccesskey	= L
 confirmNavigationAway.buttonStay		= 移動しない
 confirmNavigationAway.buttonStayAccesskey	= S
 
 breadcrumbs.siblings	= 隣接する要素
 # LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
 # method when registering the HTML panel.
 
-# LOCALIZATION NOTE (inspectButton.tooltiptext):
+# LOCALIZATION NOTE (inspectButtonWithShortcutKey.tooltip):
 # This button appears in the Inspector Toolbar. inspectButton is stateful,
 # if it's pressed users can select an element with the mouse.
 # %S is the keyboard shortcut.
-inspectButton.tooltiptext	= マウスで要素を選択 (%S)
+inspectButtonWithShortcutKey.tooltip	= マウスで要素を選択 (%S)
+
+# LOCALIZATION NOTE (inspectButton.tooltip):
+# Same as inspectButtonWithShortcutKey.tooltip but used when an add-on
+# overrides the shortcut key.
+inspectButton.tooltip			= マウスで要素を選択
 
 # LOCALIZATION NOTE (markupButton.*):
 # This button is the button located at the beginning of the breadcrumbs
 # in the inspector toolbar. Its tooltip is built dynamically.
 # markupButton.tooltip is used on Mac.
 # On Windows and Linux, we use markupButton.tooltipWithAccesskey, where we append
 # the keyboard shortcut.
 markupButton.tooltip			= マークアップパネル
--- a/browser/chrome/browser/devtools/layoutview.dtd
+++ b/browser/chrome/browser/devtools/layoutview.dtd
@@ -3,19 +3,16 @@
   - sidebar. -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
-<!ENTITY elementSize.label	"要素のサイズ: ">
-
-
 <!-- LOCALIZATION NOTE (*.tooltip): These tooltips are not regular tooltips.
   -  The text appears on the bottom right corner of the layout view when
   -  the corresponding box is hovered. -->
 
 <!ENTITY margins.tooltip	"margin">
 <!ENTITY borders.tooltip	"border">
 <!ENTITY padding.tooltip	"padding">
 <!ENTITY content.tooltip	"要素の内容">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/responsiveUI.properties
@@ -0,0 +1,17 @@
+# LOCALIZATION NOTE These strings are used inside the Responsive Mode
+# which is available from the Web Developer sub-menu -> 'Responsive Mode'.
+#
+# 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  (responsiveUI.rotate): label of the rotate button.
+responsiveUI.rotate		= 高さと幅を入れ替え
+
+# LOCALIZATION NOTE  (responsiveUI.customResolution): label of the first item
+# in the menulist at the beginning of the toolbar. For %S is replace with the
+# current size of the page. For example: "400x600".
+responsiveUI.customResolution	= %S (指定値)
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -183,8 +183,14 @@ timerStarted			= %S: タイマー開始
 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.
 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.
+JSTerm.updateNotInspectable	= 入力値が再評価されてしまうと、結果を調査することはできません。
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -34,14 +34,13 @@ 8_firefox	= 入力フォームの履歴
 16_ie		= 保存されているパスワード
 16_safari	= 保存されているパスワード
 16_chrome	= 保存されているパスワード
 16_firefox	= 保存されているパスワード
 
 32_ie		= お気に入り
 32_safari	= ブックマーク
 32_chrome	= ブックマーク
-32_firefox	= ブックマーク
 
 64_ie		= その他のデータ
 64_safari	= その他のデータ
 64_chrome	= その他のデータ
 64_firefox	= ブックマークのバックアップ
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -96,16 +96,17 @@
 <!ENTITY  permBlock			"ブロック">
 <!ENTITY  permissionsFor		"対象サイト:">
 <!ENTITY  permImage			"画像の読み込み">
 <!ENTITY  permPopup			"ポップアップウィンドウを開く">
 <!ENTITY  permCookie			"Cookie データの保存">
 <!ENTITY  permInstall			"拡張機能やテーマのインストール">
 <!ENTITY  permGeo			"位置情報の送信">
 <!ENTITY  permPlugins			"プラグインの実行">
+<!ENTITY  permFullscreen		"全画面表示に切り替え">
 
 <!ENTITY  permIndexedDB			"オフラインストレージの維持">
 <!ENTITY  permClearStorage		"ストレージを消去">
 <!ENTITY  permClearStorage.accesskey	"C">
 
 <!ENTITY  securityTab			"セキュリティ">
 <!ENTITY  securityTab.accesskey		"S">
 <!ENTITY  securityHeader		"このページのセキュリティ情報">
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -18,21 +18,16 @@
 <!ENTITY view.sort.accesskey			"S">
 <!ENTITY view.unsorted.label			"並べ替えない">
 <!ENTITY view.unsorted.accesskey		"U">
 <!ENTITY view.sortAscending.label		"昇順 (A &gt; Z)">
 <!ENTITY view.sortAscending.accesskey		"A">
 <!ENTITY view.sortDescending.label		"降順 (Z &gt; A)">
 <!ENTITY view.sortDescending.accesskey		"Z">
 
-<!ENTITY cmd.findInBookmarks.label		"ブックマークを検索...">
-<!ENTITY cmd.findInBookmarks.accesskey		"F">
-<!ENTITY cmd.findCurrent.label			"表示中の項目から検索...">
-<!ENTITY cmd.findCurrent.accesskey		"i">
-
 <!ENTITY importBookmarksFromHTML.label		"HTML からインポート...">
 <!ENTITY importBookmarksFromHTML.accesskey	"I">
 <!ENTITY exportBookmarksToHTML.label		"HTML としてエクスポート...">
 <!ENTITY exportBookmarksToHTML.accesskey	"E">
 <!ENTITY importOtherBrowser.label			"他のブラウザからデータをインポート...">
 <!ENTITY importOtherBrowser.accesskey		"A">
 
 <!ENTITY cmd.backup.label			"バックアップ...">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -39,17 +39,16 @@ view.sortBy.lastModified.label	= 変更日時順で表示
 view.sortBy.lastModified.accesskey= M
 view.sortBy.tags.label		= タグ順で表示
 view.sortBy.tags.accesskey	= T
 
 searchBookmarks			= ブックマークの検索
 searchHistory			= 履歴の検索
 searchDownloads			= ダウンロードの検索
 searchCurrentDefault		= '%S' から検索
-findInPrefix			= '%S' から検索...
 
 tabs.openWarningTitle		= 同時に複数のタブを開く確認
 tabs.openWarningMultipleBranded	= 同時に複数 (%S) のタブを開こうとしています。ページの読み込み中は %S の動作が遅くなることがあります。本当に開いてもよろしいですか?
 tabs.openButtonMultiple		= タブで開く
 tabs.openWarningPromptMeBranded	= 同時に複数のタブを開いて %S の動作が遅くなるときは確認する
 
 SelectImport			= ブックマークファイルのインポート
 EnterExport			= ブックマークファイルのエクスポート
@@ -59,17 +58,18 @@ saveSearch.title		= 検索条件を保存
 saveSearch.inputLabel		= 名前:
 saveSearch.inputDefaultText	= 新しい検索条件
 
 detailsPane.noItems		= 項目がありません
 # LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of items
 # example: 111 items
-detailsPane.itemsCountLabel	= 項目の数: 1 個;項目の数: #1 個
+# Thanks Feedback! http://forums.mozillazine.jp/viewtopic.php?t=13122
+detailsPane.itemsCountLabel	= 項目の数: #1 個
 
 # (^^; ブックマークツールバー直下のフォルダになったから短く: 表示回数の多いページ、よく表示するページ、よく見るページ、表示回数順 etc...
 mostVisitedTitle		= よく見るページ
 recentlyBookmarkedTitle		= 最近ブックマークしたページ
 recentTagsTitle			= 最近付けたタグ
 
 OrganizerQueryHistory		= 履歴
 OrganizerQueryDownloads		= ダウンロード
--- a/browser/chrome/browser/preferences/aboutPermissions.dtd
+++ b/browser/chrome/browser/preferences/aboutPermissions.dtd
@@ -30,8 +30,10 @@
 
 <!ENTITY plugins.label			"プラグイン">
 
 <!-- LOCALIZATION NOTE (indexedDB.label): This is describing indexedDB storage
      using the same language used for the permIndexedDB string in browser/pageInfo.dtd -->
 <!ENTITY indexedDB.label		"オフラインストレージの維持">
 
 <!ENTITY popup.label			"ポップアップウィンドウを開く">
+
+<!ENTITY fullscreen.label		"全画面表示">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -20,18 +20,19 @@
 <!ENTITY allowHWAccel.label			"ハードウェアアクセラレーション機能を使用する (可能な場合)">
 <!ENTITY allowHWAccel.accesskey			"r">
 <!ENTITY checkSpelling.label			"自動スペルチェック機能を使用する">
 <!ENTITY checkSpelling.accesskey		"t">
 
 <!ENTITY systemDefaults.label			"既定のブラウザ">
 <!ENTITY alwaysCheckDefault.label		"起動時に &brandShortName; が既定のブラウザであるか確認する"><!--XXX-->
 <!ENTITY alwaysCheckDefault.accesskey		"w">
-<!ENTITY checkNow.label				"今すぐ確認">
-<!ENTITY checkNow.accesskey			"N">
+<!ENTITY setDefault.label			"&brandShortName; を既定のブラウザに設定する">
+<!ENTITY setDefault.accesskey			"d">
+<!ENTITY isDefault.label			"&brandShortName; は既定のブラウザに設定されています">
 <!ENTITY submitCrashes.label			"クラッシュレポートを送信する">
 <!ENTITY submitCrashes.accesskey		"S">
 <!ENTITY submitTelemetry.label			"パフォーマンス情報を送信する">
 <!ENTITY submitTelemetry.accesskey		"P">
 
 <!ENTITY networkTab.label			"ネットワーク">
 
 <!ENTITY connection.label			"接続">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -1,17 +1,15 @@
 <!ENTITY startup.label			"起動">
 
 <!ENTITY startupPage.label		"&brandShortName; を起動するとき:">
 <!ENTITY startupPage.accesskey		"s">
 <!ENTITY startupHomePage.label		"ホームページを表示する">
 <!ENTITY startupBlankPage.label		"空白ページを表示する">
 <!ENTITY startupLastSession.label	"前回終了時のウィンドウとタブを表示する">
-<!ENTITY restoreOnDemand.label		"タブが選択されるまでページを読み込まない">
-<!ENTITY restoreOnDemand.accesskey	"l">
 
 <!ENTITY homepage.label			"ホームページ:">
 <!ENTITY homepage.accesskey		"P">
 <!ENTITY useCurrentPage.label		"現在のページを使用">
 <!ENTITY useCurrentPage.accesskey	"C">
 <!ENTITY useMultiple.label		"現在のタブグループを使用">
 <!ENTITY chooseBookmark.label		"ブックマークを使う...">
 <!ENTITY chooseBookmark.accesskey	"B">
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -9,8 +9,10 @@
 <!ENTITY  paneContent.title		"コンテンツ">
 <!ENTITY  paneApplications.title	"プログラム">
 <!ENTITY  panePrivacy.title		"プライバシー">
 <!ENTITY  paneSecurity.title		"セキュリティ">
 <!ENTITY  paneAdvanced.title		"詳細">
 
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 <!ENTITY  paneSync.title		"Sync">
+<!ENTITY  buttonForward.tooltip		"1 ページ進む">
+<!ENTITY  buttonBack.tooltip		"1 ページ戻る">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -54,16 +54,17 @@ useDefault			= %S を使用 (標準設定)
 
 useOtherApp			= 他のプログラムを選択...
 fpTitleChooseApp		= プログラムの選択
 manageApp			= プログラムの管理...
 webFeed				= Web フィード
 videoPodcastFeed		= ビデオポッドキャスト
 audioPodcastFeed		= ポッドキャスト
 alwaysAsk			= 毎回確認する
+portableDocumentFormat		= PDF 文書 (PDF)
 
 # LOCALIZATION NOTE (usePluginIn):
 # %1$S = plugin name (for example "QuickTime Plugin-in 7.2")
 # %2$S = brandShortName from brand.properties (for example "Minefield")
 usePluginIn			= %S を使用 (%S 内で表示)
 
 # LOCALIZATION NOTE (previewInApp, addLiveBookmarksInApp): %S = brandShortName
 previewInApp			= %S でプレビュー表示
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -5,13 +5,16 @@
 <!ENTITY warnCloseMultipleTabs.accesskey "m">
 
 <!ENTITY warnOpenManyTabs.label		"同時に複数のタブを開いて &brandShortName; の動作が遅くなるときは確認する">
 <!ENTITY warnOpenManyTabs.accesskey	"o">
 
 <!ENTITY showTabBar.label		"常にタブバーを表示する">
 <!ENTITY showTabBar.accesskey		"b">
 
+<!ENTITY restoreTabsOnDemand.label	"タブが選択されるまでページを読み込まない">
+<!ENTITY restoreTabsOnDemand.accesskey	"l">
+
 <!ENTITY switchToNewTabs.label		"リンクを新しいタブで開いたとき、すぐにそのタブに切り替える">
 <!ENTITY switchToNewTabs.accesskey	"s">
 
 <!ENTITY showTabsInTaskbar.label	"タスクバーにタブのプレビューを表示する">
 <!ENTITY showTabsInTaskbar.accesskey	"k">
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -32,33 +32,22 @@
    - and other provisions required by the LGPL or the GPL. If you do not delete
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
 #endif
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY safeModeDialog.title		"&brandShortName; セーフモード">
-<!ENTITY window.width			"37em">
-
-<!ENTITY autoSafeModeIntro.label	"&brandShortName; は正常に起動できませんでした。">
-<!ENTITY autoSafeModeDescription.label	"ご不便をおかけしまして、誠に申し訳ありません。&brandShortName; はセーフモードで実行されており、ユーザ設定、テーマ、拡張機能はすべて一時的に無効化されています。">
+<!ENTITY window.maxWidth		"400">
 
-<!ENTITY safeModeDescription.label	"&brandShortName; はセーフモードで実行されており、ユーザ設定、テーマ、拡張機能はすべて一時的に無効化されています。">
-<!ENTITY safeModeDescription2.label	"以下の項目については恒久的に変更できます:">
-
-<!ENTITY disableAddons.label		"すべてのアドオンを無効化する">
-<!ENTITY disableAddons.accesskey	"D">
+<!ENTITY startSafeMode.label		"セーフモードで起動">
+<!ENTITY resetProfile.label		"&brandShortName; をリセット">
 
-<!ENTITY resetToolbars.label		"ツールバーとコントロールをリセットする"><!-- Reset toolbars and controls -->
-<!ENTITY resetToolbars.accesskey	"R">
+<!ENTITY safeModeDescription3.label	"セーフモードは、トラブルシューティングのための、&brandShortName; の特別なモードです。">
+<!ENTITY safeModeDescription4.label	"設定とアドオンは一時的に無効化されます。">
 
-<!ENTITY deleteBookmarks.label		"バックアップ以外すべてのブックマークを削除する">
-<!ENTITY deleteBookmarks.accesskey	"b">
+<!ENTITY resetProfileInstead.label	"最初からやり直したい場合は、&brandShortName; をリセットすることもできます。">
 
-<!ENTITY resetUserPrefs.label		"すべてのユーザ設定をリセットする">
-<!ENTITY resetUserPrefs.accesskey	"p">
-
-<!ENTITY restoreSearch.label		"既定の検索エンジンを復元する">
-<!ENTITY restoreSearch.accesskey	"s">
-
-<!ENTITY changeAndRestartButton.label	"変更を実行して再起動">
-<!ENTITY continueButton.label		"セーフモードを続ける">
+<!-- LOCALIZATION NOTE (autoSafeModeDescription2.label safeModeInstead.label resetProfileFooter.label): Shown on the safe mode dialog after multiple startup crashes. See also chrome/global/resetProfile.dtd -->
+<!ENTITY autoSafeModeDescription2.label	"&brandShortName; は正常に起動できませんでした。アドオン、または他に問題がある可能性があります。問題を解決するには、&brandShortName; をリセットして初期状態に戻してみるか、セーフモードでトラブルシューティングできます。">
+<!ENTITY resetProfileFooter.label	"ほかはすべて初期状態にリセットされます。">
+<!ENTITY safeModeInstead.label		"リセットしたくない場合は、アドオンと設定を一時的に無効化したセーフモードで続行して、自分でトラブルシューティングを行うことができます。">
new file mode 100644
--- /dev/null
+++ b/browser/pdfviewer/chrome.properties
@@ -0,0 +1,3 @@
+# Chrome notification bar messages and buttons
+unsupported_feature		= この PDF 文書は正しく表示できない可能性があります。
+open_with_different_viewer	= ほかのビューアで開く
new file mode 100644
--- /dev/null
+++ b/browser/pdfviewer/viewer.properties
@@ -0,0 +1,91 @@
+# Main toolbar buttons (tooltips and alt text for images)
+previous.title		= 前のページ
+previous_label		= 前へ
+next.title		= 次のページ
+next_label		= 次へ
+
+# LOCALIZATION NOTE (page_label, page_of):
+# These strings are concatenated to form the "Page: X of Y" string.
+# Do not translate "{{pageCount}}", it will be substituted with a number
+# representing the total number of pages.
+page_label		= ページ:
+page_of			= of {{pageCount}}
+
+zoom_out.title		= 縮小
+zoom_out_label		= 縮小
+zoom_in.title		= 拡大
+zoom_in_label		= 拡大
+zoom.title		= 拡大/縮小
+print.title		= 印刷
+print_label		= 印刷
+open_file.title		= ファイルを開く
+open_file_label		= 開く
+download.title		= ダウンロード
+download_label		= ダウンロード
+bookmark.title		= 現在のビュー (コピーまたは新しいウィンドウで開く)
+bookmark_label		= 現在のビュー
+
+# Tooltips and alt text for side panel toolbar buttons
+# (the _label strings are alt text for the buttons, the .title strings are
+# tooltips)
+toggle_slider.title	= サイドバーの切り替え
+toggle_slider_label	= サイドバーの切り替え
+outline.title		= 文書の目次を表示
+outline_label		= 文書の目次
+thumbs.title		= 縮小版を表示
+thumbs_label		= 縮小版
+search_panel.title	= 文書を検索
+search_panel_label	= 検索
+
+# Document outline messages
+no_outline		= 利用可能な目次はありません
+
+# Thumbnails panel item (tooltip and alt text for images)
+# LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
+# number.
+thumb_page_title	= ページ {{page}}
+# LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
+# number.
+thumb_page_canvas	= ページの縮小版 {{page}}
+
+# Search panel button title and messages
+search			= 検索
+search_terms_not_found	= (見つかりません)
+
+# Error panel labels
+error_more_info		= 詳細情報
+error_less_info		= 詳細情報の非表示
+error_close		= 閉じる
+# LOCALIZATION NOTE (error_build): "{{build}}" will be replaced by the PDF.JS
+# build ID.
+error_build		= PDF.JS Build: {{build}}
+# LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
+# english string describing the error.
+error_message		= メッセージ: {{message}}
+# LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
+# trace.
+error_stack		= スタック: {{stack}}
+# LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
+error_file		= ファイル: {{file}}
+# LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
+error_line		= ライン: {{line}}
+rendering_error		= ページのレンダリング中にエラーが発生しました。
+
+# Predefined zoom values
+page_scale_width	= 幅に合わせる
+page_scale_fit		= ページのサイズに合わせる
+page_scale_auto		= 自動ズーム
+page_scale_actual	= 実際のサイズ
+
+# Loading indicator messages
+# LOCALIZATION NOTE (error_line): "{{[percent}}" will be replaced with a percentage
+loading			= 読み込み中... {{percent}}%
+loading_error_indicator	= エラー
+loading_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 はパスワードによって保護されています:
new file mode 100644
--- /dev/null
+++ b/browser/webapp-uninstaller/webapp-uninstaller.properties
@@ -0,0 +1,6 @@
+# LOCALIZATION NOTE: This file must be saved as UTF8
+# LOCALIZATION NOTE: $AppName will be replaced with the (already localized)
+#                    name of the webapp being uninstalled.
+
+^UninstallCaption	= $AppName をアンインストール
+UN_CONFIRM_UNINSTALL	= $AppName はコンピュータからアンインストールされます。
--- a/browser/webapprt/webapp.properties
+++ b/browser/webapprt/webapp.properties
@@ -10,8 +10,16 @@
 
 # LOCALIZATION NOTE (quitApplicationCmdMac.label): %S will be replaced with
 # the name of the webapp.
 quitApplicationCmdMac.label	= %S を閉じる
 
 # LOCALIZATION NOTE (hideApplicationCmdMac.label): %S will be replaced with
 # the name of the webapp.
 hideApplicationCmdMac.label	= %S を隠す
+
+# LOCALIZATION NOTE (geolocation.title): %S will be replaced with the name of
+# the webapp.
+geolocation.title		= %S - 位置情報の共有
+geolocation.description		= 位置情報を共有しますか?
+geolocation.sharelocation	= 位置情報を共有
+geolocation.dontshare		= 共有しない
+geolocation.remember		= 位置情報の共有の設定を保存する