13.0: sync browser with en-US rev90743:e13879b89d80
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Sat, 21 Apr 2012 14:01:26 +0900
changeset 605 5b2446e6a78431b7ba73ebddcaff78afa5131542
parent 604 d01862a4fd308d79a26bb3e70fece75451655048
child 606 bf33534a907b62e1c3294e6197cfa63af9c31b9e
push id216
push useraxel@mozilla.com
push dateTue, 24 Apr 2012 17:52:24 +0000
bugs13
13.0: sync browser with en-US rev90743:e13879b89d80
browser/chrome/browser/aboutHome.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/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/sourceeditor.dtd
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/newTab.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/safeMode.dtd
browser/chrome/browser/setDesktopBackground.dtd
browser/chrome/browser/syncSetup.dtd
browser/updater/updater.ini
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,23 +1,27 @@
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+%brandDTD;
+<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
+%syncBrandDTD;
 
 <!-- These strings are used in the about:home page -->
 
 <!ENTITY abouthome.pageTitle		"&brandFullName; スタートページ">
 
 <!ENTITY abouthome.searchEngineButton.label		"検索">
 
-<!ENTITY abouthome.aboutMozilla "Mozilla について">
-
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
 <!ENTITY abouthome.defaultSnippet1.v1			"Firefox をさらに活用したいときは、<a>使い方のヒント</a> をご覧ください。基本的なキーボードショートカットや主な機能をご説明します。">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1			"<a>Firefox をカスタマイズしてみましょう</a>。たくさんの無料のアドオンの中から気に入ったものを選べば、自分好みのブラウザを作ることができます。">
 
-<!ENTITY abouthome.syncSetup.label				"Sync をセットアップ">
-<!ENTITY abouthome.pairDevice.label				"デバイスと連携">
+<!ENTITY abouthome.bookmarksButton.label		"ブックマーク">
+<!ENTITY abouthome.historyButton.label			"履歴">
+<!ENTITY abouthome.settingsButton.label			"オプション">
+<!ENTITY abouthome.addonsButton.label			"アドオン">
+<!ENTITY abouthome.appsButton.label			"Marketplace">
+<!ENTITY abouthome.downloadsButton.label		"ダウンロード">
+<!ENTITY abouthome.syncButton.label			"&syncBrand.shortName.label;">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -208,21 +208,27 @@ can reach it easily. -->
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
 <!ENTITY scratchpad.label             "スクラッチパッド">
 <!ENTITY scratchpad.accesskey         "s">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
-<!ENTITY inspectPanelTitle.label	"HTML">
-<!ENTITY inspectButton.label		"調査">
-<!ENTITY inspectButton.accesskey	"I">
 <!ENTITY inspectCloseButton.tooltiptext	"調査を閉じる">
 
+<!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 (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">
@@ -595,8 +601,20 @@ just addresses the organization to follo
 <!ENTITY syncSetup.label				"&syncBrand.shortName.label; をセットアップ...">
 <!ENTITY syncSetup.accesskey			"Y">
 <!ENTITY syncSyncNowItem.label			"今すぐ同期">
 <!ENTITY syncSyncNowItem.accesskey		"S">
 <!ENTITY syncToolbarButton.label		"Sync">
 
 <!ENTITY addonBarCloseButton.tooltip	"アドオンバーを閉じます">
 <!ENTITY toggleAddonBarCmd.key			"/">
+
+<!-- LOCALIZATION NOTE (htmlPanel.label): This is a label for a button that
+activates the Web Developer->Inspect UI's HTML Tree Panel. -->
+<!ENTITY htmlPanel.label			"HTML">
+
+<!-- LOCALIZATION NOTE (htmlPanel.tooltiptext): The text that appears when a user
+hovers over the HTML panel's toolbar button. -->
+<!ENTITY htmlPanel.tooltiptext			"HTML パネル">
+
+<!-- LOCALIZATION NOTE (htmlPanel.accesskey): The key bound to the HTML panel's
+toolbar button -->
+<!ENTITY htmlPanel.accesskey			"H">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -214,20 +214,20 @@ identity.mixed_content			= この Web サイトとの通信は一部しか暗号化されておらず、第三者に盗み見られないようにはなっていません。
 
 identity.unknown.tooltip		= この Web サイトには運営者を証明する証明書がありません
 
 # (^^; EVSSL による認証(法人登記なども確認して実在証明) ではなく通常の SSL 認証(ドメイン真正性のみ検証) の場合:
 #identity.ownerUnknown2			= (運営者は実在認証されていません)
 identity.ownerUnknown2			= (運営者は不明です)
 
 # Downloads Monitor Panel
-# LOCALIZATION NOTE (activeDownloads, pausedDownloads): Semi-colon list of plural
+# LOCALIZATION NOTE (activeDownloads1, pausedDownloads1): Semi-colon list of plural
 # forms. See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of downloads; #2 time left
-# examples: One active download (2 minutes remaining); 11 paused downloads
+# examples: 1 active download (2 minutes remaining); 11 paused downloads
 activeDownloads1			= #1 件のダウンロードが進行中です (#2)
 pausedDownloads1			= #1 件のダウンロードが中断しています
 
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle		= ブックマークに追加しました
 # (^^; ツールメニューのブックマークからは無理...要再検討
 editBookmarkPanel.pageBookmarkedDescription	= %1$0.S今後このページにはブックマークからアクセスできます。
 
@@ -339,8 +339,19 @@ syncPromoNotification.learnMoreLinkText		= 詳細
 # LOCALIZATION NOTE (telemetryPrompt): %1$S will be replaced by brandFullName,
 # and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryPrompt			= %1$S の改善のため、パフォーマンス、ハードウェア情報、機能の使用状況、ブラウザの設定を匿名で %2$S に送信しますか?
 telemetryLinkLabel		= 詳細
 telemetryYesButtonLabel2	= はい、協力します
 telemetryYesButtonAccessKey	= Y
 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" をインストールしますか?
+
+# 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		= %3$S の改善のため、パフォーマンス、ハードウェア情報、機能の使用状況、ブラウザの設定を %2$S に送信します。
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -0,0 +1,34 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Script 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		"スクリプトデバッガ">
+
+<!-- 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.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	"スコープ内の変数">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -0,0 +1,54 @@
+# LOCALIZATION NOTE These strings are used inside the Script Debugger
+# which is available from the Web Developer sub-menu -> 'Script 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 (pauseLabel): The label that is displayed on the pause
+# button when the debugger is in a running state.
+pauseLabel	= 停止
+
+# 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	= ローカル
+
+# 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 (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
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -54,12 +54,235 @@ inspectManual		= CSS セレクタで DOM をハイライトし\
 inspectNodeDesc		= CSS セレクタ
 
 # LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
 # parameter to the 'inspect' command, displayed when the user asks for help
 # on what it does.
 inspectNodeManual	= document.querySelector() で\
 一意に識別可能な CSS セレクタ
 
+# LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
+# command. See tiltManual 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.
+tiltDesc		= Web ページを 3D 表示します
+
+# LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
+# command, displayed when the user asks for help on what it does.
+tiltManual		= Web ページのさまざまなパーツのつながりを 3D 空間に表示して調べます
+
+# LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
+# command. See tiltOpenManual 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.
+tiltOpenDesc		= 3D 調査ビューを開きます
+
+# LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltOpenManual		= 3D 調査ビューを初期化して、CSS セレクタで指定されたノードをハイライトします
+
+# LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
+# command. See tiltTranslateManual 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.
+tiltTranslateDesc	= 3D オブジェクトを動かします
+
+# LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltTranslateManual	= 3D オブジェクトを特定の方向へ平行移動させます
+
+# LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateXDesc	= X軸 (ピクセル)
+
+# LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateXManual	= X軸方向の移動量 (ピクセル単位)
+
+# LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateYDesc	= Y軸 (ピクセル)
+
+# LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateYManual	= Y軸方向の移動量 (ピクセル単位)
+
+# LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
+# command. See tiltRotateManual 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.
+tiltRotateDesc		= 3D オブジェクトを回転させます
+
+# LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
+# command, displayed when the user asks for help on what it does.
+tiltRotateManual	= 3D オブジェクトを特定の方向へ回転させます
+
+# LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateXDesc		= X軸 (角度)
+
+# LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateXManual	= X軸方向の回転量 (角度)
+
+# LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateYDesc		= Y軸 (角度)
+
+# LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateYManual	= Y軸方向の回転量 (角度)
+
+# LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
+# 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateZDesc		= Z軸 (角度)
+
+# LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateZManual	= Z軸方向の回転量 (角度)
+
+# LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
+# command. See tiltZoomManual 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.
+tiltZoomDesc		= 3D オブジェクトを拡大/縮小します
+
+# LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
+# command, displayed when the user asks for help on what it does.
+tiltZoomManual		= 3D オブジェクトを Z 軸方向に動かします
+
+# LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
+# 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
+# when the user is using this command.
+tiltZoomAmountDesc	= 拡大/縮小 (ピクセル単位)
+
+# LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
+# parameter to the 'zoom' command, displayed when the user asks for help
+# on what it does.
+tiltZoomAmountManual	= Z軸方向の移動量 (ピクセル単位)
+
+# LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
+# command. See tiltResetManual 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.
+tiltResetDesc		= 平行移動、回転、拡大/縮小をリセットします
+
+# LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
+# command, displayed when the user asks for help on what it does.
+tiltResetManual		= 3D オブジェクトに適用された変形処理をリセットします
+
+# LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
+# command. See tiltCloseManual 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.
+tiltCloseDesc		= 3D 調査ビューを閉じます
+
+# LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
+# command, displayed when the user asks for help on what it does.
+tiltCloseManual		= 3D 調査ビューを閉じて、標準ハイライトの調査ビューに戻ります
+
+# LOCALIZATION NOTE (breakDesc) A very short string used to describe the
+# function of the break command.
+breakDesc		= ブレークポイントを管理します
+
+# LOCALIZATION NOTE (breakManual) A longer description describing the
+# set of commands that control breakpoints.
+breakManual		= ブレークポイントの一覧を表示したり、追加や削除を行います
+
+# LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
+# function of the 'break list' command.
+breaklistDesc		= 既存のブレークポイントを表示します
+
+# LOCALIZATION NOTE (breaklistLineEntry) Used in the output of the 'break list'
+# command to display a single line breakpoint.
+# %1$S=script URL, %2$S=line number
+breaklistLineEntry	= 行ブレークポイント: %1$S:%2$S
+
+# LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
+# command to explain that the list is empty.
+breaklistNone		= 設置されているブレークポイントはありません
+
+# LOCALIZATION NOTE (breaklistIntro) Used in the output of the 'break list'
+# command to preface the list contents.
+breaklistIntro		= 次のブレークポイントが設置されています:
+
+# LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
+# command to explain that a breakpoint was added.
+breakaddAdded		= 設置されたブレークポイント
+
+# LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
+# command to explain that a breakpoint could not be added.
+breakaddFailed		= ブレークポイントを設置できません: %S
+
+# LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
+# function of the 'break add' command.
+breakaddDesc		= ブレークポイントを設置します
+
+# LOCALIZATION NOTE (breakaddManual) A longer description describing the
+# set of commands that are responsible for adding breakpoints.
+breakaddManual		= 対応しているブレークポイントの種類: 行ブレークポイント
+
+# LOCALIZATION NOTE (breakaddDebuggerStopped) Used in the output of the
+# 'break add' command to explain that the debugger must be opened first.
+breakaddDebuggerStopped	= ブレークポイントを設置する前に、スクリプトデバッガを開いてください
+
+# LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
+# function of the 'break add line' command.
+breakaddlineDesc	= 行ブレークポイントを設置します
+
+# LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
+# the function of the file parameter in the 'break add line' command.
+breakaddlineFileDesc	= JavaScript ファイル URI
+
+# LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
+# the function of the line parameter in the 'break add line' command.
+breakaddlineLineDesc	= 行
+
+# LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
+# function of the 'break del' command.
+breakdelDesc		= ブレークポイントを撤去します
+
+# LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
+# the function of the index parameter in the 'break del' command.
+breakdelBreakidDesc	= ブレークポイントのインデックス
+
+# LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
+# command to explain that a breakpoint was removed.
+breakdelRemoved		= ブレークポイントが撤去されました
+
+# LOCALIZATION NOTE (breakNotFound) Used in the output of the 'break del'
+# command to explain that the breakpoint was not found.
+breakNotFound		= ブレークポイントが見つかりません
+
 # LOCALIZATION NOTE (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 (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.
+editManual		= この Web ページのリソース (または、一般的な Web リソース?) のうちの1つを編集します
+
+# LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
+# 'resource' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editResourceDesc	= 編集するリソースの URL
+
+# LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
+# 'line' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editLineToJumpToDesc	= 指定行へ移動
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -15,25 +15,20 @@ 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 (htmlPanel.label): This is a lable for a button that
-# activates the Web Developer->Inspect UI's HTML Tree Panel.
-htmlPanel.label		= HTML
-
-# LOCALIZATION NOTE (htmlPanel.tooltiptext): The text that appears when a user
-# hovers over the HTML panel's toolbar button.
-htmlPanel.tooltiptext	= HTML パネル
-
-# LOCALIZATION NOTE (htmlPanel.accesskey): The key bound to the HTML panel's
-# toolbar button.
-htmlPanel.accesskey	= H
-
 # LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
 # associated with the Highlighter's CSS Rule View in the Style Sidebar.
 ruleView.label		= ルール
 ruleView.accesskey	= R
 ruleView.tooltiptext	= CSS の確認と編集
+
+# LOCALIZATION NOTE (inspectButton.tooltiptext):
+# This button appears in the Inspector Toolbar. inspectButton is stateful,
+# if it's pressed users can select an element with the mouse. Pressing the
+# "Return" key # changes that state. %S is the keyboard shortcut (VK_RETURN in
+# chrome://global/locale/keys.properties).
+inspectButton.tooltiptext	= マウスで要素を選択 (%S)
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -38,60 +38,16 @@
 
 <!ENTITY closeCmd.label			"閉じる">
 <!ENTITY closeCmd.key			"W">
 <!ENTITY closeCmd.accesskey		"C">
 
 <!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">
-<!ENTITY redoCmd.accesskey		"R">
-
-<!ENTITY cutCmd.label			"切り取り">
-<!ENTITY cutCmd.key			"X">
-<!ENTITY cutCmd.accesskey		"t">
-
-<!ENTITY copyCmd.label			"コピー">
-<!ENTITY copyCmd.key			"C">
-<!ENTITY copyCmd.accesskey		"C">
-
-<!ENTITY pasteCmd.label			"貼り付け">
-<!ENTITY pasteCmd.key			"V">
-<!ENTITY pasteCmd.accesskey		"P">
-
-<!ENTITY selectAllCmd.label		"すべて選択">
-<!ENTITY selectAllCmd.key		"A">
-<!ENTITY selectAllCmd.accesskey		"A">
-
-<!ENTITY findCmd.label			"検索...">
-<!ENTITY findCmd.key			"F">
-<!ENTITY findCmd.accesskey		"F">
-
-<!ENTITY findAgainCmd.label		"次を検索...">
-<!-- LOCALIZATION NOTE (findAgainCmd.key): This key is used only on Macs.
-  -  Windows and Linux builds use the F3 key which is not localizable on purpose.
-  -->
-<!ENTITY findAgainCmd.key		"G">
-<!ENTITY findAgainCmd.accesskey		"g">
-<!-- LOCALIZATION NOTE (findPreviousCmd.key): This key is used only on Macs.
-  -  Windows and Linux builds use the Shift-F3 key which is not localizable on
-  -  purpose.
-  -->
-<!ENTITY findPreviousCmd.key		"G">
-
-<!ENTITY gotoLineCmd.label		"指定行へ移動...">
-<!ENTITY gotoLineCmd.key		"J">
-<!ENTITY gotoLineCmd.accesskey		"J">
-
 <!ENTITY run.label			"実行">
 <!ENTITY run.accesskey			"R">
 <!ENTITY run.key			"r">
 
 <!ENTITY inspect.label			"調査">
 <!ENTITY inspect.accesskey		"I">
 <!ENTITY inspect.key			"i">
 
@@ -116,16 +72,28 @@
   -  to select an execution environment for the browser window itself as opposed
   -  to content. This is a feature for browser and addon developers and only
   -  enabled via the devtools.chrome.enabled preference. Formerly, this label
   -  was called "Chrome".
   -->
 <!ENTITY browserContext.label		"ブラウザ">
 <!ENTITY browserContext.accesskey	"B">
 
+<!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
+  -  for the help button in the menubar but Gnome does not.
+  -->
+<!ENTITY helpMenu.label			"ヘルプ">
+<!ENTITY helpMenu.accesskey		"H">
+<!ENTITY helpMenuWin.label		"ヘルプ">
+<!ENTITY helpMenuWin.accesskey		"H">
+
+<!ENTITY documentationLink.label	"スクラッチパッドのヘルプ (MDN)">
+<!ENTITY documentationLink.accesskey	"D">
+
+
 <!-- LOCALIZATION NOTE (resetContext2.label): This command allows the developer
   -  to reset/clear the global object of the environment where the code executes.
   -->
 <!ENTITY resetContext2.label		"変数をリセット">
 <!ENTITY resetContext2.accesskey	"T">
 
 <!ENTITY executeMenu.label		"実行メニュー">
 <!ENTITY executeMenu.accesskey		"X">
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -49,8 +49,12 @@ 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
 
 # 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
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/sourceeditor.dtd
@@ -0,0 +1,15 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Source Editor component
+  - strings. The source editor component is used within the Scratchpad and
+  - Style Editor tools. -->
+
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!-- 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 gotoLineCmd.label		"指定行へ移動...">
+<!ENTITY gotoLineCmd.key		"J">
+<!ENTITY gotoLineCmd.accesskey		"J">
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -23,8 +23,18 @@ findCmd.promptMessage		= 検索:
 # when the user wants to jump to a specific line number in the code. You can
 # access this feature by pressing Ctrl-J on Windows/Linux or Cmd-J on Mac.
 gotoLineCmd.promptTitle		= 指定行へ移動...
 
 # LOCALIZATION NOTE  (gotoLineCmd.promptMessage): This is the message shown when
 # the user wants to jump to a specific line number in the code. You can
 # access this feature by pressing Ctrl-J on Windows/Linux or Cmd-J on Mac.
 gotoLineCmd.promptMessage	= 指定行へ移動:
+
+# LOCALIZATION NOTE  (annotation.breakpoint.title): This is the text shown in
+# front of any breakpoint annotation when it is displayed as a tooltip in one of
+# the editor gutters. This feature is used in the JavaScript Debugger.
+annotation.breakpoint.title	= ブレークポイント: %S
+
+# LOCALIZATION NOTE  (annotation.currentLine): This is the text shown in
+# a tooltip displayed in any of the editor gutters when the user hovers the
+# current line.
+annotation.currentLine		= 現在の行
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -32,15 +32,92 @@ rule.sourceElement		= 要素
 # e.g "Inherited from body#bodyID (styles.css:20)"
 rule.inheritedSource		= %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.tooltip	= 要素のスタイルを調査
+style.highlighter.button.tooltip2	= 要素の計算済みスタイルを調査
 
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
 # quickly jump to the documentation from the Mozilla Developer Network site.
 # This is the link title shown in the hover tooltip.
 helpLinkTitle			= このプロパティに関するドキュメントを開く
+
+# LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
+# entered into the rule view a warning icon is displayed. This text is used for
+# the title attribute of the warning icon.
+rule.warning.title				= 無効な値
+
+# LOCALIZATION NOTE (style.contextmenu.copyselection): The computed view's
+# context menu copy entry.
+style.contextmenu.copyselection			= 選択範囲をコピー
+
+# LOCALIZATION NOTE (style.contextmenu.copyselection.accesskey): The computed
+# view's context menu copy entry access key.
+style.contextmenu.copyselection.accesskey	= C
+
+# LOCALIZATION NOTE (style.contextmenu.copydeclaration): The style inspector's
+# context menu copy property entry allows a complete CSS property to be copied.
+style.contextmenu.copydeclaration		= 宣言行をコピー
+
+# LOCALIZATION NOTE (style.contextmenu.copydeclaration.accesskey): The style
+# inspector's context menu copy property access key.
+style.contextmenu.copydeclaration.accesskey	= D
+
+# LOCALIZATION NOTE (style.contextmenu.copyproperty): The style inspector's
+# context menu copy property name entry allows a CSS property name to be copied.
+style.contextmenu.copyproperty			= プロパティをコピー
+
+# LOCALIZATION NOTE (style.contextmenu.copyproperty.accesskey): The style
+# inspector's context menu copy property name access key.
+style.contextmenu.copyproperty.accesskey	= P
+
+# LOCALIZATION NOTE (style.contextmenu.copypropertyvalue): The style inspector's
+# context menu copy property value entry allows a CSS property name to be copied.
+style.contextmenu.copypropertyvalue		= 値をコピー
+
+# LOCALIZATION NOTE (style.contextmenu.copypropertyvalue.accesskey): The style
+# inspector's context menu copy property value access key.
+style.contextmenu.copypropertyvalue.accesskey	= U
+
+# LOCALIZATION NOTE (rule.contextmenu.copyselection): The rule view's context
+# menu copy entry.
+rule.contextmenu.copyselection			= 選択範囲をコピー
+
+# LOCALIZATION NOTE (rule.contextmenu.copyselection.accesskey): The rule view's
+# context menu copy entry access key.
+rule.contextmenu.copyselection.accesskey	= C
+
+# LOCALIZATION NOTE (rule.contextmenu.copyrule): The rule view's context menu
+# copy rule entry allows a complete CSS rule to be copied.
+rule.contextmenu.copyrule			= ルールをコピー
+
+# LOCALIZATION NOTE (rule.contextmenu.copyrule.accesskey): The rule view's
+# context menu copy rule access key.
+rule.contextmenu.copyrule.accesskey		= R
+
+# LOCALIZATION NOTE (rule.contextmenu.copydeclaration): The rule view's context
+# menu copy property entry allows a complete CSS property to be copied.
+rule.contextmenu.copydeclaration		= 宣言行をコピー
+
+# LOCALIZATION NOTE (rule.contextmenu.copydeclaration.accesskey): The rule view's
+# context menu copy property access key.
+rule.contextmenu.copydeclaration.accesskey	= D
+
+# LOCALIZATION NOTE (rule.contextmenu.copyproperty): The rule view's context
+# menu copy property entry allows a CSS property name to be copied.
+rule.contextmenu.copyproperty			= プロパティをコピー
+
+# LOCALIZATION NOTE (rule.contextmenu.copyproperty.accesskey): The rule
+# view's context menu copy property name access key.
+rule.contextmenu.copyproperty.accesskey		= P
+
+# LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue): The rule view's
+# context menu copy property entry allows a CSS property value to be copied.
+rule.contextmenu.copypropertyvalue		= 値をコピー
+
+# LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue.accesskey): The rule
+# view's context menu copy property value access key.
+rule.contextmenu.copypropertyvalue.accesskey	= U
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -1,6 +1,2 @@
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle	"新しいタブ">
-
-<!ENTITY newtab.show		"新しいタブページを表示">
-<!ENTITY newtab.hide		"新しいタブページを閉じる">
-<!ENTITY newtab.reset		"新しいタブページをリセット">
--- a/browser/chrome/browser/newTab.properties
+++ b/browser/chrome/browser/newTab.properties
@@ -1,3 +1,5 @@
 newtab.pin	= このサイトをこの位置にピン留め
 newtab.unpin	= このサイトのピン留めを外す
 newtab.block	= このサイトを削除
+newtab.show	= 新しいタブページを表示
+newtab.hide	= 新しいタブページを閉じる
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -46,16 +46,19 @@ unknown			= 不明
 notset			= なし
 yes			= はい
 no			= いいえ
 
 mediaImg		= 画像
 mediaVideo		= 動画
 mediaAudio		= オーディオ
 mediaBGImg		= 背景画像
+mediaBorderImg		= ボーダーの画像
+mediaListImg		= リストのマーカー画像
+mediaCursor		= カーソル
 mediaObject		= オブジェクト
 mediaEmbed		= 埋め込みオブジェクト
 mediaLink		= アイコン
 mediaInput		= 入力
 mediaFileSize		= %S KB
 mediaSize		= %Spx × %Spx
 mediaSelectFolder	= 画像を保存するフォルダを選択してください
 mediaBlockImage		= %S の画像をブロック
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -10,17 +10,16 @@
 <!ENTITY  locbar.pre.label		"ロケーションバーには次の中から候補を表示する:">
 <!ENTITY  locbar.pre.accessKey		"u">
 <!ENTITY  locbar.post.label		"">
 <!ENTITY  locbar.both.label		"履歴とブックマーク">
 <!ENTITY  locbar.history.label		"履歴のみ">
 <!ENTITY  locbar.bookmarks.label	"ブックマークのみ">
 <!ENTITY  locbar.nothing.label		"候補を表示しない">
 
-
 <!ENTITY  acceptCookies.label		"サイトから送られてきた Cookie を保存する">
 <!ENTITY  acceptCookies.accesskey	"A">
 
 <!ENTITY  acceptThirdParty.label	"サードパーティの Cookie も保存する">
 <!ENTITY  acceptThirdParty.accesskey	"c">
 
 <!ENTITY  keepUntil.label		"Cookie を保存する期間:">
 <!ENTITY  keepUntil.accesskey		"K">
@@ -59,21 +58,18 @@
 <!-- LOCALIZATION NOTE (dontrememberActions.post.label): include a starting space as needed -->
 <!ENTITY  dontrememberActions.pre.label			"">
 <!ENTITY  dontrememberActions.clearHistory.label	"現在の履歴をすべて消去">
 <!ENTITY  dontrememberActions.post.label		" できます。">
 
 <!ENTITY  privateBrowsingPermanent2.label		"常にプライベートブラウジングモード">
 <!ENTITY  privateBrowsingPermanent2.accesskey		"p">
 
-<!ENTITY  rememberHistory.label			"表示したページの履歴を残す">
-<!ENTITY  rememberHistory.accesskey		"b">
-
-<!ENTITY  rememberDownload.label		"ファイルのダウンロード履歴を記憶させる">
-<!ENTITY  rememberDownload.accesskey		"d">
+<!ENTITY  rememberHistory2.label			"表示したページとファイルのダウンロードの履歴を残す">
+<!ENTITY  rememberHistory2.accesskey			"b">
 
 <!ENTITY  rememberSearchForm.label		"検索やフォームの入力履歴を記憶させる">
 <!ENTITY  rememberSearchForm.accesskey		"f">
 
 <!ENTITY  clearOnClose.label			"&brandShortName; の終了時に履歴を消去する">
 <!ENTITY  clearOnClose.accesskey		"r">
 
 <!ENTITY  clearOnCloseSettings.label		"設定...">
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -34,16 +34,19 @@
    - 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 safeModeDescription.label	"&brandShortName; はセーフモードで実行されており、ユーザ設定、テーマ、拡張機能はすべて一時的に無効化されています。">
 <!ENTITY safeModeDescription2.label	"以下の項目については恒久的に変更できます:">
 
 <!ENTITY disableAddons.label		"すべてのアドオンを無効化する">
 <!ENTITY disableAddons.accesskey	"D">
 
 <!ENTITY resetToolbars.label		"ツールバーとコントロールをリセットする"><!-- Reset toolbars and controls -->
 <!ENTITY resetToolbars.accesskey	"R">
--- a/browser/chrome/browser/setDesktopBackground.dtd
+++ b/browser/chrome/browser/setDesktopBackground.dtd
@@ -1,9 +1,11 @@
 <!ENTITY position.label			"位置:">
 <!ENTITY tile.label			"並べて表示">
 <!ENTITY center.label			"中央に表示">
 <!ENTITY stretch.label			"拡大して表示">
+<!ENTITY fill.label			"ページ幅に合わせる">
+<!ENTITY fit.label			"画面サイズに合わせる">
 <!ENTITY preview.label			"プレビュー">
 <!ENTITY color.label			"背景色:">
 <!ENTITY setDesktopBackground.title	"デスクトップの背景に設定">
 <!ENTITY openDesktopPrefs.label		"デスクトップの設定を開く">
 <!ENTITY closeWindow.key		"w">
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -7,17 +7,17 @@
 <!ENTITY button.haveAccount.label      "アカウントを持っています">
 
 <!ENTITY setup.choicePage.title.label     "これまでに &syncBrand.fullName.label; を使用したことはありますか?">
 <!ENTITY setup.choicePage.new.label       "これまでに &syncBrand.shortName.label; を使用したことは一度もありません">
 <!ENTITY setup.choicePage.existing.label  "すでに他のパソコンで &syncBrand.shortName.label; を使用しています">
 
 <!-- New Account AND Existing Account -->
 <!ENTITY server.label               "サーバ">
-<!ENTITY serverType.main.label      "&syncBrand.fullName.label; サーバ">
+<!ENTITY serverType.default.label      "既定: Mozilla &syncBrand.fullName.label; サーバ">
 <!ENTITY serverType.custom2.label   "独自サーバを使用する...">
 <!ENTITY signIn.account2.label      "アカウント">
 <!ENTITY signIn.account2.accesskey  "A">
 <!ENTITY signIn.password.label      "パスワード">
 <!ENTITY signIn.password.accesskey  "P">
 <!ENTITY signIn.recoveryKey.label       "リカバリキー">
 <!ENTITY signIn.recoveryKey.accesskey   "K">
 
--- a/browser/updater/updater.ini
+++ b/browser/updater/updater.ini
@@ -1,4 +1,6 @@
 ; This file is in the UTF-8 encoding
+; All strings must be less than 600 chars.
 [Strings]
 TitleText=%MOZ_APP_DISPLAYNAME% の更新
 InfoText=%MOZ_APP_DISPLAYNAME% を更新しています。起動するまでしばらくお待ちください...
+MozillaMaintenanceDescription=Mozilla メンテナンスサービスは、Mozilla Firefox をもっともセキュアな最新バージョンに保ちます。Firefox を最新バージョンに保つことは、オンラインでのセキュリティにとても重要であり、このサービスは常に有効にしておくことを Mozilla は強くお勧めします。