37.0: sync browser with en-US rev240673:3d8ee2772089 FIREFOX_37_0b4_BUILD1 FIREFOX_37_0b4_RELEASE FIREFOX_37_0b5_BUILD1 FIREFOX_37_0b5_RELEASE FIREFOX_37_0b6_BUILD1 FIREFOX_37_0b6_RELEASE FIREFOX_37_0b7_BUILD1 FIREFOX_37_0b7_RELEASE FIREFOX_38_0b1_BUILD1 FIREFOX_38_0b1_RELEASE FIREFOX_38_0b2_BUILD1 FIREFOX_38_0b2_RELEASE FIREFOX_38_0b3_BUILD1 FIREFOX_38_0b3_RELEASE FIREFOX_38_0b4_BUILD1 FIREFOX_38_0b4_RELEASE FIREFOX_38_0b5_BUILD1 FIREFOX_38_0b5_RELEASE
authorABE Hiroki (hATrayflood) <h.rayflood@gmail.com>
Mon, 02 Mar 2015 00:00:33 +0900
changeset 1682 4401bcf30b899133111e28ddc66f66234950039f
parent 1679 8a99f7eba247c7b44498169765fb825d6da4eaa5
child 1683 8e9b65d1ed4eae278540d8fb46cffc6830fba47b
child 1688 c6c99b1b759fa1d3993ef0e408b5a105efd0b39c
child 1691 6885090810b6af013e5094cccc75125c12da368b
child 1693 c0f9dea960be26d34b4d29d4e253445677122ece
child 1695 8a7e0ddf1e96b20371bfaf4472c3d003c81e407f
child 1706 88818a2a31200a713c6eaa3f8d1dd78c37caa570
child 1710 07432fc1269b47282a20686a407c8ddadb2b35a7
child 1712 88f4bd3c5fc2b2628cdd0328dd65f628a0fd38bf
child 1714 3a768ec8cf5826967c1af5e74bc2a6545e39b2d1
child 1715 55a5775068c1ed5cd784dfa8e24fd662ea76cf3f
push id868
push userh.rayflood@gmail.com
push dateSun, 01 Mar 2015 15:00:48 +0000
bugs37
37.0: sync browser with en-US rev240673:3d8ee2772089
browser/chrome/browser/accounts.properties
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/animationinspector.dtd
browser/chrome/browser/devtools/animationinspector.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/projecteditor.properties
browser/chrome/browser/devtools/timeline.dtd
browser/chrome/browser/devtools/timeline.properties
browser/chrome/browser/devtools/webide.dtd
browser/chrome/browser/devtools/webide.properties
browser/chrome/browser/loop/loop.properties
browser/chrome/browser/preferences/colors.dtd
browser/chrome/browser/preferences/cookies.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/shellservice.properties
browser/pdfviewer/viewer.properties
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/accounts.properties
@@ -0,0 +1,46 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (needUserShort)
+# %S = Firefox Accounts brand name from syncBrand.dtd
+needUserShort					= %S required for sync
+needUserLong					= Sync がより簡単に使えるようになりました。同期を継続するには、Firefox アカウントをアップグレードしてください。
+
+upgradeToFxA.label				= アップグレード
+upgradeToFxA.accessKey				= U
+
+# LOCALIZATION NOTE (signInAfterUpgradeOnOtherDevice.description)
+# %S = Email address of user's Firefox Account
+signInAfterUpgradeOnOtherDevice.description	= %S がほかの端末で Sync をアップグレードしました。同期を再開しますか?
+signInAfterUpgradeOnOtherDevice.label		= サインイン
+signInAfterUpgradeOnOtherDevice.accessKey	= S
+
+# LOCALIZATION NOTE (needVerifiedUserShort, needVerifiedUserLong)
+# %S = Email address of user's Firefox Account
+needVerifiedUserShort				= %S は認証されていません
+needVerifiedUserLong				= %S に送信された認証メールのリンクをクリックしてください
+
+resendVerificationEmail.label			= 再送信
+resendVerificationEmail.accessKey		= R
+
+forgetMigration.label				= 忘れる
+forgetMigration.accessKey			= F
+
+unlinkMigration.label				= Sync を切断
+unlinkMigration.accessKey			= L
+
+unlinkVerificationTitle				= 古いバージョンの Sync を切断しますか?
+unlinkVerificationDescription			= Sync のアップグレードを通知したくない場合は、古い Sync アカウントを切断してください。
+unlinkVerificationConfirm			= 切断
+
+# These strings are used in a dialog we display after the user requests we resend
+# a verification email.
+verificationSentTitle				= 認証メールを送信しました
+# LOCALIZATION NOTE (verificationSentHeading) - %S = Email address of user's Firefox Account
+verificationSentHeading				= 認証 URL を %S に送信しました
+verificationSentDescription			= 同期を始めるには、メールを確認してリンクをクリックしてください。
+
+verificationNotSentTitle			= 認証メールを送信できません
+verificationNotSentHeading			= 認証メールを送信できませんでした。
+verificationNotSentDescription			= 後で試してください。
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -90,16 +90,18 @@ when there are no windows but Firefox is
 <!ENTITY toolbarContextMenu.undoCloseTab.accesskey	"U">
 
 <!ENTITY pageSourceCmd.label		"ページのソース">
 <!ENTITY pageSourceCmd.accesskey	"o">
 <!ENTITY pageSourceCmd.commandkey	"u">
 <!ENTITY pageInfoCmd.label		"ページの情報">
 <!ENTITY pageInfoCmd.accesskey		"I">
 <!ENTITY pageInfoCmd.commandkey		"i">
+<!ENTITY mirrorTabCmd.label		"タブを複製">
+<!ENTITY mirrorTabCmd.accesskey		"m">
 <!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
 These should match what Safari and other Apple applications use on OS X Lion. -->
 <!ENTITY enterFullScreenCmd.label	"全画面表示にする">
 <!ENTITY enterFullScreenCmd.accesskey	"F">
 <!ENTITY exitFullScreenCmd.label	"全画面表示から戻る">
 <!ENTITY exitFullScreenCmd.accesskey	"F">
 <!ENTITY fullScreenCmd.label		"全画面表示">
 <!ENTITY fullScreenCmd.accesskey	"F">
@@ -415,16 +417,21 @@ These should match what Safari and other
 <!ENTITY searchFocus.commandkey2	"e">
 <!ENTITY searchFocusUnix.commandkey	"j">
 
 <!-- LOCALIZATION NOTE (searchFor.label, searchWith.label):
      These two strings are used to build the header above the list of one-click
      search providers:  "Search for <used typed keywords> with:" -->
 <!ENTITY searchFor.label              "">
 <!ENTITY searchWith.label             " を検索します。エンジン:">
+<!-- LOCALIZATION NOTE (searchWithHeader.label):
+     The wording of this string should be as close as possible to
+     searchFor.label and searchWith.label. This string will be used instead of
+     them when the user has not typed any keyword. -->
+<!ENTITY searchWithHeader.label       "検索エンジン:">
 <!ENTITY changeSearchSettings.button  "検索設定を変更">
 
 <!ENTITY tabView.commandkey		"e">
 
 <!ENTITY openLinkCmdInTab.label		"リンクを新しいタブで開く">
 <!ENTITY openLinkCmdInTab.accesskey	"T">
 <!ENTITY openLinkCmd.label		"リンクを新しいウィンドウで開く">
 <!ENTITY openLinkCmd.accesskey		"W">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -373,20 +373,20 @@ safebrowsing.getMeOutOfHereButton.access
 safebrowsing.reportedWebForgery			= 偽装サイトとして報告されています!
 safebrowsing.notAForgeryButton.label		= 偽装サイトの誤報告を指摘...
 safebrowsing.notAForgeryButton.accessKey	= F
 safebrowsing.reportedAttackSite			= 攻撃サイトとして報告されています!
 safebrowsing.notAnAttackButton.label		= 攻撃サイトの誤報告を指摘...
 safebrowsing.notAnAttackButton.accessKey	= A
 
 # Ctrl-Tab
-# LOCALIZATION NOTE (ctrlTab.showAll.label): #1 represents the number
+# LOCALIZATION NOTE (ctrlTab.listAllTabs.label): #1 represents the number
 # of tabs in the current browser window. It will always be 2 at least.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-ctrlTab.showAll.label				= すべて (#1 ページ) のタブを表示
+ctrlTab.listAllTabs.label			= すべて (#1 ページ) のタブを一覧
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 # (^^; イマイチ
 addKeywordTitleAutoFill				= 検索: %S
 
 # TabView
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/animationinspector.dtd
@@ -0,0 +1,24 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : FILE This file contains the Animations panel strings.
+  - The Animations panel is part of the Inspector sidebar -->
+
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+<!-- LOCALIZATION NOTE (title): This is the label shown in the sidebar tab -->
+<!ENTITY title                  "アニメーション">
+
+<!-- LOCALIZATION NOTE (invalidElement): This is the label shown in the panel
+  - when an invalid node is currently selected in the inspector. -->
+<!ENTITY invalidElement         "この要素にアニメーションはありません。">
+
+<!-- LOCALIZATION NOTE (selectElement): This is the label shown in the panel
+  - when an invalid node is currently selected in the inspector, to invite the
+  - user to select a new node by clicking on the element-picker icon. -->
+<!ENTITY selectElement         "このページのほかの要素を選択してください。">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/animationinspector.properties
@@ -0,0 +1,43 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE These strings are used inside the Animation inspector
+# which is available as a sidebar panel in the Inspector.
+# 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 (player.animationNameLabel):
+# This string is displayed in each animation player widget. It is the label
+# displayed before the animation name.
+player.animationNameLabel		= アニメーション:
+
+# LOCALIZATION NOTE (player.transitionNameLabel):
+# This string is displayed in each animation player widget. It is the label
+# displayed in the header, when the element is animated by mean of a css
+# transition
+player.transitionNameLabel		= 状態遷移
+
+# LOCALIZATION NOTE (player.animationDurationLabel):
+# This string is displayed in each animation player widget. It is the label
+# displayed before the animation duration.
+player.animationDurationLabel		= 再生時間:
+
+# LOCALIZATION NOTE (player.animationIterationCountLabel):
+# This string is displayed in each animation player widget. It is the label
+# displayed before the number of times the animation is set to repeat.
+player.animationIterationCountLabel	= 繰り返し:
+
+# LOCALIZATION NOTE (player.infiniteIterationCount):
+# In case the animation repeats infinitely, this string is displayed next to the
+# player.animationIterationCountLabel string, instead of a number.
+player.infiniteIterationCount		= &#8734;
+
+# LOCALIZATION NOTE (player.timeLabel):
+# This string is displayed in each animation player widget, to indicate either
+# how long (in seconds) the animation lasts, or what is the animation's current
+# time (in seconds too);
+player.timeLabel			= %S 秒
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -69,16 +69,20 @@
 <!-- LOCALIZATION NOTE (debuggerUI.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
   -  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
   -  in the network details footer for the "All" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterAll    "すべて">
 
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterHTML): This is the label displayed
   -  in the network details footer for the "HTML" filtering button. -->
 <!ENTITY netmonitorUI.footer.filterHTML   "HTML">
 
@@ -187,16 +191,45 @@
   -  in a "wait" state. -->
 <!ENTITY netmonitorUI.timings.wait        "待機:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.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.error): This is the label displayed
+  -  in the security tab if a security error prevented the connection. -->
+<!ENTITY netmonitorUI.security.error      "エラー:">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.security.protocolVersion): This is the label displayed
+  -  in the security tab describing TLS/SSL protocol version. -->
+<!ENTITY netmonitorUI.security.protocolVersion "プロトコルバージョン:">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.security.cipherSuite): This is the label displayed
+  -  in the security tab describing the cipher suite used to secure this connection. -->
+<!ENTITY netmonitorUI.security.cipherSuite "暗号アルゴリズム:">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.security.hsts): This is the label displayed
+  -  in the security tab describing the usage of HTTP Strict Transport Security. -->
+<!ENTITY netmonitorUI.security.hsts "HTTP Strict Transport Security:">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.security.hpkp): This is the label displayed
+  -  in the security tab describing the usage of Public Key Pinning. -->
+<!ENTITY netmonitorUI.security.hpkp "公開鍵のピン留め:">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.security.connection): This is the label displayed
+  -  in the security tab describing the section containing information related to
+  -  the secure connection. -->
+<!ENTITY netmonitorUI.security.connection "接続:">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.security.certificate): This is the label displayed
+  -  in the security tab describing the server certificate section. -->
+<!ENTITY netmonitorUI.security.certificate "証明書:">
+
 <!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools): This is the label displayed
   -  on the context menu that shows the performance analysis tools -->
 <!ENTITY netmonitorUI.context.perfTools   "パフォーマンス解析を開始します...">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
   -  for the performance analysis menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.context.perfTools.accesskey "S">
 
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -24,16 +24,56 @@ netmonitor.panelLabel	= ネットワークパネル
 netmonitor.commandkey	= Q
 netmonitor.accesskey	= N
 
 # LOCALIZATION NOTE (netmonitor.tooltip):
 # This string is displayed in the tooltip of the tab when the Network Monitor is
 # displayed inside the developer tools window.
 netmonitor.tooltip	= ネットワークモニタ
 
+# LOCALIZATION NOTE (netmonitor.security.state.secure)
+# This string is used as an tooltip for request that was performed over secure
+# channel i.e. the connection was encrypted.
+netmonitor.security.state.secure	= このリソースの取得に使われる接続は暗号化されています。
+
+# LOCALIZATION NOTE (netmonitor.security.state.insecure)
+# This string is used as an tooltip for request that was performed over insecure
+# channel i.e. the connection was not encrypted.
+netmonitor.security.state.insecure	= このリソースの取得に使われる接続は暗号化されていません。
+
+# LOCALIZATION NOTE (netmonitor.security.state.broken)
+# This string is used as an tooltip for request that failed due to security
+# issues.
+netmonitor.security.state.broken	= 暗号化に問題があるため、読み込まれたリソースを無視しました。
+
+# LOCALIZATION NOTE (netmonitor.security.enabled):
+# This string is used to indicate that a specific security feature is used by
+# a connection in the security details tab.
+# For example: "HTTP Strict Transport Security: Enabled"
+netmonitor.security.enabled		= 有効
+
+# LOCALIZATION NOTE (netmonitor.security.disabled):
+# This string is used to indicate that a specific security feature is not used by
+# a connection in the security details tab.
+# For example: "HTTP Strict Transport Security: Disabled"
+netmonitor.security.disabled		= 無効
+
+# LOCALIZATION NOTE (netmonitor.security.hostHeader):
+# This string is used as a header for section containing security information
+# related to the remote host. %S is replaced with the domain name of the remote
+# host. For example: Host example.com
+netmonitor.security.hostHeader		= ホスト %S:
+
+# LOCALIZATION NOTE (netmonitor.security.notAvailable):
+# This string is used to indicate that a certain piece of information is not
+# available to be displayd. For example a certificate that has no organization
+# defined:
+#   Organization: <Not Available>
+netmonitor.security.notAvailable	= <利用不可>
+
 # LOCALIZATION NOTE (collapseDetailsPane): This is the tooltip for the button
 # that collapses the network details pane in the UI.
 collapseDetailsPane	= 要求の詳細を閉じる
 
 # LOCALIZATION NOTE (expandDetailsPane): This is the tooltip for the button
 # that expands the network details pane in the UI.
 expandDetailsPane	= 要求の詳細を表示
 
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -28,16 +28,20 @@
 <!-- LOCALIZATION NOTE (profilerUI.recordButton): This string is displayed
   -  on a button that starts a new profile. -->
 <!ENTITY profilerUI.recordButton.tooltip "JavaScript の関数呼び出しを記録します。">
 
 <!-- LOCALIZATION NOTE (profilerUI.importButton): This string is displayed
   -  on a button that opens a dialog to import a saved profile data file. -->
 <!ENTITY profilerUI.importButton "インポート...">
 
+<!-- LOCALIZATION NOTE (profilerUI.exportButton): This string is displayed
+  -  on a button that opens a dialog to export a saved profile data file. -->
+<!ENTITY profilerUI.exportButton "保存">
+
 <!-- LOCALIZATION NOTE (profilerUI.clearButton): This string is displayed
   -  on a button that remvoes all the recordings. -->
 <!ENTITY profilerUI.clearButton "消去">
 
 <!-- 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 "呼び出しツリーを反転">
 
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -59,16 +59,22 @@ recordingsList.saveLabel	= 保存
 profile.tab			= %1$S ms → %2$S ms
 
 # LOCALIZATION NOTE (graphs.fps):
 # This string is displayed in the framerate graph of the Profiler,
 # as the unit used to measure frames per second. This label should be kept
 # AS SHORT AS POSSIBLE so it doesn't obstruct important parts of the graph.
 graphs.fps			= fps
 
+# LOCALIZATION NOTE (graphs.ms):
+# This string is displayed in the flamegraph of the Profiler,
+# as the unit used to measure time (in milliseconds). This label should be kept
+# AS SHORT AS POSSIBLE so it doesn't obstruct important parts of the graph.
+graphs.ms			= ms
+
 # LOCALIZATION NOTE (category.*):
 # These strings are displayed in the categories graph of the Profiler,
 # as the legend for each block in every bar. These labels should be kept
 # AS SHORT AS POSSIBLE so they don't obstruct important parts of the graph.
 category.other			= Gecko
 category.css			= CSS
 category.js			= JIT
 category.gc			= GC
--- a/browser/chrome/browser/devtools/projecteditor.properties
+++ b/browser/chrome/browser/devtools/projecteditor.properties
@@ -41,16 +41,21 @@ projecteditor.deleteFolderPromptMessage	= このフォルダを削除しますか?
 # to make sure if a file should be removed.
 projecteditor.deleteFilePromptMessage	= このファイルを削除しますか?
 
 # LOCALIZATION NOTE (projecteditor.newLabel):
 # This string is displayed as a menu item for adding a new file to
 # the directory.
 projecteditor.newLabel		= 新規作成...
 
+# LOCALIZATION NOTE (projecteditor.renameLabel):
+# This string is displayed as a menu item for renaming a file in
+# the directory.
+projecteditor.renameLabel	= 名前変更
+
 # LOCALIZATION NOTE (projecteditor.saveLabel):
 # This string is displayed as a menu item for saving the current file.
 projecteditor.saveLabel		= 保存
 
 # LOCALIZATION NOTE (projecteditor.saveAsLabel):
 # This string is displayed as a menu item for saving the current file
 # with a new name.
 projecteditor.saveAsLabel	= 名前を付けて保存...
--- a/browser/chrome/browser/devtools/timeline.dtd
+++ b/browser/chrome/browser/devtools/timeline.dtd
@@ -14,24 +14,28 @@
 <!-- LOCALIZATION NOTE (timelineUI.recordButton): This string is displayed
   -  on a button that starts a new recording. -->
 <!ENTITY timelineUI.recordButton.tooltip	"タイムラインオペレーションを記録します">
 
 <!-- LOCALIZATION NOTE (timelineUI.recordLabel): This string is displayed
   -  as a label to signal that a recording is in progress. -->
 <!ENTITY timelineUI.recordLabel			"記録中...">
 
-<!-- LOCALIZATION NOTE (timelineUI.timelineUI.memoryCheckbox.label): This string
+<!-- LOCALIZATION NOTE (timelineUI.memoryCheckbox.label): This string
   -  is displayed next to a checkbox determining whether or not memory
   -  measurements are enabled. -->
 <!ENTITY timelineUI.memoryCheckbox.label	"メモリ">
 
-<!-- LOCALIZATION NOTE (timelineUI.timelineUI.memoryCheckbox.tooltip): This string
+<!-- LOCALIZATION NOTE (timelineUI.memoryCheckbox.tooltip): This string
   -  is displayed next to the memory checkbox -->
-<!ENTITY timelineUI.memoryCheckbox.tooltip	"メモリ計測を有効にする">
+<!ENTITY timelineUI.memoryCheckbox.tooltip	"メモリ計測を有効にします">
+
+<!-- LOCALIZATION NOTE (timelineUI.filterButton.tooltip): This string
+  -  is displayed next to the filter button-->
+<!ENTITY timelineUI.filterButton.tooltip	"表示するデータを選択します">
 
 <!-- LOCALIZATION NOTE (timelineUI.emptyNotice1/2): This is the label shown
   -  in the timeline view when empty. -->
 <!ENTITY timelineUI.emptyNotice1		"">
 <!ENTITY timelineUI.emptyNotice2		"ボタンをクリックすると、タイムラインイベントの記録を開始します。">
 
 <!-- LOCALIZATION NOTE (timelineUI.stopNotice1/2): This is the label shown
   -  in the timeline view while recording. -->
--- a/browser/chrome/browser/devtools/timeline.properties
+++ b/browser/chrome/browser/devtools/timeline.properties
@@ -30,21 +30,22 @@ timeline.tooltip	= パフォーマンスタイムライン
 timeline.tick		= %S ms
 
 # LOCALIZATION NOTE (timeline.records):
 # This string is displayed in the timeline waterfall, as a title for the menu.
 timeline.records	= 項目
 
 # LOCALIZATION NOTE (timeline.label.*):
 # These strings are displayed in the timeline waterfall, identifying markers.
-timeline.label.styles	= CSS
-timeline.label.reflow	= リフロー
-timeline.label.paint	= 描画
-timeline.label.javascript	= Javascript
-timeline.label.domevent	= DOM イベント
+# We want to use the same wording as Google Chrome
+timeline.label.styles2		= CSS 再計算
+timeline.label.reflow2		= レイアウト
+timeline.label.paint		= 描画
+timeline.label.javascript2	= 関数呼び出し
+timeline.label.domevent		= DOM イベント
 timeline.label.consoleTime	= コンソール
 
 # LOCALIZATION NOTE (graphs.memory):
 # This string is displayed in the memory graph of the Performance tool,
 # as the unit used to memory consumption. This label should be kept
 # AS SHORT AS POSSIBLE so it doesn't obstruct important parts of the graph.
 graphs.memory=MB
 
@@ -60,8 +61,12 @@ timeline.markerDetail.start			= 開始:
 timeline.markerDetail.end			= 終了:
 timeline.markerDetail.duration			= 期間:
 timeline.markerDetail.consoleTimerName		= タイマー名:
 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		= <不明な位置>
--- a/browser/chrome/browser/devtools/webide.dtd
+++ b/browser/chrome/browser/devtools/webide.dtd
@@ -109,18 +109,20 @@
 <!ENTITY addons_aboutaddons				"アドオンマネージャを開く">
 
 <!-- Prefs -->
 <!ENTITY prefs_title					"設定">
 <!ENTITY prefs_editor_title				"エディタ">
 <!ENTITY prefs_general_title				"一般">
 <!ENTITY prefs_restore					"既定値に戻す">
 <!ENTITY prefs_manage_components			"追加のコンポーネントを管理">
+<!ENTITY prefs_options_autoconnectruntime		"前回のランタイムに再接続">
+<!ENTITY prefs_options_autoconnectruntime_tooltip	"WebIDE の起動時に前回のランタイムに再接続します">
 <!ENTITY prefs_options_rememberlastproject		"最後に選択したプロジェクトを記録">
-<!ENTITY prefs_options_rememberlastproject_tooltip	"WebIDE の起動時に以前開いたプロジェクトを自動的に選択します">
+<!ENTITY prefs_options_rememberlastproject_tooltip	"WebIDE の起動時に前回開いたプロジェクトを自動的に選択します">
 <!ENTITY prefs_options_templatesurl			"テンプレート URL">
 <!ENTITY prefs_options_templatesurl_tooltip		"利用可能なテンプレートの一覧です">
 <!ENTITY prefs_options_showeditor			"エディタを表示">
 <!ENTITY prefs_options_showeditor_tooltip		"組み込みエディタを表示します">
 <!ENTITY prefs_options_tabsize				"タブの長さ">
 <!ENTITY prefs_options_expandtab			"ソフトタブ">
 <!ENTITY prefs_options_expandtab_tooltip		"タブ文字の代わりにスペース文字を使います">
 <!ENTITY prefs_options_detectindentation		"自動インデント">
--- a/browser/chrome/browser/devtools/webide.properties
+++ b/browser/chrome/browser/devtools/webide.properties
@@ -60,17 +60,17 @@ addons_status_unknown				= ?
 addons_status_installed				= インストール済み
 addons_status_uninstalled			= 未インストール
 addons_status_preparing				= 準備中
 addons_status_downloading			= ダウンロード中
 addons_status_installing			= インストール中
 
 runtimedetails_checkno				= いいえ
 runtimedetails_checkyes				= はい
-runtimedetails_checkunkown			= 不明
+runtimedetails_checkunknown			= 不明 (ADB Helper 0.4.0 以降が必要)
 runtimedetails_notUSBDevice			= USB デバイスではありません
 
 # Validation status
 status_tooltip					= 正当性チェック結果: %1$S
 status_valid					= 有効
 status_warning					= 警告
 status_error					= エラー
 status_unknown					= 不明
--- a/browser/chrome/browser/loop/loop.properties
+++ b/browser/chrome/browser/loop/loop.properties
@@ -220,16 +220,22 @@ call_progress_connecting_description	= 接続中...
 ## 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.
 contact_offline_title			= この人はオンラインではありません
@@ -266,17 +272,17 @@ powered_by_afterLogo			=
 
 feedback_call_experience_heading2	= 通話品質はいかがでしたか?
 feedback_what_makes_you_sad		= ご不満な点はどこですか?
 feedback_thank_you_heading		= フィードバックありがとうございます!
 feedback_category_audio_quality		= 音声品質
 feedback_category_video_quality		= 映像品質
 feedback_category_was_disconnected	= 回線が切断された
 feedback_category_confusing		= 混線した
-feedback_category_other			= その他:
+feedback_category_other2		= その他
 feedback_custom_category_text_placeholder	= ご不満な点を具体的にお書きください。
 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}} 秒後に閉じます
--- a/browser/chrome/browser/preferences/colors.dtd
+++ b/browser/chrome/browser/preferences/colors.dtd
@@ -1,18 +1,22 @@
 <!-- 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  colorsDialog.title              "配色">
 <!ENTITY  window.width                    "38em">
 <!ENTITY  window.macWidth                 "41em">
 
-<!ENTITY  allowPagesToUse.label           "Web ページが指定した配色を優先する">
-<!ENTITY  allowPagesToUse.accesskey       "A">
+<!ENTITY  overridePageColors.label        "選択した配色を Web ページが指定した配色で上書きする:">
+<!ENTITY  overridePageColors.accesskey    "O">
+
+<!ENTITY  overridePageColors.always.label "常に">
+<!ENTITY  overridePageColors.auto.label   "高コントラストなテーマのみ">
+<!ENTITY  overridePageColors.never.label  "しない">
 
 <!ENTITY  color                           "テキストと背景の色">
 <!ENTITY  textColor.label                 "テキスト:">
 <!ENTITY  textColor.accesskey             "T">
 <!ENTITY  backgroundColor.label           "背景:">
 <!ENTITY  backgroundColor.accesskey       "B">
 <!ENTITY  useSystemColors.label           "システムの配色を使用する">
 <!ENTITY  useSystemColors.accesskey       "s">
--- a/browser/chrome/browser/preferences/cookies.dtd
+++ b/browser/chrome/browser/preferences/cookies.dtd
@@ -2,21 +2,23 @@
    - 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.width		"36em">
 
 <!ENTITY     cookiesonsystem.label		"以下の Cookie が保存されています:">
 <!ENTITY     cookiename.label			"Cookie 名">
 <!ENTITY     cookiedomain.label			"サイト"> 
-<!ENTITY     button.removecookies.label		"Cookie を削除">
-<!ENTITY     button.removecookie.label		"Cookie を削除">
-<!ENTITY     button.removecookie.accesskey	"R">
-<!ENTITY     button.removeallcookies.label	"すべての Cookie を削除">
-<!ENTITY     button.removeallcookies.accesskey	"A">
+<!-- LOCALIZATION NOTE (button.removeSelectedCookies.accesskey):
+  The label associated with this accesskey can be found in 
+  preferences.properties as removeSelectedCookies.
+-->
+<!ENTITY     button.removeSelectedCookies.accesskey	"R">
+<!ENTITY     button.removeAllCookies.label		"すべての Cookie を削除">
+<!ENTITY     button.removeAllCookies.accesskey		"A">
 
 <!ENTITY     props.name.label		"名前:">
 <!ENTITY     props.value.label		"内容:">
 <!ENTITY     props.domain.label		"ホスト:">
 <!ENTITY     props.path.label		"パス:">
 <!ENTITY     props.secure.label		"送信制限:"><!-- en-US: Send For: -->
 <!ENTITY     props.expires.label	"有効期限:">
 
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -19,12 +19,10 @@
 <!ENTITY  paneContent.title       "コンテンツ">
 <!ENTITY  paneApplications.title  "プログラム">
 <!ENTITY  panePrivacy.title       "プライバシー">
 <!ENTITY  paneSecurity.title      "セキュリティ">
 <!ENTITY  paneAdvanced.title      "詳細">
 
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 <!ENTITY  paneSync.title          "Sync">
-<!ENTITY  buttonForward.tooltip   "1 ページ進む">
-<!ENTITY  buttonBack.tooltip      "1 ページ戻る">
 
 <!ENTITY  helpButton.label        "ヘルプ">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -87,16 +87,24 @@ forAnyConnection		= 暗号化の有無によらず常に送信
 expireAtEndOfSession		= セッション終了時
 can				= 許可
 canAccessFirstParty		= ファーストパーティのみ
 canSession			= 現在のセッションのみ
 cannot				= 不許可
 noCookieSelected		= <Cookie が選択されていません>
 cookiesAll			= 以下の Cookie が保存されています:
 cookiesFiltered			= 以下の Cookie が検索にマッチしました:
+# LOCALIZATION NOTE (removeSelectedCookies):
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# If you need to display the number of selected elements in your language,
+# you can use #1 in your localization as a placeholder for the number.
+# For example this is the English string with numbers:   
+# removeSelectedCookied=Remove #1 Selected;Remove #1 Selected
+removeSelectedCookies		= 選択された Cookie を削除
 
 #### Offline apps
 offlineAppsList.height		= 7em
 offlineAppRemoveTitle		= オフライン作業用データの削除
 offlineAppRemovePrompt		= このデータを削除すると %S をオフラインでは利用できなくなります。この Web サイトをオフライン作業対象から外してもよろしいですか?
 offlineAppRemoveConfirm		= データを削除
 
 # LOCALIZATION NOTE: The next string is for the disk usage of the
@@ -132,14 +140,8 @@ updateAutoDesktop.accessKey	= A
 syncUnlink.title		= 端末を切り離しますか?
 syncUnlink.label		= この端末は Sync アカウントとの関連付けがなくなります。すべての個人情報は、この端末と Sync アカウントの両方に、そのまま残ります。
 syncUnlinkConfirm.label		= 切り離す
 
 # LOCALIZATION NOTE (featureEnableRequiresRestart, featureDisableRequiresRestart, restartTitle): %S = brandShortName
 featureEnableRequiresRestart	= この機能を有効にするには、%S の再起動が必要です
 featureDisableRequiresRestart	= この機能を無効にするには、%S の再起動が必要です
 shouldRestartTitle		= %S を再起動
-
-###Preferences::Sync::Firefox Accounts
-firefoxAccountsVerificationSentTitle		= 認証メール送信
-# LOCALIZATION NOTE: %S = user's email address.
-firefoxAccountsVerificationSentHeading		= 認証 URL を %S に送信しました
-firefoxAccountVerificationSentDescription	= 同期を始めるには、メールを確認してリンクをクリックしてください。
--- a/browser/chrome/browser/shellservice.properties
+++ b/browser/chrome/browser/shellservice.properties
@@ -12,18 +12,20 @@ setDefaultBrowserConfirm.label     = %S を既定のブラウザに設定する
 setDefaultBrowserConfirm.accesskey = U
 setDefaultBrowserOptions.label     = 設定
 setDefaultBrowserOptions.accesskey = O
 setDefaultBrowserNotNow.label      = 後で
 setDefaultBrowserNotNow.accesskey  = N
 setDefaultBrowserNever.label       = 次回から確認しない
 setDefaultBrowserNever.accesskey   = D
 
-# LOCALIZATION NOTE (setDefaultBrowserTitle, setDefaultBrowserMessage, setDefaultBrowserDontAsk):
+# LOCALIZATION NOTE (setDefaultBrowserTitle, setDefaultBrowserMessage, setDefaultBrowserDontAsk, setDefaultBrowserAlertConfirm.label, setDefaultBrowserAlertNotNow.label):
 # These strings are used as an alternative to the ones above, in a modal dialog.
 # %S will be replaced by brandShortName
 setDefaultBrowserTitle		= 既定のブラウザ
 setDefaultBrowserMessage	= %S は現在既定のブラウザに設定されていません。既定のブラウザに設定しますか?
 setDefaultBrowserDontAsk	= %S の起動時に必ず確認する
+setDefaultBrowserAlertConfirm.label	= %S を既定のブラウザに設定する
+setDefaultBrowserAlertNotNow.label	= 後で
 
 desktopBackgroundLeafNameWin	= デスクトップ Background.bmp
 DesktopBackgroundDownloading	= 画像を保存...
 DesktopBackgroundSet		= デスクトップの背景に設定
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -135,16 +135,19 @@ error_file=ファイル: {{file}}
 error_line=行: {{line}}
 rendering_error=ページのレンダリング中にエラーが発生しました
 
 # Predefined zoom values
 page_scale_width=幅に合わせる
 page_scale_fit=ページのサイズに合わせる
 page_scale_auto=自動ズーム
 page_scale_actual=実際のサイズ
+# LOCALIZATION NOTE (page_scale_percent): "{{scale}}" will be replaced by a
+# numerical scale value.
+page_scale_percent={{scale}}%
 
 # Loading indicator messages
 loading_error_indicator=エラー
 loading_error=PDF の読み込み中にエラーが発生しました
 invalid_file_error=無効または破損した PDF ファイル
 missing_file_error=PDF ファイルが見つかりません。
 unexpected_response_error=サーバから予期せぬ応答がありました。