39.0: sync browser with en-US rev255285:b5527b393f62 FIREFOX_39_0b1_BUILD2 FIREFOX_39_0b1_RELEASE FIREFOX_39_0b2_BUILD1 FIREFOX_39_0b2_RELEASE FIREFOX_39_0b3_BUILD1 FIREFOX_39_0b3_RELEASE FIREFOX_39_0b4_BUILD2 FIREFOX_39_0b4_RELEASE FIREFOX_39_0b5_BUILD1 FIREFOX_39_0b5_RELEASE FIREFOX_39_0b6_BUILD1 FIREFOX_39_0b6_RELEASE FIREFOX_39_0b7_BUILD1 FIREFOX_39_0b7_RELEASE FIREFOX_40_0b1_BUILD1 FIREFOX_40_0b1_BUILD2 FIREFOX_40_0b1_RELEASE FIREFOX_40_0b2_BUILD1 FIREFOX_40_0b2_RELEASE FIREFOX_40_0b3_BUILD1 FIREFOX_40_0b3_RELEASE FIREFOX_40_0b4_BUILD1 FIREFOX_40_0b4_RELEASE
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Sat, 09 May 2015 16:21:13 +0900
changeset 1763 f530a1c99c19f49ad09d0c6a0f62d8cb1a12400e
parent 1762 99cffae25dd866d7a6648c338a433bef69f12d05
child 1764 fe03bf136fb4d368bfa14ff51a8cc53afb44129e
child 1775 f77967756d53b099f14f0e6e053083df4fd5054e
child 1777 1afbf295898ba2c383b89225f0b2116433a554a0
child 1778 e169546c06f76388569ba6a81594c6866fe43db7
child 1780 0a58f4d5f34a18737a5ee70481d957d3836f15f5
child 1782 c4e8cadd3d2102f215d2e4c37f789fbbf5e572c6
child 1784 59f70f735da542f631fa822b74deb5678200670f
child 1786 1bfdc31eb1f9264a3831d53184abe412664c2d02
child 1799 5686a186c24f7fa80b3509f88c68ca6447165342
child 1801 f6e24fb12518de45a007f718b26c53608ce08f02
child 1803 3b1e22f4af3082f2567a96f48be80854e2fafc2b
child 1804 01ae6cadb461abbb24e11bfac127d7eed9d4c494
child 1809 ec56cf66dad2ea9c31b08bd6f503b1786b424a18
push id921
push userzbraniecki@mozilla.com
push dateMon, 11 May 2015 18:59:38 +0000
bugs39
39.0: sync browser with en-US rev255285:b5527b393f62
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/customizableui/customizableWidgets.properties
browser/chrome/browser/devtools/canvasdebugger.dtd
browser/chrome/browser/devtools/canvasdebugger.properties
browser/chrome/browser/devtools/device.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/timeline.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/loop/loop.properties
browser/chrome/browser/newTab.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/permissions.dtd
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -264,16 +264,17 @@ These should match what Safari and other
 <!ENTITY scratchpad.accesskey         "s">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!-- LOCALIZATION NOTE (browserToolboxMenu.label): This is the label for the
   -  application menu item that opens the browser toolbox UI in the Tools menu. -->
 <!ENTITY browserToolboxMenu.label     "ブラウザツールボックス">
 <!ENTITY browserToolboxMenu.accesskey "e">
+<!ENTITY browserToolboxCmd.commandkey "i">
 
 <!-- LOCALIZATION NOTE (browserContentToolboxMenu.label): This is the label for the
   -  application menu item that opens the browser content toolbox UI in the Tools menu.
   -  This toolbox allows to debug the chrome of the content process in multiprocess builds.  -->
 <!ENTITY browserContentToolboxMenu.label     "ブラウザコンテンツツールボックス">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "開発ツールバーを閉じる">
 <!ENTITY devToolbarMenu.label              "開発ツールバー">
@@ -848,13 +849,12 @@ just addresses the organization to follo
 
 <!ENTITY readingList.label                        "後で読む">
 <!ENTITY readingList.sidebar.commandKey           "R">
 <!ENTITY readingList.showSidebar.label            "後で読むサイドバーを表示">
 <!-- Pre-landed string for bug 1124153 -->
 <!ENTITY readingList.sidebar.showMore.label       "さらに表示...">
 <!-- Pre-landed string for bug 1133662 -->
 <!ENTITY readingList.sidebar.emptyText            "後で必要なときにすぐに記事を見つけられるように、後で読むリストに追加します。">
-<!-- Pre-landed string for bug 1123525 -->
 <!ENTITY readingList.sidebar.delete.tooltip       "後で読むリストから削除します">
 <!-- Pre-landed strings for bug 1123519 -->
 <!ENTITY readingList.sidebar.add.label            "後で読むリストに追加">
 <!ENTITY readingList.sidebar.add.tooltip          "後で読むリストに追加します">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -15,36 +15,56 @@ droponhomemsg		= この Web ページまたはファイルを新しいホームページに設定します。よろしいですか?
 contextMenuSearch			= %1$S で検索: "%2$S"
 contextMenuSearch.accesskey		= S
 
 # bookmark dialog strings
 
 bookmarkAllTabsDefault		= [フォルダ名]
 
 # (^^; en-US は機能ごとに統一性がないが ja ではある程度そろえた。
-xpinstallPromptWarning			= このサイト (%2$S) からは %1$S にソフトウェアをインストールできない設定になっています。
+xpinstallPromptMessage			= このサイトからは %1$S にソフトウェアをインストールできない設定になっています。
 xpinstallPromptAllowButton		= 許可
 # Accessibility Note:
 # Be sure you do not choose an accesskey that is used elsewhere in the active context (e.g. main menu bar, submenu of the warning popup button)
 # See http://www.mozilla.org/access/keyboard/accesskey for details
 xpinstallPromptAllowButton.accesskey	= A
 xpinstallDisabledMessageLocked		= ソフトウェアのインストールはシステム管理者により無効化されています。
 xpinstallDisabledMessage		= ソフトウェアのインストールは現在無効になっています。[有効にする] をクリックしてからもう一度やり直してください。
 xpinstallDisabledButton			= 有効にする
 xpinstallDisabledButton.accesskey	= n
 
-# LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled, addonDownloadRestart):
+# LOCALIZATION NOTE (addonDownloadingAndVerifying):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Also see https://bugzilla.mozilla.org/show_bug.cgi?id=570012 for mockups
-addonDownloading			= アドオンをダウンロード中
-addonDownloadCancelled			= アドオンのダウンロードはキャンセルされました。
-addonDownloadRestart			= ダウンロードを再開
-addonDownloadRestart.accessKey		= R
-addonDownloadCancelTooltip		= キャンセル
+addonDownloadingAndVerifying		= #1 個のアドオンをダウンロードして検証しています...
+addonDownloadVerifying			= 検証中
+
+addonInstall.cancelButton.label		= キャンセル
+addonInstall.cancelButton.accesskey	= C
+addonInstall.acceptButton.label		= インストール
+addonInstall.acceptButton.accesskey	= I
+
+# LOCALIZATION NOTE (addonConfirmInstallMessage):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is brandShortName
+# #2 is the number of add-ons being installed
+addonConfirmInstall.message		= このサイトは #1 に #2 個のアドオンのインストールを求めています:
+
+addonwatch.slow				= %1$S によって %2$S の動作が遅くなっています
+addonwatch.disable.label		= %S を無効にする
+addonwatch.disable.accesskey		= D
+addonwatch.ignoreSession.label		= 今だけ無視
+addonwatch.ignoreSession.accesskey	= I
+addonwatch.ignorePerm.label		= 無視
+addonwatch.ignorePerm.accesskey		= p
+addonwatch.restart.message		= %2$S を再起動すると %1$S が無効になります
+addonwatch.restart.label		= %S を再起動
+addonwatch.restart.accesskey		= R
 
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 first add-on's name, #2 number of add-ons, #3 application name
 # (^m^) 要修正 https://bugzilla.mozilla.org/show_bug.cgi?id=658191
 addonsInstalled				= #1 がインストールされました。;#2 個のアドオンがインストールされました。
 addonsInstalledNeedsRestart		= #1 は #3 の再起動後にインストールされます。;#2 個のアドオンは #3 の再起動後にインストールされます。
@@ -63,16 +83,20 @@ addonError-4		= #3 は必要なファイルが変更できなかったため、#1 をインストールできませんでした。
 # #1 is the add-on name, #3 is the application name, #4 is the application version
 addonLocalError-1	= ファイルシステムエラーのため、アドオンをインストールできませんでした。
 addonLocalError-2	= このアドオンは #3 に対応していないため、インストールできませんでした。
 addonLocalError-3	= このアドオンは壊れているため、インストールできませんでした。
 addonLocalError-4	= #3 は必要なファイルが変更できなかったため、#1 をインストールできませんでした。
 addonErrorIncompatible	= #3 #4 と互換性がないため、#1 をインストールできませんでした。
 addonErrorBlocklisted	= セキュリティまたは安定性に問題があるため、#1 をインストールできませんでした。
 
+# LOCALIZATION NOTE (deveditionTheme.name): This should be nearly the brand name for aurora.
+# See browser/branding/aurora/locales/*/brand.properties
+deveditionTheme.name	= Developer Edition
+
 # LOCALIZATION NOTE (lwthemeInstallRequest.message): %S will be replaced with
 # the host name of the site.
 lwthemeInstallRequest.message		= このサイト (%S) はテーマをインストールしようとしています。
 lwthemeInstallRequest.allowButton	= 許可
 lwthemeInstallRequest.allowButton.accesskey	= a
 
 lwthemePostInstallNotification.message			= 新しいテーマがインストールされました。
 lwthemePostInstallNotification.undoButton		= 元に戻す
@@ -400,22 +424,22 @@ extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name		= デフォルト
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description	= 標準設定のテーマです。
 
 # safeModeRestart
 safeModeRestartPromptTitle			= アドオンを無効にして再起動
 safeModeRestartPromptMessage			= すべてのアドオンを無効にして再起動します。よろしいですか?
 safeModeRestartButton				= 再起動
 
 # LOCALIZATION NOTE (browser.menu.showCharacterEncoding): Set to the string
-# "true" (spelled and capitalized exactly that way) to show the "Character
+# "true" (spelled and capitalized exactly that way) to show the "Text
 # Encoding" menu in the main Firefox button on Windows. Any other value will
-# hide it. Regardless of the value of this setting, the "Character Encoding"
+# hide it. Regardless of the value of this setting, the "Text Encoding"
 # menu will always be accessible via the "Web Developer" menu.
 # This is not a string to translate; it just controls whether the menu shows
-# up in the Firefox button. If users frequently use the "Character Encoding"
+# up in the Firefox button. If users frequently use the "Text Encoding"
 # menu, set this to "true". Otherwise, you can leave it as "false".
 browser.menu.showCharacterEncoding		= true
 
 # LOCALIZATION NOTE (syncPromoNotification.bookmarks.label): This appears in
 # the add bookmark star panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.bookmarks.description	= %S でブックマークを他の端末と共有できます。
 # LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
--- a/browser/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -76,21 +76,21 @@ copy-button.tooltiptext2		= コピー (%S)
 
 paste-button.label			= 貼り付け
 # LOCALIZATION NOTE(paste-button.tooltiptext2): %S is the keyboard shortcut.
 paste-button.tooltiptext2		= 貼り付け (%S)
 
 feed-button.label			= 購読
 feed-button.tooltiptext2		= このページを購読します
 
-# LOCALIZATION NOTE (characterencoding-button.label): The \u00ad character at the beginning
+# LOCALIZATION NOTE (characterencoding-button2.label): The \u00ad text at the beginning
 # of the string is used to disable auto hyphenation on the button text when it is displayed
 # in the menu panel.
-characterencoding-button.label		= \u00ad文字エンコーディング
-characterencoding-button.tooltiptext2	= 文字エンコーディングのオプションを表示します
+characterencoding-button2.label		= \u00adテキストエンコーディング
+characterencoding-button2.tooltiptext	= テキストエンコーディングのオプションを表示します
 
 email-link-button.label			= ページの URL をメールで送信
 email-link-button.tooltiptext3		= このページの URL をメールで送信します
 
 # LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.linux2		= %1$S を終了します (%2$S)
 # LOCALIZATION NOTE(quit-button.tooltiptext.mac): %1$S is the brand name (e.g. Firefox),
--- a/browser/chrome/browser/devtools/canvasdebugger.dtd
+++ b/browser/chrome/browser/devtools/canvasdebugger.dtd
@@ -19,19 +19,19 @@
   -  along with the button that triggers a page refresh. -->
 <!ENTITY canvasDebuggerUI.reloadNotice2   "すると、&lt;canvas&gt; コンテキストをデバッグできるようになります。">
 
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.emptyNotice1/2): This is the label shown
   -  in the call list view when empty. -->
 <!ENTITY canvasDebuggerUI.emptyNotice1    "">
 <!ENTITY canvasDebuggerUI.emptyNotice2    "ボタンをクリックすると、アニメーションフレームのコールスタックを記録します。">
 
-<!-- LOCALIZATION NOTE (canvasDebuggerUI.reloadNotice1): This is the label shown
-  -  in the call list view while loading a snapshot. -->
-<!ENTITY canvasDebuggerUI.importNotice    "読み込み中...">
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.waitingNotice): This is the label shown
+  -  in the call list view while recording a snapshot. -->
+<!ENTITY canvasDebuggerUI.waitingNotice   "アニメーション全体を記録しています...">
 
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.recordSnapshot): This string is displayed
   -  on a button that starts a new snapshot. -->
 <!ENTITY canvasDebuggerUI.recordSnapshot.tooltip "アニメーションループの次のフレームを記録します。">
 
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.importSnapshot): This string is displayed
   -  on a button that opens a dialog to import a saved snapshot data file. -->
 <!ENTITY canvasDebuggerUI.importSnapshot "インポート...">
--- a/browser/chrome/browser/devtools/canvasdebugger.properties
+++ b/browser/chrome/browser/devtools/canvasdebugger.properties
@@ -71,8 +71,14 @@ snapshotsList.saveDialogAllFilter	= すべてのファイル
 # as a generic description about how many draw calls were made.
 snapshotsList.drawCallsLabel		= #1 描画
 
 # LOCALIZATION NOTE (snapshotsList.functionCallsLabel):
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # This string is displayed in the snapshots list of the Canvas Debugger,
 # as a generic description about how many function calls were made in total.
 snapshotsList.functionCallsLabel	= #1 命令
+
+# LOCALIZATION NOTE (recordingTimeoutFailure):
+# This notification alert is displayed when attempting to record a requestAnimationFrame
+# cycle in the Canvas Debugger and no cycles detected. This alerts the user that no
+# loops were found.
+recordingTimeoutFailure			= Canvas デバッガは requestAnimationFrame または setTimeout によるループを検出できませんでした。
--- a/browser/chrome/browser/devtools/device.properties
+++ b/browser/chrome/browser/devtools/device.properties
@@ -9,11 +9,12 @@
 # language in which you'd find the best documentation on web development on the
 # web.
 
 # LOCALIZATION NOTE:
 # These strings are category names in a list of devices that a user can choose
 # to simulate (e.g. "ZTE Open C", "VIA Vixen", "720p HD Television", etc).
 device.phones		= 携帯電話
 device.tablets		= タブレット
-device.notebooks	= ノート PC
+device.laptops		= ノート PC
 device.televisions	= テレビ
+device.consoles		= ゲーム機
 device.watches		= 時計
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -51,158 +51,162 @@
   -  in the network table toolbar, above the "size" column, which is the
   -  uncompressed / decoded size. -->
 <!ENTITY netmonitorUI.toolbar.size        "サイズ">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.waterfall): This is the label displayed
   -  in the network table toolbar, above the "waterfall" column. -->
 <!ENTITY netmonitorUI.toolbar.waterfall   "タイムライン">
 
-<!-- LOCALIZATION NOTE (debuggerUI.tab.headers): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.tab.headers): This is the label displayed
   -  in the network details pane identifying the headers tab. -->
 <!ENTITY netmonitorUI.tab.headers         "ヘッダ">
 
-<!-- LOCALIZATION NOTE (debuggerUI.tab.cookies): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.tab.cookies): This is the label displayed
   -  in the network details pane identifying the cookies tab. -->
 <!ENTITY netmonitorUI.tab.cookies         "Cookie">
 
-<!-- LOCALIZATION NOTE (debuggerUI.tab.params): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.tab.params): This is the label displayed
   -  in the network details pane identifying the params tab. -->
 <!ENTITY netmonitorUI.tab.params          "パラメータ">
 
-<!-- LOCALIZATION NOTE (debuggerUI.tab.response): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.tab.response): This is the label displayed
   -  in the network details pane identifying the response tab. -->
 <!ENTITY netmonitorUI.tab.response        "応答">
 
-<!-- LOCALIZATION NOTE (debuggerUI.tab.timings): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.tab.timings): This is the label displayed
   -  in the network details pane identifying the timings tab. -->
 <!ENTITY netmonitorUI.tab.timings         "タイミング">
 
-<!-- LOCALIZATION NOTE (debuggerUI.tab.preview): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.tab.preview): This is the label displayed
   -  in the network details pane identifying the preview tab. -->
 <!ENTITY netmonitorUI.tab.preview         "プレビュー">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.tab.security): This is the label displayed
   -  in the network details pane identifying the security tab. -->
 <!ENTITY netmonitorUI.tab.security        "暗号化">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.filterAll): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterAll): This is the label displayed
   -  in the network details footer for the "All" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterAll    "すべて">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.filterHTML): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterHTML): This is the label displayed
   -  in the network details footer for the "HTML" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterHTML   "HTML">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.filterCSS): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterCSS): This is the label displayed
   -  in the network details footer for the "CSS" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterCSS    "CSS">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.filterJS): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterJS): This is the label displayed
   -  in the network details footer for the "JS" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterJS     "JS">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.filterXHR): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterXHR): This is the label displayed
   -  in the network details footer for the "XHR" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterXHR    "XHR">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.filterFonts): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterFonts): This is the label displayed
   -  in the network details footer for the "Fonts" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterFonts  "フォント">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.filterImages): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterImages): This is the label displayed
   -  in the network details footer for the "Images" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterImages "画像">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.filterMedia): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterMedia): This is the label displayed
   -  in the network details footer for the "Media" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterMedia  "メディア">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.filterFlash): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterFlash): This is the label displayed
   -  in the network details footer for the "Flash" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterFlash  "Flash">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.filterOther): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.filterOther): This is the label displayed
   -  in the network details footer for the "Other" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterOther  "その他">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.clear): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.clear): This is the label displayed
   -  in the network details footer for the "Clear" button. -->
 <!ENTITY netmonitorUI.footer.clear  "消去">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.clear): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.footer.clear): This is the label displayed
   -  in the network details footer for the performance analysis button. -->
 <!ENTITY netmonitorUI.footer.perf   "パフォーマンス解析を切り替える...">
 
-<!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
+<!-- LOCALIZATION NOTE (netmonitorUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the netmonitor UI. -->
 <!ENTITY netmonitorUI.panesButton.tooltip "ネットワーク状況を切り替える">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.url): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.url): This is the label displayed
   -  in the network details headers tab identifying the URL. -->
 <!ENTITY netmonitorUI.summary.url         "要求 URL:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.method): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.method): This is the label displayed
   -  in the network details headers tab identifying the method. -->
 <!ENTITY netmonitorUI.summary.method      "要求メソッド:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.status): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.address): This is the label displayed
+  -  in the network details headers tab identifying the remote address. -->
+<!ENTITY netmonitorUI.summary.address     "リモートアドレス:">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.status): This is the label displayed
   -  in the network details headers tab identifying the status code. -->
 <!ENTITY netmonitorUI.summary.status      "ステータスコード:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.version): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.version): This is the label displayed
   -  in the network details headers tab identifying the http version. -->
 <!ENTITY netmonitorUI.summary.version     "バージョン:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.size): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.size): This is the label displayed
   -  in the network details headers tab identifying the headers size. -->
 <!ENTITY netmonitorUI.summary.size        "ヘッダサイズ:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.response.name): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.response.name): This is the label displayed
   -  in the network details response tab identifying an image's file name. -->
 <!ENTITY netmonitorUI.response.name       "名前:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.response.dimensions): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.response.dimensions): This is the label displayed
   -  in the network details response tab identifying an image's dimensions. -->
 <!ENTITY netmonitorUI.response.dimensions "大きさ:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.response.mime): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.response.mime): This is the label displayed
   -  in the network details response tab identifying an image's mime. -->
 <!ENTITY netmonitorUI.response.mime       "MIME タイプ:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.response.encoding): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.response.encoding): This is the label displayed
   -  in the network details response tab identifying an image's encoding. -->
 <!ENTITY netmonitorUI.response.encoding   "文字エンコーディング:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.timings.blocked): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.timings.blocked): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "blocked" state. -->
 <!ENTITY netmonitorUI.timings.blocked     "ブロック:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.timings.dns): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.timings.dns): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "dns" state. -->
 <!ENTITY netmonitorUI.timings.dns         "DNS 解決:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.timings.connect): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.timings.connect): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "connect" state. -->
 <!ENTITY netmonitorUI.timings.connect     "接続:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.timings.send): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.timings.send): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "send" state. -->
 <!ENTITY netmonitorUI.timings.send        "送信:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.timings.wait): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.timings.wait): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "wait" state. -->
 <!ENTITY netmonitorUI.timings.wait        "待機:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.timings.receive): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.timings.receive): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "receive" state. -->
 <!ENTITY netmonitorUI.timings.receive     "受信:">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.security.warning.protocol): A tooltip
   -  for warning icon that indicates a connection uses insecure protocol. -->
 <!ENTITY netmonitorUI.security.warning.sslv3      "SSL 3.0 プロトコルは安全ではないため、推奨されません。">
 
@@ -264,67 +268,67 @@
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri): This is the label displayed
   -  on the context menu that copies the selected image as data uri -->
 <!ENTITY netmonitorUI.context.copyImageAsDataUri "画像をデータ URI としてコピー">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri.accesskey): This is the access key
   -  for the Copy Image As Data URI menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.context.copyImageAsDataUri.accesskey  "I">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.editAndResend): This is the label displayed
   -  on the button in the headers tab that opens a form to edit and resend the currently
      displayed request -->
 <!ENTITY netmonitorUI.summary.editAndResend "編集して再送信">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend.accesskey): This is the access key
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.editAndResend.accesskey): This is the access key
   -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.summary.editAndResend.accesskey "R">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.rawHeaders): This is the label displayed
   -  on the button in the headers tab that toggle view for raw request/response headers
      from the currently displayed request -->
 <!ENTITY netmonitorUI.summary.rawHeaders "生ヘッダ">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders.requestHeaders): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.rawHeaders.requestHeaders): This is the label displayed
   -  in the network details headers tab identifying the raw request headers textarea -->
 <!ENTITY netmonitorUI.summary.rawHeaders.requestHeaders "要求ヘッダ:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders.responseHeaders): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.summary.rawHeaders.responseHeaders): This is the label displayed
   -  in the network details headers tab identifying the raw response headers textarea -->
 <!ENTITY netmonitorUI.summary.rawHeaders.responseHeaders "応答ヘッダ:">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.newTab):  This is the label
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  network container  -->
 <!ENTITY netmonitorUI.context.newTab      "新しいタブで開く">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.newTab.accesskey): This is the access key
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  network container -->
 <!ENTITY netmonitorUI.context.newTab.accesskey "O">
 
-<!-- LOCALIZATION NOTE (debuggerUI.custom.newRequest): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.custom.newRequest): This is the label displayed
   -  as the title of the new custom request form -->
 <!ENTITY netmonitorUI.custom.newRequest   "新しい要求">
 
-<!-- LOCALIZATION NOTE (debuggerUI.custom.query): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.custom.query): This is the label displayed
   -  above the query string entry in the custom request form -->
 <!ENTITY netmonitorUI.custom.query        "クエリ文字列:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.custom.headers): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.custom.headers): This is the label displayed
   -  above the request headers entry in the custom request form -->
 <!ENTITY netmonitorUI.custom.headers      "要求ヘッダ:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.custom.postData): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.custom.postData): This is the label displayed
   -  above the request body entry in the custom request form -->
 <!ENTITY netmonitorUI.custom.postData     "要求ボディ:">
 
-<!-- LOCALIZATION NOTE (debuggerUI.custom.send): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.custom.send): This is the label displayed
   -  on the button which sends the custom request -->
 <!ENTITY netmonitorUI.custom.send         "送信">
 
-<!-- LOCALIZATION NOTE (debuggerUI.custom.cancel): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.custom.cancel): This is the label displayed
   -  on the button which cancels and closes the custom request form -->
 <!ENTITY netmonitorUI.custom.cancel       "キャンセル">
 
-<!-- LOCALIZATION NOTE (debuggerUI.backButton): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.backButton): This is the label displayed
   -  on the button which exists the performance statistics view -->
 <!ENTITY netmonitorUI.backButton          "戻る">
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -40,38 +40,44 @@
 <!-- LOCALIZATION NOTE (profilerUI.clearButton): This string is displayed
   -  on a button that remvoes all the recordings. -->
 <!ENTITY profilerUI.clearButton "消去">
 
 <!-- LOCALIZATION NOTE (profilerUI.toolbar.*): These strings are displayed
   -  in the toolbar on buttons that select which view is currently shown. -->
 <!ENTITY profilerUI.toolbar.waterfall		"タイムライン">
 <!ENTITY profilerUI.toolbar.js-calltree		"JavaScript">
-<!ENTITY profilerUI.toolbar.memory-calltree	"メモリ">
+<!ENTITY profilerUI.toolbar.memory-calltree1	"メモリ割り当て">
 <!ENTITY profilerUI.toolbar.js-flamegraph	"JS フレームチャート">
-<!ENTITY profilerUI.toolbar.memory-flamegraph	"メモリフレームチャート">
+<!ENTITY profilerUI.toolbar.memory-flamegraph1	"メモリ割り当てフレームチャート">
 
 <!-- LOCALIZATION NOTE (profilerUI.table.*): These strings are displayed
   -  in the call tree headers for a recording. -->
 <!ENTITY profilerUI.table.totalDuration2  "合計時間">
 <!ENTITY profilerUI.table.selfDuration2   "時間">
 <!ENTITY profilerUI.table.totalPercentage "合計コスト">
 <!ENTITY profilerUI.table.selfPercentage  "コスト">
 <!ENTITY profilerUI.table.samples         "サンプル">
-<!ENTITY profilerUI.table.totalAlloc      "割り当て合計">
-<!ENTITY profilerUI.table.selfAlloc       "割り当て">
 <!ENTITY profilerUI.table.function        "関数">
+<!ENTITY profilerUI.table.totalAlloc1       "割り当てサンプル合計">
+<!ENTITY profilerUI.table.totalAllocTooltip "この場所と呼び出し先で割り当てられたオブジェクトの合計サンプル数です。">
+<!ENTITY profilerUI.table.selfAlloc1        "割り当てサンプル">
+<!ENTITY profilerUI.table.selfAllocTooltip  "この場所で割り当てられたオブジェクトのサンプル数です。">
 
 <!-- LOCALIZATION NOTE (profilerUI.newtab.tooltiptext): The tooltiptext shown
   -  on the "+" (new tab) button for a profile when a selection is available. -->
 <!ENTITY profilerUI.newtab.tooltiptext "選択範囲を新しいタブで開きます">
 
+<!-- LOCALIZATION NOTE (profilerUI.toolbar.filter.tooltiptext): This string
+  -  is displayed next to the filter button-->
+<!ENTITY profilerUI.options.filter.tooltiptext "タイムラインに表示するデータを選択します">
+
 <!-- LOCALIZATION NOTE (profilerUI.options.tooltiptext): This is the tooltip
   -  for the options button. -->
-<!ENTITY profilerUI.options.tooltiptext "プロファイラの設定を行います。">
+<!ENTITY profilerUI.options.gear.tooltiptext "プロファイラの設定を行います。">
 
 <!-- LOCALIZATION NOTE (profilerUI.invertTree): This is the label shown next to
   -  a checkbox that inverts and un-inverts the profiler's call tree. -->
 <!ENTITY profilerUI.invertTree             "呼び出しツリーを反転">
 <!ENTITY profilerUI.invertTree.tooltiptext "呼び出しツリーを反転すると、新しいフレームから始まり古いフレームの外に広がる、プロファイルされた呼び出し経路を表示します">
 
 <!-- LOCALIZATION NOTE (profilerUI.invertFlameGraph): This is the label shown next to
   -  a checkbox that inverts and un-inverts the profiler's flame graph. -->
--- a/browser/chrome/browser/devtools/timeline.properties
+++ b/browser/chrome/browser/devtools/timeline.properties
@@ -65,8 +65,9 @@ timeline.markerDetail.DOMEventType		= イベント種別:
 timeline.markerDetail.DOMEventPhase		= フェーズ:
 timeline.markerDetail.DOMEventTargetPhase	= ターゲット
 timeline.markerDetail.DOMEventCapturingPhase	= キャプチャ
 timeline.markerDetail.DOMEventBubblingPhase	= バブリング
 timeline.markerDetail.stack			= スタック:
 timeline.markerDetail.startStack		= スタックの開始:
 timeline.markerDetail.endStack			= スタックの終了:
 timeline.markerDetail.unknownFrame		= <不明な位置>
+timeline.markerDetail.asyncStack		= (非同期: %S)
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -18,16 +18,20 @@
 <!ENTITY toolboxZoomReset.key          "0">
 
 <!ENTITY toolboxReload.key             "r">
 <!-- LOCALIZATION NOTE (toolboxFramesButton): This is the label for
   -  the iframes menu list that appears only when the document has some.
   -  It allows you to switch the context of the whole toolbox. -->
 <!ENTITY toolboxFramesTooltip          "現在のドキュメントとして読み込む iframe を選択します">
 
+<!-- LOCALIZATION NOTE (browserToolboxErrorMessage): This is the label
+  -  shown next to error details when the Browser Toolbox is unable to open. -->
+<!ENTITY browserToolboxErrorMessage          "ブラウザツールボックスを開いた時のエラーを通知:">
+
 <!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
   -  the heading of the advanced settings group in the options panel. -->
 <!ENTITY options.context.advancedSettings "詳細な設定">
 
 <!-- LOCALIZATION NOTE (options.context.inspector): This is the label for
   -  the heading of the Inspector group in the options panel. -->
 <!ENTITY options.context.inspector		"調査">
 
@@ -67,18 +71,18 @@
 <!-- LOCALIZATION NOTE (options.context.triggersPageRefresh): This is the
   -  triggers page refresh footnote under the advanced settings group in the
   -  options panel and is used for settings that trigger page reload. -->
 <!ENTITY options.context.triggersPageRefresh  "* 現在のセッションのみ有効。再読み込みで復帰">
 
 <!-- LOCALIZATION NOTE (options.enableChrome.label4): This is the label for the
   -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
   -  boolean preference in about:config, in the options panel. -->
-<!ENTITY options.enableChrome.label4    "ブラウザとアドオンのデバッガを有効">
-<!ENTITY options.enableChrome.tooltip2  "さまざまな開発ツールがブラウザコンテキストとアドオンマネージャからのアドオンデバッグで使えるようになります">
+<!ENTITY options.enableChrome.label5    "ブラウザとアドオンのデバッガを有効">
+<!ENTITY options.enableChrome.tooltip3  "さまざまな開発ツールがブラウザコンテキスト (ツール > Web 開発 > ブラウザツールボックス) とアドオンマネージャからのアドオンデバッグで使えるようになります">
 
 <!-- LOCALIZATION NOTE (options.enableRemote.label3): This is the label for the
   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
   -  boolean preference in about:config, in the options panel. -->
 <!ENTITY options.enableRemote.label3    "リモートデバッガを有効">
 <!ENTITY options.enableRemote.tooltip   "Firefox OS などのリモート Firefox インスタンスを、開発ツールでデバッグできるようになります">
 
 <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
@@ -88,16 +92,22 @@
 <!ENTITY options.disableJavaScript.tooltip   "このオプションを有効にすると、現在のタブの JavaScript を無効にします。タブまたはツールボックスを閉じると、この設定は元に戻されます。">
 
 <!-- LOCALIZATION NOTE (options.disableCache.label,
   -  options.disableCache.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles the cache on or off. -->
 <!ENTITY options.disableCache.label2     "キャッシュを無効 (ツールボックスを開いているとき)">
 <!ENTITY options.disableCache.tooltip2   "このオプションを有効にすると、ツールボックスを開いているときはすべてのタブのキャッシュを無効にします。">
 
+<!-- LOCALIZATION NOTE (options.enableServiceWorkersTesting.label,
+  -  options.enableServiceWorkersTesting.tooltip): This is the options panel label and
+  -  tooltip for the checkbox that toggles the service workers testing features on or off. -->
+<!ENTITY options.enableServiceWorkersTesting.label     "Service Worker のテスト機能を有効 (ツールボックスを開いたとき)">
+<!ENTITY options.enableServiceWorkersTesting.tooltip   "このオプションを有効にすると、ツールボックスを開いているすべてのタブで Service Worker のテスト機能を有効になります。">
+
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
 <!ENTITY options.selectDefaultTools.label     "標準の Firefox 開発ツール">
 
 <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
   -  added by add-ons. This heading is hidden when there is no developer tool
@@ -148,17 +158,17 @@
 <!ENTITY options.stylesheetAutocompletion.label      "CSS 自動補完">
 <!ENTITY options.stylesheetAutocompletion.tooltip    "スタイルエディタで CSS プロパティ、値、セレクタ入力時に自動補完">
 
 <!-- LOCALIZATION NOTE (options.profiler.label): This is the label for the
   -  heading of the group of JavaScript Profiler preferences in the options
   -  panel. -->
 <!ENTITY options.profiler.label            "JavaScript プロファイラ">
 
-<!-- LOCALICATION NOTE (options.commonprefs): This is the label for the heading
+<!-- LOCALIZATION NOTE (options.commonprefs): This is the label for the heading
       of all preferences that affect both the Web Console and the Network
       Monitor -->
 <!ENTITY options.commonPrefs.label           "共通設定">
 
 <!-- LOCALIZATION NOTE (options.enablePersistentLogs.label): This is the
   -  label for the checkbox that toggles persistent logs in the Web Console and
   -  network monitor,  i.e. devtools.webconsole.persistlog a boolean preference in
   -  about:config, in the options panel. -->
--- a/browser/chrome/browser/loop/loop.properties
+++ b/browser/chrome/browser/loop/loop.properties
@@ -21,157 +21,158 @@ invite_header_text			= 通話に招待する。
 
 # Status text
 display_name_guest			= ゲスト
 display_name_dnd_status			= 通話に出られません
 display_name_available_status		= 通話できます
 
 # Error bars
 ## LOCALIZATION NOTE(unable_retrieve_url,session_expired_error_description,could_not_authenticate,password_changed_question,try_again_later,could_not_connect,check_internet_connection,login_expired,service_not_available,problem_accessing_account):
-## These may be displayed at the top of the panel here:
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error
+## These may be displayed at the top of the panel.
 unable_retrieve_url			= 申し訳ありません。通話 URL を取得できませんでした。
 session_expired_error_description	= セッションが有効期限切れです。以前に生成、共有された URL はすべて無効です。
 could_not_authenticate			= 認証できませんでした
 password_changed_question		= パスワードを変更しましたか?
 try_again_later				= 後で試してください
 could_not_connect			= サーバに接続できませんでした
 check_internet_connection		= インターネット接続を確認してください
 login_expired				= ログインは有効期限切れです
 service_not_available			= ただいまサービスが利用できません
 problem_accessing_account		= あなたのアカウントへのアクセスに問題があります
 
 ## LOCALIZATION NOTE(retry_button): Displayed when there is an error to retry
 ## the appropriate action.
-## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error for location
 retry_button				= 再試行
 
 share_email_subject5			= {{clientShortname2}} — 通話に参加しましょう
+## LOCALIZATION NOTE (share_email_subject_context): This is the alternate email
+## subject when a conversation is shared with a context attached.
+## {{clientShortName2}} will be replaced with the respective string in this file.
+## {{title}} will be replaced with the title of an HTML document.
+share_email_subject_context		= {{clientShortname2}} 話題: {{title}}
 ## LOCALIZATION NOTE (share_email_body4): In this item, don't translate the
 ## part between {{..}} and leave the \n\n part alone
-share_email_body5			= こんにちは!\n\n{{clientShortname2}} でビデオ通話に参加しましょう。\n\nどこの誰とでも簡単にビデオ通話ができます。{{clientSuperShortname}} ならダウンロードやインストールは必要ありません。クリックするか、この URL をコピーして {{brandShortname}}、Opera、Chrome に貼り付けるだけで通話に参加できます。\n\n{{callUrl}}\n\n{{clientSuperShortname}} の詳細とビデオ通話の始め方については、{{learnMoreUrl}} をご覧ください。\n\nすぐ通話しましょう!
+share_email_body5			= こんにちは!\n\n{{clientShortname2}} でビデオ通話しましょう。\n\nどこの誰とでも簡単にビデオ通話ができます。{{clientSuperShortname}} ならダウンロードやインストールは必要ありません。クリックするか、この URL をコピーして {{brandShortname}}、Opera、Chrome に貼り付けるだけで通話に参加できます。\n\n{{callUrl}}\n\n{{clientSuperShortname}} の詳細とビデオ通話の始め方については、{{learnMoreUrl}} をご覧ください。\n\nすぐ通話しましょう!
+## LOCALIZATION NOTE (share_email_body_context): In this item, don't translate
+## the part between {{..}} and leave the \n\n part alone.
+share_email_body_context		= こんにちは!\n\n{{title}} の話を {{clientShortname2}} でビデオ通話しましょう。\n\nどこの誰とでも簡単にビデオ通話ができます。{{clientSuperShortname}} ならダウンロードやインストールは必要ありません。クリックするか、この URL をコピーして {{brandShortname}}、Opera、Chrome に貼り付けるだけで通話に参加できます。\n\n{{callUrl}}\n\n{{clientSuperShortname}} の詳細とビデオ通話の始め方については、{{learnMoreUrl}} をご覧ください。\n\nすぐ通話しましょう!
+## LOCALIZATION NOTE (share_tweeet): In this item, don't translate the part
+## between {{..}}. Please keep the text below 117 characters to make sure it fits
+## in a tweet.
+share_tweet				= {{clientShortname2}} でビデオ通話しましょう!
 
-share_button2				= URL をメール送信
+share_button3				= URL を共有
+share_add_service_button		= サービスを追加
+add_to_toolbar_button			= 共有パネルをツールバーに追加
+share_panel_header			= 友だちにサイトを共有しましょう!
+## LOCALIZATION NOTE (share_panel_body): In this item, don't translate the part
+## between {{..}}.
+share_panel_body			= {{brandShortname}} の新しい共有パネルを使うと、URL をすぐに共有したり、あなたが使っている SNS に簡単に投稿できます。
 copy_url_button2			= URL をコピー
 copied_url_button			= コピー済み!
 
 panel_footer_signin_or_signup_link	= サインインまたはアカウント登録
 
 settings_menu_item_account		= アカウント
 settings_menu_item_settings		= 設定
 settings_menu_item_signout		= サインアウト
 settings_menu_item_signin		= サインイン
 settings_menu_button_tooltip		= 設定
 
 # Contact Strings (Panel)
 
 ## LOCALIZATION NOTE(contacts_search_placeholder): This is the placeholder text for
-## the search field at https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
+## the search field.
 contacts_search_placesholder		= 検索...
 
 ## LOCALIZATION NOTE (new_contact_button): This is the button to open the
 ## new contact sub-panel.
-## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
-## for where this appears on the UI
 new_contact_button			= 新しい連絡先
 ## LOCALIZATION NOTE (new_contact_name_placeholder, new_contact_email_placeholder):
-## These are the placeholders for the fields for entering a new contact
-## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
-## and click the 'New Contact' button to see the fields.
+## These are the placeholders for the fields for entering a new contact. Click
+## the 'New Contact' button to see the fields.
 new_contact_name_placeholder		= 名前
 new_contact_email_placeholder		= メールアドレス
 new_contact_fxos_phone_placeholder	= Firefox OS 端末
 new_contact_phone_placeholder2		= 携帯電話
 
 contacts_blocked_contacts		= ブロックされた連絡先
 
 ## LOCALIZATION NOTE (add_contact_button):
-## This is the button to actually add the new contact
-## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
-## and click the 'New Contact' button to see the fields.
+## This is the button to actually add the new contact. Click the 'New Contact'
+## button to see the fields.
 add_contact_button			= 連絡先を追加
 ### LOCALIZATION NOTE (valid_email_text_description): This is displayed when
 ### the user enters an invalid email address, preventing the addition of the
 ### contact.
 valid_email_text_description		= 正しいメールアドレスを入力してください
 
-## LOCALIZATION NOTE (add_or_import_contact_title): This is the subtitle of the panel
-## at https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
+## LOCALIZATION NOTE (add_or_import_contact_title): This is the subtitle of the
+## panel.
 add_or_import_contact_title		= 連絡先の追加またはインポート
-## LOCALIZATION NOTE (import_contacts_button, importing_contacts_progress_button):
-## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
-## for where these appear on the UI
 import_contacts_button			= インポート
 importing_contacts_progress_button	= インポート中...
 import_contacts_failure_message		= いくつかの連絡先がインポートできませんでした。やり直してください。
 ## LOCALIZATION NOTE(import_contacts_success_message): Success notification message
 ## when user's contacts have been successfully imported.
 ## Semicolon-separated list of plural forms. See:
 ## http://developer.mozilla.org/en/docs/Localization_and_Plurals
 ## In this item, don't translate the part between {{..}}
 import_contacts_success_message		= {{total}} 件の連絡先をインポートしました。
 ## LOCALIZATION NOTE(sync_contacts_button): This button is displayed in place of
 ## importing_contacts_button once contacts have been imported once.
 sync_contacts_button			= 連絡先を同期
 
 ## LOCALIZATION NOTE(import_failed_description simple): Displayed when an import of
-## contacts fails. This is displayed in the error field here:
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error
+## contacts fails. This is displayed in the error field.
 import_failed_description_simple	= 申し訳ありません。インポートに失敗しました
 import_failed_description_some		= 連絡先をインポートできませんでした。
 import_failed_support_button		= ヘルプ
 
 ## LOCALIZATION NOTE(remove_contact_menu_button): Displayed in the contact list in
 ## a pop-up menu next to the contact's name.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 remove_contact_menu_button		= 連絡先を削除
 ## LOCALIZATION NOTE(confirm_delete_contact_alert): This is an alert that is displayed
 ## to confirm deletion of a contact.
 confirm_delete_contact_alert		= この連絡先を削除しますか?
 ## LOCALIZATION NOTE(confirm_delete_contact_remove_button, confirm_delete_contact_cancel_button):
 ## These are displayed on the alert with confirm_delete_contact_alert
 confirm_delete_contact_remove_button	= 連絡先を削除
 confirm_delete_contact_cancel_button	= キャンセル
 
 ## LOCALIZATION NOTE(block_contact_menu_button): Displayed in the contact list in
 ## a pop-up menu next to the contact's name, used to block a contact from calling
-## the user. https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
+## the user.
 block_contact_menu_button		= 連絡先をブロック
 ## LOCALIZATION NOTE(unblock_contact_menu_button): Displayed in the contact list in
 ## a pop-up menu next to the contact's name, used to unblock a contact and allow them
-## to call the user. https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
+## to call the user.
 unblock_contact_menu_button		= ブロックを解除
 
 ## LOCALIZATION NOTE(edit_contact_menu_button): Displayed in the contact list in a
 ## pop-up menu next to the contact's name.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 edit_contact_menu_button		= 連絡先を編集...
 ## LOCALIZATION NOTE(edit_contact_tile): This is the subtitle of the edit contact
 ## panel. It is displayed when Edit Contact is selected.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 edit_contact_title			= 連絡先を編集
 ## LOCALIZATION NOTE(edit_contact_name_label, edit_contact_email_label):
 ## These fields are display when the Edit Contact button is selected.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 edit_contact_name_label			= 名前
 edit_contact_email_label		= メールアドレス
 ## LOCALIZATION NOTE(edit_contact_name_label, edit_contact_email_label):
 ## These button is displayed when the Edit Contact button is selected and is used
 ## to accept the change.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 edit_contact_done_button		= 完了
 
 ## LOCALIZATION NOTE(audio_call_menu_button): Displayed in the contact list in a
 ## pop-up menu next to the contact's name.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 audio_call_menu_button			= 音声通話
 
 ## LOCALIZATION NOTE(video_call_menu_button): Displayed in the contact list in a
 ## pop-up menu next to the contact's name.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 video_call_menu_button			= ビデオ通話
 
 ## LOCALIZATION NOTE(gravatars_promo_message): The {{learn_more}} part will be
 ## replaced with a link with the text content of gravatars_promo_message_learnmore.
 gravatars_promo_message			= Gravatar にメールアドレスを登録すると、連絡先にプロフィールアイコンを設定できます。{{learn_more}}
 
 gravatars_promo_message_learnmore	= 詳細
 gravatars_promo_button_nothanks		= 不要
@@ -196,62 +197,56 @@ unmute_local_video_button_title		= 映像を戻す
 active_screenshare_button_title		= 共有を停止
 inactive_screenshare_button_title	= 画面を共有
 share_tabs_button_title			= タブを共有
 share_windows_button_title		= 他のウィンドウを共有
 
 ## LOCALIZATION NOTE (call_with_contact_title): The title displayed
 ## when calling a contact. Don't translate the part between {{..}} because
 ## this will be replaced by the contact's name.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#call-outgoing
 call_with_contact_title			= {{contactName}} と通話
 
 # Outgoing conversation
 
 outgoing_call_title			= 通話を開始しますか?
 initiate_audio_video_call_button2	= 開始
 initiate_audio_video_call_tooltip2	= ビデオ通話を開始
 initiate_audio_call_button2		= 音声通話
 initiate_call_cancel_button		= キャンセル
 
 ## LOCALIZATION NOTE (call_progress_connecting_description): This is displayed
-## whilst the client is contacting the client at the other end of the connection
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#call-outgoing
+## whilst the client is contacting the client at the other end of the connection.
 call_progress_connecting_description	= 接続中...
 ## LOCALIZATION NOTE (call_progress_ringing_description): This is displayed
 ## when the other client is actually ringing.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#call-outgoing
 call_progress_ringing_description	= 呼び出し中...
 
 peer_ended_conversation2		= 先方が通話を終了しました。
 conversation_has_ended			= 通話を終了しました。
 restart_call				= 再通話
 
 ## LOCALIZATION NOTE (contact_unavailable_title): The title displayed
 ## when a contact is unavailable. Don't translate the part between {{..}}
 ## because this will be replaced by the contact's name.
 contact_unavailable_title		= {{contactName}} とは通話できません。
 generic_contact_unavailable_title	= この人とは通話できません。
 
 generic_failure_title			= 何らかのエラーが発生しました。
 generic_failure_with_reason2		= 再通話するか、後で通話できるように URL をメールで送信できます。
 generic_failure_no_reason2		= 再通話しますか?
 
-## LOCALIZATION NOTE (contact_offline_title): Title for
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#link-prompt
-## displayed when the contact is offline.
+## LOCALIZATION NOTE (contact_offline_title): Title which is displayed when the
+## contact is offline.
 contact_offline_title			= この人はオンラインではありません
-## LOCALIZATION NOTE (call_timeout_notification_text): Title for
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#link-prompt
-## displayed when the call didn't go through.
+## LOCALIZATION NOTE (call_timeout_notification_text): Title which is displayed
+## when the call didn't go through.
 call_timeout_notification_text		= 発信できませんでした。
 
 ## LOCALIZATION NOTE (retry_call_button, cancel_button, email_link_button):
-## These buttons are displayed when a call has failed:
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#link-prompt
+## These buttons are displayed when a call has failed.
 retry_call_button			= 再試行
 email_link_button			= URL をメールで送信
 cancel_button				= キャンセル
 
 cannot_start_call_session_not_ready	= 通話を開始できません。セッションが準備できていません。
 network_disconnected			= ネットワーク接続が急に切断されました。
 connection_error_see_console_notification	= 通話できませんでした。詳細はコンソールを確認してください。
 
@@ -283,17 +278,16 @@ feedback_submit_button			= 送信
 feedback_back_button			= 戻る
 ## LOCALIZATION NOTE (feedback_window_will_close_in2):
 ## Semicolon-separated list of plural forms. See:
 ## http://developer.mozilla.org/en/docs/Localization_and_Plurals
 ## In this item, don't translate the part between {{..}}
 feedback_window_will_close_in2		= このウィンドウは {{countdown}} 秒後に閉じます
 ## LOCALIZATION_NOTE (feedback_rejoin_button): Displayed on the feedback form after
 ## a signed-in to signed-in user call.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#feedback
 feedback_rejoin_button			= 再通話
 ## LOCALIZATION NOTE (feedback_report_user_button): Used to report a user in the case of
 ## an abusive user.
 feedback_report_user_button		= 問題のあるユーザを報告
 
 help_label				= ヘルプ
 tour_label				= ツアー
 
@@ -326,8 +320,23 @@ rooms_signout_alert				= 通話を終了します
 
 # Infobar strings
 
 infobar_screenshare_browser_message		= 通話中のユーザには、あなたがクリックするタブの内容が見えるようになります。
 infobar_button_gotit_label			= 共有
 infobar_button_gotit_accesskey			= G
 infobar_menuitem_dontshowagain_label		= 次回からは確認しない
 infobar_menuitem_dontshowagain_accesskey	= D
+
+# Context in conversation strings
+context_offer_label				= このページの話をする
+# LOCALIZATION NOTE (context_inroom_label): this string is followed by the
+# title/URL of the website you are having a conversation about, displayed on a
+# separate line. If this structure doesn't work for your locale, you might want
+# to consider this as a stand-alone title. See example screenshot:
+# https://bug1115342.bugzilla.mozilla.org/attachment.cgi?id=8563677
+context_inroom_label				= 話題:
+## LOCALIZATION_NOTE (context_edit_activate_label): {{title}} will be replaced
+## by the title of the active tab, also known as the title of an HTML document.
+## The quotes around the title are intentional.
+context_edit_activate_label			= "{{title}}" の話をする
+context_edit_name_placeholder			= 話題
+context_edit_comments_placeholder		= コメント
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -1,16 +1,16 @@
 <!-- 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/. -->
 
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle		"新しいタブ">
 <!ENTITY newtab.customize.title		"新しいタブページをカスタマイズ">
-<!ENTITY newtab.customize.enhanced	"拡張">
-<!ENTITY newtab.customize.classic	"クラシック">
-<!ENTITY newtab.customize.blank		"白紙">
+<!ENTITY newtab.customize.suggested	"提案サイトとよく見るサイトを表示">
+<!ENTITY newtab.customize.topsites	"よく見るサイトを表示">
+<!ENTITY newtab.customize.blank2	"空白ページを表示">
 <!ENTITY newtab.customize.what		"このページについて">
 <!ENTITY newtab.intro.header		"このページについて">
 <!ENTITY newtab.undo.removedLabel	"サムネイルを削除しました。">
 <!ENTITY newtab.undo.undoButton		"元に戻す。">
 <!ENTITY newtab.undo.restoreButton	"すべて復元する。">
 <!ENTITY newtab.undo.closeTooltip	"閉じる">
--- a/browser/chrome/browser/newTab.properties
+++ b/browser/chrome/browser/newTab.properties
@@ -4,20 +4,29 @@
 
 newtab.pin	= このサイトをこの位置にピン留め
 newtab.unpin	= このサイトのピン留めを外す
 newtab.block	= このサイトを削除
 # LOCALIZATION NOTE(newtab.sponsored.button): This text appears for sponsored
 # and enhanced tiles on the same line as the tile's title, so prefer short
 # strings to avoid overlap. This string should be uppercase.
 newtab.sponsored.button		= スポンサー
+# LOCALIZATION NOTE(newtab.suggested.button): %1$S will be replaced inline by
+# one of the user's top 100 sites that triggered this suggested tile.
+# This text appears for suggested tiles under the tile's title, so prefer short
+# strings to avoid truncating important text.
+newtab.suggested.button		= %1$S を見てる人へ
 # LOCALIZATION NOTE(newtab.sponsored.explain): %1$S will be replaced inline by
 # the (X) block icon. %2$S will be replaced by an active link using string
 # newtab.learn.link as text.
 newtab.sponsored.explain	= このタイルは Mozilla がパートナーに代わって表示しているものです。%1$S ボタンを押すと、いつでもタイルを削除できます。%2$S
+# LOCALIZATION NOTE(newtab.suggested.explain): %1$S will be replaced inline by
+# the (X) block icon. %2$S will be replaced by an active link using string
+# newtab.learn.link as text.
+newtab.suggested.explain	= このサイトは Mozilla からの提案サイトです。%1$S ボタンをクリックするといつでも削除できます。%2$S
 # LOCALIZATION NOTE(newtab.enhanced.explain): %1$S will be replaced inline by
 # the gear icon used to customize the new tab window. %2$S will be replaced by
 # an active link using string newtab.learn.link as text.
 newtab.enhanced.explain		= Mozilla パートナーはスクリーンショットの代わりに、視覚効果のあるタイルが表示されます。%1$S ボタンを押すと、タイルの視覚効果をオフにできます。%2$S
 # LOCALIZATION NOTE(newtab.intro.paragraph1): %1$S will be replaced inline by
 # active link using string newtab.learn.link as text.
 newtab.intro.paragraph1		= 新しいタブを開くと、よく訪れるサイトが、あなたへのおすすめサイトのタイルとともに表示されます。Mozilla パートナーがスポンサーとなっているものも含まれる場合があります。それらはスポンサーによるものであることが常に明記されています。%1$S
 # LOCALIZATION NOTE(newtab.intro.paragraph2): %1$S will be replaced inline by
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -1,85 +1,87 @@
 <!-- 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  pageInfoWindow.width		"600">
-<!ENTITY  pageInfoWindow.height		"540">
+<!ENTITY  pageInfoWindow.width  "600">
+<!ENTITY  pageInfoWindow.height "540">
 
-<!ENTITY  copy.key			"C">
-<!ENTITY  copy.label			"コピー">
-<!ENTITY  copy.accesskey		"C">
-<!ENTITY  selectall.key			"A">
-<!ENTITY  selectall.label		"すべて選択">
-<!ENTITY  selectall.accesskey		"A">
-<!ENTITY  closeWindow.key		"w">
+<!ENTITY  copy.key              "C">
+<!ENTITY  copy.label            "コピー">
+<!ENTITY  copy.accesskey        "C">
+<!ENTITY  selectall.key         "A">
+<!ENTITY  selectall.label       "すべて選択">
+<!ENTITY  selectall.accesskey   "A">
+<!ENTITY  closeWindow.key       "w">
 
-<!ENTITY  generalTab			"一般">
-<!ENTITY  generalTab.accesskey		"G">
-<!ENTITY  generalURL			"アドレス:">
-<!ENTITY  generalType			"MIME タイプ:">
-<!ENTITY  generalMode			"描画モード:">
-<!ENTITY  generalSize			"サイズ:">
-<!ENTITY  generalReferrer		"参照元 URL:">
-<!ENTITY  generalSource			"キャッシュソース:">
-<!ENTITY  generalModified		"更新日時:">
-<!ENTITY  generalEncoding		"文字エンコーディング:">
-<!ENTITY  generalMetaName		"名前">
-<!ENTITY  generalMetaContent		"値">
+<!ENTITY  generalTab            "一般">
+<!ENTITY  generalTab.accesskey  "G">
+<!ENTITY  generalURL            "アドレス:">
+<!ENTITY  generalType           "MIME タイプ:">
+<!ENTITY  generalMode           "描画モード:">
+<!ENTITY  generalSize           "サイズ:">
+<!ENTITY  generalReferrer       "参照元 URL:">
+<!ENTITY  generalSource         "キャッシュソース:">
+<!ENTITY  generalModified       "更新日時:">
+<!ENTITY  generalEncoding2      "テキストエンコーディング:">
+<!ENTITY  generalMetaName       "名前">
+<!ENTITY  generalMetaContent    "値">
 
-<!ENTITY  mediaTab			"メディア">
-<!ENTITY  mediaTab.accesskey		"M">
-<!ENTITY  mediaLocation			"アドレス (URL):">
-<!ENTITY  mediaText			"関連テキスト:"><!-- (^^; Associated Text -->
-<!ENTITY  mediaAltHeader		"代替テキスト">
-<!ENTITY  mediaAddress			"URL">
-<!ENTITY  mediaType			"種類">
-<!ENTITY  mediaSize			"大きさ">
-<!ENTITY  mediaCount    	        "カウント">
-<!ENTITY  mediaDimension		"大きさ:"><!-- (^^; -->
-<!ENTITY  mediaLongdesc			"詳細説明:">
-<!ENTITY  mediaBlockImage.accesskey	"B">
-<!ENTITY  mediaSaveAs			"名前を付けて保存...">
-<!ENTITY  mediaSaveAs.accesskey		"A">
-<!ENTITY  mediaSaveAs2.accesskey	"e">
-<!ENTITY  mediaPreview			"メディアプレビュー:"><!-- (^^; 要再検討 -->
+<!ENTITY  mediaTab              "メディア">
+<!ENTITY  mediaTab.accesskey    "M">
+<!ENTITY  mediaLocation         "アドレス (URL):">
+<!ENTITY  mediaText             "関連テキスト:"><!-- (^^; Associated Text -->
+<!ENTITY  mediaAltHeader        "代替テキスト">
+<!ENTITY  mediaAddress          "URL">
+<!ENTITY  mediaType             "種類">
+<!ENTITY  mediaSize             "大きさ">
+<!ENTITY  mediaCount            "カウント">
+<!ENTITY  mediaDimension        "大きさ:"><!-- (^^; -->
+<!ENTITY  mediaLongdesc         "詳細説明:">
+<!ENTITY  mediaBlockImage.accesskey "B">
+<!ENTITY  mediaSaveAs           "名前を付けて保存...">
+<!ENTITY  mediaSaveAs.accesskey "A">
+<!ENTITY  mediaSaveAs2.accesskey "e">
+<!ENTITY  mediaPreview          "メディアプレビュー:"><!-- (^^; 要再検討 -->
 
-<!ENTITY  feedTab			"フィード">
-<!ENTITY  feedTab.accesskey		"F">
-<!ENTITY  feedSubscribe			"購読">
-<!ENTITY  feedSubscribe.accesskey	"u">
+<!ENTITY  feedTab               "フィード">
+<!ENTITY  feedTab.accesskey     "F">
+<!ENTITY  feedSubscribe         "購読">
+<!ENTITY  feedSubscribe.accesskey "u">
 
-<!ENTITY  permTab			"サイト別設定">
-<!ENTITY  permTab.accesskey		"P">
-<!ENTITY  permUseDefault		"標準設定を使用する">
-<!ENTITY  permAskAlways			"毎回確認する">
-<!ENTITY  permAllow			"許可">
-<!ENTITY  permAllowSession		"セッション中のみ許可">
-<!ENTITY  permBlock			"ブロック">
-<!ENTITY  permissionsFor		"対象サイト:">
-<!ENTITY  permPlugins			"プラグインの実行">
+<!ENTITY  permTab               "サイト別設定">
+<!ENTITY  permTab.accesskey     "P">
+<!ENTITY  permUseDefault        "標準設定を使用する">
+<!ENTITY  permAskAlways         "毎回確認する">
+<!ENTITY  permAllow             "許可">
+<!ENTITY  permAllowSession      "セッション中のみ許可">
+<!ENTITY  permBlock             "ブロック">
+<!ENTITY  permissionsFor        "対象サイト:">
+<!ENTITY  permPlugins           "プラグインの実行">
 
-<!ENTITY  permClearStorage		"ストレージを消去">
-<!ENTITY  permClearStorage.accesskey	"C">
+<!ENTITY  permClearStorage           "ストレージを消去">
+<!ENTITY  permClearStorage.accesskey "C">
 
-<!ENTITY  securityTab			"セキュリティ">
-<!ENTITY  securityTab.accesskey		"S">
-<!ENTITY  securityView.certView		"証明書を表示...">
-<!ENTITY  securityView.accesskey	"V">
-<!ENTITY  securityView.unknown		"不明">
+<!ENTITY  securityTab           "セキュリティ">
+<!ENTITY  securityTab.accesskey "S">
+<!ENTITY  securityView.certView "証明書を表示...">
+<!ENTITY  securityView.accesskey "V">
+<!ENTITY  securityView.unknown   "不明">
 
 
-<!ENTITY  securityView.identity.header		"Web サイトの識別情報">
-<!ENTITY  securityView.identity.owner		"運営者:">
-<!ENTITY  securityView.identity.domain		"Web サイト:">
-<!ENTITY  securityView.identity.verifier	"認証局:">
+<!ENTITY  securityView.identity.header   "Web サイトの識別情報">
+<!ENTITY  securityView.identity.owner    "運営者:">
+<!ENTITY  securityView.identity.domain   "Web サイト:">
+<!ENTITY  securityView.identity.verifier "認証局:">
 
-<!ENTITY  securityView.privacy.header		"プライバシーと履歴">
-<!ENTITY  securityView.privacy.history		"昨日までにこのサイトを表示したことがあるか">
-<!ENTITY  securityView.privacy.cookies		"このサイトはコンピュータに情報 (Cookie) を保存しているか">
-<!ENTITY  securityView.privacy.viewCookies	"Cookie を表示...">
-<!ENTITY  securityView.privacy.viewCookies.accessKey	"k">
-<!ENTITY  securityView.privacy.passwords	"このサイトのパスワードを保存しているか">
-<!ENTITY  securityView.privacy.viewPasswords	"パスワードを表示..."><!-- (^^; デザイン上このボタンラベルは短く -->
-<!ENTITY  securityView.privacy.viewPasswords.accessKey	"w">
+<!ENTITY  securityView.privacy.header                   "プライバシーと履歴">
+<!ENTITY  securityView.privacy.history                  "昨日までにこのサイトを表示したことがあるか">
+<!ENTITY  securityView.privacy.cookies                  "このサイトはコンピュータに情報 (Cookie) を保存しているか">
+<!ENTITY  securityView.privacy.viewCookies              "Cookie を表示...">
+<!ENTITY  securityView.privacy.viewCookies.accessKey    "k">
+<!ENTITY  securityView.privacy.passwords                "このサイトのパスワードを保存しているか">
+<!ENTITY  securityView.privacy.viewPasswords            "パスワードを表示..."><!-- (^^; デザイン上このボタンラベルは短く -->
+<!ENTITY  securityView.privacy.viewPasswords.accessKey  "w">
 
-<!ENTITY  securityView.technical.header		"技術情報">
+<!ENTITY  securityView.technical.header                 "技術情報">
+
+<!ENTITY  helpButton.label                              "ヘルプ">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -108,16 +108,17 @@
 
 <!ENTITY offlineAppsList2.label          "オフライン作業用のデータの保存を許可している Web サイト:">
 <!ENTITY offlineAppsList.height          "7em">
 <!ENTITY offlineAppsListRemove.label     "削除...">
 <!ENTITY offlineAppsListRemove.accesskey "R">
 <!ENTITY offlineAppRemove.confirm        "オフライン作業用データの削除">
 
 <!ENTITY certificateTab.label            "証明書">
+<!ENTITY certSelection.label             "要求">
 <!ENTITY certSelection.description       "サーバが個人証明書を要求したとき:">
 <!ENTITY certs.auto                      "自動的に選択する">
 <!ENTITY certs.auto.accesskey            "S">
 <!ENTITY certs.ask                       "毎回自分で選択する">
 <!ENTITY certs.ask.accesskey             "A">
 <!ENTITY enableOCSP.label                "OCSP レスポンダに問い合わせてデジタル証明書の有効性をリアルタイムに確認する">
 <!ENTITY enableOCSP.accesskey            "Q">
 <!ENTITY viewCerts.label                 "証明書を表示...">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -58,20 +58,20 @@
 
 <!-- default font type -->
 <!ENTITY  useDefaultFontSerif.label               "明朝体 (Serif)">
 <!ENTITY  useDefaultFontSansSerif.label           "ゴシック体 (Sans-serif)">
 
 <!ENTITY  allowPagesToUse.label                   "Web ページが指定したフォントを優先する">
 <!ENTITY  allowPagesToUse.accesskey               "A">
 
-<!ENTITY languages.customize.Fallback.grouplabel  "古い Web ページでの文字エンコーディング">
-<!ENTITY languages.customize.Fallback.label       "代替文字エンコーディング:">
-<!ENTITY languages.customize.Fallback.accesskey   "C">
-<!ENTITY languages.customize.Fallback.desc        "この文字エンコーディングは、文字エンコーディングが宣言されていない古い Web ページで使用されます。">
+<!ENTITY languages.customize.Fallback2.grouplabel "古い Web ページでのテキストエンコーディング">
+<!ENTITY languages.customize.Fallback2.label      "代替テキストエンコーディング:">
+<!ENTITY languages.customize.Fallback2.accesskey  "T">
+<!ENTITY languages.customize.Fallback2.desc       "このテキストエンコーディングは、テキストエンコーディングが宣言されていない古い Web ページで使用されます。">
 
 <!ENTITY languages.customize.Fallback.auto        "現在のロケールの既定値">
 <!-- LOCALIZATION NOTE (languages.customize.Fallback.arabic):
      Translate "Arabic" as an adjective for an encoding, not as the name of the language. -->
 <!ENTITY languages.customize.Fallback.arabic      "アラビア語">
 <!ENTITY languages.customize.Fallback.baltic      "バルト諸語">
 <!ENTITY languages.customize.Fallback.ceiso       "中欧 (ISO)">
 <!ENTITY languages.customize.Fallback.cewindows   "中欧 (Windows)">
--- a/browser/chrome/browser/preferences/permissions.dtd
+++ b/browser/chrome/browser/preferences/permissions.dtd
@@ -1,26 +1,27 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY window.title			"例外サイト">
-<!ENTITY window.width			"36em">
+<!ENTITY window.title                 "例外サイト">
+<!ENTITY window.width                 "36em">
 
-<!ENTITY treehead.sitename.label	"サイト">
-<!ENTITY treehead.status.label		"現在の設定">
-<!ENTITY removepermission.label		"サイトを削除">
-<!ENTITY removepermission.accesskey	"R">
-<!ENTITY removeallpermissions.label	"すべてのサイトを削除">
-<!ENTITY removeallpermissions.accesskey	"e">
-<!ENTITY address.label			"サイトのアドレス:">
-<!ENTITY address.accesskey		"d">
-<!ENTITY block.label			"不許可">
-<!ENTITY block.accesskey		"B">
-<!ENTITY session.label			"現在のセッションのみ">
-<!ENTITY session.accesskey		"S">
-<!ENTITY allow.label			"許可">
-<!ENTITY allow.accesskey		"A">
-<!ENTITY windowClose.key		"w">
+<!ENTITY treehead.sitename.label      "サイト">
+<!ENTITY treehead.status.label        "現在の設定">
+<!ENTITY removepermission.label       "サイトを削除">
+<!ENTITY removepermission.accesskey   "R">
+<!ENTITY removeallpermissions.label   "すべてのサイトを削除">
+<!ENTITY removeallpermissions.accesskey "e">
+<!ENTITY address.label                "サイトのアドレス:">
+<!ENTITY address.accesskey            "d">
+<!ENTITY block.label                  "不許可">
+<!ENTITY block.accesskey              "B">
+<!ENTITY session.label                "現在のセッションのみ">
+<!ENTITY session.accesskey            "S">
+<!ENTITY allow.label                  "許可">
+<!ENTITY allow.accesskey              "A">
+<!ENTITY windowClose.key              "w">
 
-<!ENTITY button.close.label		"閉じる">
-<!ENTITY button.close.accesskey		"C">
-
+<!ENTITY button.cancel.label          "キャンセル">
+<!ENTITY button.cancel.accesskey      "C">
+<!ENTITY button.ok.label              "変更を保存">
+<!ENTITY button.ok.accesskey          "S">