17.0: sync browser with en-US rev106924:3c38673c4b1c
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Wed, 26 Sep 2012 02:21:21 +0900
changeset 834 9cbf9500885bf239f41f916f48f316774e4668e2
parent 833 d3f72f415d33d647952a70114fdaced5f19ca6ef
child 835 911b4931fd504155272b0dcc06a6369bf3892080
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs17
17.0: sync browser with en-US rev106924:3c38673c4b1c
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/gclicommands.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/styleinspector.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/syncProgress.dtd
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -236,56 +236,47 @@ These should match what Safari and other
 
 <!ENTITY inspectCloseButton.tooltiptext	"調査を閉じる">
 
 <!ENTITY devToolbarCloseButton.tooltiptext	"開発ツールバーを閉じる">
 <!ENTITY devToolbarMenu.label			"開発ツールバー">
 <!ENTITY devToolbarMenu.accesskey		"v">
 <!ENTITY devToolbar.keycode			"VK_F2">
 <!ENTITY devToolbar.keytext			"F2">
+<!ENTITY devToolbarOtherToolsButton.label	"その他のツール">
 
 <!ENTITY webConsoleButton.label			"Web コンソール">
 <!ENTITY inspectorButton.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">
 
 <!-- LOCALIZATION NOTE (styleeditor.label): This menu item label appears
   -  in the Tools menu. -->
 <!ENTITY styleeditor.label		"スタイルエディタ">
 <!ENTITY styleeditor.accesskey		"y">
 <!ENTITY styleeditor.keycode		"VK_F7">
 <!ENTITY styleeditor.keytext		"F7">
 
-<!ENTITY getMoreDevtoolsCmd.label	"その他のツール">
+<!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">
 
@@ -652,12 +643,26 @@ doesn't display any label, but exposes a
 <!ENTITY markupButton.arialabel			"マークアップ">
 <!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
 toolbar button -->
 <!ENTITY markupButton.accesskey			"M">
 
 <!ENTITY socialToolbar.title			"ソーシャルツールバーボタン">
 <!ENTITY social.notLoggedIn.label		"ログインしていません">
 
+<!-- LOCALIZATION NOTE (social.ok.label, social.ok.accesskey): this string is
+     used for the "OK" button for two different social panels. One appears when
+     the feature is activated (social.activated.* below), and the other when
+     the user clicks the "Share" button a second time (social.sharePopup.*
+     below). -->
+<!ENTITY social.ok.label			"OK">
+<!ENTITY social.ok.accesskey			"O">
+
 <!ENTITY social.sharePopup.undo.label		"共有しない">
 <!ENTITY social.sharePopup.undo.accesskey	"U">
-<!ENTITY social.sharePopup.ok.label		"OK">
-<!ENTITY social.sharePopup.ok.accesskey		"O">
+<!ENTITY social.sharePopup.shared.label		"このページを共有しました。">
+<!ENTITY social.sharePopup.portrait.arialabel	"プロファイル画像">
+
+<!ENTITY social.toggleSidebar.label		"サイドバーを表示する">
+<!ENTITY social.toggleSidebar.accesskey		"s">
+
+<!ENTITY social.activated.undobutton.label	"元に戻す">
+<!ENTITY social.activated.undobutton.accesskey	"U">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -364,22 +364,55 @@ telemetryNoButtonLabel		= いいえ
 telemetryNoButtonAccessKey	= 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		= アプリケーションをインストールしました
+# LOCALIZATION NOTE (webapps.uninstall.notification): %S will be replaced with the name of the uninstalled web app
+webapps.uninstall.notification	= コンピュータから %S をアンインストールしました。
+webapps.uninstall.label		= アプリをアンインストールする
 
 # 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 での全画面表示の設定を保存する
 
-social.shareButton.tooltip		= 共有する
-social.shareButton.sharedtooltip	= 共有しました
-social.pageShared.label			= ページを共有しました
+# 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.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
+
+# Identity notifications popups
+identity.termsOfService			= 利用規約
+identity.privacyPolicy			= プライバシーポリシー
+identity.chooseIdentity.description	= %S にサインイン
+identity.chooseIdentity.label		= 既存のメールアドレスを使う
+identity.newIdentity.label		= 別のメールアドレスを使う
+identity.newIdentity.accessKey		= e
+identity.newIdentity.email.placeholder	= メールアドレス
+# LOCALIZATION NOTE (identity.newIdentity.description, identity.chooseIdentity.description): %S is the website origin (ie. https://www.mozilla.org) shown in popup notifications.
+identity.newIdentity.description	= %S にサインインするメールアドレスを入力してください
+identity.next.label			= 次へ
+identity.next.accessKey			= n
+# LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
+# LOCALIZATION NOTE (identity.loggedIn.description): %S is the website origin (ie. https://www.mozilla.org)
+identity.loggedIn.description		= %S としてサインインしました
+identity.loggedIn.signOut.label		= サインアウト
+identity.loggedIn.signOut.accessKey	= O
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -62,9 +62,9 @@
 <!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	"見つかりません。">
+<!ENTITY debuggerUI.emptyScriptText	"見つかりません">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -54,16 +54,24 @@ resumeTooltip	= クリックすると復帰
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
 # frames list when there are no frames to display.
 emptyStackText	= 表示できるスタックはありません。
 
 # LOCALIZATION NOTE (emptyBreakpointsText): The text that is displayed in the
 # breakpoints list when there are no breakpoints to display.
 emptyBreakpointsText			= 表示できるブレークポイントはありません。
 
+# LOCALIZATION NOTE (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 (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
 breakpointMenuItem.enableSelf		= ブレークポイントを有効にする
 breakpointMenuItem.disableSelf		= ブレークポイントを無効にする
 breakpointMenuItem.deleteSelf		= ブレークポイントを取り除く
 breakpointMenuItem.enableOthers		= ほかのブレークポイントを有効にする
 breakpointMenuItem.disableOthers	= ほかのブレークポイントを無効にする
 breakpointMenuItem.deleteOthers		= ほかのブレークポイントを取り除く
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -467,51 +467,51 @@ addonListDictionaryHeading	= 現在、以下の辞書がインストールされています:
 addonListExtensionHeading	= 現在、以下の拡張機能がインストールされています:
 addonListLocaleHeading		= 現在、以下の言語がインストールされています:
 addonListPluginHeading		= 現在、以下のプラグインがインストールされています:
 addonListThemeHeading		= 現在、以下のテーマがインストールされています:
 addonListAllHeading		= 現在、以下のアドオンがインストールされています:
 addonListUnknownHeading		= 現在、以下の選択された種類のアドオンがインストールされています:
 
 # LOCALIZATION NOTE (addonNameDesc) A very short description of the
-# name parameter of numerous addon commands. This string is designed to be shown
+# name parameter of numerous add-on commands. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 addonNameDesc		= アドオンの名前
 
 # LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
-# command when a search for addons of a particular type were not found.
+# command when a search for add-ons of a particular type were not found.
 addonNoneOfType		= 指定の種類のアドオンはインストールされていません。
 
 # LOCALIZATION NOTE (addonEnableDesc) A very short description of the
 # 'addon enable <type>' 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.
 addonEnableDesc		= 指定されたアドオンを有効化します
 
 # LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
-# 'addon enable' command when an attempt is made to enable an addon is already
-# enabled.
+# 'addon enable' command when an attempt is made to enable an add-on that is
+# already enabled.
 addonAlreadyEnabled	= %S はすでに有効化されています。
 
 # LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
-# command when an addon is enabled.
+# command when an add-on is enabled.
 addonEnabled		= %S を有効化しました。
 
 # LOCALIZATION NOTE (addonDisableDesc) A very short description of the
 # 'addon disable <type>' 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.
 addonDisableDesc	= 指定されたアドオンを無効かします
 
 # LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
-# 'addon disable' command when an attempt is made to disable an addon is already
-# disabled.
+# 'addon disable' command when an attempt is made to disable an add-on that is
+# already disabled.
 addonAlreadyDisabled	= %S はすでに無効化されています。
 
 # LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
-# command when an addon is disabled.
+# command when an add-on is disabled.
 addonDisabled		= %S を無効化しました。
 
 # LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
 # 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.
 exportDesc		= リソースをエクスポートします
 
 # LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
@@ -729,17 +729,17 @@ cookieSetDomainDesc	= Cookie に設定するドメイン
 # LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
 # 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetSecureDesc	= https での送信に限定する
 
 # LOCALIZATION NOTE (jsbDesc) A very short description of the
 # 'jsb' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-jsbDesc				= Javascript を整形します
+jsbDesc				= JavaScript を整形します
 
 # LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
 # 'jsb <url>' parameter. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 jsbUrlDesc			= URL で指定された JS ファイルを整形してきれいにします
 
 # LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
 # 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
@@ -834,17 +834,17 @@ jsbInvalidURL			= 正しい URL を入力してください
 # LOCALIZATION NOTE (calllogDesc) A very short description of the
 # 'calllog' 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.
 calllogDesc		= 関数呼び出しのロギングを操作するコマンドです
 
 # LOCALIZATION NOTE (calllogStartDesc) A very short description of the
 # 'calllog start' 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.
-calllogStartDesc	= コンソールへの関数呼び出しのロギングを開始します
+calllogStartDesc	= 関数呼び出しのコンソールへのロギングを開始します
 
 # LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
 # the 'calllog start' command.
 calllogStartReply	= ロギングを開始しました。
 
 # LOCALIZATION NOTE (calllogStopDesc) A very short description of the
 # 'calllog stop' 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.
@@ -852,8 +852,74 @@ calllogStopDesc		= 関数呼び出しのロギングを停止します
 
 # LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
 # the 'calllog stop' command when there is nothing to stop.
 calllogStopNoLogging	= 現在実行中のロギングはありません
 
 # LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
 # the 'calllog stop' command when there are logging actions to stop.
 calllogStopReply	= ロギングを停止しました。実行中のロギング: %1$S
+
+# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
+# 'calllog chromestart' 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.
+calllogChromeStartDesc		= ブラウザコンテキストでの関数呼び出しのコンソールへのロギングを開始します
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart <sourceType>' 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.
+calllogChromeSourceTypeDesc	= グローバルオブジェクト, JSM URI, またはグローバルオブジェクトから取得した JS
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart' 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.
+calllogChromeSourceTypeManual	= グローバルオブジェクト, JSM を指す URI, またはグローバルオブジェクトから取得した、ブラウザウィンドウで実行される JS
+
+# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
+# of the 'calllog chromestart' command.
+calllogChromeStartReply		= ロギングを開始しました。
+
+# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
+# 'calllog chromestop' 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.
+calllogChromeStopDesc		= 関数呼び出しのロギングを停止します
+
+# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
+# result of the 'calllog chromestop' command when there is nothing to stop.
+calllogChromeStopNoLogging	= 現在実行中のブラウザコンテキストでのロギングはありません
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog chromestop' command when there are logging actions to stop.
+calllogChromeStopReply		= ロギングを停止しました。実行中のロギング: %1$S
+
+# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
+# of the 'calllog chromestart' command when an anonymouse function is to be
+# logged.
+callLogChromeAnonFunction	= <匿名関数>
+
+# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
+# of the 'calllog chromestart' command to proceed a method name when it is to be
+# logged.
+callLogChromeMethodCall		= メソッド呼び出し
+
+# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
+# of the 'calllog chromestart' command with an invalid JSM or JSM path.
+callLogChromeInvalidJSM		= JSM が不正です!
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# content-variable and an invalid variable name.
+callLogChromeVarNotFoundContent	= Web ページ内で値が見つかりません。
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# chrome-variable and an invalid variable name.
+callLogChromeVarNotFoundChrome	= ブラウザウィンドウ内で値が見つかりません。
+
+# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of javascript
+# and invalid JavaScript code.
+callLogChromeEvalException	= 評価された JavaScript が以下の例外を送出しました。
+
+# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
+# result of passing a non-JavaScript object creating source via the
+# 'calllog chromestart javascript' command.
+callLogChromeEvalNeedsObject	= JavaScript ソースは、メソッド呼び出しが記録されるオブジェクトを評価しなければなりません。例: "({a1: function() {this.a2()},a2: function() {}});"
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -52,17 +52,17 @@ confirmClose				= このスクラッチパッドを保存しますか?
 
 # LOCALIZATION NOTE  (confirmClose.title): This is title of the prompt dialog when
 # you try to close a scratchpad with unsaved changes.
 confirmClose.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 */.
-scratchpadIntro				= /*\n * この画面は JavaScript スクラッチパッドです。\n *\n * JavaScript を入力して、右クリックまたは [実行] メニューを選択してください。\n * 1. 実行: 選択したコードを実行します。\n * 2. 調査: 実行結果をオブジェクトインスペクタで表示します。\n * 3. 表示: 選択したコードの後ろに、実行結果をコメント形式で挿入します。\n */\n\n
+scratchpadIntro1			= /*\n * この画面は JavaScript スクラッチパッドです。\n *\n * JavaScript を入力して、右クリックまたは [実行] メニューを選択してください。\n * 1. 実行: 選択したコードを実行します。(%1$S)\n * 2. 調査: 実行結果をオブジェクトインスペクタで表示します。(%2$S)\n * 3. 表示: 選択したコードの後ろに、実行結果をコメント形式で挿入します。(%3$S)\n */\n\n
 
 # 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
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -25,21 +25,21 @@ rule.status.UNMATCHED		= 適用しない
 
 # LOCALIZATION NOTE (rule.sourceElement, rule.sourceInline): For each
 # style property the panel shows the rules which hold that specific property.
 # For every rule, the rule source is also displayed: a rule can come from a
 # file, from the same page (inline), or from the element itself (element).
 rule.sourceInline		= インライン
 rule.sourceElement		= 要素
 
-# LOCALIZATION NOTE (rule.inheritedSource): Shown for CSS rules
-# that were inherited from a parent node.  Will be passed a node
-# identifier and a source location.
-# e.g "Inherited from body#bodyID (styles.css:20)"
-rule.inheritedSource		= %S から継承 (%S)
+# LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
+# that were inherited from a parent node. Will be passed a node
+# identifier of the parent node.
+# e.g "Inherited from body#bodyID"
+rule.inheritedFrom		= %S から継承 (%S)
 
 # LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
 # sidebar of the Highlighter for the style inspector button.
 # "Computed" refers to the Computed Style of the element.
 style.highlighter.button.label2		= 計算済み
 style.highlighter.accesskey2		= C
 style.highlighter.button.tooltip2	= 要素の計算済みスタイルを調査
 
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -3,24 +3,88 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- 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.requestHeaders		"要求ヘッダ">
 <!ENTITY networkPanel.requestCookie		"送信 Cookie">
 <!ENTITY networkPanel.requestBody		"要求ボディ">
 <!ENTITY networkPanel.requestFormData		"送信フォームデータ">
 
 <!ENTITY networkPanel.responseHeaders		"応答ヘッダ">
 <!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
+   - Console context menu. -->
+<!ENTITY saveBodies.label			"要求ボディと応答ボディを記録">
+<!ENTITY saveBodies.accesskey			"L">
+
+<!-- LOCALIZATION NOTE (btnPageNet.label): This string is used for the menu
+  -  button that allows users to toggle the network logging output.
+  -  This string and the following strings toggle various kinds of output
+  -  filters. -->
+<!ENTITY btnPageNet.label			"ネットワーク">
+<!ENTITY btnPageNet.tooltip			"ネットワークアクセスを記録します">
+<!ENTITY btnPageCSS.label			"CSS">
+<!ENTITY btnPageCSS.tooltip			"CSS パースエラーを記録します">
+<!ENTITY btnPageJS.label			"JS">
+<!ENTITY btnPageJS.tooltip			"JavaScript 例外を記録します">
+
+<!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
+  -  the toolbar. It shows or hides messages that the web developer inserted on
+  -  the page for debugging purposes, using calls such console.log() and
+  -  console.error(). -->
+<!ENTITY btnPageLogging.label			"ロギング">
+<!ENTITY btnPageLogging.tooltip			"window.console オブジェクトに送信されたメッセージを記録します">
+<!ENTITY btnConsoleErrors			"エラー">
+<!ENTITY btnConsoleInfo				"メッセージ">
+<!ENTITY btnConsoleWarnings			"警告">
+<!ENTITY btnConsoleLog				"ログ">
+
+<!-- LOCALIZATION NOTE (btnPosition.label): The label shown for the menu which
+  -  allows the user to toggle between the Web Console positioning types. -->
+<!ENTITY btnPosition.label			"表示位置">
+
+<!-- LOCALIZATION NOTE (btnPosition.tooltip): The tooltip shown when the user
+  -  hovers the Position button in the Web Console toolbar. -->
+<!ENTITY btnPosition.tooltip			"Web コンソールの表示位置を指定します">
+
+<!-- LOCALIZATION NOTE (positionMenu.above): When this option is selected the
+  -  Web Console interface is displayed above the web page. -->
+<!ENTITY positionMenu.above			"上側">
+
+<!-- LOCALIZATION NOTE (positionMenu.below): When this option is selected the
+  -  Web Console interface is displayed below the web page. -->
+<!ENTITY positionMenu.below			"下側">
+
+<!-- LOCALIZATION NOTE (positionMenu.window): When this option is selected the
+  -  Web Console interface is displayed in a floating panel. -->
+<!ENTITY positionMenu.window			"ウィンドウ">
+
+<!ENTITY filterBox.placeholder			"フィルタ">
+<!ENTITY btnClear.label				"消去">
+<!ENTITY btnClear.tooltip			"Web コンソールの内容を消去します">
+<!ENTITY btnClose.tooltip			"Web コンソールを閉じます">
+
+<!ENTITY fullZoomEnlargeCmd.commandkey		"+">
+<!ENTITY fullZoomEnlargeCmd.commandkey2		"="> <!-- + is above this key on many keyboards -->
+<!ENTITY fullZoomEnlargeCmd.commandkey3		"">
+
+<!ENTITY fullZoomReduceCmd.commandkey		"-">
+<!ENTITY fullZoomReduceCmd.commandkey2		"">
+
+<!ENTITY fullZoomResetCmd.commandkey		"0">
+<!ENTITY fullZoomResetCmd.commandkey2		"">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -18,52 +18,21 @@ typeStrict		= 厳密な警告:
 msgCategory		= カテゴリ: 
 errLine			= 行: %S
 btnHide			= 隠す
 btnPrefs		= 設定
 categoryPage		= ページ:
 categoryConsole		= コンソール:
 btnMutation		= DOM 変更
 tipMutation		= DOM 変更イベントを記録します
-btnPageNet		= ネットワーク
-tipPageNet		= ネットワークアクセスを記録します
-btnPageCSS		= CSS
-tipPageCSS		= CSS パースエラーを記録します
-btnPageJS		= JS
-tipPageJS		= JavaScript 例外を記録します
-# LOCALIZATION NOTE (btnPageLogging):
-#
-# This is used as the text of the "Logging" button on the toolbar. It
-# shows or hides messages that the web developer inserted on the page for
-# debugging purposes, using calls such console.log() and console.error().
-btnPageLogging		= ロギング
-# LOCALIZATION NOTE (tipPageLogging):
-#
-# This is used as the text of the tool tip for the "Logging" button on
-# the toolbar.
-tipPageLogging		= "console" オブジェクトに送信されたメッセージを記録します
-btnConsoleErrors	= エラー
-tipConsoleErrors	= console.error() の呼び出しを記録します
-btnConsoleInfo		= メッセージ
-tipConsoleInfo		= console.info() の呼び出しを記録します
-btnConsoleWarnings	= 警告
-tipConsoleWarnings	= console.warn() の呼び出しを記録します
-btnConsoleLog		= ログ
-tipConsoleLog		= console.log() の呼び出しを記録します
 btnGlobal		= グローバルメッセージ
 tipGlobal		= グローバルメッセージのログ表示を切り替えます
 localConsole		= ローカルコンソール
 clearConsoleCmd.label		= ログ消去
 clearConsoleCmd.accesskey	= e
-# LOCALIZATION NOTE (btnClear):
-#
-# This is used as the text of the "Clear" button for the toolbar. It clears the
-# contents of the console.
-btnClear		= 消去
-stringFilter		= フィルタ
 close.button		= 閉じる
 close.accesskey		= C
 update.button		= 更新
 update.accesskey	= U
 # LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
 #
 # The "PropertyPanel" is used to display a JS object to the user.
 # If it is clear which object is being inspected (e.g., window, document object)
@@ -80,22 +49,16 @@ jsPropertyTitle		= オブジェクトインスペクタ
 # The %S is replaced by the evaluated code the user clicked on in the console.
 #
 # Example: The user executed `window.document` in the WebConsole. The `document`
 # object is written to the output. If the user clicks on the `document` output
 # in the console, a PropertyPanel will show up. The title of the PropertyPanel
 # is set to `Inspect: window.document` because the clicked `document` object was
 # evaluated based on the `window.document` string.
 jsPropertyInspectTitle	= 調査: %S
-saveBodies.label	= 要求ボディと応答ボディを記録
-saveBodies.accesskey	= L
-copyCmd.label		= コピー
-copyCmd.accesskey	= C
-selectAllCmd.label	= すべて選択
-selectAllCmd.accesskey	= A
 # LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
 # %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
 timestampFormat		= %1$02S:%2$02S:%3$02S.%4$03S
 
 helperFuncUnsupportedTypeError	= この種類のオブジェクト上の pprint は呼び出せません。
 NetworkPanel.label	= ネットワーク要求調査
 # LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
 #
@@ -119,50 +82,30 @@ NetworkPanel.imageSizeDeltaDurationMS	= %Sx%Spx, Δ%Sms
 # flash data received from the server can't be displayed.
 #
 # The %S is replaced by the content type, that can't be displayed, examples are
 #  o application/x-shockwave-flash
 #  o music/crescendo
 NetworkPanel.responseBodyUnableToDisplay.content	= "%S" の応答は表示できません。
 ConsoleAPIDisabled			= Web コンソールのログ記録 API (console.log, console.info, console.warn, console.error) は、このページ上のスクリプトにより無効化されています。
 
-# LOCALIZATION NOTE (webConsolePosition): The label shown for the menu which
-# allows the user to toggle between the Web Console positioning types.
-webConsolePosition		= 表示位置
-
-# LOCALIZATION NOTE (webConsolePositionTooltip): The tooltip shown when the user
-# hovers the Position button in the Web Console toolbar.
-webConsolePositionTooltip	= Web コンソールの表示位置を指定します
-
-# LOCALIZATION NOTE (webConsolePositionAbove): When this option is selected the
-# Web Console interface is displayed above the web page.
-webConsolePositionAbove		= 上側
-
-# LOCALIZATION NOTE (webConsolePositionBelow): When this option is selected the
-# Web Console interface is displayed below the web page.
-webConsolePositionBelow		= 下側
-
-# LOCALIZATION NOTE (webConsolePositionWindow): When this option is selected the
-# Web Console interface is displayed in a floating panel.
-webConsolePositionWindow	= ウィンドウ
-
 # LOCALIZATION NOTE (webConsoleWindowTitleAndURL): The Web Console floating
 # panel title, followed by the web page URL.
 # For RTL languages you need to set the LRM in the string to give the URL
 # the correct direction.
 webConsoleWindowTitleAndURL	= Web コンソール - %S
 
 # LOCALIZATION NOTE (webConsoleMixedContentWarning): Message displayed after a
 # URL in the Web Console that has been flagged for Mixed Content (i.e. http
 # content in an https page)
 webConsoleMixedContentWarning	= 混在コンテンツ
 
 # LOCALIZATION NOTE (scratchpad.linkText):
 # The text used in the right hand side of the web console command line when
-# Javascript is being entered, to indicate how to jump into scratchpad mode
+# JavaScript is being entered, to indicate how to jump into scratchpad mode
 scratchpad.linkText		= Shift+RETURN - スクラッチパッドを開く
 
 # LOCALIZATION NOTE (gcliterm.instanceLabel): The console displays
 # objects using their type (from the constructor function) in this descriptive
 # string
 gcliterm.instanceLabel		= %S のインスタンス
 
 # LOCALIZATION NOTE (Autocomplete.label):
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -7,16 +7,23 @@
      -->
 <!ENTITY indicator.tooltiptext		"ダウンロード">
 
 <!-- LOCALIZATION NOTE (downloads.title):
      Used by screen readers to describe the Downloads Panel.
      -->
 <!ENTITY downloads.title		"ダウンロードマネージャ">
 
+<!-- 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.
+     -->
+<!ENTITY downloads.width		"65ch">
+
 <!ENTITY cmd.pause.label		"中断">
 <!ENTITY cmd.pause.accesskey		"P">
 <!ENTITY cmd.resume.label		"再開">
 <!ENTITY cmd.resume.accesskey		"R">
 <!ENTITY cmd.cancel.label		"キャンセル">
 <!ENTITY cmd.cancel.accesskey		"C">
 <!-- LOCALIZATION NOTE (cmd.show.label, cmd.show.accesskey, cmd.showMac.label,
      cmd.showMac.accesskey):
@@ -32,10 +39,8 @@
 <!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">
 
-<!ENTITY downloadshistory.label		"すべての履歴を表示">
-<!ENTITY downloadshistory.accesskey	"S">
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -62,11 +62,25 @@ 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	= 今後も同様に処理する
--- a/browser/chrome/browser/syncProgress.dtd
+++ b/browser/chrome/browser/syncProgress.dtd
@@ -2,14 +2,14 @@
    - 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 % brandDTD
     SYSTEM "chrome://branding/locale/brand.dtd">
     %brandDTD;
 
 <!-- These strings are used in the sync progress upload page -->
-<!ENTITY syncProgress.pageTitle    "Your First Sync">
-<!ENTITY syncProgress.textBlurb    "Your data is now being encrypted and uploaded in the background. You can close this tab and continue using &brandShortName;.">
-<!ENTITY syncProgress.closeButton  "Close">
-<!ENTITY syncProgress.logoAltText  "&brandShortName; logo">
-<!ENTITY syncProgress.diffText     "&brandShortName; will now automatically sync in the background.  You can close this tab and continue using &brandShortName;.">
+<!ENTITY syncProgress.pageTitle    "最初の同期">
+<!ENTITY syncProgress.textBlurb    "バックグラウンドでデータを暗号化してアップロードしています。このタブを閉じて、&brandShortName; を使い続けることができます。">
+<!ENTITY syncProgress.closeButton  "閉じる">
+<!ENTITY syncProgress.logoAltText  "&brandShortName; ロゴ">
+<!ENTITY syncProgress.diffText     "&brandShortName; はバックグラウンドで自動的に同期しています。このタブを閉じて、&brandShortName; を使い続けることができます。">