19.0: sync browser/devtools with en-US rev119068:a122b3c03b4c FIREFOX_19_0b3_BUILD1 FIREFOX_19_0b3_RELEASE FIREFOX_19_0b4_BUILD1 FIREFOX_19_0b4_RELEASE FIREFOX_19_0b5_BUILD1 FIREFOX_19_0b5_RELEASE FIREFOX_19_0b6_BUILD1 FIREFOX_19_0b6_RELEASE
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Wed, 26 Dec 2012 23:45:57 +0900
changeset 933 6cbe784b5c54efca5cad9efcd91489dada1bff45
parent 932 8c3919dc1ef064f48cdbb823db65bc29a19ccc9d
child 934 ef4a8d06bf25396c695afa549ac4ee7214685b4b
child 951 75a102005bb75e57be892d1c66802a43537283e8
child 955 a9644914282a08ba0694d6abe85782f61dfa6904
child 959 a23ffdc3daddde2501d35f6f3c9be51daf5a700f
child 966 433be44f9074aee195910ba53505ca14f178c923
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs19
19.0: sync browser/devtools with en-US rev119068:a122b3c03b4c
browser/chrome/browser-region/region.properties
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/scratchpad.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/downloads/downloads.dtd
browser/chrome/browser/downloads/downloads.properties
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/sanitize.dtd
browser/installer/nsisstrings.properties
browser/pdfviewer/chrome.properties
browser/pdfviewer/viewer.properties
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -19,22 +19,16 @@ browser.search.order.8			= Wikipedia (ja
 # selection UI
 browser.contentHandlers.types.0.title	= Google リーダー
 browser.contentHandlers.types.0.uri	= http://www.google.com/reader/view/feed/%s
 browser.contentHandlers.types.1.title	= My Yahoo!
 browser.contentHandlers.types.1.uri	= http://add.my.yahoo.co.jp/rss?url=%s
 browser.contentHandlers.types.2.title	= livedoor Reader
 browser.contentHandlers.types.2.uri	= http://reader.livedoor.com/subscribe/?url=%s
 
-# URL for site-specific search engines
-# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
-# to be searched and the user's search query. Place them in the appropriate location
-# for your locale's URL but do not translate them.
-browser.search.siteSearchURL = https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-
 # increment this number when anything gets changed in the list below.  This will
 # cause Firefox to re-read these prefs and inject any new handlers into the 
 # profile database.  Note that "new" is defined as "has a different URL"; this
 # means that it's not possible to update the name of existing handler, so 
 # don't make any spelling errors here.
 gecko.handlerService.defaultHandlersVersion=4
 
 # The default set of protocol handlers for webcal:
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -58,17 +58,17 @@ can reach it easily. -->
 <!ENTITY printSetupCmd.accesskey	"u">
 <!ENTITY printPreviewCmd.label		"印刷プレビュー">
 <!ENTITY printPreviewCmd.accesskey	"v">
 <!ENTITY printCmd.label			"印刷...">
 <!ENTITY printCmd.accesskey		"P">
 <!ENTITY printCmd.commandkey		"p">
 
 <!ENTITY goOfflineCmd.label		"オフライン作業">
-<!ENTITY goOfflineCmd.accesskey		"w">
+<!ENTITY goOfflineCmd.accesskey		"k">
 
 <!ENTITY menubarCmd.label		"メニューバー">
 <!ENTITY menubarCmd.accesskey		"M">
 <!ENTITY navbarCmd.label		"ナビゲーションツールバー">
 <!ENTITY navbarCmd.accesskey		"N">
 <!ENTITY personalbarCmd.label		"ブックマークツールバー">
 <!ENTITY personalbarCmd.accesskey	"B">
 <!ENTITY bookmarksToolbarItem.label	"ブックマークツールバーの項目">
@@ -156,34 +156,32 @@ These should match what Safari and other
 <!ENTITY tabGroupsButton.label		"タブグループ">
 <!ENTITY tabGroupsButton.tooltip	"タブをグループ分けして管理できます">
 
 <!ENTITY feedButton.label		"購読">
 <!ENTITY feedButton.tooltip		"このページのフィードを購読します...">
 
 <!ENTITY bookmarksButton.label		"ブックマーク">
 <!ENTITY bookmarksButton.tooltip	"ブックマークをサイドバーに表示します">
-<!ENTITY bookmarksButton.accesskey	"B">
 <!ENTITY bookmarksCmd.commandkey	"b">
 
 <!ENTITY bookmarksMenuButton.label	"ブックマーク">
 <!ENTITY bookmarksMenuButton.tooltip	"ブックマークを表示します">
 <!ENTITY bookmarksMenuButton.unsorted.label	"未整理のブックマーク">
 <!ENTITY viewBookmarksSidebar.label	"ブックマークをサイドバーに表示します">
 <!ENTITY viewBookmarksToolbar.label	"ブックマークツールバーを表示">
 
 <!-- LOCALIZATION NOTE (bookmarksSidebarGtkCmd.commandkey): This command
   -  key should not contain the letters A-F, since these are reserved
   -  shortcut keys on Linux. -->
 <!ENTITY bookmarksGtkCmd.commandkey	"o">
 <!ENTITY bookmarksWinCmd.commandkey	"i">
 
 <!ENTITY historyButton.label		"履歴">
 <!ENTITY historyButton.tooltip		"最近表示したページの履歴をサイドバーに表示します">
-<!ENTITY historySidebarCmd.accesskey	"s">
 <!ENTITY historySidebarCmd.commandKey	"h">
 
 <!ENTITY toolsMenu.label		"ツール">
 <!ENTITY toolsMenu.accesskey		"T">
 
 <!ENTITY keywordfield.label		"この検索にキーワードを設定...">
 <!ENTITY keywordfield.accesskey		"K">
 <!ENTITY search.label			"Web 検索">
@@ -202,16 +200,17 @@ These should match what Safari and other
 
 <!ENTITY errorConsoleCmd.label		"エラーコンソール">
 <!ENTITY errorConsoleCmd.accesskey	"C">
 <!ENTITY errorConsoleCmd.commandkey	"j">
 
 <!ENTITY webConsoleCmd.label		"Web コンソール">
 <!ENTITY webConsoleCmd.accesskey	"W">
 <!ENTITY webConsoleCmd.commandkey	"k">
+<!ENTITY remoteWebConsoleCmd.label	"リモート Web コンソール">
 
 <!ENTITY inspectMenu.label		"調査">
 <!ENTITY inspectMenu.accesskey		"I">
 <!ENTITY inspectMenu.commandkey		"I">
 
 <!ENTITY inspectContextMenu.label	"要素を調査">
 <!ENTITY inspectContextMenu.accesskey	"Q">
 
@@ -272,16 +271,18 @@ These should match what Safari and other
 <!ENTITY getMoreDevtoolsCmd.label	"その他のツールを入手">
 <!ENTITY getMoreDevtoolsCmd.accesskey	"M">
 
 <!ENTITY fileMenu.label			"ファイル">
 <!ENTITY fileMenu.accesskey		"F">
 <!ENTITY newNavigatorCmd.label		"新しいウィンドウ">
 <!ENTITY newNavigatorCmd.key		"N">
 <!ENTITY newNavigatorCmd.accesskey	"N">
+<!ENTITY newPrivateWindow.label		"新しいプライベートブラウジングウィンドウ">
+<!ENTITY newPrivateWindow.accesskey	"W">
 
 <!ENTITY editMenu.label			"編集">
 <!ENTITY editMenu.accesskey		"E">
 <!ENTITY undoCmd.label			"元に戻す">
 <!ENTITY undoCmd.key			"Z">
 <!ENTITY undoCmd.accesskey		"U">
 <!ENTITY redoCmd.label			"やり直し">
 <!ENTITY redoCmd.key			"Y">
@@ -652,8 +653,10 @@ toolbar button -->
 <!ENTITY social.toggleSidebar.label		"サイドバーを表示する">
 <!ENTITY social.toggleSidebar.accesskey		"s">
 
 <!ENTITY social.toggleNotifications.label	"デスクトップ通知を表示する">
 <!ENTITY social.toggleNotifications.accesskey	"n">
 
 <!ENTITY social.activated.undobutton.label	"元に戻す">
 <!ENTITY social.activated.undobutton.accesskey	"U">
+
+<!ENTITY social.chatBar.commandkey		"c">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -5,20 +5,20 @@
 nv_timeout		= タイムアウト
 openFile		= ファイルを開く
 
 droponhometitle		= ホームページの設定
 droponhomemsg		= この Web ページまたはファイルを新しいホームページに設定します。よろしいですか?
 
 # context menu strings
 
-# LOCALIZATION NOTE (contextMenuSearchText): %1$S is the search engine,
+# LOCALIZATION NOTE (contextMenuSearch): %1$S is the search engine,
 # %2$S is the selection string.
-contextMenuSearchText			= %1$S で検索: "%2$S"
-contextMenuSearchText.accesskey		= S
+contextMenuSearch			= %1$S で検索: "%2$S"
+contextMenuSearch.accesskey		= S
 
 # bookmark dialog strings
 
 bookmarkAllTabsDefault		= [フォルダ名]
 
 # (^^; en-US は機能ごとに統一性がないが ja ではある程度そろえた。
 xpinstallPromptWarning			= このサイト (%2$S) からは %1$S にソフトウェアをインストールできない設定になっています。
 xpinstallPromptAllowButton		= 許可
@@ -375,16 +375,31 @@ syncPromoNotification.addons-sync-disabled.description	= %S アカウントで複数の端末間でアドオンを同期することができます。
 # preference.
 telemetryOptInPrompt		= %1$S の改善のため、パフォーマンス、ハードウェア、使用状況、設定の情報を %2$S に送信しますか?
 telemetryLinkLabel		= 詳細
 telemetryYesButtonLabel2	= はい、協力します
 telemetryYesButtonAccessKey	= Y
 telemetryNoButtonLabel		= いいえ
 telemetryNoButtonAccessKey	= N
 
+# Keyword.URL reset prompt
+# LOCALIZATION NOTE (keywordPrompt.message):
+#  - %1$S is brandShortName
+#  - %2$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
+#  - %3$S is the name of the default search engine (e.g. "Google")
+keywordPrompt.message			= %1$S はロケーションバーからの検索に '%2$S' を使っています。既定の検索エンジン (%3$S) に戻しますか?
+
+# LOCALIZATION NOTE (keywordPrompt.yesButton): %1$S is the name of the default search engine
+keywordPrompt.yesButton			= はい、%1$S に戻します
+keywordPrompt.yesButton.accessKey	= Y
+
+# LOCALIZATION NOTE (keywordPrompt.noButton): %1$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
+keywordPrompt.noButton			= いいえ、'%1$S' のままにします
+keywordPrompt.noButton.accessKey	= N
+
 # Webapps notification popup
 webapps.install			= インストール
 webapps.install.accesskey	= I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall		= このサイト (%2$S) から "%1$S" をインストールしますか?
 webapps.install.success		= アプリケーションをインストールしました
 
 # Telemetry opt-out prompt for Aurora and Nightly
@@ -392,31 +407,35 @@ webapps.install.success		= アプリケーションをインストールしました
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt		= %1$S の改善のために、パフォーマンスおよびハードウェアの情報、機能の使用状況、ブラウザの設定が %2$S に送信されます。%3$0.S
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered		= %S は現在全画面表示モードです。
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision	= %S での全画面表示の設定を保存する
 
-# LOCALIZATION NOTE (social.toggle.label): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
-social.toggle.label			= %1$S for %2$S
-social.toggle.accesskey			= f
-
 # 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.remove.label): %S = brandShortName
 social.remove.label			= %S から削除する
 social.remove.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
@@ -448,8 +467,10 @@ getUserMedia.shareCamera.accesskey		= S
 getUserMedia.shareSpecificCamera.label		= カメラを共有: %S
 getUserMedia.shareMicrophone.message		= マイクを %S と共有しますか?
 getUserMedia.shareMicrophone.label		= マイクを共有
 getUserMedia.shareMicrophone.accesskey		= S
 getUserMedia.shareSpecificMicrophone.label	= マイクを共有: %S
 getUserMedia.shareCameraAndMicrophone.message	= カメラとマイクを %S と共有しますか?
 getUserMedia.shareCameraAndMicrophone.label	= カメラとマイクを共有
 getUserMedia.shareCameraAndMicrophone.accesskey	= S
+getUserMedia.denyRequest.label			= 共有しない
+getUserMedia.denyRequest.accesskey		= D
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -11,17 +11,17 @@
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 <!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
   -  application menu item that opens the debugger UI. -->
 <!ENTITY debuggerMenu.label2		"デバッガ">
 
 <!-- LOCALIZATION NOTE (debuggerMenu.accesskey): This is accesskey for the
-  -  Tools meny entry of Debugger that opens the debugger UI. -->
+  -  Tools menu entry of Debugger that opens the debugger UI. -->
 <!ENTITY debuggerMenu.accesskey		"D">
 
 <!-- LOCALIZATION NOTE (remoteDebuggerMenu.label): This is the label for the
   -  application menu item that opens the remote debugger UI. -->
 <!ENTITY remoteDebuggerMenu.label	"リモートデバッガ">
 
 <!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
   -  application menu item that opens the browser debugger UI. -->
@@ -30,15 +30,49 @@
 <!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
   -  launches the debugger UI. Do not translate this one! -->
 <!ENTITY debuggerMenu.commandkey	"S">
 
 <!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
   -  the button that closes the debugger UI. -->
 <!ENTITY debuggerUI.closeButton.tooltip	"閉じる">
 
+<!-- LOCALIZATION NOTE (debuggerUI.optsButton.tooltip): This is the tooltip for
+  -  the button that opens up an options context menu for the debugger UI. -->
+<!ENTITY debuggerUI.optsButton.tooltip	"デバッガオプション">
+
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 <!ENTITY debuggerUI.pauseExceptions	"例外発生で停止">
+<!ENTITY debuggerUI.pauseExceptions.key	"E">
+
+<!-- LOCALIZATION NOTE (debuggerUI.showPanesOnInit): This is the label for the
+  -  checkbox that toggles visibility of panes when opening the debugger. -->
+<!ENTITY debuggerUI.showPanesOnInit	"起動時にデバッガを開く">
+<!ENTITY debuggerUI.showPanesOnInit.key	"S">
+
+<!-- LOCALIZATION NOTE (debuggerUI.showVarsSearch): This is the label for the
+  -  checkbox that toggles visibility of a designated variables searchbox. -->
+<!ENTITY debuggerUI.showVarsSearch	"変数検索ボックスを表示">
+<!ENTITY debuggerUI.showVarsSearch.key	"V">
+
+<!-- LOCALIZATION NOTE (debuggerUI.showNonEnums): This is the label for the
+  -  checkbox that toggles visibility of hidden (non-enumerable) variables and
+  -  properties in stack views. -->
+<!ENTITY debuggerUI.showNonEnums	"隠しプロパティを表示">
+<!ENTITY debuggerUI.showNonEnums.key	"P">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
   -  appears in the filter panel popup as a description. -->
 <!ENTITY debuggerUI.searchPanelTitle	"検索演算子">
+
+<!-- LOCALIZATION NOTE (debuggerUI.condBreakPanelTitle): This is the text that
+  -  appears in the conditional breakpoint panel popup as a description. -->
+<!ENTITY debuggerUI.condBreakPanelTitle	"以下の式が true のときに、このブレークポイントで停止します">
+
+<!-- LOCALIZATION NOTE (debuggerUI.seMenuBreak): This is the text that
+  -  appears in the source editor context menu for adding a breakpoint. -->
+<!ENTITY debuggerUI.seMenuBreak		"ブレークポイントを設置">
+
+<!-- LOCALIZATION NOTE (debuggerUI.seMenuCondBreak): This is the text that
+  -  appears in the source editor context menu for adding a conditional
+  -  breakpoint. -->
+<!ENTITY debuggerUI.seMenuCondBreak	"条件付きブレークポイントを設置">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -14,16 +14,20 @@
 # 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 (chromeDebuggerWindowTitle): The title displayed for the
+# chrome (browser) debugger window.
+chromeDebuggerWindowTitle		= ブラウザデバッガ
+
 # LOCALIZATION NOTE (remoteDebuggerWindowTitle): The title displayed for the
 # remote debugger window.
 remoteDebuggerWindowTitle		= リモートデバッガ
 
 # LOCALIZATION NOTE (remoteDebuggerPromptTitle): The title displayed on the
 # debugger prompt asking for the remote host and port to connect to.
 remoteDebuggerPromptTitle		= リモート接続
 
@@ -39,21 +43,21 @@ remoteDebuggerPromptCheck		= 次回からは確認しない
 # 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 (collapsePanes): This is the tooltip for the button
-# that collapses the left and right panes in the debugger UI. -->
+# that collapses the left and right panes in the debugger UI.
 collapsePanes				= 左右のウィンドウを非表示
 
 # LOCALIZATION NOTE (expandPanes): This is the tooltip for the button
-# that expands the left and right panes in the debugger UI. -->
+# that expands the left and right panes in the debugger UI.
 expandPanes				= 左右のウィンドウを表示
 
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
 pauseButtonTooltip			= クリックすると停止
 
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
@@ -68,74 +72,111 @@ stepOverTooltip				= ステップオーバー (%S)
 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				= 表示できるスタックはありません。
+emptyStackText				= 表示できるスタックはありません
 
 # LOCALIZATION NOTE (emptyBreakpointsText): The text that is displayed in the
 # breakpoints list when there are no breakpoints to display.
-emptyBreakpointsText			= 表示できるブレークポイントはありません。
+emptyBreakpointsText			= 表示できるブレークポイントはありません
+
+# LOCALIZATION NOTE (emptyGlobalsText): The text to display in the menulist
+# when there are no chrome globals available.
+noGlobalsText				= グローバル変数はありません
 
-# LOCALIZATION NOTE (noScriptsText): The text to display in the menulist when
-# there are no scripts.
-noScriptsText				= スクリプトがありません
+# LOCALIZATION NOTE (noMatchingScriptsText): 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
+# when there are no scripts.
+noScriptsText				= スクリプトはありません
 
 # LOCALIZATION NOTE (noMatchingScriptsText): The text to display in the
 # menulist when there are no matching scripts after filtering.
 noMatchingScriptsText			= 一致するスクリプトはありません
 
+# 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.
+# filter text box when it is empty and the scripts container is selected.
 emptyFilterText				= ファイル名を検索 (%S)
 
+# LOCALIZATION NOTE (emptyChromeGlobalsFilterText): This is the text that
+# appears in the filter text box when it is empty and the chrome globals
+# container is selected.
+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 (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)
 
+# LOCALIZATION NOTE (searchPanelVariable): This is the text that appears in the
+# filter panel popup for the variables search operation.
+searchPanelVariable			= 変数を検索 (%S)
+
 # LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
+breakpointMenuItem.setConditional	= 条件付きブレークポイントを設定する
 breakpointMenuItem.enableSelf		= ブレークポイントを有効にする
 breakpointMenuItem.disableSelf		= ブレークポイントを無効にする
 breakpointMenuItem.deleteSelf		= ブレークポイントを取り除く
 breakpointMenuItem.enableOthers		= ほかのブレークポイントを有効にする
 breakpointMenuItem.disableOthers	= ほかのブレークポイントを無効にする
 breakpointMenuItem.deleteOthers		= ほかのブレークポイントを取り除く
 breakpointMenuItem.enableAll		= すべてのブレークポイントを有効にする
 breakpointMenuItem.disableAll		= すべてのブレークポイントを無効にする
 breakpointMenuItem.deleteAll		= すべてのブレークポイントを取り除く
 
 # 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
+# editor when the loading 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 (emptyStackText): The text that is displayed in the watch
+# expressions list to add a new item.
+addWatchExpressionText			= ウォッチ式を追加
 
 # LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
 # variables pane when there are no variables to display.
-emptyVariablesText			= 表示できる変数はありません。
+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 (watchExpressionsScopeLabel): The name of the watch
+# expressions scope. This text is displayed in the variables pane as a header for
+# the watch expressions scope.
+watchExpressionsScopeLabel		= ウォッチ式
+
 # LOCALIZATION NOTE (globalScopeLabel): The name of the global scope. This text
 # is added to scopeLabel and displayed in the variables pane as a header for
 # the global scope.
 globalScopeLabel			= グローバル
+
+# LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
+# in the variables list as a separator between the name and value.
+variablesSeparatorLabel			= :
+
+# LOCALIZATION NOTE (watchExpressionsSeparatorLabel): The text that is displayed
+# in the watch expressions list as a separator between the code and evaluation.
+watchExpressionsSeparatorLabel		= \ \u2192
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -118,26 +118,25 @@ nodeParseNone		= 見つかりません
 # fuller description of what it does.
 helpDesc		= 使用可能なコマンドのヘルプ
 
 # LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
 # Displayed when the user asks for help on what it does.
 helpManual		= 特定のコマンド (検索文字列が一致した場合) または使用可能なコマンド (検索文字列がない、または一致するものがない場合) のヘルプを表示します。
 
 # LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
-# parameter to the 'help' command. See helpSearchManual for a fuller
+# parameter to the 'help' command. See helpSearchManual3 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 (helpSearchManual2): A fuller description of the 'search'
+# LOCALIZATION NOTE (helpSearchManual3): A fuller description of the 'search'
 # parameter to the 'help' command. Displayed when the user asks for help on
-# what it does. Inline HTML (e.g. <strong>) can be used to emphasize the core
-# concept.
-helpSearchManual2	= コマンドを絞り込む<strong>検索文字列</strong>を指定します。正規表現は使えません。
+# what it does.
+helpSearchManual3	= コマンドを絞り込む検索文字列を指定します。正規表現は使えません。
 
 # 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.
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -100,23 +100,23 @@ screenshotDelayManual		= 保存するタイミングをずらすタイマーを設定します (秒単位)
 # 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 (screenshotSelectorChromeConflict) Exception thwon when user
+# LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thrown when user
 # tries to use 'selector' option along with 'chrome' option of the screenshot
 # command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
 screenshotSelectorChromeConflict= chrome オプションが true の場合は、selector はサポートされません
 
 # LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
-# when no file name is provided. the first argument (%1$S) is the date string
+# when no file name is provided. The first argument (%1$S) is the date string
 # in yyyy-mm-dd format and the second argument (%2$S) is the time string
 # in HH.MM.SS format. Please don't add the extension here.
 screenshotGeneratedFilename	= Screen Shot %1$S at %2$S
 
 # LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
 # encountering error while saving the screenshot to the file specified.
 screenshotErrorSavingToFile	= 保存時にエラーがありました
 
@@ -137,21 +137,21 @@ screenshotCopied		= クリップボードにコピーしました。
 # command name, which is why it should be as short as possible.
 restartFirefoxDesc		= Firefox を再起動します
 
 # LOCALIZATION NOTE (restartFirefoxNocacheDesc) 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	= キャッシュからページを読み込ませずに再起動します
 
-# LOCALIZATION NOTE (restartFirefoxRequestCancelled) A string dispalyed to the
+# LOCALIZATION NOTE (restartFirefoxRequestCancelled) A string displayed to the
 # user when a scheduled restart has been aborted by the user.
 restartFirefoxRequestCancelled	= ユーザによって再起動が取り消されました。
 
-# LOCALIZATION NOTE (restartFirefoxRestarting) A string dispalyed to the
+# LOCALIZATION NOTE (restartFirefoxRestarting) A string displayed to the
 # user when a restart has been initiated without a delay.
 restartFirefoxRestarting	= Firefox を再起動しています...
 
 # 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		= ノードを調査します
@@ -847,26 +847,26 @@ 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 (jsbBraceStyleDesc2) A very short description of the
+# LOCALIZATION NOTE (jsbBraceStyleDesc) 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.
-jsbBraceStyleDesc2		= Collapse, expand, end-expand, expand-strict
+jsbBraceStyleDesc		= Collapse, expand, end-expand, expand-strict
 
-# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
+# LOCALIZATION NOTE (jsbBraceStyleManual) A fuller description of the
 # 'jsb <braceStyle>' parameter, displayed when the user asks for help
 # on what it does.
-jsbBraceStyleManual2		= 括弧のコーディングスタイル。次のどれかを選択します: collapse, expand, end-expand, expand-strict
+jsbBraceStyleManual		= 括弧のコーディングスタイル。次のどれかを選択します: collapse, expand, 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
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -66,15 +66,24 @@ confirmRevert				= このスクラッチパッドに加えた変更を元に戻しますか?
 # you try to revert unsaved content of scratchpad.
 confirmRevert.title			= 変更を破棄
 
 # LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
 scratchpadIntro1			= /*\n * この画面は JavaScript スクラッチパッドです。\n *\n * JavaScript を入力して、右クリックまたは [実行] メニューを選択してください。\n * 1. 実行: 選択したコードを実行します。(%1$S)\n * 2. 調査: 実行結果をオブジェクトインスペクタで表示します。(%2$S)\n * 3. 表示: 選択したコードの後ろに、実行結果をコメント形式で挿入します。(%3$S)\n */\n\n
 
+# LOCALIZATION NOTE  (scratchpad.noargs): This error message is shown when
+# Scratchpad instance is created without any arguments. Scratchpad window
+# expects to receive its unique identifier as the first window argument.
+scratchpad.noargs			= スクラッチパッドは引数なしで作成されました。
+
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification		= このスクラッチパッドは、ブラウザコンテキストで実行されます。
 
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
 help.openDocumentationPage		= https://developer.mozilla.org/ja/Tools/Scratchpad
+
+# LOCALIZATION NOTE (fileExists.notification): This is the message displayed
+# over the top of the the editor when a file does not exist.
+fileNoLongerExists.notification		= このファイルはもう存在しません。
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -5,26 +5,27 @@
 <!-- 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 window.title				"Web コンソール">
 
-<!ENTITY networkPanel.requestURL		"要求 URL">
-<!ENTITY networkPanel.requestMethod		"要求メソッド">
-<!ENTITY networkPanel.statusCode		"ステータスコード">
+<!ENTITY networkPanel.requestURLColon		"要求 URL:">
+<!ENTITY networkPanel.requestMethodColon	"要求メソッド:">
+<!ENTITY networkPanel.statusCodeColon		"ステータスコード:">
 
 <!ENTITY networkPanel.requestHeaders		"要求ヘッダ">
 <!ENTITY networkPanel.requestCookie		"送信 Cookie">
 <!ENTITY networkPanel.requestBody		"要求ボディ">
 <!ENTITY networkPanel.requestFormData		"送信フォームデータ">
 
 <!ENTITY networkPanel.responseHeaders		"応答ヘッダ">
+<!ENTITY networkPanel.responseCookie		"受信 Cookie">
 <!ENTITY networkPanel.responseBody		"応答ボディ">
 <!ENTITY networkPanel.responseBodyCached	"キャッシュデータ">
 <!ENTITY networkPanel.responseBodyUnknownType	"不明なファイルの種類">
 <!ENTITY networkPanel.responseNoBody		"応答ボディなし">
 <!ENTITY networkPanel.responseImage		"受信画像">
 <!ENTITY networkPanel.responseImageCached	"キャッシュ画像">
 
 <!-- LOCALIZATION NOTE (saveBodies.label): You can see this string in the Web
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -58,17 +58,17 @@ jsPropertyInspectTitle	= 調査: %S
 # %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
 timestampFormat		= %1$02S:%2$02S:%3$02S.%4$03S
 
 helperFuncUnsupportedTypeError	= この種類のオブジェクト上の pprint は呼び出せません。
 NetworkPanel.label	= ネットワーク要求調査
 # LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
 #
 # This string is used to show the duration between two network events (e.g
-# request and respones header or response header and response body).
+# request and response header or response header and response body).
 NetworkPanel.durationMS	= %Sms
 # LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
 # This string is used to show the duration between the response header and the
 # response body event. It also shows the size of the received or cached image.
 #
 # The first %S is replace by the width of the inspected image.
 # The second %S is replaced by the height of the inspected image.
 # The third %S is replaced by the duration between the response header and the
@@ -141,8 +141,47 @@ 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	= 入力値が再評価されてしまうと、結果を調査することはできません。
+
+# LOCALIZATION NOTE (remoteWebConsolePromptTitle): The title displayed on the
+# Web Console prompt asking for the remote host and port to connect to.
+remoteWebConsolePromptTitle	= リモート接続
+
+# LOCALIZATION NOTE (remoteWebConsolePromptMessage): The message displayed on the
+# Web Console prompt asking for the remote host and port to connect to.
+remoteWebConsolePromptMessage	= ホスト名とポート番号を入力してください (ホスト:ポート)
+
+# LOCALIZATION NOTE (remoteWebConsoleSelectTabTitle): The title displayed on the
+# Web Console prompt asking the user to pick a tab to attach to.
+remoteWebConsoleSelectTabTitle	= タブ一覧 - リモート接続
+
+# LOCALIZATION NOTE (remoteWebConsoleSelectTabMessage): The message displayed on the
+# Web Console prompt asking the user to pick a tab to attach to.
+remoteWebConsoleSelectTabMessage	= アタッチしたいタブを選択してください。またはグローバルコンソールを選択してください。
+
+# LOCALIZATION NOTE (listTabs.globalConsoleActor): The string displayed for the
+# global console in the tabs selection.
+listTabs.globalConsoleActor	= *グローバルコンソール*
+
+# LOCALIZATION NOTE (longStringEllipsis): The string displayed after a long
+# string. This string is clickable such that the rest of the string is retrieved
+# from the server.
+longStringEllipsis		= [...]
+
+# LOCALIZATION NOTE (executeEmptyInput): This is displayed when the user tries
+# to execute code, but the input is empty.
+executeEmptyInput		= コマンドが空文字です。
+
+# LOCALIZATION NOTE (NetworkPanel.fetchRemainingResponseContentLink): This is
+# displayed in the network panel when the response body is only partially
+# available.
+NetworkPanel.fetchRemainingResponseContentLink	= 残り %1$S バイトを読み込む
+
+# LOCALIZATION NOTE (NetworkPanel.fetchRemainingRequestContentLink): This is
+# displayed in the network panel when the request body is only partially
+# available.
+NetworkPanel.fetchRemainingRequestContentLink	= 応答ボディ (%1$S バイト) を読み込む
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -1,28 +1,49 @@
 <!-- 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 (indicator.tooltiptext):
-     Tooltip for the indicator that displays the progress of ongoing downloads.
-     -->
-<!ENTITY indicator.tooltiptext		"ダウンロード">
-
 <!-- LOCALIZATION NOTE (downloads.title):
      Used by screen readers to describe the Downloads Panel.
      -->
-<!ENTITY downloads.title		"ダウンロードマネージャ">
+<!ENTITY downloads.title		"ダウンロード">
+
+<!-- LOCALIZATION NOTE (downloadDetails.width):
+     Width of details for a Downloads Panel item (which directly influences the
+     width of the Downloads Panel) expressed using a CSS unit. The longest
+     labels that should fit in the item width are usually those of in-progress
+     downloads and those of blocked downloads.
+
+     A good rule of thumb is to try to determine the longest string possible
+     that an in-progress download could display, and use that value in ch
+     units.
+
+     For example, in English, a long string would be:
+
+     59 minutes, 59 seconds remaining - 1022 of 1023 KB
 
-<!-- LOCALIZATION NOTE (downloads.width):
-     Width of the Downloads Panel list items, expressed using a CSS unit.  The
-     longest labels that should fit in the item width are usually those of
-     in-progress downloads and those of blocked downloads.
+     That's 50 characters, so we set the width at 50ch.
      -->
-<!ENTITY downloads.width		"65ch">
+<!ENTITY downloadDetails.width		"50ch">
+
+<!-- LOCALIZATION NOTE (downloadsSummary.minWidth):
+     Minimum width for the main description of the downloads summary,
+     which is displayed at the bottom of the Downloads Panel if the
+     number of downloads exceeds the limit that the panel can display.
+
+     A good rule of thumb here is to look at the otherDownloads string
+     in downloads.properties, and make a reasonable estimate of its
+     maximum length. For English, this seems like a reasonable limit:
+
+     +999 other current downloads
+
+     that's 28 characters, so we set the minimum width to 28ch.
+     -->
+<!ENTITY downloadsSummary.minWidth	"34ch">
 
 <!ENTITY cmd.pause.label		"中断">
 <!ENTITY cmd.pause.accesskey		"P">
 <!ENTITY cmd.resume.label		"再開">
 <!ENTITY cmd.resume.accesskey		"R">
 <!ENTITY cmd.cancel.label		"キャンセル">
 <!ENTITY cmd.cancel.accesskey		"C">
 <!-- LOCALIZATION NOTE (cmd.show.label, cmd.show.accesskey, cmd.showMac.label,
@@ -39,8 +60,15 @@
 <!ENTITY cmd.goToDownloadPage.accesskey	"G">
 <!ENTITY cmd.copyDownloadLink.label	"ダウンロードした URL をコピー">
 <!ENTITY cmd.copyDownloadLink.accesskey	"L">
 <!ENTITY cmd.removeFromList.label	"リストから削除">
 <!ENTITY cmd.removeFromList.accesskey	"e">
 <!ENTITY cmd.clearList.label		"履歴の消去">
 <!ENTITY cmd.clearList.accesskey	"a">
 
+<!-- LOCALIZATION NOTE (downloadsHistory.label, downloadsHistory.accesskey):
+     This string is shown at the bottom of the Downloads Panel when all the
+     downloads fit in the available space, or when there are no downloads in
+     the panel at all.
+     -->
+<!ENTITY downloadsHistory.label		"すべての履歴を表示">
+<!ENTITY downloadsHistory.accesskey	"S">
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -62,25 +62,18 @@ shortTimeLeftDays			= %1$S 日
 # that we use a wider space after the separator when it is followed by a number,
 # just to avoid visually confusing it with with a minus sign with some fonts.
 # If you use a different separator, this might not be necessary.  However, there
 # is usually no need to change the separator or the order of the substitutions,
 # even for right-to-left languages, unless the defaults are not suitable.
 statusSeparator				= %1$S \u2014 %2$S
 statusSeparatorBeforeNumber		= %1$S \u2014  %2$S
 
-# LOCALIZATION NOTE (showMoreDownloads):
-# This string is shown in the Downloads Panel when there are more active
-# downloads than can fit in the available space.  The phrase should be read as
-# "Show N more of my recent downloads".  Use a semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/Localization_and_Plurals
-showMoreDownloads			= 最近の履歴 %1$S 個を表示する
-# LOCALIZATION NOTE (showAllDownloads):
-# This string is shown in place of showMoreDownloads when all the downloads fit
-# in the available space, or when there are no downloads in the panel at all.
-showAllDownloads			= すべての履歴を表示
-# LOCALIZATION NOTE (showDownloadsAccessKey):
-# This access key applies to both showMoreDownloads and showAllDownloads.
-showDownloadsAccessKey			= S
-
 fileExecutableSecurityWarning		= "%S" は実行可能なファイルです。実行可能なファイルにはあなたのコンピュータを破壊するウイルス、その他の悪意あるコードが含まれていることがあります。この形式のファイルを開く場合には注意してください。"%S" を実行してもよろしいですか?
 fileExecutableSecurityWarningTitle	= 実行可能なファイルを開きますか?
 fileExecutableSecurityWarningDontAsk	= 今後も同様に処理する
+
+# LOCALIZATION NOTE (otherDownloads):
+# This is displayed in an item at the bottom of the Downloads Panel when
+# there are more downloads than can fit in the list in the panel. Use a
+# semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+otherDownloads				= +%1$S個のファイルをダウンロード中
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -86,28 +86,16 @@
 <!ENTITY col.keyword.label			"キーワード">
 <!ENTITY col.description.label			"説明">
 <!ENTITY col.dateadded.label			"追加日時">
 <!ENTITY col.lastmodified.label			"変更日時">
 
 <!ENTITY search.label				"検索:">
 <!ENTITY search.accesskey			"S">
 
-<!ENTITY search.in.label			"検索対象:">
-<!ENTITY search.scopeFolder.label		"選択されているフォルダ">
-<!ENTITY search.scopeFolder.accesskey		"r">
-<!ENTITY search.scopeBookmarks.label		"ブックマーク">
-<!ENTITY search.scopeBookmarks.accesskey	"k">
-<!ENTITY search.scopeDownloads.label		"ダウンロード">
-<!ENTITY search.scopeDownloads.accesskey	"D">
-<!ENTITY search.scopeHistory.label		"履歴">
-<!ENTITY search.scopeHistory.accesskey		"H">
-<!ENTITY saveSearch.label			"検索条件を保存">
-<!ENTITY saveSearch.accesskey			"S">
-
 <!ENTITY cmd.find.key				"f">
 
 <!ENTITY maintenance.label			"インポートとバックアップ">
 <!ENTITY maintenance.accesskey			"I">
 <!ENTITY maintenance.tooltip			"ブックマークのインポートとバックアップができます">
 
 <!ENTITY backButton.tooltip			"フォルダ表示履歴を前に戻ります">
 
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -42,31 +42,25 @@ view.sortBy.dateAdded.accesskey	= e
 view.sortBy.lastModified.label	= 変更日時順で表示
 view.sortBy.lastModified.accesskey= M
 view.sortBy.tags.label		= タグ順で表示
 view.sortBy.tags.accesskey	= T
 
 searchBookmarks			= ブックマークの検索
 searchHistory			= 履歴の検索
 searchDownloads			= ダウンロードの検索
-searchCurrentDefault		= '%S' から検索
 
 tabs.openWarningTitle		= 同時に複数のタブを開く確認
 tabs.openWarningMultipleBranded	= 同時に複数 (%S) のタブを開こうとしています。ページの読み込み中は %S の動作が遅くなることがあります。本当に開いてもよろしいですか?
 tabs.openButtonMultiple		= タブで開く
 tabs.openWarningPromptMeBranded	= 同時に複数のタブを開いて %S の動作が遅くなるときは確認する
 
 SelectImport			= ブックマークファイルのインポート
 EnterExport			= ブックマークファイルのエクスポート
 
-# (^^; Save Search / New Query については en-US 無視
-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
 # Thanks Feedback! http://forums.mozillazine.jp/viewtopic.php?t=13122
 detailsPane.itemsCountLabel	= 項目の数: #1 個
 
@@ -76,23 +70,23 @@ recentlyBookmarkedTitle		= 最近ブックマークしたページ
 recentTagsTitle			= 最近付けたタグ
 
 OrganizerQueryHistory		= 履歴
 OrganizerQueryDownloads		= ダウンロード
 OrganizerQueryAllBookmarks	= すべてのブックマーク
 OrganizerQueryTags		= タグ
 
 # LOCALIZATION NOTE (tagResultLabel) :
-# This is what we use to form the label (for screen readers)
-# for url bar autocomplete results of type "tag"
+# Noun used to describe the location bar autocomplete result type
+# to users with screen readers
 # See createResultLabel() in urlbarBindings.xml 
 tagResultLabel			= タグ
 # LOCALIZATION NOTE (bookmarkResultLabel) :
-# This is what we use to form the label (for screen readers)
-# for url bar autocomplete results of type "bookmark"
+# Noun used to describe the location bar autocomplete result type
+# to users with screen readers
 # See createResultLabel() in urlbarBindings.xml 
 bookmarkResultLabel		= ブックマーク
 
 # LOCALIZATION NOTE (lockPrompt.text)
 # %S will be replaced with the application name.
 lockPrompt.title		= ブラウザ起動エラー
 lockPrompt.text			= %S のファイルを他のアプリケーションが使用しているため、ブックマークと履歴のシステムが無効化されます。この問題はセキュリティソフトが原因で生じることがあります。
 lockPromptInfoButton.label	= 詳細を表示
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -10,17 +10,17 @@
 <!-- The page shown when logged in... -->
 
 <!-- Login error feedback -->
 <!ENTITY updatePass.label             "更新">
 <!ENTITY resetPass.label              "リセット">
 
 <!-- Manage Account -->
 <!ENTITY manageAccount.label          "アカウントを管理">
-<!ENTITY manageAccount.accesskey      "A">
+<!ENTITY manageAccount.accesskey      "n">
 <!ENTITY viewQuota.label              "サーバ使用量を表示">
 <!ENTITY changePassword2.label        "パスワードを変更...">
 <!ENTITY myRecoveryKey.label          "リカバリキー">
 <!ENTITY resetSync2.label             "Sync をリセット...">
 
 <!ENTITY pairDevice.label             "端末と連携">
 
 <!ENTITY syncMy.label               "同期するデータ">
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -1,20 +1,18 @@
 <!-- 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 sanitizePrefs2.title			"履歴の消去設定">
 <!ENTITY sanitizeDialog2.title			"最近の履歴を消去">
 
-<!ENTITY sanitizeItems.label			"次のプライバシー情報を今すぐ消去:">
 <!ENTITY clearDataSettings2.label		"&brandShortName; の終了時には次のデータを自動消去する:">
 
 <!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
-
 <!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
      See UI mockup at bug 480169 -->
 <!ENTITY clearTimeDuration.label		"消去する履歴の期間:">
 <!ENTITY clearTimeDuration.accesskey		"T">
 <!ENTITY clearTimeDuration.lastHour		"1 時間以内の履歴">
 <!ENTITY clearTimeDuration.last2Hours		"2 時間以内の履歴">
 <!ENTITY clearTimeDuration.last4Hours		"4 時間以内の履歴">
 <!ENTITY clearTimeDuration.today		"今日の履歴">
--- a/browser/installer/nsisstrings.properties
+++ b/browser/installer/nsisstrings.properties
@@ -44,16 +44,17 @@ CREATE_SHORTCUTS		= $BrandShortName アイコンの作成先:
 ADD_SC_TASKBAR			= タスクバー(&T)
 ADD_SC_QUICKLAUNCHBAR		= クイック起動ツールバー(&Q)
 ADD_CheckboxShortcutInStartMenu	= スタートメニューのプログラムフォルダ(&S)
 ADD_CheckboxShortcutOnDesktop	= デスクトップ(&D)
 SPACE_REQUIRED			= 必要な容量:
 SPACE_AVAILABLE			= 空き容量:
 ONE_MOMENT			= インストールが完了次第、$BrandShortName を起動します...
 INSTALL_MAINT_SERVICE		= $BrandShortName バックグラウンドアップデートサービスをインストールする(&I)
+SEND_PING			= インストールに関する情報を Mozilla に送信する(&S)
 BROWSE_BUTTON			= 参照(&R)...
 DEST_FOLDER			= インストール先フォルダ
 
 DOWNLOADING_IN_PROGRESS		= ダウンロード中...
 DOWNLOADING_DONE		= ダウンロード完了
 INSTALLING_TO_BE_DONE		= インストール完了
 INSTALLING_IN_PROGRESS		= インストール中...
 
--- a/browser/pdfviewer/chrome.properties
+++ b/browser/pdfviewer/chrome.properties
@@ -1,8 +1,18 @@
-# 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/.
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 # Chrome notification bar messages and buttons
-unsupported_feature		= この PDF 文書は正しく表示できない可能性があります。
-open_with_different_viewer	= ほかのビューアで開く
-open_with_different_viewer.accessKey	= o
+unsupported_feature=この PDF 文書はサポートされていないため正しく表示できない可能性があります。
+open_with_different_viewer=ほかのビューアで開く
+open_with_different_viewer.accessKey=o
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -1,101 +1,122 @@
-# 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/.
+# Copyright 2012 Mozilla Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 # Main toolbar buttons (tooltips and alt text for images)
-previous.title		= 前のページ
-previous_label		= 前へ
-next.title		= 次のページ
-next_label		= 次へ
+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}}
+page_label=ページ:
+page_of=of {{pageCount}}
 
-zoom_out.title		= 縮小
-zoom_out_label		= 縮小
-zoom_in.title		= 拡大
-zoom_in_label		= 拡大
-zoom.title		= 拡大/縮小
-print.title		= 印刷
-print_label		= 印刷
-presentation_mode.title	= プレゼンテーションモードに切り替えます
-presentation_mode_label	= プレゼンテーションモード
-open_file.title		= ファイルを開く
-open_file_label		= 開く
-download.title		= ダウンロード
-download_label		= ダウンロード
-bookmark.title		= 現在のビュー (コピーまたは新しいウィンドウで開く)
-bookmark_label		= 現在のビュー
+zoom_out.title=縮小
+zoom_out_label=縮小
+zoom_in.title=拡大
+zoom_in_label=拡大
+zoom.title=拡大/縮小
+print.title=印刷
+print_label=印刷
+presentation_mode.title=プレゼンテーションモードに切り替えます
+presentation_mode_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	= 検索
+toggle_slider.title=サイドバーの切り替え
+toggle_slider_label=サイドバーの切り替え
+outline.title=文書の目次
+outline_label=文書の目次
+thumbs.title=縮小版
+thumbs_label=縮小版
+findbar.title=検索
+findbar_label=検索
 
 # Document outline messages
-no_outline		= 利用可能な目次はありません
+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}}
+thumb_page_title={{page}} ページ
 # LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
 # number.
-thumb_page_canvas	= ページの縮小版 {{page}}
+thumb_page_canvas=ページの縮小版 {{page}}
 
 # Context menu
-page_rotate_cw.label	= 右回転
-page_rotate_ccw.label	= 左回転
+first_page.label=最初のページへ移動
+last_page.label=最後のページへ移動
+page_rotate_cw.label=右回転
+page_rotate_ccw.label=左回転
 
-# Search panel button title and messages
-search			= 検索
-search_terms_not_found	= (見つかりません)
+# Find panel button title and messages
+find_label=検索:
+find_previous.title=指定文字列に一致する 1 つ前の部分を検索します
+find_previous_label=前へ
+find_next.title=指定文字列に一致する次の部分を検索します
+find_next_label=次へ
+find_highlight=すべて強調表示
+find_match_case_label=大文字/小文字を区別
+find_reached_top=文書先頭まで検索したので末尾に戻って検索しました。
+find_reached_bottom=文書末尾まで検索したので先頭に戻って検索しました。
+find_not_found=見つかりませんでした。
 
 # Error panel labels
-error_more_info		= 詳細情報
-error_less_info		= 詳細情報の非表示
-error_close		= 閉じる
+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}}
+error_build=PDF.JS Build: {{build}}
 # LOCALIZATION NOTE (error_message): "{{message}}" will be replaced by an
 # english string describing the error.
-error_message		= メッセージ: {{message}}
+error_message=メッセージ: {{message}}
 # LOCALIZATION NOTE (error_stack): "{{stack}}" will be replaced with a stack
 # trace.
-error_stack		= スタック: {{stack}}
+error_stack=スタック: {{stack}}
 # LOCALIZATION NOTE (error_file): "{{file}}" will be replaced with a filename
-error_file		= ファイル: {{file}}
+error_file=ファイル: {{file}}
 # LOCALIZATION NOTE (error_line): "{{line}}" will be replaced with a line number
-error_line		= ライン: {{line}}
-rendering_error		= ページのレンダリング中にエラーが発生しました。
+error_line=ライン: {{line}}
+rendering_error=ページのレンダリング中にエラーが発生しました
 
 # Predefined zoom values
-page_scale_width	= 幅に合わせる
-page_scale_fit		= ページのサイズに合わせる
-page_scale_auto		= 自動ズーム
-page_scale_actual	= 実際のサイズ
+page_scale_width=幅に合わせる
+page_scale_fit=ページのサイズに合わせる
+page_scale_auto=自動ズーム
+page_scale_actual=実際のサイズ
 
 # Loading indicator messages
-loading_error_indicator	= エラー
-loading_error		= PDF の読み込み中にエラーが発生しました。
+loading_error_indicator=エラー
+loading_error=PDF の読み込み中にエラーが発生しました
+invalid_file_error=無効または破損した PDF ファイル
 
 # LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
-text_annotation_type	= [{{type}} 注釈]
-request_password	= PDF はパスワードによって保護されています:
+text_annotation_type=[{{type}} 注釈]
+request_password=PDF はパスワードによって保護されています
 
-printing_not_supported	= 警告: このブラウザでの印刷は完全にはサポートされていません。
+printing_not_supported=警告: このブラウザでは印刷が完全にサポートされていません