Merge Aurora to Central (hg merge --tool internal:other)
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Thu, 21 Nov 2013 19:29:16 +0100
changeset 1249 cf35fdc2b61625f3fd3d195f7d3e4bccd81f7de2
parent 1248 1f35c17c8bddd4d7b64643598c64db609e131820 (current diff)
parent 1067 347b3892f36303c5a6fdef36238fb9ca2c793434 (diff)
child 1250 24dcfd93138c12ecf745865469cf75496225c41b
push id552
push useraxel@mozilla.com
push dateMon, 21 Jul 2014 19:14:59 +0000
Merge Aurora to Central (hg merge --tool internal:other)
browser/branding/official/brand.dtd
browser/branding/official/brand.properties
browser/chrome/browser-region/region.properties
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutHealthReport.dtd
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.dtd
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/layoutview.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/responsiveUI.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/sourceeditor.dtd
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/styleinspector.dtd
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/tilt.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/downloads/downloads.dtd
browser/chrome/browser/downloads/downloads.properties
browser/chrome/browser/migration/migration.dtd
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/newTab.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/places/editBookmarkOverlay.dtd
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/preferences/aboutPermissions.properties
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/safeMode.dtd
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/setDesktopBackground.dtd
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncKey.dtd
browser/chrome/browser/syncProgress.dtd
browser/chrome/browser/syncQuota.dtd
browser/chrome/browser/syncQuota.properties
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/browser/tabbrowser.properties
browser/chrome/browser/tabview.properties
browser/chrome/browser/taskbar.properties
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
browser/feedback/main.dtd
browser/feedback/main.properties
browser/installer/custom.properties
browser/pdfviewer/chrome.properties
browser/pdfviewer/viewer.properties
browser/profile/bookmarks.inc
browser/searchplugins/amazon-jp.xml
browser/searchplugins/google-jp.xml
browser/searchplugins/oshiete-goo.xml
browser/searchplugins/rakuten.xml
browser/searchplugins/twitter-ja.xml
browser/searchplugins/yahoo-jp-auctions.xml
browser/searchplugins/yahoo-jp.xml
browser/updater/updater.ini
browser/webapp-uninstaller/webapp-uninstaller.properties
browser/webapprt/webapp.dtd
browser/webapprt/webapp.properties
calendar/chrome/calendar/calendar-event-dialog-attendees.properties
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/calendar.properties
calendar/chrome/calendar/preferences/advanced.dtd
calendar/chrome/calendar/preferences/alarms.dtd
calendar/chrome/calendar/preferences/connection.dtd
calendar/chrome/calendar/preferences/general.dtd
calendar/chrome/calendar/preferences/preferences.dtd
calendar/chrome/calendar/timezones.properties
calendar/chrome/lightning/lightning-toolbar.dtd
calendar/chrome/lightning/lightning.dtd
calendar/chrome/lightning/lightning.properties
calendar/chrome/sunbird/menuOverlay.dtd
calendar/installer/custom.properties
chat/accounts.properties
chat/commands.properties
chat/conversations.properties
chat/facebook.properties
chat/irc.properties
chat/status.properties
chat/twitter.properties
chat/xmpp.properties
dom/chrome/accessibility/AccessFu.properties
dom/chrome/accessibility/mac/accessible.properties
dom/chrome/appstrings.properties
dom/chrome/charsetTitles.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/HtmlForm.properties
dom/chrome/layout/css.properties
dom/chrome/layout/htmlparser.properties
dom/chrome/mathml/mathml.properties
dom/chrome/netError.dtd
dom/chrome/plugins.properties
dom/chrome/security/caps.properties
dom/chrome/security/csp.properties
editor/ui/chrome/composer/editingOverlay.dtd
editor/ui/chrome/composer/editor.dtd
editor/ui/chrome/composer/editor.properties
editor/ui/chrome/composer/editorOverlay.dtd
editor/ui/chrome/dialogs/EdDialogOverlay.dtd
editor/ui/chrome/dialogs/EditorImageProperties.dtd
extensions/irc/chrome/channels.dtd
extensions/irc/chrome/chatzilla.properties
extensions/spellcheck/hunspell/en-US.aff
extensions/venkman/chrome/venkman.properties
mail/chrome/communicator/utilityOverlay.dtd
mail/chrome/messenger-newsblog/am-newsblog.dtd
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger-newsblog/newsblog.properties
mail/chrome/messenger-region/region.properties
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/accountCreation.properties
mail/chrome/messenger/addbuddy.dtd
mail/chrome/messenger/addressbook/abCardOverlay.dtd
mail/chrome/messenger/addressbook/abContactsPanel.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/am-addressing.dtd
mail/chrome/messenger/am-advanced.dtd
mail/chrome/messenger/am-copies.dtd
mail/chrome/messenger/am-identities-list.dtd
mail/chrome/messenger/am-im.dtd
mail/chrome/messenger/am-junk.dtd
mail/chrome/messenger/am-main.dtd
mail/chrome/messenger/am-mdn.dtd
mail/chrome/messenger/am-server-top.dtd
mail/chrome/messenger/am-serverwithnoidentities.dtd
mail/chrome/messenger/am-smime.properties
mail/chrome/messenger/baseMenuOverlay.dtd
mail/chrome/messenger/chat.dtd
mail/chrome/messenger/chat.properties
mail/chrome/messenger/cloudfile/Box/auth.dtd
mail/chrome/messenger/cloudfile/Box/settings.dtd
mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
mail/chrome/messenger/cloudfile/addAccountDialog.dtd
mail/chrome/messenger/eudoraImportMsgs.properties
mail/chrome/messenger/filter.properties
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/glodaComplete.properties
mail/chrome/messenger/glodaFacetView.properties
mail/chrome/messenger/imAccountWizard.dtd
mail/chrome/messenger/imAccounts.dtd
mail/chrome/messenger/imAccounts.properties
mail/chrome/messenger/importDialog.dtd
mail/chrome/messenger/importMsgs.properties
mail/chrome/messenger/joinChat.dtd
mail/chrome/messenger/junkLog.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/messengercompose/sendProgress.dtd
mail/chrome/messenger/messengercompose/sendProgress.properties
mail/chrome/messenger/migration/migration.dtd
mail/chrome/messenger/migration/migration.properties
mail/chrome/messenger/mime.properties
mail/chrome/messenger/msgAccountCentral.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/multimessageview.dtd
mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
mail/chrome/messenger/newmailaccount/accountProvisioner.properties
mail/chrome/messenger/news.properties
mail/chrome/messenger/offline.properties
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/preferences/applications.dtd
mail/chrome/messenger/preferences/applications.properties
mail/chrome/messenger/preferences/chat.dtd
mail/chrome/messenger/preferences/display.dtd
mail/chrome/messenger/preferences/fonts.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/preferences.properties
mail/chrome/messenger/preferences/security.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/quickFilterBar.dtd
mail/chrome/messenger/search.properties
mail/chrome/messenger/searchTermOverlay.dtd
mail/chrome/messenger/systemIntegrationDialog.dtd
mail/chrome/messenger/taskbar.properties
mail/chrome/messenger/telemetry.properties
mail/chrome/messenger/templateUtils.properties
mail/chrome/overrides/netError.dtd
mail/installer/custom.properties
mail/searchplugins/amazon-jp.xml
mail/searchplugins/google-jp.xml
mail/searchplugins/list.txt
mail/searchplugins/oshiete-goo.xml
mail/searchplugins/rakuten.xml
mail/searchplugins/twitter-ja.xml
mail/searchplugins/wikipedia-ja.xml
mail/searchplugins/yahoo-jp-auctions.xml
mail/searchplugins/yahoo-jp.xml
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/about.dtd
mobile/android/chrome/aboutAddons.dtd
mobile/android/chrome/aboutAddons.properties
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutCertError.dtd
mobile/android/chrome/aboutDownloads.dtd
mobile/android/chrome/aboutDownloads.properties
mobile/android/chrome/aboutPrivateBrowsing.dtd
mobile/android/chrome/aboutReader.properties
mobile/android/chrome/browser.properties
mobile/android/chrome/checkbox.dtd
mobile/android/chrome/config.dtd
mobile/android/chrome/config.properties
mobile/android/chrome/feedback.dtd
mobile/android/chrome/localepicker.properties
mobile/android/chrome/notification.dtd
mobile/android/chrome/phishing.dtd
mobile/android/chrome/pippki.properties
mobile/android/chrome/prompt.dtd
mobile/android/chrome/sync.dtd
mobile/android/chrome/sync.properties
mobile/android/defines.inc
mobile/android/mobile-l10n.js
mobile/chrome/region.properties
mobile/overrides/appstrings.properties
mobile/overrides/netError.dtd
mobile/overrides/passwordmgr.properties
mobile/profile/bookmarks.inc
mobile/searchplugins/amazon-jp.xml
mobile/searchplugins/twitter-ja.xml
mobile/searchplugins/yahoo-jp.xml
netwerk/necko.properties
security/manager/chrome/pipnss/nsserrors.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pippki/deviceManager.dtd
security/manager/chrome/pippki/pippki.properties
security/manager/chrome/pippki/validation.dtd
services/sync/errors.properties
services/sync/sync.properties
suite/chrome/branding/brand.properties
suite/chrome/browser/linkToolbar.dtd
suite/chrome/browser/navigator.dtd
suite/chrome/browser/navigator.properties
suite/chrome/browser/navigatorOverlay.dtd
suite/chrome/browser/pageInfo.dtd
suite/chrome/browser/pageInfo.properties
suite/chrome/browser/region.properties
suite/chrome/browser/taskbar.properties
suite/chrome/browser/unix/platformNavigationBindings.dtd
suite/chrome/common/about.dtd
suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
suite/chrome/common/bookmarks/places.dtd
suite/chrome/common/consoleOverlay.dtd
suite/chrome/common/contentAreaCommands.dtd
suite/chrome/common/dataman/dataman.dtd
suite/chrome/common/dataman/dataman.properties
suite/chrome/common/downloads/downloadmanager.dtd
suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/chrome/common/help/customize_help.xhtml
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/mailnews_account_settings.xhtml
suite/chrome/common/help/mailnews_getting_started.xhtml
suite/chrome/common/help/mailnews_organizing.xhtml
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/mailnews_using_mail.xhtml
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/ssl_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/help/using_priv_help.xhtml
suite/chrome/common/help/validation_help.xhtml
suite/chrome/common/help/welcome_help.xhtml
suite/chrome/common/history/history.dtd
suite/chrome/common/mac/platformCommunicatorOverlay.dtd
suite/chrome/common/migration/migration.dtd
suite/chrome/common/migration/migration.properties
suite/chrome/common/notification.properties
suite/chrome/common/openLocation.dtd
suite/chrome/common/openLocation.properties
suite/chrome/common/pref/pref-advanced.dtd
suite/chrome/common/pref/pref-cache.dtd
suite/chrome/common/pref/pref-content.dtd
suite/chrome/common/pref/pref-download.dtd
suite/chrome/common/pref/pref-findasyoutype.dtd
suite/chrome/common/pref/pref-fonts.dtd
suite/chrome/common/pref/pref-images.dtd
suite/chrome/common/pref/pref-keynav.dtd
suite/chrome/common/pref/pref-languages.dtd
suite/chrome/common/pref/pref-locationbar.dtd
suite/chrome/common/pref/pref-mousewheel.dtd
suite/chrome/common/pref/pref-navigator.dtd
suite/chrome/common/pref/pref-popups.dtd
suite/chrome/common/pref/pref-scripts.dtd
suite/chrome/common/pref/pref-ssl.dtd
suite/chrome/common/pref/pref-sync.dtd
suite/chrome/common/pref/pref-tabs.dtd
suite/chrome/common/pref/pref-validation.dtd
suite/chrome/common/pref/preferences.dtd
suite/chrome/common/pref/prefutilities.properties
suite/chrome/common/sync/syncGenericChange.properties
suite/chrome/common/sync/syncKey.dtd
suite/chrome/common/sync/syncQuota.properties
suite/chrome/common/sync/syncSetup.dtd
suite/chrome/common/sync/syncSetup.properties
suite/chrome/common/tasksOverlay.dtd
suite/chrome/common/unix/platformCommunicatorOverlay.dtd
suite/chrome/common/utilityOverlay.dtd
suite/chrome/common/viewApplyThemeOverlay.dtd
suite/chrome/common/viewApplyThemeOverlay.properties
suite/chrome/common/viewZoomOverlay.dtd
suite/chrome/common/viewZoomOverlay.properties
suite/chrome/common/win/platformCommunicatorOverlay.dtd
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/addressbook/abMainWindow.dtd
suite/chrome/mailnews/compose/composeMsgs.properties
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/compose/sendProgress.dtd
suite/chrome/mailnews/compose/sendProgress.properties
suite/chrome/mailnews/eudoraImportMsgs.properties
suite/chrome/mailnews/filter.properties
suite/chrome/mailnews/folderProps.dtd
suite/chrome/mailnews/importDialog.dtd
suite/chrome/mailnews/importMsgs.properties
suite/chrome/mailnews/mailKeysOverlay.dtd
suite/chrome/mailnews/mailOverlay.dtd
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/mime.properties
suite/chrome/mailnews/msgHdrViewOverlay.dtd
suite/chrome/mailnews/msgHdrViewPopup.dtd
suite/chrome/mailnews/news.properties
suite/chrome/mailnews/newsblog/am-newsblog.dtd
suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
suite/chrome/mailnews/newsblog/newsblog.properties
suite/chrome/mailnews/pref/AccountWizard.dtd
suite/chrome/mailnews/pref/am-addressing.dtd
suite/chrome/mailnews/pref/am-advanced.dtd
suite/chrome/mailnews/pref/am-archiveoptions.dtd
suite/chrome/mailnews/pref/am-copies.dtd
suite/chrome/mailnews/pref/am-identities-list.dtd
suite/chrome/mailnews/pref/am-junk.dtd
suite/chrome/mailnews/pref/am-main.dtd
suite/chrome/mailnews/pref/am-mdn.dtd
suite/chrome/mailnews/pref/am-offline.dtd
suite/chrome/mailnews/pref/am-server-top.dtd
suite/chrome/mailnews/pref/am-serverwithnoidentities.dtd
suite/chrome/mailnews/pref/pref-composing_messages.dtd
suite/chrome/mailnews/pref/prefs.properties
suite/chrome/mailnews/search.properties
suite/chrome/mailnews/searchTermOverlay.dtd
suite/chrome/mailnews/smime/am-smime.properties
suite/chrome/mailnews/start.dtd
suite/searchplugins/amazon-jp.xml
suite/searchplugins/creativecommons.xml
suite/searchplugins/wikipedia-ja.xml
toolkit/chrome/cookie/cookieAcceptDialog.dtd
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global-platform/unix/platformKeys.properties
toolkit/chrome/global-platform/win/platformKeys.properties
toolkit/chrome/global/aboutRights.properties
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/aboutTelemetry.properties
toolkit/chrome/global/commonDialogs.properties
toolkit/chrome/global/config.dtd
toolkit/chrome/global/console.dtd
toolkit/chrome/global/console.properties
toolkit/chrome/global/customizeToolbar.dtd
toolkit/chrome/global/filepicker.dtd
toolkit/chrome/global/filepicker.properties
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/languageNames.properties
toolkit/chrome/global/notification.dtd
toolkit/chrome/global/resetProfile.dtd
toolkit/chrome/global/textcontext.dtd
toolkit/chrome/global/videocontrols.dtd
toolkit/chrome/global/viewSource.dtd
toolkit/chrome/mozapps/downloads/downloads.properties
toolkit/chrome/mozapps/downloads/unknownContentType.dtd
toolkit/chrome/mozapps/downloads/unknownContentType.properties
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/extensions/newaddon.dtd
toolkit/chrome/mozapps/extensions/newaddon.properties
toolkit/chrome/mozapps/extensions/selectAddons.dtd
toolkit/chrome/mozapps/extensions/selectAddons.properties
toolkit/chrome/mozapps/extensions/xpinstallConfirm.dtd
toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/mozapps/plugins/plugins.properties
toolkit/chrome/mozapps/profile/profileSelection.properties
toolkit/chrome/mozapps/update/updates.dtd
toolkit/chrome/mozapps/update/updates.properties
toolkit/chrome/passwordmgr/passwordManager.dtd
toolkit/chrome/passwordmgr/passwordmgr.properties
toolkit/chrome/places/places.properties
toolkit/crashreporter/crashreporter.ini
webapprt/webapp-uninstaller/webapp-uninstaller.properties
webapprt/webapprt/webapp.dtd
webapprt/webapprt/webapp.properties
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -12,22 +12,20 @@ browser.search.order.3			= Amazon.co.jp
 browser.search.order.4			= 楽天市場
 browser.search.order.5			= ヤフオク!
 browser.search.order.6			= 教えて!goo
 browser.search.order.7			= Twitter
 browser.search.order.8			= Wikipedia (ja)
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI
-browser.contentHandlers.types.0.title	= Google リーダー
-browser.contentHandlers.types.0.uri	= http://www.google.com/reader/view/feed/%s
-browser.contentHandlers.types.1.title	= My Yahoo!
-browser.contentHandlers.types.1.uri	= http://add.my.yahoo.co.jp/rss?url=%s
-browser.contentHandlers.types.2.title	= livedoor Reader
-browser.contentHandlers.types.2.uri	= http://reader.livedoor.com/subscribe/?url=%s
+browser.contentHandlers.types.0.title	= My Yahoo!
+browser.contentHandlers.types.0.uri	= http://add.my.yahoo.co.jp/rss?url=%s
+browser.contentHandlers.types.1.title	= livedoor Reader
+browser.contentHandlers.types.1.uri	= http://reader.livedoor.com/subscribe/?url=%s
 
 # increment this number when anything gets changed in the list below.  This will
 # cause Firefox to re-read these prefs and inject any new handlers into the 
 # profile database.  Note that "new" is defined as "has a different URL"; this
 # means that it's not possible to update the name of existing handler, so 
 # don't make any spelling errors here.
 gecko.handlerService.defaultHandlersVersion=4
 
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -31,27 +31,29 @@
 <!ENTITY contribute.end			"">
 
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license		"ライセンス情報">
 
 <!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 <!ENTITY bottomLinks.rights		"あなたの権利について">
 
-<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 <!ENTITY bottomLinks.privacy		"プライバシーポリシー">
 
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingForUpdates	"ソフトウェアの更新を確認...">
 <!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingAddonCompat	"アドオンの互換性を確認中...">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound		"&brandShortName; は最新バージョンです">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled		"システム管理者により、更新が無効化されています">
+<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
+<!ENTITY update.otherInstanceHandlingUpdates	"&brandShortName; は別のプロセスで更新中です">
 
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
      the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
      one line, try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.failed.start		"更新に失敗しました。">
 <!ENTITY update.failed.linkText		"最新バージョンをダウンロード">
@@ -59,16 +61,26 @@
 
 <!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
      all go into one line and have an anchor in between with text that is the same as the link to a site
      to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
      try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.manual.start		"更新が利用可能です ">
 <!ENTITY update.manual.end		"">
 
+<!-- LOCALIZATION NOTE (update.unsupported.start,update.unsupported.linkText,update.unsupported.end):
+     update.unsupported.start, update.unsupported.linkText, and
+     update.unsupported.end all go into one line with linkText being wrapped in
+     an anchor that links to a site to provide additional information regarding
+     why the system is no longer supported. As this is all in one line, try to
+     make the localized text short (see bug 843497 for screenshots). -->
+<!ENTITY update.unsupported.start	"最新バージョンはご使用のシステムに対応していません。">
+<!ENTITY update.unsupported.linkText	"詳細">
+<!ENTITY update.unsupported.end		"">
+
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 <!ENTITY update.downloading.start	"更新をダウンロード中 — ">
 <!ENTITY update.downloading.end		"">
 
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -16,16 +16,18 @@
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
 <!ENTITY abouthome.defaultSnippet1.v1			"Firefox をさらに活用したいときは、<a>使い方のヒント</a> をご覧ください。基本的なキーボードショートカットや主な機能をご説明します。">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1			"<a>Firefox をカスタマイズしてみましょう</a>。たくさんの無料のアドオンの中から気に入ったものを選べば、自分好みのブラウザを作ることができます。">
+<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
+<!ENTITY abouthome.rightsSnippet			"&brandFullName; は非営利団体 Mozilla Foundation が公開している無料のオープンソースソフトウェアです。<a>あなたの権利について...</a>">
 
 <!ENTITY abouthome.bookmarksButton.label		"ブックマーク">
 <!ENTITY abouthome.historyButton.label			"履歴">
 <!ENTITY abouthome.settingsButton.label			"オプション">
 <!ENTITY abouthome.addonsButton.label			"アドオン">
 <!ENTITY abouthome.appsButton.label			"Marketplace">
 <!ENTITY abouthome.downloadsButton.label		"ダウンロード">
 <!ENTITY abouthome.syncButton.label			"&syncBrand.shortName.label;">
--- a/browser/chrome/browser/aboutRobots.dtd
+++ b/browser/chrome/browser/aboutRobots.dtd
@@ -1,16 +1,14 @@
 <!-- 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:robots page, which ties in with the
-     robots theme used in the Firefox 3 Beta 2/3 first run pages...
-         https://www.mozilla.com/en-US/firefox/3.0b2/firstrun/
-         https://www.mozilla.com/en-US/firefox/3.0b3/firstrun/
+     robots theme used in the Firefox 3 Beta 2/3 first run pages.
      They're just meant to be fun and whimsical, with references to some geeky
      but well-known robots in movies and books. Be creative with translations! -->
 
 <!-- Nonsense line from the movie "The Day The Earth Stood Still". No translation needed. -->
 <!-- 宇宙家族カールビンソン -->
 <!ENTITY robots.pagetitle  "まるちぷるたいたんぱー!">
 <!-- Movie: Logan's Run... Box (cybog): "Welcome Humans! I am ready for you." -->
 <!-- 原文ままの翻訳 -->
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -1,22 +1,34 @@
 <!-- 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 restorepage.tabtitle		"セッションの復元">
+<!ENTITY restorepage.tabtitle       "セッションの復元">
+
 <!-- LOCALIZATION NOTE: The title is intended to be apologetic and disarming, expressing dismay
      and regret that we are unable to restore the session for the user -->
-<!ENTITY restorepage.errorTitle		"ご迷惑をおかけして申し訳ありません">
-<!ENTITY restorepage.problemDesc	"&brandShortName; はウインドウとタブを正常に復元できませんでした。多くの場合、正常に復元できない原因は最近開いた Web ページによるものです。">
-<!ENTITY restorepage.tryThis		"次のいずれかをお試しください:">
-<!ENTITY restorepage.restoreSome	"問題の原因となりそうなタブを除外して起動する">
-<!ENTITY restorepage.startNew		"タブを復元せずに新しいブラウザセッションを開始する">
+<!ENTITY restorepage.errorTitle     "ご迷惑をおかけして申し訳ありません">
+<!ENTITY restorepage.problemDesc    "&brandShortName; はウインドウとタブを正常に復元できませんでした。多くの場合、正常に復元できない原因は最近開いた Web ページによるものです。">
+<!ENTITY restorepage.tryThis        "次のいずれかをお試しください:">
+<!ENTITY restorepage.restoreSome    "問題の原因となりそうなタブを除外して起動する">
+<!ENTITY restorepage.startNew       "タブを復元せずに新しいブラウザセッションを開始する">
+
+<!ENTITY restorepage.tryagainButton "タブを復元">
+<!ENTITY restorepage.restore.access "R">
+<!ENTITY restorepage.closeButton    "閉じる">
+<!ENTITY restorepage.close.access   "C">
 
-<!ENTITY restorepage.tryagainButton	"タブを復元">
-<!ENTITY restorepage.restore.access	"R">
-<!ENTITY restorepage.closeButton	"閉じる">
-<!ENTITY restorepage.close.access	"C">
+<!ENTITY restorepage.restoreHeader  "復元">
+<!ENTITY restorepage.listHeader     "ウインドウとタブ">
+<!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
+<!ENTITY restorepage.windowLabel    "ウインドウ &#37;S">
+
 
-<!ENTITY restorepage.restoreHeader	"復元">
-<!ENTITY restorepage.listHeader		"ウインドウとタブ">
-<!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
-<!ENTITY restorepage.windowLabel	"ウインドウ &#37;S">
+<!-- LOCALIZATION NOTE: The following 'welcomeback' strings are for about:welcomeback,
+     not for about:sessionstore -->
+<!ENTITY welcomeback.tabtitle       "おかえり!">
+
+<!-- LOCALIZATION NOTE: The title is intended to be welcoming and congratulatory,
+     expressing joy that the user has successfully migrated their stuff and hope
+     that now they have a better experience.  -->
+<!ENTITY welcomeback.pageTitle      "おかえり!">
+<!ENTITY welcomeback.pageInfo       "&brandShortName; はプロファイルをリセットできました。以下は開いていたウインドウとタブの一覧です。これらを復元するか、または白紙の状態で開始できます。">
--- a/browser/chrome/browser/baseMenuOverlay.dtd
+++ b/browser/chrome/browser/baseMenuOverlay.dtd
@@ -14,16 +14,20 @@
                        for the help button in the menubar but Gnome does not.   -->
 <!ENTITY helpMenuWin.label		"ヘルプ"> 
 <!ENTITY helpMenuWin.accesskey		"H">
 <!ENTITY aboutProduct.label		"&brandShortName; について">
 <!ENTITY aboutProduct.accesskey		"A">
 <!ENTITY productHelp.label		"&brandShortName; ヘルプ">
 <!ENTITY productHelp.accesskey		"H">
 <!ENTITY helpMac.commandkey		"?">
+
+<!ENTITY helpKeyboardShortcuts.label		"キーボードショートカット">
+<!ENTITY helpKeyboardShortcuts.accesskey	"K">
+
 <!ENTITY helpSafeMode.label		"アドオンを無効にして再起動...">
 <!ENTITY helpSafeMode.accesskey		"R">
 
 <!ENTITY healthReport.label		"&brandShortName; ヘルスレポート">
 <!ENTITY healthReport.accesskey		"e">
 
 <!ENTITY helpTroubleshootingInfo.label	"トラブルシューティング情報...">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -15,16 +15,21 @@
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix	"(プライベートブラウジング)">
 
 <!-- Tab context menu -->
 <!ENTITY  reloadTab.label		"タブを再読み込み">
 <!ENTITY  reloadTab.accesskey		"R">
 <!ENTITY  reloadAllTabs.label		"すべてのタブを再読み込み">
 <!ENTITY  reloadAllTabs.accesskey	"A">
+<!-- LOCALIZATION NOTE (closeTabsToTheEnd.label): This should indicate the
+direction in which tabs are closed, i.e. locales that use RTL mode should say
+left instead of right. -->
+<!ENTITY  closeTabsToTheEnd.label	"右側のタブをすべて閉じる">
+<!ENTITY  closeTabsToTheEnd.accesskey	"i">
 <!ENTITY  closeOtherTabs.label		"他のタブをすべて閉じる">
 <!ENTITY  closeOtherTabs.accesskey	"o">
 
 <!-- LOCALIZATION NOTE (pinTab.label, unpinTab.label): "Pin" is being
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
 left edge of the tabstrip. Really we just want the string to express the idea
 that this is a lightweight and reversible action that keeps your tab where you
 can reach it easily. -->
@@ -36,17 +41,22 @@ can reach it easily. -->
 <!ENTITY  moveToGroup.accesskey		"M">
 <!ENTITY  moveToNewGroup.label		"新規タブグループ">
 <!ENTITY  moveToNewWindow.label		"新規ウインドウへ移動">
 <!ENTITY  moveToNewWindow.accesskey	"W">
 <!ENTITY  bookmarkAllTabs.label		"すべてのタブをブックマーク...">
 <!ENTITY  bookmarkAllTabs.accesskey	"T">
 <!ENTITY  undoCloseTab.label		"閉じたタブを元に戻す">
 <!ENTITY  undoCloseTab.accesskey		"U">
-<!ENTITY  closeTab.label			"タブを閉じる">
+<!-- LOCALIZATION NOTE (undoCloseTabs.label) : This label is used
+when the previous tab-closing operation closed more than one tab. It
+replaces the undoCloseTab.label and will use the same accesskey as the
+undoCloseTab.label so users will not need to learn new keyboard controls. -->
+<!ENTITY  undoCloseTabs.label		"閉じたタブを戻す">
+<!ENTITY  closeTab.label		"タブを閉じる">
 <!ENTITY  closeTab.accesskey		"c">
 
 <!ENTITY  listAllTabs.label		"タブを一覧表示します">
 
 <!ENTITY tabCmd.label			"新規タブ"><!-- 表示カ所によりアクセスキーが異なる -->
 <!ENTITY tabCmd.accesskey		"T">
 <!ENTITY tabCmd.commandkey		"t">
 <!ENTITY openLocationCmd.label		"URL を開く...">
@@ -63,22 +73,19 @@ can reach it easily. -->
 <!ENTITY printCmd.commandkey		"p">
 
 <!ENTITY goOfflineCmd.label		"オフライン作業">
 <!ENTITY goOfflineCmd.accesskey		"k">
 
 <!ENTITY menubarCmd.label		"メニューバー">
 <!ENTITY menubarCmd.accesskey		"M">
 <!ENTITY navbarCmd.label		"ナビゲーションツールバー">
-<!ENTITY navbarCmd.accesskey		"N">
 <!ENTITY personalbarCmd.label		"ブックマークツールバー">
 <!ENTITY personalbarCmd.accesskey	"B">
 <!ENTITY bookmarksToolbarItem.label	"ブックマークツールバーの項目">
-<!ENTITY addonBarCmd.label		"アドオンバー">
-<!ENTITY addonBarCmd.accesskey		"A">
 
 <!ENTITY pageSourceCmd.label		"ページのソース">
 <!ENTITY pageSourceCmd.accesskey	"o">
 <!ENTITY pageSourceCmd.commandkey	"u">
 <!ENTITY pageInfoCmd.label		"ページの情報">
 <!ENTITY pageInfoCmd.accesskey		"I">
 <!ENTITY pageInfoCmd.commandkey		"i">
 <!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
@@ -97,30 +104,40 @@ These should match what Safari and other
 <!ENTITY fullScreenRestore.tooltip	"元に戻す">
 <!ENTITY fullScreenClose.tooltip	"閉じる">
 <!ENTITY fullScreenAutohide.label	"ツールバーを隠す">
 <!ENTITY fullScreenAutohide.accesskey	"H">
 <!ENTITY fullScreenExit.label		"フルスクリーンモードを終了">
 <!ENTITY fullScreenExit.accesskey	"F">
 <!ENTITY fullscreenAllowButton.label	"許可">
 <!ENTITY fullscreenExitButton.label	"拒否">
-<!ENTITY fullscreenApproval.value	"フルスクリーンモードを許可しますか?">
 
-<!ENTITY fullscreenExitHint.value	"ESC キーを押すと、フルスクリーンモードを終了します。">
+<!ENTITY fullscreenExitHint2.value	"ESC キーを押すと、フルスクリーンモードを終了します。">
 <!ENTITY leaveDOMFullScreen.label	"フルスクリーンモードを終了">
 <!ENTITY leaveDOMFullScreen.accesskey	"u">
 
 <!ENTITY closeWindow.label		"ウインドウを閉じる">
 <!ENTITY closeWindow.accesskey 		"d">
 
 <!ENTITY bookmarksMenu.label		"ブックマーク">
 <!ENTITY bookmarksMenu.accesskey	"B">
 <!ENTITY bookmarkThisPageCmd.label	"このページをブックマーク">
 <!ENTITY bookmarkThisPageCmd.commandkey	"d">
-<!ENTITY sharePageCmd.commandkey	"l">
+<!ENTITY markPageCmd.commandkey		"l">
+<!ENTITY sharePageCmd.label		"このページを共有">
+<!ENTITY sharePageCmd.commandkey	"S">
+<!ENTITY sharePageCmd.accesskey		"s">
+<!ENTITY shareLinkCmd.label		"この URL を共有">
+<!ENTITY shareLinkCmd.accesskey		"s">
+<!ENTITY shareImageCmd.label		"この画像を共有">
+<!ENTITY shareImageCmd.accesskey	"s">
+<!ENTITY shareSelectCmd.label		"選択範囲を共有">
+<!ENTITY shareSelectCmd.accesskey	"s">
+<!ENTITY shareVideoCmd.label		"この動画を共有">
+<!ENTITY shareVideoCmd.accesskey	"s">
 <!ENTITY subscribeToPageMenupopup.label	"このページを購読">
 <!ENTITY subscribeToPageMenuitem.label	"このページを購読...">
 <!ENTITY addCurPagesCmd.label		"すべてのタブをブックマーク...">
 <!ENTITY showAllBookmarks2.label		"すべてのブックマークを表示">
 <!ENTITY unsortedBookmarksCmd.label		"未整理のブックマーク">
 <!ENTITY bookmarksToolbarChevron.tooltip	"残りのブックマークを表示します">
 
 <!ENTITY backCmd.label			"戻る">
@@ -140,78 +157,74 @@ These should match what Safari and other
 <!ENTITY stopButton.tooltip		"このページの読み込みを中止します">
 <!ENTITY goEndCap.tooltip		"ロケーションバーに入力された URL に移動します">
 <!ENTITY printButton.label		"プリント">
 <!ENTITY printButton.tooltip		"このページをプリントします">
 
 <!ENTITY backForwardItem.title		"戻る/進む">
 <!ENTITY locationItem.title		"ロケーションバー">
 <!ENTITY searchItem.title		"検索">
-<!ENTITY throbberItem.title		"読み込み中アイコン">
 <!ENTITY bookmarksItem.title		"ブックマーク">
 
 <!-- Toolbar items -->
-<!ENTITY appMenuButton.label		"メニュー">
-<!ENTITY appMenuButton.tooltip		"&brandShortName; メニューを開く">
 <!ENTITY homeButton.label		"ホーム">
 
 <!ENTITY tabGroupsButton.label		"タブグループ">
 <!ENTITY tabGroupsButton.tooltip	"タブをグループ分けして管理できます">
 
-<!ENTITY feedButton.label		"購読">
-<!ENTITY feedButton.tooltip		"このページのフィードを購読します...">
-
 <!ENTITY bookmarksButton.label		"ブックマーク">
-<!ENTITY bookmarksButton.tooltip	"ブックマークをサイドバーに表示します">
 <!ENTITY bookmarksCmd.commandkey	"b">
 
 <!ENTITY bookmarksMenuButton.label	"ブックマーク">
-<!ENTITY bookmarksMenuButton.tooltip	"ブックマークを表示します">
 <!ENTITY bookmarksMenuButton.unsorted.label	"未整理のブックマーク">
 <!ENTITY viewBookmarksSidebar.label	"ブックマークをサイドバーに表示します">
 <!ENTITY viewBookmarksToolbar.label	"ブックマークツールバーを表示">
 
 <!-- LOCALIZATION NOTE (bookmarksSidebarGtkCmd.commandkey): This command
   -  key should not contain the letters A-F, since these are reserved
   -  shortcut keys on Linux. -->
 <!ENTITY bookmarksGtkCmd.commandkey	"o">
 <!ENTITY bookmarksWinCmd.commandkey	"i">
 
 <!ENTITY historyButton.label		"履歴">
-<!ENTITY historyButton.tooltip		"最近表示したページの履歴をサイドバーに表示します">
 <!ENTITY historySidebarCmd.commandKey	"h">
 
 <!ENTITY toolsMenu.label		"ツール">
 <!ENTITY toolsMenu.accesskey		"T">
 
 <!ENTITY keywordfield.label		"この検索にキーワードを設定...">
 <!ENTITY keywordfield.accesskey		"K">
-<!ENTITY search.label			"Web 検索">
-<!ENTITY search.accesskey		"S">
+
 <!ENTITY downloads.label		"ダウンロード">
 <!ENTITY downloads.tooltip		"ダウンロードの進行状況を表示します">
 <!ENTITY downloads.accesskey		"D">
 <!ENTITY downloads.commandkey		"j">
 <!ENTITY downloadsUnix.commandkey	"y">
 <!ENTITY addons.label			"アドオン">
 <!ENTITY addons.accesskey		"A">
 <!ENTITY addons.commandkey		"A">
 
 <!ENTITY webDeveloperMenu.label		"Web 開発">
 <!ENTITY webDeveloperMenu.accesskey	"W">
 
+<!ENTITY devToolsCmd.keycode		"VK_F12">
+<!ENTITY devToolsCmd.keytext		"F12">
+
 <!ENTITY devtoolsConnect.label		"接続...">
 <!ENTITY devtoolsConnect.accesskey	"e">
 
 <!ENTITY errorConsoleCmd.label		"エラーコンソール">
 <!ENTITY errorConsoleCmd.accesskey	"C">
-<!ENTITY errorConsoleCmd.commandkey	"j">
 
 <!ENTITY remoteWebConsoleCmd.label	"リモート Web コンソール">
 
+<!ENTITY browserConsoleCmd.label	"ブラウザコンソール">
+<!ENTITY browserConsoleCmd.commandkey	"j">
+<!ENTITY browserConsoleCmd.accesskey	"B">
+
 <!ENTITY inspectContextMenu.label	"要素を調査">
 <!ENTITY inspectContextMenu.accesskey	"Q">
 
 <!ENTITY responsiveDesignTool.label		"レスポンシブデザインビュー">
 <!ENTITY responsiveDesignTool.accesskey		"R">
 <!ENTITY responsiveDesignTool.commandkey	"M">
 
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
@@ -219,28 +232,36 @@ These should match what Safari and other
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
-<!ENTITY scratchpad.label             "スクラッチパッド">
-<!ENTITY scratchpad.accesskey         "s">
-<!ENTITY scratchpad.keycode           "VK_F4">
-<!ENTITY scratchpad.keytext           "F4">
+<!ENTITY scratchpad.label			"スクラッチパッド">
+<!ENTITY scratchpad.accesskey			"s">
+<!ENTITY scratchpad.keycode			"VK_F4">
+<!ENTITY scratchpad.keytext			"F4">
+
+<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
+  -  application menu item that opens the browser debugger UI in the Tools menu. -->
+<!ENTITY chromeDebuggerMenu.label		"ブラウザデバッガ">
 
 <!ENTITY devToolbarCloseButton.tooltiptext	"開発ツールバーを閉じる">
 <!ENTITY devToolbarMenu.label			"開発ツールバー">
 <!ENTITY devToolbarMenu.accesskey		"v">
+<!ENTITY devAppMgrMenu.label			"アプリマネージャ">
+<!ENTITY devAppMgrMenu.accesskey		"a">
 <!ENTITY devToolbar.keycode			"VK_F2">
 <!ENTITY devToolbar.keytext			"F2">
 <!ENTITY devToolboxMenuItem.label		"開発ツールを表示">
 <!ENTITY devToolboxMenuItem.accesskey		"T">
+<!ENTITY devToolboxMenuItem.keycode		"I">
+<!ENTITY devToolboxMenuItem.keytext		"I">
 
 <!ENTITY devToolbarToolsButton.tooltip		"開発ツールを表示">
 <!ENTITY devToolbarOtherToolsButton.label	"その他のツール">
 
 <!ENTITY getMoreDevtoolsCmd.label	"その他のツールを入手">
 <!ENTITY getMoreDevtoolsCmd.accesskey	"M">
 
 <!ENTITY fileMenu.label			"ファイル">
@@ -288,40 +309,28 @@ These should match what Safari and other
 <!ENTITY viewTabGroups.label		"タブグループ...">
 <!ENTITY viewTabGroups.accesskey	"G">
 <!ENTITY viewToolbarsMenu.label		"ツールバー">
 <!ENTITY viewToolbarsMenu.accesskey	"T">
 <!ENTITY viewSidebarMenu.label		"サイドバー">
 <!ENTITY viewSidebarMenu.accesskey	"e">
 <!ENTITY viewCustomizeToolbar.label	"カスタマイズ...">
 <!ENTITY viewCustomizeToolbar.accesskey	"C">
-<!ENTITY viewTabsOnTop.label		"タブを上部に表示">
-<!ENTITY viewTabsOnTop.accesskey	"T">
 
 <!ENTITY historyMenu.label		"履歴">
 <!ENTITY historyMenu.accesskey		"s">
 <!ENTITY historyUndoMenu.label		"最近閉じたタブ">
 <!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
 <!ENTITY historyUndoWindowMenu.label	"最近閉じたウインドウ">
 <!ENTITY historyRestoreLastSession.label	"以前のセッションを復元">
 
-<!ENTITY historyHomeCmd.label		"ホーム">
 <!ENTITY showAllHistoryCmd2.label	"すべての履歴を表示"><!-- (^^; -->
 <!ENTITY showAllHistoryCmd.commandkey	"H">
 
-<!ENTITY appMenuEdit.label		"編集">
 <!ENTITY appMenuCustomize.label		"カスタマイズ">
-<!ENTITY appMenuToolbarLayout.label	"ツールバーのカスタマイズ...">
-<!ENTITY appMenuSidebars.label		"サイドバー">
-<!ENTITY appMenuFind.label		"ページ内検索...">
-<!ENTITY appMenuUnsorted.label		"未整理のブックマーク">
-<!ENTITY appMenuWebDeveloper.label	"Web 開発">
-<!ENTITY appMenuGettingStarted.label	"使いこなそう">
-<!ENTITY appMenuSafeMode.label		"アドオンを無効にして再起動...">
-<!ENTITY appMenuSafeMode.accesskey	"R">
 
 <!ENTITY openCmd.commandkey		"l">
 <!ENTITY urlbar.placeholder2		"URL または検索語句を入力します">
 <!ENTITY urlbar.accesskey		"d">
 <!ENTITY urlbar.switchToTab.label	"タブを表示:">
 
 <!-- 
   Comment duplicated from browser-sets.inc:
@@ -380,16 +389,18 @@ These should match what Safari and other
 <!ENTITY viewFrameInfoCmd.label		"フレームの情報を表示">
 <!ENTITY viewFrameInfoCmd.accesskey	"I">
 <!ENTITY reloadImageCmd.label		"画像を再読み込み">
 <!ENTITY reloadImageCmd.accesskey	"R">
 <!ENTITY viewImageCmd.label		"画像だけを表示">
 <!ENTITY viewImageCmd.accesskey		"I">
 <!ENTITY viewImageInfoCmd.label		"画像の情報を表示">
 <!ENTITY viewImageInfoCmd.accesskey	"f">
+<!ENTITY viewImageDescCmd.label		"画像の詳細情報を表示">
+<!ENTITY viewImageDescCmd.accesskey	"D">
 <!ENTITY viewVideoCmd.label		"動画だけを表示">
 <!ENTITY viewVideoCmd.accesskey		"I">
 <!ENTITY viewBGImageCmd.label		"背景画像だけを表示">
 <!ENTITY viewBGImageCmd.accesskey	"w">
 <!ENTITY setDesktopBackgroundCmd.label		"デスクトップの背景に設定...">
 <!ENTITY setDesktopBackgroundCmd.accesskey	"S">
 <!ENTITY bookmarkPageCmd2.label		"このページをブックマーク">
 <!ENTITY bookmarkPageCmd2.accesskey	"m">
@@ -451,29 +462,29 @@ items are mutually exclusive. -->
 <!ENTITY mediaPause.accesskey		"P">
 <!-- LOCALIZATION NOTE: The access keys for "Mute" and
 "Unmute" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaMute.label		"ミュート">
 <!ENTITY mediaMute.accesskey		"M">
 <!ENTITY mediaUnmute.label		"ミュート解除">
 <!ENTITY mediaUnmute.accesskey		"m">
-<!ENTITY mediaPlaybackRate.label		"再生スピード">
-<!ENTITY mediaPlaybackRate.accesskey		"l">
-<!ENTITY mediaPlaybackRate050x.label		"スローモーション (0.5×)">
-<!ENTITY mediaPlaybackRate050x.accesskey	"S">
-<!ENTITY mediaPlaybackRate100x.label		"通常">
-<!ENTITY mediaPlaybackRate100x.accesskey	"N">
-<!ENTITY mediaPlaybackRate150x.label		"早送り (1.5×)">
-<!ENTITY mediaPlaybackRate150x.accesskey	"H">
+<!ENTITY mediaPlaybackRate.label                "再生スピード">
+<!ENTITY mediaPlaybackRate.accesskey            "l">
+<!ENTITY mediaPlaybackRate050x.label            "スローモーション (0.5倍)">
+<!ENTITY mediaPlaybackRate050x.accesskey        "S">
+<!ENTITY mediaPlaybackRate100x.label            "通常">
+<!ENTITY mediaPlaybackRate100x.accesskey        "N">
+<!ENTITY mediaPlaybackRate150x.label            "早送り (1.5倍)">
+<!ENTITY mediaPlaybackRate150x.accesskey        "H">
 <!-- LOCALIZATION NOTE: "Ludicrous Speed" is a reference to the
 movie "Space Balls" and is meant to say that this speed is very
 fast. -->
-<!ENTITY mediaPlaybackRate200x.label		"なんて速さだ! (2×)">
-<!ENTITY mediaPlaybackRate200x.accesskey	"L">
+<!ENTITY mediaPlaybackRate200x.label            "ウルトラスーパーハイ (2倍)">
+<!ENTITY mediaPlaybackRate200x.accesskey        "L">
 <!-- LOCALIZATION NOTE: The access keys for "Show Controls" and
 "Hide Controls" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaShowControls.label	"コントロールを表示">
 <!ENTITY mediaShowControls.accesskey	"C">
 <!ENTITY mediaHideControls.label	"コントロールを隠す">
 <!ENTITY mediaHideControls.accesskey	"C">
 <!ENTITY videoFullScreen.label		"フルスクリーン">
@@ -514,34 +525,27 @@ you can use these alternative items. Oth
 <!ENTITY fullZoomToggleCmd.accesskey	"T">
 <!ENTITY fullZoom.label			"ズーム">
 <!ENTITY fullZoom.accesskey		"Z">
 
 <!ENTITY newTabButton.tooltip		"新規タブを開きます">
 <!ENTITY newWindowButton.tooltip	"新規ウインドウを開きます">
 <!ENTITY sidebarCloseButton.tooltip	"サイドバーを閉じます">
 
-<!ENTITY cutButton.tooltip		"カット">
-<!ENTITY copyButton.tooltip		"コピー">
-<!ENTITY pasteButton.tooltip		"ペースト">
-
 <!ENTITY fullScreenButton.tooltip	"ウインドウを画面全体に表示します">
 
-<!ENTITY zoomOutButton.tooltip		"縮小">
-<!ENTITY zoomInButton.tooltip		"拡大">
-<!ENTITY zoomControls.label		"拡大/縮小コントロール">
-
 <!ENTITY quitApplicationCmdWin.label	"終了">
 <!ENTITY quitApplicationCmdWin.accesskey	"x">
 <!ENTITY goBackCmd.commandKey		"[">
 <!ENTITY goForwardCmd.commandKey	"]">
 <!ENTITY quitApplicationCmd.label	"終了">
 <!ENTITY quitApplicationCmd.accesskey	"Q">
 <!ENTITY quitApplicationCmdMac.label	"&brandShortName; を終了">
-<!ENTITY quitApplicationCmdMac.key	"Q">
+<!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX builds. -->
+<!ENTITY quitApplicationCmdUnix.key	"Q">
 
 <!ENTITY closeCmd.label			"ウインドウを閉じる">
 <!ENTITY closeCmd.key			"W">
 <!ENTITY closeCmd.accesskey		"C">
 
 <!ENTITY pageStyleMenu.label		"スタイルシート">
 <!ENTITY pageStyleMenu.accesskey	"y">
 <!ENTITY pageStyleNoStyle.label		"スタイルシートを使用しない">
@@ -594,59 +598,124 @@ The layout of the identity dialog preven
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!-- (^^; EVSSL の場合のみ identity.runBy の値に組織名を出力 -->
 <!ENTITY identity.runBy				"このサイトの運営者:">
 
 <!ENTITY identity.moreInfoLinkText		"詳細を表示...">
 
+<!ENTITY identity.permissions			"サイト別設定">
+
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label			"ブラウザタブ"><!-- (^m^) Bug 565042  音声読み上げ用ラベル -->
 
 <!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
 <!ENTITY syncTabsMenu2.label			"他の端末で開いていたタブ">
 
 <!ENTITY syncBrand.shortName.label		"Sync">
 
 <!ENTITY syncSetup.label				"&syncBrand.shortName.label; をセットアップ...">
 <!ENTITY syncSetup.accesskey			"Y">
 <!ENTITY syncSyncNowItem.label			"今すぐ同期">
 <!ENTITY syncSyncNowItem.accesskey		"S">
 <!ENTITY syncToolbarButton.label		"Sync">
 
-<!ENTITY addonBarCloseButton.tooltip	"アドオンバーを閉じます">
-<!ENTITY toggleAddonBarCmd.key			"/">
-
 <!ENTITY socialToolbar.title			"ソーシャルツールバーボタン">
 <!ENTITY social.notLoggedIn.label		"ログインしていません">
 
 <!ENTITY social.ok.label			"OK">
 <!ENTITY social.ok.accesskey			"O">
 
 <!ENTITY social.toggleSidebar.label		"サイドバーを表示する">
 <!ENTITY social.toggleSidebar.accesskey		"s">
 
 <!ENTITY social.addons.label			"サービスを管理...">
 
 <!ENTITY social.toggleNotifications.label	"デスクトップ通知を表示する">
 <!ENTITY social.toggleNotifications.accesskey	"n">
 
-<!ENTITY social.activated.undobutton.label	"取り消す">
-<!ENTITY social.activated.undobutton.accesskey	"U">
+<!ENTITY social.activated.description		"<label/> からのサービスが有効になりました。<label class='text-link'>アドオンマネージャ</label>のサービスで、設定を変更できます。">
+<!ENTITY social.activated.undo.label		"取り消す">
+<!ENTITY social.activated.undo.accesskey	"U">
+<!ENTITY social.learnMore.label			"詳細...">
+<!ENTITY social.learnMore.accesskey		"l">
+<!ENTITY social.closeNotificationItem.label	"後で">
 
 <!ENTITY social.chatBar.commandkey		"c">
 <!ENTITY social.chatBar.label			"チャットを入力">
 <!ENTITY social.chatBar.accesskey		"c">
 
+<!ENTITY social.markpageMenu.accesskey		"P">
+<!ENTITY social.markpageMenu.label		"ページを保存する...">
+<!ENTITY social.marklinkMenu.accesskey		"L">
+<!ENTITY social.marklinkMenu.label		"リンクを保存する...">
+
 <!ENTITY getUserMedia.selectCamera.label		"共有するカメラ:">
 <!ENTITY getUserMedia.selectCamera.accesskey		"C">
 <!ENTITY getUserMedia.selectMicrophone.label		"共有するマイク:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey	"M">
 
 <!ENTITY webrtcIndicatorButton.label		"カメラ、マイクへのアクセス">
 <!ENTITY webrtcIndicatorButton.tooltip		"カメラかマイクを共有しているサイトを表示します">
 
 <!ENTITY mixedContentBlocked.helplink		"詳細">
 <!ENTITY mixedContentBlocked.moreinfo		"ほとんどの Web サイトは、このコンテンツがブロックされても、正しく表示されます。">
 
 <!ENTITY pointerLock.notification.message	"ESC キーを押すと、毎回確認するようになります。">
+
+<!ENTITY pluginNotification.showAll.label	"すべて表示">
+<!ENTITY pluginNotification.showAll.accesskey	"S">
+
+<!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
+<!ENTITY pluginActivateNow.label		"今すぐ許可">
+<!ENTITY pluginActivateAlways.label		"常に許可">
+<!ENTITY pluginBlockNow.label			"プラグインをブロック">
+
+<!-- LOCALIZATION NOTE: (pluginNotification.width): This is used to determine the
+     width of the plugin popup notification that can appear if a plugin has been
+     blocked on a page. Should be wide enough to fit the pluginActivateNow.label
+     and pluginActivateAlways.label strings above on a single line. This must be
+     a CSS length value. -->
+<!ENTITY pluginNotification.width		"28em">
+
+<!ENTITY tabCrashed.header			"クラッシュしたタブ">
+<!ENTITY tabCrashed.message			"申し訳ありません。Web ページを表示しようとしましたが、応答がありませんでした。">
+<!ENTITY tabCrashed.checkSendReport		"&vendorShortName; にクラッシュ内容を送信する。">
+<!ENTITY tabCrashed.tryAgain			"再試行">
+
+<!-- LOCALIZATION NOTE: the following strings are unused in Australis, they're
+     kept here to avoid warnings from l10n tools like compare-locales on
+     l10n-central. They will be definitely removed when Australis is ready
+     for mozilla-aurora. -->
+
+<!ENTITY navbarCmd.accesskey		"N">
+<!ENTITY addonBarCmd.label		"アドオンバー">
+<!ENTITY addonBarCmd.accesskey		"A">
+<!ENTITY throbberItem.title		"読み込み中アイコン">
+<!ENTITY appMenuButton.label		"メニュー">
+<!ENTITY appMenuButton.tooltip		"&brandShortName; メニューを開く">
+<!ENTITY feedButton.label		"購読">
+<!ENTITY feedButton.tooltip		"このページのフィードを購読します...">
+<!ENTITY bookmarksButton.tooltip	"ブックマークをサイドバーに表示します">
+<!ENTITY historyButton.tooltip		"最近表示したページの履歴をサイドバーに表示します">
+<!ENTITY viewTabsOnTop.label		"タブを上部に表示">
+<!ENTITY viewTabsOnTop.accesskey	"T">
+<!ENTITY appMenuEdit.label		"編集">
+<!ENTITY appMenuToolbarLayout.label	"ツールバーのカスタマイズ...">
+<!ENTITY appMenuSidebars.label		"サイドバー">
+<!ENTITY appMenuFind.label		"ページ内検索...">
+<!ENTITY appMenuUnsorted.label		"未整理のブックマーク">
+<!ENTITY appMenuWebDeveloper.label	"Web 開発">
+<!ENTITY appMenuGettingStarted.label	"使いこなそう">
+<!ENTITY appMenuSafeMode.label		"アドオンを無効にして再起動...">
+<!ENTITY appMenuSafeMode.accesskey	"R">
+<!ENTITY cutButton.tooltip		"カット">
+<!ENTITY copyButton.tooltip		"コピー">
+<!ENTITY pasteButton.tooltip		"ペースト">
+<!ENTITY zoomOutButton.tooltip		"縮小">
+<!ENTITY zoomInButton.tooltip		"拡大">
+<!ENTITY zoomControls.label		"拡大/縮小コントロール">
+<!ENTITY addonBarCloseButton.tooltip	"アドオンバーを閉じます">
+<!ENTITY toggleAddonBarCmd.key			"/">
+<!-- end of strings to be removed post-Australis -->
+<!ENTITY bookmarksMenuButton.tooltip	"ブックマークを表示します">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -27,27 +27,27 @@ xpinstallPromptAllowButton		= 許可
 # See http://www.mozilla.org/access/keyboard/accesskey for details
 xpinstallPromptAllowButton.accesskey	= A
 xpinstallDisabledMessageLocked		= ソフトウェアのインストールはシステム管理者により無効化されています。
 xpinstallDisabledMessage		= ソフトウェアのインストールは現在無効になっています。“有効にする” をクリックしてからもう一度やり直してください。
 xpinstallDisabledButton			= 有効にする
 xpinstallDisabledButton.accesskey	= n
 
 # LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled, addonDownloadRestart):
-# Semi-colon list of plural forms. See:
+# 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		= キャンセル
 
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
-# Semi-colon list of plural forms. See:
+# 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 の再起動後にインストールされます。
 addonInstallRestartButton		= 今すぐ再起動
 addonInstallRestartButton.accesskey	= R
 
@@ -82,70 +82,105 @@ lwthemePostInstallNotification.manageBut
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message		= %S は再起動後にインストールされます。
 lwthemeNeedsRestart.button		= 今すぐ再起動
 lwthemeNeedsRestart.accesskey		= R
 
 # LOCALIZATION NOTE (popupWarning.message): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName and #2 is the number of pop-ups blocked.
 popupWarning.message			= #2 個のポップアップがブロックされました。
 popupWarningButton			= 設定
 popupWarningButton.accesskey		= O
 popupWarningButtonUnix			= 設定
 popupWarningButtonUnix.accesskey	= P
 popupAllow				= このサイト (%S) によるポップアップを許可する
 popupBlock				= このサイト (%S) によるポップアップを禁止する
 popupWarningDontShowFromMessage		= ポップアップをブロックするとき、このメッセージを表示しない
 popupWarningDontShowFromLocationbar	= ポップアップをブロックするとき、通知バーを表示しない
 popupShowPopupPrefix			= '%S' を表示
 
 # missing plugin installer
-missingpluginsMessage.title			= このページをすべて表示するにはプラグインを追加する必要があります。
-missingpluginsMessage.button.label		= プラグインを追加...
-missingpluginsMessage.button.accesskey		= I
-outdatedpluginsMessage.title			= このページの表示に使用するプラグインが古いので更新してください。
-outdatedpluginsMessage.updateButton.label	= プラグインを更新...
-outdatedpluginsMessage.updateButton.accesskey	= U
-blockedpluginsMessage.title			= このページを表示するにはプラグインが必要ですが、安全のためにブロックされました。
-blockedpluginsMessage.infoButton.label		= 詳細...
-blockedpluginsMessage.infoButton.accesskey	= D
-blockedpluginsMessage.searchButton.label	= プラグインを更新...
-blockedpluginsMessage.searchButton.accesskey	= U
+installPlugin.message				= このページのメディアの表示に必要なプラグインをインストールしますか?
+installPlugin.button.label			= %S をインストール
+installPlugin.button.accesskey			= I
+installPlugin.ignoreButton.label		= 次回から確認しない
+installPlugin.ignoreButton.accesskey		= N
+
 crashedpluginsMessage.title			= %S プラグインがクラッシュしました。
 crashedpluginsMessage.reloadButton.label	= ページを再読み込み
 crashedpluginsMessage.reloadButton.accesskey	= R
 crashedpluginsMessage.submitButton.label	= クラッシュレポートを送信
 crashedpluginsMessage.submitButton.accesskey	= S
 crashedpluginsMessage.learnMore			= 詳細を確認...
-activatePluginsMessage.message			= このページでプラグインを有効にしますか?
-activateAllPluginsMessage.label			= すべてのプラグインを有効化
-activatePluginsMessage.accesskey		= A
-activatePluginsMessage.always			= このサイトでは常にプラグインを有効にする
-activatePluginsMessage.always.accesskey		= c
-activatePluginsMessage.never			= このサイトではプラグインを無効にする
-activatePluginsMessage.never.accesskey		= N
-activateSinglePlugin				= 有効化
+
+## Plugin doorhanger strings
+# LOCALIZATION NOTE (pluginActivateNw.message): Used for newly-installed
+# plugins which are not known to be unsafe. %1$S is the plugin name and %2$S
+# is the site domain.
+pluginActivateNew.message			= %2$S で "%1$S" の実行を許可しますか?
+pluginActivateMultiple.message			= %S でプラグインの実行を許可しますか?
+pluginActivate.learnMore			= 詳細...
+# LOCALIZATION NOTE (pluginActivateOutdated.message, pluginActivateOutdated.label):
+# These strings are used when an unsafe plugin has an update available.
+# %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
+pluginActivateOutdated.message			= %3$S は %2$S の古いプラグイン "%1$S" の実行をブロックしました。
+pluginActivateOutdated.label			= 古いプラグイン
+pluginActivate.updateLabel			= 今すぐ更新...
+# LOCALIZATION NOTE (pluginActivateVulnerable.message, pluginActivateVulnerable.label):
+# These strings are used when an unsafe plugin has no update available.
+# %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
+pluginActivateVulnerable.message		= %3$S は %2$S の安全ではないプラグイン "%1$S" の実行をブロックしました。
+pluginActivateVulnerable.label			= 安全ではないプラグイン!
+pluginActivate.riskLabel			= 危険性について
+# LOCALIZATION NOTE (pluginActivateBlocked.message): %1$S is the plugin name, %2$S is brandShortName
+pluginActivateBlocked.message			= 保護のため %2$S は "%1$S" をブロックしました。
+pluginActivateBlocked.label			= ブロックによる保護
+pluginActivateDisabled.message			= "%S" は無効化されています。
+pluginActivateDisabled.label			= 無効
+pluginActivateDisabled.manage			= プラグインの管理...
+pluginEnabled.message				= %2$S の "%1$S" は有効です。
+pluginEnabledOutdated.message			= %2$S の古いプラグイン "%1$S" が有効化されています。
+pluginEnabledVulnerable.message			= %2$S の安全ではないプラグイン "%1$S" が有効化されています。
+pluginInfo.unknownPlugin			= 不明
+
+# LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.dtd
+# LOCALIZATION NOTE (pluginActivateNow.label): This button will enable the
+# plugin in the current session for an short time (about an hour), auto-renewed
+# if the site keeps using the plugin.
+pluginActivateNow.label				= 今すぐ許可
+pluginActivateNow.accesskey			= N
+# LOCALIZATION NOTE (pluginActivateAlways.label): This button will enable the
+# plugin for a long while (90 days), auto-renewed if the site keeps using the
+# plugin.
+pluginActivateAlways.label			= 常に許可する
+pluginActivateAlways.accesskey			= R
+pluginBlockNow.label				= プラグインをブロック
+pluginBlockNow.accesskey			= B
+pluginContinue.label				= 許可を続行
+pluginContinue.accesskey			= C
+
+# in-page UI
 PluginClickToActivate				= %S を有効にします。
-# LOCALIZATION NOTE - "vulnerable" indicates there is a security bug in the
-# plugin that is being exploited by attackers.
 PluginVulnerableUpdatable			= このプラグインは安全ではありません。更新してください。
 PluginVulnerableNoUpdate			= このプラグインはセキュリティの問題があります。
-vulnerableUpdatablePluginWarning		= 古いバージョンです!
-vulnerableNoUpdatePluginWarning			= 危険なプラグインです!
-vulnerablePluginsMessage			= いくつかのプラグインはセキュリティに問題があるため無効化されました。
-pluginInfo.unknownPlugin			= 不明
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title	= すべての履歴を消去
 sanitizeButtonOK			= 今すぐ消去
+# LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
+# button between the user clicking it and the window closing.  Indicates the
+# items are being cleared.
+sanitizeButtonClearing			= 消去中
+
 # LOCALIZATION NOTE (sanitizeEverythingWarning2): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has not modified the default set of history items to clear.
 sanitizeEverythingWarning2		= すべての履歴が消去されます。
 # LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has modified the default set of history items to clear.
 sanitizeSelectedWarning			= 選択した項目の履歴がすべて消去されます。
@@ -174,17 +209,17 @@ feedShowFeedNew				= '%S' を購読...
 
 menuOpenAllInTabs.label			= タブですべて開く
 
 # History menu
 menuRestoreAllTabs.label		= すべてのタブを復元
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
 # see bug 394759
 menuRestoreAllWindows.label		= すべてのウインドウを復元
-# LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 Window Title, #2 Number of tabs
 menuUndoCloseWindowLabel		= #1 (その他 #2 個のタブ)
 menuUndoCloseWindowSingleTabLabel	= #1
 
 # Unified Back-/Forward Popup
 tabHistory.current			= 現在のページです
 tabHistory.goBack			= このページに戻ります
@@ -220,36 +255,40 @@ offlineApps.manageUsageAccessKey	= S
 # LOCALIZATION NOTE (indexedDB.usage): %1$S is the website host name
 # %2$S a number of megabytes.
 indexedDB.usage				= この Web サイト (%1$S) はオフライン作業用のデータを %2$S MB 以上保存しようとしています。
 
 identity.identified.verifier		= 認証局: %S
 identity.identified.verified_by_you	= このサイトはあなたがセキュリティ例外として追加しました。
 identity.identified.state_and_country	= %S, %S
 
-identity.encrypted			= この Web サイトとの通信は第三者に盗み見られないように暗号化されています。
+identity.encrypted2			= この Web サイトとの通信は安全です。
+identity.mixed_display_loaded		= この Web サイトとのすべての通信が暗号化されていません。画像などの暗号化されてない要素が含まれています。
+identity.mixed_active_loaded2		= この Web サイトは、暗号化されてないスクリプトなどのインタラクティブなコンテンツが含まれています。第三者に情報を盗み見られたり、Web サイトの動作を改ざんされる可能性があります。
 identity.unencrypted			= この Web サイトとの通信は暗号化されていません。
-identity.mixed_content			= この Web サイトとの通信は一部しか暗号化されておらず、第三者に盗み見られないようにはなっていません。
 
 identity.unknown.tooltip		= この Web サイトには運営者を証明する証明書がありません
 
 # (^^; EVSSL による認証(法人登記なども確認して実在証明) ではなく通常の SSL 認証(ドメイン真正性のみ検証) の場合:
 #identity.ownerUnknown2			= (運営者は実在認証されていません)
 identity.ownerUnknown2			= (運営者は不明です)
 
+# LOCALIZATION NOTE (identity.chrome): %S is replaced with the brandShortName.
+identity.chrome				= %S のシステムページです。
+
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle		= ブックマークに追加しました
 # (^^; ツールメニューのブックマークからは無理...要再検討
 editBookmarkPanel.pageBookmarkedDescription	= %1$0.S今後このページにはブックマークからアクセスできます。
 editBookmarkPanel.bookmarkedRemovedTitle	= ブックマークを削除しました
 editBookmarkPanel.editBookmarkTitle		= ブックマークを編集できます
 
-# LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
-# Semi-colon list of plural forms. Replacement for #1 is
-# the number of bookmarks to be removed.
+# LOCALIZATION NOTE (editBookmark.removeBookmarks.label): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# Replacement for #1 is the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
 # (^a^) Workaround for Bug 473706
 # en-US: Remove Bookmark;Remove Bookmarks (#1)
 # editBookmark.removeBookmarks.label		= ブックマークを削除;複数 (#1) のブックマークを削除
 editBookmark.removeBookmarks.label		= この URL のブックマーク (#1 個) を削除
 
 # Post Update Notifications
@@ -281,24 +320,24 @@ webNotifications.showForSession.accesske
 webNotifications.alwaysShow			= 常に通知を表示する
 webNotifications.alwaysShow.accesskey		= A
 webNotifications.neverShow			= 通知をブロックする
 webNotifications.neverShow.accesskey		= N
 webNotifications.showFromSite			= %S からの通知を表示しますか?
 
 # Pointer lock UI
 
-pointerLock.allow				= マウスポインタを隠す
-pointerLock.allow.accesskey			= H
+pointerLock.allow2				= マウスポインタを隠す
+pointerLock.allow2.accesskey			= H
 pointerLock.alwaysAllow				= 常に許可
 pointerLock.alwaysAllow.accesskey		= A
 pointerLock.neverAllow				= 常に許可しない
 pointerLock.neverAllow.accesskey		= N
-pointerLock.title				= %S ではマウスポインタを非表示にしますか?
-pointerLock.autoLock.title			= %S ではマウスポインタを隠します。
+pointerLock.title2				= %S ではマウスポインタを非表示にしますか?
+pointerLock.autoLock.title2			= %S ではマウスポインタを非表示にします。
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
 # The two button strings will never be shown at the same time, so
 # it's okay for them to have the same access key
 safebrowsing.getMeOutOfHereButton.label		= スタートページに戻る
 safebrowsing.getMeOutOfHereButton.accessKey	= G
 safebrowsing.reportedWebForgery			= 偽装サイトとして報告されています!
@@ -317,17 +356,17 @@ ctrlTab.showAll.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.
 tabview.title					= %S - タブグループ
-# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the page title of the first tab in the unnamed group, 
 # #2 is the number of remaining tabs.
 tabview.moveToUnnamedGroup.label		= #1 と #2 個のタブ
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name		= デフォルト
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description	= 標準設定のテーマです。
 
@@ -363,56 +402,53 @@ syncPromoNotification.addons.description	= %S でアドオンを他の端末と共有できます。
 # LOCALIZATION NOTE (syncPromoNotification.addons-sync-disabled.label):
 # This appears in the add-on install complete panel when Sync is set
 # but addons sync is not. %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.addons-sync-disabled.description	= %S アカウントで複数の端末間でアドオンを同期することができます。
 
 # Mozilla data reporting notification (Telemetry, Firefox Health Report, etc)
 dataReportingNotification.message		= ユーザ体験の向上のため、%1$S は自動的にいくつかのデータを %2$S に送信します。
-dataReportingNotification.button.label		= 共有する
+dataReportingNotification.button.label		= 共有するデータを選択
 dataReportingNotification.button.accessKey	= C
 
-# Keyword.URL reset prompt
-# LOCALIZATION NOTE (keywordPrompt.message):
-#  - %1$S is brandShortName
-#  - %2$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
-#  - %3$S is the name of the default search engine (e.g. "Google")
-keywordPrompt.message			= %1$S はロケーションバーからの検索に '%2$S' を使っています。デフォルトの検索エンジン (%3$S) に戻しますか?
-
-# LOCALIZATION NOTE (keywordPrompt.yesButton): %1$S is the name of the default search engine
-keywordPrompt.yesButton			= はい、%1$S に戻します
-keywordPrompt.yesButton.accessKey	= Y
-
-# LOCALIZATION NOTE (keywordPrompt.noButton): %1$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
-keywordPrompt.noButton			= いいえ、'%1$S' のままにします
-keywordPrompt.noButton.accessKey	= N
-
 # Webapps notification popup
 webapps.install			= インストール
 webapps.install.accesskey	= I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall		= このサイト (%2$S) から "%1$S" をインストールしますか?
 webapps.install.success		= アプリケーションをインストールしました
+webapps.install.inprogress	= アプリケーションをインストールしています
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered		= %S は現在フルスクリーンモードです。
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision	= %S でのフルスクリーンの設定を保存する
 
-# LOCALIZATION NOTE (social.activated.description): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
-social.activated.description		= %1$S for %2$S を有効にしました。
+service.toolbarbutton.label		= サービス
+service.toolbarbutton.tooltiptext	= サービス
+
+# LOCALIZATION NOTE (social.install.description): %1$S is the hostname of the social provider, %2$S is brandShortName (e.g. Firefox)
+service.install.description		= %1$S からのサービスを有効にして %2$S のツールバーとサイドバーに表示しますか?
+service.install.ok.label		= サービスを有効にする
+service.install.ok.accesskey		= E
+service.install.learnmore		= 詳細...
 
 # LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
 social.turnOff.label			= %S をオフにする
 social.turnOff.accesskey		= T
 # LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
 social.turnOn.label			= %S をオンにする
 social.turnOn.accesskey			= T
 
+# LOCALIZATION NOTE (social.markpageMenu.label): %S is the name of the social provider
+social.markpageMenu.label		= ページを %S に保存する
+# LOCALIZATION NOTE (social.marklinkMenu.label): %S is the name of the social provider
+social.marklinkMenu.label		= リンクを %S に保存する
+
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message			= %1$S は現在 %2$S に接続できません。
 social.error.tryAgain.label		= 再接続
 social.error.tryAgain.accesskey		= T
 social.error.closeSidebar.label		= サイドバーを閉じる
 social.error.closeSidebar.accesskey	= C
 
 # LOCALIZATION NOTE: %1$S is the label for the toolbar button, %2$S is the associated badge numbering that the social provider may provide.
@@ -432,33 +468,33 @@ identity.newIdentity.description	= %S にサインインするメールアドレスを入力してください
 identity.next.label			= 次へ
 identity.next.accessKey			= n
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
 # LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
 identity.loggedIn.description		= %S としてサインインしました
 identity.loggedIn.signOut.label		= サインアウト
 identity.loggedIn.signOut.accessKey	= O
 
-# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
+# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
 getUserMedia.shareCamera.message		= カメラを %S と共有しますか?
 getUserMedia.shareMicrophone.message		= マイクを %S と共有しますか?
 getUserMedia.shareCameraAndMicrophone.message	= カメラとマイクを %S と共有しますか?
 getUserMedia.noVideo.label			= 映像なし
 getUserMedia.noAudio.label			= 音声なし
 getUserMedia.shareSelectedDevices.label		= 選択したデバイスを共有
 getUserMedia.shareSelectedDevices.accesskey	= S
 getUserMedia.denyRequest.label			= 共有しない
 getUserMedia.denyRequest.accesskey		= D
-getUserMedia.sharingCamera.message		= カメラを %S と共有しています。
-getUserMedia.sharingMicrophone.message		= マイクを %S と共有しています。
-getUserMedia.sharingCameraAndMicrophone.message	= カメラとマイクを %S と共有しています。
+getUserMedia.sharingCamera.message2		= カメラをこのページと共有しています。
+getUserMedia.sharingMicrophone.message2		= マイクをこのページと共有しています。
+getUserMedia.sharingCameraAndMicrophone.message2	= カメラとマイクをこのページと共有しています。
 
 # Mixed Content Blocker Doorhanger Notification
 # LOCALIZATION NOTE - %S is brandShortName
 mixedContentBlocked.message				= %S は安全でないコンテンツをブロックしました。
 mixedContentBlocked.keepBlockingButton.label		= ブロックを継続
 mixedContentBlocked.keepBlockingButton.accesskey	= B
 mixedContentBlocked.unblock.label			= このページの保護を無効にする
 mixedContentBlocked.unblock.accesskey			= D
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/VariablesView.dtd
@@ -0,0 +1,12 @@
+<!-- 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 The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+<!ENTITY PropertiesViewWindowTitle "プロパティ">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/app-manager.dtd
@@ -0,0 +1,85 @@
+<!-- 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 index.title			"アプリマネージャ">
+<!ENTITY index.projects2		"アプリ">
+<!ENTITY index.device2			"端末">
+<!ENTITY index.help			"ヘルプ">
+
+<!ENTITY device.screenshot		"スクリーンショット">
+<!ENTITY device.screenshotTooltip	"端末の現在の状態のスクリーンショットを新規タブに開きます。">
+<!ENTITY device.title			"端末コントロールセンタ">
+<!ENTITY device.notConnected		"接続されていません。以下の端末と接続してください。">
+<!ENTITY device.startApp		"開始">
+<!ENTITY device.startAppTooltip		"端末上のこのアプリを開始します。">
+<!ENTITY device.stopApp			"停止">
+<!ENTITY device.stopAppTooltip		"端末上のこのアプリを停止します。">
+<!ENTITY device.debugApp		"デバッグ">
+<!ENTITY device.debugAppTooltip		"端末上のこのアプリに接続された開発ツールを開きます。">
+<!ENTITY device.name			"端末名">
+<!ENTITY device.app			"アプリ">
+<!ENTITY device.privileged		"特権付き">
+<!ENTITY device.certified		"認証済み">
+<!ENTITY device.allow			"許可">
+<!ENTITY device.allowTooltip		"この許可設定はこの種類のアプリについて許可されました。">
+<!ENTITY device.prompt			"プロンプト">
+<!ENTITY device.promptTooltip		"この許可設定はこの種類のアプリのユーザプロンプトに必要です。">
+<!ENTITY device.deny			"拒否">
+<!ENTITY device.denyTooltip		"この許可設定はこの種類のアプリについて拒否されました。">
+<!ENTITY device.installedApps		"インストールされたアプリ">
+<!ENTITY device.installedAppsTooltip	"端末にインストールされたアプリのリストを表示します。認証済みアプリなど、一部のアプリはこのリストから除外されています。">
+<!ENTITY device.permissions		"許可設定">
+<!ENTITY device.permissionsTooltip	"異なるアプリの種類にアクセス可能な許可設定の表を表示します。">
+<!ENTITY device.permissionsHelpLink	"https://developer.mozilla.org/docs/Web/Apps/App_permissions">
+<!ENTITY device.help			"ヘルプ">
+
+<!ENTITY connection.connectTooltip		"端末に接続します。">
+<!ENTITY connection.disconnect			"切断">
+<!ENTITY connection.disconnectTooltip		"現在の端末またはシミュレータから切断します。">
+<!ENTITY connection.notConnected2		"接続されていません。">
+<!ENTITY connection.connectTo			"接続先:">
+<!ENTITY connection.noDeviceFound		"端末が見つかりません。端末を接続してください">
+<!ENTITY connection.changeHostAndPort		"変更">
+<!ENTITY connection.changeHostAndPortTooltip	"端末と接続するホスト名とポート番号を変更します。 (デフォルト値 localhost:6000)">
+<!ENTITY connection.startSimulator		"シミュレータを起動">
+<!ENTITY connection.startSimulatorTooltip	"シミュレータのインスタンスを起動して接続します。">
+<!ENTITY connection.saveConnectionInfo		"保存">
+<!ENTITY connection.saveConnectionInfoTooltip	"ホスト名とポート番号を保存します。">
+<!ENTITY connection.connecting			"接続中...">
+<!ENTITY connection.disconnecting		"切断中...">
+<!ENTITY connection.cancel			"キャンセル">
+<!ENTITY connection.cancelConnectTooltip	"接続中の手続きをキャンセルします。">
+<!ENTITY connection.cancelShowSimulatorTooltip	"シミュレータの接続モードを終了して初期プロンプトに戻ります。">
+<!ENTITY connection.or				"または">
+<!ENTITY connection.noSimulatorInstalled	"シミュレータがインストールされていません。">
+<!ENTITY connection.installOneSimulator		"シミュレータをインストール">
+<!ENTITY connection.installOneSimulatorTooltip	"関連するアドオンをダウンロードしてシミュレータをインストールします。">
+<!ENTITY connection.installAnotherSimulator	"追加">
+<!ENTITY connection.installAnotherSimulatorTooltip	"関連するアドオンをダウンロードして追加のシミュレータをインストールします。">
+
+<!ENTITY projects.localApps			"ローカルアプリ">
+<!ENTITY projects.addApp			"追加">
+<!ENTITY projects.addPackaged			"パッケージアプリを追加">
+<!ENTITY projects.addPackagedTooltip		"新しいパッケージアプリ (アプリのディレクトリ) をコンピュータから追加します。">
+<!ENTITY projects.addHosted			"ホストされたアプリを追加">
+<!ENTITY projects.addHostedTooltip		"新しいホストされたアプリ (manifest.webapp ファイルへのリンク) をリモートの Web サイトから追加します。">
+<!ENTITY projects.title				"ローカルアプリ">
+<!ENTITY projects.appDetails			"アプリの詳細">
+<!ENTITY projects.removeAppFromList		"このアプリを作業中のアプリのリストから削除します。この操作は端末やシミュレータからは削除しません。">
+<!ENTITY projects.updateApp			"更新">
+<!ENTITY projects.updateAppTooltip		"検証チェックを実行して接続された端末のアプリを更新します">
+<!ENTITY projects.debugApp			"デバッグ">
+<!ENTITY projects.debugAppTooltip		"このアプリに接続された開発ツールを開きます">
+<!ENTITY projects.hostedManifestPlaceHolder2	"http://example.com/app/manifest.webapp">
+<!ENTITY projects.noProjects			"プロジェクトがありません。以下の新しいパッケージアプリ (ローカルディレクトリ) またはホストされたアプリ (manifest ファイルへのリンク) を追加してください。">
+
+<!ENTITY help.title				"アプリマネージャ">
+<!ENTITY help.close				"閉じる">
+<!ENTITY help.intro				"このツールは、互換端末 (Firefox OS) 上の Web アプリのビルドとインストールを助けます。<strong>アプリ</strong> タブでは、アプリの検証プロセスとインストールプロセスを支援します。<strong>端末</strong> タブでは、接続された端末についての情報を提供します。下部のツールバーを使用して端末に接続するかシミュレータを起動してください。">
+<!ENTITY help.usefullLinks			"役立つリンク:">
+<!ENTITY help.appMgrDoc				"ドキュメンテーション: アプリマネージャの使い方">
+<!ENTITY help.configuringDevice			"Firefox OS 端末のセットアップ方法">
+<!ENTITY help.troubleShooting			"トラブルシューティング">
+<!ENTITY help.simulatorAddon			"シミュレータアドオンをインストールする">
+<!ENTITY help.adbHelperAddon			"Adb Helper アドオンをインストールする">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/app-manager.properties
@@ -0,0 +1,35 @@
+# 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 (device.deviceSize): %1$S is the device's width, %2$S is
+# the device's height, %3$S is the device's pixel density.
+# Example: 800x480 (86 DPI).
+device.deviceSize			=端末の画面サイズ: %1$Sx%2$S (%3$S DPI)
+# LOCALIZATION NOTE (connection.connectedToDevice, connection.connectTo):
+# %1$S is the host name, %2$S is the port number.
+connection.connectedToDevice		=%1$S に接続
+connection.connectTo			=%1$S:%2$S に接続
+project.filePickerTitle			=webapp フォルダの選択
+project.installing			=インストール中...
+project.installed			=インストール完了!
+validator.nonExistingFolder		=プロジェクトフォルダが存在しません
+validator.expectProjectFolder		=The project folder ends up being a file
+validator.wrongManifestFileName		=パッケージアプリは、プロジェクトのルートフォルダに 'manifest.webapp' という名前の manifest ファイルが必要です
+validator.invalidManifestURL		=不正な manifest URL '%S'
+# LOCALIZATION NOTE (validator.invalidManifestJSON, validator.noAccessManifestURL):
+# %1$S is the error message, %2$S is the URI of the manifest.
+validator.invalidManifestJSON		=webapp manifest の JSON ファイルが不正です: %1$S URI: %2$S
+validator.noAccessManifestURL		=manifest ファイルが読めません: %1$S URI: %2$S
+# LOCALIZATION NOTE (validator.invalidHostedManifestURL): %1$S is the URI of
+# the manifest, %2$S is the error message.
+validator.invalidHostedManifestURL	=ホストされた不正な manifest URL '%1$S': %2$S
+validator.invalidProjectType		=未知のプロジェクト形式 '%S'
+# LOCALIZATION NOTE (validator.missNameManifestProperty, validator.missIconsManifestProperty):
+# don't translate 'icons' and 'name'.
+validator.missNameManifestProperty	=Manifest に必須の 'name' 項目が足りません。
+validator.missIconsManifestProperty	=Manifest に 'icons' 項目が足りません。
+validator.missIconMarketplace		=Marketplace に投稿するアプリは 128px 以上のサイズのアイコンが必要です
+validator.invalidAppType		=未知のアプリ形式: '%S'.
+validator.invalidHostedPriviledges	=ホストされたアプリは '%S' の形式にできません
+validator.noCertifiedSupport		='certified' アプリはまだアプリマネージャで完全にサポートされていません。
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/appcacheutils.properties
@@ -0,0 +1,123 @@
+# 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 Web Console
+# command line which is available from the Web Developer sub-menu
+# -> 'Web Console'.
+# These messages are displayed when an attempt is made to validate a
+# page or a cache manifest using AppCacheUtils.jsm
+
+# 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 (noManifest): the specified page has no cache manifest.
+noManifest			= 指定のページはマニフェストがありません。
+
+# LOCALIZATION NOTE (notUTF8): the associated cache manifest has a character
+# encoding that is not UTF-8. Parameters: %S is the current encoding.
+notUTF8				= マニフェストの文字エンコーディングが %S になっています。UTF-8 であるべきです。
+
+# LOCALIZATION NOTE (badMimeType): the associated cache manifest has a
+# mimetype that is not text/cache-manifest. Parameters: %S is the current
+# mimetype.
+badMimeType			= マニフェストの MIME タイプが %S になっています。text/cache-manifest であるべきです。
+
+# LOCALIZATION NOTE (duplicateURI): the associated cache manifest references
+# the same URI from multiple locations. Parameters: %1$S is the URI, %2$S is a
+# list of references to this URI.
+duplicateURI			= URI %1$S が複数の場所から参照されています。許可されていません: %2$S
+
+# LOCALIZATION NOTE (networkBlocksURI, fallbackBlocksURI): the associated
+# cache manifest references the same URI in the NETWORK (or FALLBACK) section
+# as it does in other sections. Parameters: %1$S is the line number, %2$S is
+# the resource name, %3$S is the line number, %4$S is the resource name, %5$S
+# is the section name.
+networkBlocksURI		= %3$S 行目 (%4$S) の %5$S セクションは %1$S 行目 (%2$S) の NETWORK セクションによりキャッシュされませんでした。
+fallbackBlocksURI		= %3$S 行目 (%4$S) の %5$S セクションは %1$S 行目 (%2$S) の FALLBACK セクションによりキャッシュされませんでした。
+
+# LOCALIZATION NOTE (fileChangedButNotManifest): the associated cache manifest
+# references a URI that has a file modified after the cache manifest.
+# Parameters: %1$S is the resource name, %2$S is the cache manifest, %3$S is
+# the line number.
+fileChangedButNotManifest	= ファイル %1$S は %2$S 以降に更新されました。マニフェスト内のテキストが変更されない限り、キャッシュされたバージョンは %3$S 行目が使用されます。
+
+# LOCALIZATION NOTE (cacheControlNoStore): the specified page has a header
+# preventing caching or storing information. Parameters: %1$S is the resource
+# name, %2$S is the line number.
+cacheControlNoStore		= %1$S のキャッシュコントロールは no-store が設定されています。%2$S 行目のファイルの保存からはアプリケーションキャッシュが抑制されます。
+
+# LOCALIZATION NOTE (notAvailable): the specified resource is not available.
+# Parameters: %1$S is the resource name, %2$S is the line number.
+notAvailable			= %1$S 点のリソースが使用できません: 行 %2$S
+
+# LOCALIZATION NOTE (invalidURI): it's used when an invalid URI is passed to
+# the appcache.
+invalidURI			= AppCacheUtils に渡された URI は無効です。
+
+# LOCALIZATION NOTE (noResults): it's used when a search returns no results.
+noResults			= 検索結果はありません。
+
+# LOCALIZATION NOTE (cacheDisabled): it's used when the cache is disabled and
+# an attempt is made to view offline data.
+cacheDisabled			= ディスクキャッシュが無効になっています。about:config で browser.cache.disk.enable を true に設定してから試してください。
+
+# LOCALIZATION NOTE (firstLineMustBeCacheManifest): the associated cache
+# manifest has a first line that is not "CACHE MANIFEST". Parameters: %S is
+# the line number.
+firstLineMustBeCacheManifest	= マニフェストの最初の行は "CACHE MANIFEST" であるべきです: 行 %S
+
+# LOCALIZATION NOTE (cacheManifestOnlyFirstLine2): the associated cache
+# manifest has "CACHE MANIFEST" on a line other than the first line.
+# Parameters: %S is the line number where "CACHE MANIFEST" appears.
+cacheManifestOnlyFirstLine2	= "CACHE MANIFEST" は最初の行のみにあるべきですが、%S 行目にあります。
+
+# LOCALIZATION NOTE (asteriskInWrongSection2): the associated cache manifest
+# has an asterisk (*) in a section other than the NETWORK section. Parameters:
+# %1$S is the section name, %2$S is the line number.
+asteriskInWrongSection2		= %2$S 行目の %1$S セクションでアスタリスク (*) が使われています。NETWORK セクションにアスタリスク 1 文字のみの行がある場合、マニフェストに列挙されていない任意の URI は、NETWORK セクションに列挙されているものとして扱われます。そうでない場合は、任意の URI は使用不可として扱われます。アスタリスク (*) 以外の文字は使えません。
+
+# LOCALIZATION NOTE (escapeSpaces): the associated cache manifest has a space
+# in a URI. Spaces must be replaced with %20. Parameters: %S is the line
+# number where this error occurs.
+escapeSpaces			= URI 内のスペースは %20 で置き換えられるべきです: 行 %S
+
+# LOCALIZATION NOTE (slashDotDotSlashBad): the associated cache manifest has a
+# URI containing /../, which is invalid. Parameters: %S is the line number
+# where this error occurs.
+slashDotDotSlashBad		= /../ は URL の先頭として正しくありません: 行 %S
+
+# LOCALIZATION NOTE (tooManyDotDotSlashes): the associated cache manifest has
+# a URI containing too many ../ operators. Too many of these operators mean
+# that the file would be below the root of the site, which is not possible.
+# Parameters: %S is the line number where this error occurs.
+tooManyDotDotSlashes		= ドット ドット スラッシュ (../) が多すぎます: 行 %S
+
+# LOCALIZATION NOTE (fallbackUseSpaces): the associated cache manifest has a
+# FALLBACK section containing more or less than the standard two URIs
+# separated by a single space. Parameters: %S is the line number where this
+# error occurs.
+fallbackUseSpaces		= FALLBACK セクションでは URL はスペース区切りで2つだけです: 行 %S
+
+# LOCALIZATION NOTE (fallbackAsterisk2): the associated cache manifest has a
+# FALLBACK section that attempts to use an asterisk (*) as a wildcard. In this
+# section the URI is simply a path prefix. Parameters: %S is the line number
+# where this error occurs.
+fallbackAsterisk2		= FALLBACK セクションではアスタリスク (*) は使えません。FALLBACK セクションでの URI は単純に要求 URI の先頭にマッチする必要があります: 行 %S
+
+# LOCALIZATION NOTE (settingsBadValue): the associated cache manifest has a
+# SETTINGS section containing something other than the valid "prefer-online"
+# or "fast". Parameters: %S is the line number where this error occurs.
+settingsBadValue		= SETTINGS セクションは "prefer-online" と "fast" のどちらかのみです: 行 %S
+
+# LOCALIZATION NOTE (invalidSectionName): the associated cache manifest
+# contains an invalid section name. Parameters: %1$S is the section name, %2$S
+# is the line number.
+invalidSectionName		= 名前 (%1$S) が正しくありません: 行 %2$S
+
+# LOCALIZATION NOTE (entryNotFound): the requested cache entry that does not
+# exist.
+entryNotFound			= エントリが見つかりません。
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -6,140 +6,144 @@
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
-<!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
-  -  application menu item that opens the debugger UI. -->
-<!ENTITY debuggerMenu.label2		"デバッガ">
-
-<!-- LOCALIZATION NOTE (debuggerMenu.accesskey): This is accesskey for the
-  -  Tools menu entry of Debugger that opens the debugger UI. -->
-<!ENTITY debuggerMenu.accesskey		"D">
-
-<!-- LOCALIZATION NOTE (remoteDebuggerMenu.label): This is the label for the
-  -  application menu item that opens the remote debugger UI. -->
-<!ENTITY remoteDebuggerMenu.label	"リモートデバッガ">
-
-<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
-  -  application menu item that opens the browser debugger UI. -->
-<!ENTITY chromeDebuggerMenu.label	"ブラウザデバッガ">
-
-<!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
-  -  launches the debugger UI. Do not translate this one! -->
-<!ENTITY debuggerMenu.commandkey	"S">
-
 <!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
   -  the button that closes the debugger UI. -->
 <!ENTITY debuggerUI.closeButton.tooltip	"閉じる">
 
 <!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the debugger UI. -->
 <!ENTITY debuggerUI.panesButton.tooltip	"左右のウインドウを切り替え">
 
+<!-- LOCALIZATION NOTE (debuggerUI.blackBoxMessage.label): This is the message
+  - displayed to users when they select a black boxed source from the sources
+  - list in the debugger. -->
+<!ENTITY debuggerUI.blackBoxMessage.label		"このソースはブラックボックス化されています。ブレークポイントは無効化されます。また、ステッピングはすべて通過します。">
+
+<!-- LOCALIZATION NOTE (debuggerUI.blackBoxMessage.unBlackBoxButton): This is
+  - the text displayed in the button to stop black boxing the currently selected
+  - source. -->
+<!ENTITY debuggerUI.blackBoxMessage.unBlackBoxButton	"このソースのブラックボックスを解除">
+
 <!-- LOCALIZATION NOTE (debuggerUI.optsButton.tooltip): This is the tooltip for
   -  the button that opens up an options context menu for the debugger UI. -->
-<!ENTITY debuggerUI.optsButton.tooltip	"デバッガオプション">
+<!ENTITY debuggerUI.optsButton.tooltip  "デバッガオプション">
 
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
-<!ENTITY debuggerUI.pauseExceptions	"例外発生で停止">
-<!ENTITY debuggerUI.pauseExceptions.key	"E">
+<!ENTITY debuggerUI.pauseExceptions     "例外発生で停止">
+<!ENTITY debuggerUI.pauseExceptions.key "E">
+
+<!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
+  -  checkbox that toggles ignoring caught exceptions. -->
+<!ENTITY debuggerUI.ignoreCaughtExceptions     "キャッチした例外を無視">
+<!ENTITY debuggerUI.ignoreCaughtExceptions.key "C">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showPanesOnInit): This is the label for the
   -  checkbox that toggles visibility of panes when opening the debugger. -->
-<!ENTITY debuggerUI.showPanesOnInit	"起動時にデバッガを開く">
-<!ENTITY debuggerUI.showPanesOnInit.key	"S">
+<!ENTITY debuggerUI.showPanesOnInit     "起動時にデバッガを開く">
+<!ENTITY debuggerUI.showPanesOnInit.key "S">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showVarsFilter): This is the label for the
   -  checkbox that toggles visibility of a designated variables filter box. -->
-<!ENTITY debuggerUI.showVarsFilter	"変数フィルタボックスを表示">
-<!ENTITY debuggerUI.showVarsFilter.key	"V">
+<!ENTITY debuggerUI.showVarsFilter      "変数フィルタボックスを表示">
+<!ENTITY debuggerUI.showVarsFilter.key  "V">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showOnlyEnum): This is the label for the
   -  checkbox that toggles visibility of hidden (non-enumerable) variables and
   -  properties in stack views. The "enumerable" flag is a state of a property
   -  defined in JavaScript. When in doubt, leave untranslated. -->
-<!ENTITY debuggerUI.showOnlyEnum	"計算可能なプロパティのみ表示">
-<!ENTITY debuggerUI.showOnlyEnum.key	"P">
+<!ENTITY debuggerUI.showOnlyEnum        "計算可能なプロパティのみ表示">
+<!ENTITY debuggerUI.showOnlyEnum.key    "P">
 
-<!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
-  -  appears in the filter panel popup as a description. -->
-<!ENTITY debuggerUI.searchPanelTitle	"検索演算子">
+<!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
+  -  the checkbox that toggles the display of original or sourcemap-derived
+  -  sources. -->
+<!ENTITY debuggerUI.showOriginalSource      "元のソースを表示">
+<!ENTITY debuggerUI.showOriginalSource.key  "O">
+
+<!-- LOCALIZATION NOTE (debuggerUI.searchPanelOperators): This is the text that
+  -  appears in the filter panel popup as a header for the operators part. -->
+<!ENTITY debuggerUI.searchPanelOperators    "検索演算子:">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
-<!ENTITY debuggerUI.searchFile		"スクリプトをフィルタ">
-<!ENTITY debuggerUI.searchFile.key	"P">
-<!ENTITY debuggerUI.searchFile.altkey	"O">
+<!ENTITY debuggerUI.searchFile          "スクリプトをフィルタ">
+<!ENTITY debuggerUI.searchFile.key      "P">
+<!ENTITY debuggerUI.searchFile.altkey   "O">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
   -  in the source editor's context menu for the global search operation. -->
-<!ENTITY debuggerUI.searchGlobal	"すべてのファイルを検索">
-<!ENTITY debuggerUI.searchGlobal.key	"F">
+<!ENTITY debuggerUI.searchGlobal        "すべてのファイルを検索">
+<!ENTITY debuggerUI.searchGlobal.key    "F">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchFunction): This is the text that appears
   -  in the source editor's context menu for the function search operation. -->
-<!ENTITY debuggerUI.searchFunction	"関数定義を検索">
-<!ENTITY debuggerUI.searchFunction.key	"D">
-<!ENTITY debuggerUI.searchFunction.altkey	"O">
+<!ENTITY debuggerUI.searchFunction      "関数定義を検索">
+<!ENTITY debuggerUI.searchFunction.key  "D">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchToken): This is the text that appears
   -  in the source editor's context menu for the token search operation. -->
-<!ENTITY debuggerUI.searchToken		"検索">
-<!ENTITY debuggerUI.searchToken.key	"F">
+<!ENTITY debuggerUI.searchToken         "検索">
+<!ENTITY debuggerUI.searchToken.key     "F">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
-<!ENTITY debuggerUI.searchLine		"指定行へ移動...">
-<!ENTITY debuggerUI.searchLine.key	"J">
+<!ENTITY debuggerUI.searchGoToLine      "指定行へ移動...">
+<!ENTITY debuggerUI.searchGoToLine.key  "L">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchVariable): This is the text that appears
   -  in the source editor's context menu for the variables search operation. -->
-<!ENTITY debuggerUI.searchVariable	"変数をフィルタ">
-<!ENTITY debuggerUI.searchVariable.key	"V">
+<!ENTITY debuggerUI.searchVariable      "変数をフィルタ">
+<!ENTITY debuggerUI.searchVariable.key  "V">
 
 <!-- LOCALIZATION NOTE (debuggerUI.focusVariables): This is the text that appears
   -  in the source editor's context menu for the variables focus operation. -->
-<!ENTITY debuggerUI.focusVariables	"変数ツリーへ">
-<!ENTITY debuggerUI.focusVariables.key	"V">
+<!ENTITY debuggerUI.focusVariables      "変数ツリーへ">
+<!ENTITY debuggerUI.focusVariables.key  "V">
 
 <!-- LOCALIZATION NOTE (debuggerUI.condBreakPanelTitle): This is the text that
   -  appears in the conditional breakpoint panel popup as a description. -->
-<!ENTITY debuggerUI.condBreakPanelTitle	"以下の式が true のときに、このブレークポイントで停止します">
+<!ENTITY debuggerUI.condBreakPanelTitle "以下の式が true のときに、このブレークポイントで停止します">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuBreak): This is the text that
   -  appears in the source editor context menu for adding a breakpoint. -->
-<!ENTITY debuggerUI.seMenuBreak		"ブレークポイントを設置">
-<!ENTITY debuggerUI.seMenuBreak.key	"B">
+<!ENTITY debuggerUI.seMenuBreak         "ブレークポイントを設置">
+<!ENTITY debuggerUI.seMenuBreak.key     "B">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuCondBreak): This is the text that
   -  appears in the source editor context menu for adding a conditional
   -  breakpoint. -->
-<!ENTITY debuggerUI.seMenuCondBreak	"条件付きブレークポイントを設置">
-<!ENTITY debuggerUI.seMenuCondBreak.key	"B">
+<!ENTITY debuggerUI.seMenuCondBreak     "条件付きブレークポイントを設置">
+<!ENTITY debuggerUI.seMenuCondBreak.key "B">
 
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuAddWatch): This is the text that
   -  appears in the source editor context menu for adding an expression. -->
-<!ENTITY debuggerUI.seMenuAddWatch	"選択範囲をウォッチ式へ">
-<!ENTITY debuggerUI.seMenuAddWatch.key	"E">
+<!ENTITY debuggerUI.seMenuAddWatch      "選択範囲をウォッチ式へ">
+<!ENTITY debuggerUI.seMenuAddWatch.key  "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.addWatch): This is the text that
   -  appears in the watch expressions context menu for adding an expression. -->
-<!ENTITY debuggerUI.addWatch		"ウォッチ式を追加">
-<!ENTITY debuggerUI.addWatch.key	"E">
+<!ENTITY debuggerUI.addWatch            "ウォッチ式を追加">
+<!ENTITY debuggerUI.addWatch.key        "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.removeWatch): This is the text that
   -  appears in the watch expressions context menu for removing all expressions. -->
-<!ENTITY debuggerUI.removeAllWatch	"すべてのウォッチ式を削除">
-<!ENTITY debuggerUI.removeAllWatch.key	"E">
+<!ENTITY debuggerUI.removeAllWatch      "すべてのウォッチ式を削除">
+<!ENTITY debuggerUI.removeAllWatch.key  "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.stepping): These are the keycodes that
   -  control the stepping commands in the debugger (continue, step over,
   -  step in and step out). -->
-<!ENTITY debuggerUI.stepping.resume	"VK_F6">
-<!ENTITY debuggerUI.stepping.stepOver	"VK_F7">
-<!ENTITY debuggerUI.stepping.stepIn	"VK_F8">
-<!ENTITY debuggerUI.stepping.stepOut	"VK_F8">
+<!ENTITY debuggerUI.stepping.resume1    "VK_F8">
+<!ENTITY debuggerUI.stepping.resume2    "VK_SLASH">
+<!ENTITY debuggerUI.stepping.stepOver1  "VK_F10">
+<!ENTITY debuggerUI.stepping.stepOver2  "VK_QUOTE">
+<!ENTITY debuggerUI.stepping.stepIn1    "VK_F11">
+<!ENTITY debuggerUI.stepping.stepIn2    "VK_SEMICOLON">
+<!ENTITY debuggerUI.stepping.stepOut1   "VK_F11">
+<!ENTITY debuggerUI.stepping.stepOut2   "VK_SEMICOLON">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -5,76 +5,46 @@
 # LOCALIZATION NOTE These strings are used inside the Debugger
 # which is available from the Web Developer sub-menu -> 'Debugger'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-# LOCALIZATION NOTE (confirmTabSwitch): The messages displayed for all the
-# title and buttons on the notification shown when a user attempts to open a
-# debugger in a new tab while a different tab is already being debugged.
-confirmTabSwitch.message		= ほかのタブですでにデバッガを開いています。このまま続けると、ほかのタブのデバッガを閉じます。
-confirmTabSwitch.buttonSwitch		= デバッグ中のタブに移動
-confirmTabSwitch.buttonSwitch.accessKey	= S
-confirmTabSwitch.buttonOpen		= とにかく開く
-confirmTabSwitch.buttonOpen.accessKey	= O
-
-# LOCALIZATION NOTE (open.commandkey): The key used to open the debugger in
-# combination to e.g. ctrl + shift
-open.commandkey				= S
-
-# LOCALIZATION NOTE (debuggerMenu.accesskey): The access key used to open the
-# debugger.
-debuggerMenu.accesskey			= D
-
-# LOCALIZATION NOTE (chromeDebuggerWindowTitle): The title displayed for the
-# chrome (browser) debugger window.
-chromeDebuggerWindowTitle		= ブラウザデバッガ
+# LOCALIZATION NOTE (ToolboxDebugger.label):
+# This string is displayed in the title of the tab when the debugger is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxDebugger.label			= デバッガ
 
-# LOCALIZATION NOTE (remoteDebuggerWindowTitle): The title displayed for the
-# remote debugger window.
-remoteDebuggerWindowTitle		= リモートデバッガ
-
-# LOCALIZATION NOTE (remoteDebuggerPromptTitle): The title displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerPromptTitle		= リモート接続
-
-# LOCALIZATION NOTE (remoteDebuggerPromptMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerPromptMessage		= ホスト名とポート番号を入力してください (ホスト:ポート)
+# LOCALIZATION NOTE (ToolboxDebugger.tooltip):
+# This string is displayed in the tooltip of the tab when the debugger is
+# displayed inside the developer tools window..
+ToolboxDebugger.tooltip			= JavaScript デバッガ
 
-# LOCALIZATION NOTE (remoteDebuggerPromptCheck): The message displayed on the
-# debugger prompt asking if the prompt should be shown again next time.
-remoteDebuggerPromptCheck		= 次回からは確認しない
-
-# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerReconnectMessage		= サーバが見つかりません。やり直しますか? (ホスト:ポート)
-
-# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerConnectionFailedMessage	= 指定されたホスト名とポート番号では、サーバを見つけられませんでした。
+# LOCALIZATION NOTE (debuggerMenu.commandkey, debuggerMenu.accesskey)
+# Used for the menuitem in the tool menu
+debuggerMenu.commandkey			= S
+debuggerMenu.accesskey			= D
 
 # LOCALIZATION NOTE (collapsePanes): This is the tooltip for the button
 # that collapses the left and right panes in the debugger UI.
 collapsePanes				= 左右のウインドウを非表示
 
 # LOCALIZATION NOTE (expandPanes): This is the tooltip for the button
 # that expands the left and right panes in the debugger UI.
 expandPanes				= 左右のウインドウを表示
 
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
-pauseButtonTooltip			= クリックすると停止
+pauseButtonTooltip			= クリックすると停止 (%S)
 
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
-resumeButtonTooltip			= クリックすると復帰
+resumeButtonTooltip			= クリックすると復帰 (%S)
 
 # LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the
 # button that steps over a function call.
 stepOverTooltip				= ステップオーバー (%S)
 
 # LOCALIZATION NOTE (stepInTooltip): The label that is displayed on the
 # button that steps into a function call.
 stepInTooltip				= ステップイン (%S)
@@ -82,60 +52,61 @@ stepInTooltip				= ステップイン (%S)
 # LOCALIZATION NOTE (stepOutTooltip): The label that is displayed on the
 # button that steps out of a function call.
 stepOutTooltip				= ステップアウト (%S)
 
 # LOCALIZATION NOTE (emptyGlobalsText): The text to display in the menulist
 # when there are no chrome globals available.
 noGlobalsText				= グローバル変数はありません
 
-# LOCALIZATION NOTE (noMatchingGlobalsText): The text to display in the
-# menulist when there are no matching chrome globals after filtering.
-noMatchingGlobalsText			= 一致するグローバル変数がありません
-
 # LOCALIZATION NOTE (noSourcesText): The text to display in the sources menu
 # when there are no scripts.
 noSourcesText				= このページにソースはありません。
 
-# LOCALIZATION NOTE (noMatchingSourcesText): The text to display in the
-# sources menu when there are no matching scripts after filtering.
-noMatchingSourcesText			= 一致するソースはありません。
+# LOCALIZATION NOTE (blackBoxCheckboxTooltip) = The tooltip text to display when
+# the user hovers over the checkbox used to toggle black boxing its associated
+# source.
+blackBoxCheckboxTooltip			= ブラックボックス化を切り替え
 
 # LOCALIZATION NOTE (noMatchingStringsText): The text to display in the
 # global search results when there are no matching strings after filtering.
 noMatchingStringsText			= 一致する文字列はありません
 
-# LOCALIZATION NOTE (emptyFilterText): This is the text that appears in the
+# LOCALIZATION NOTE (emptySearchText): This is the text that appears in the
 # filter text box when it is empty and the scripts container is selected.
-emptyFilterText				= ファイル名を検索 (%S)
+emptySearchText				= ファイル名を検索 (%S)
 
 # LOCALIZATION NOTE (emptyChromeGlobalsFilterText): This is the text that
 # appears in the filter text box when it is empty and the chrome globals
 # container is selected.
 emptyChromeGlobalsFilterText		= ブラウザコンテキストを検索 (%S)
 
 # LOCALIZATION NOTE (emptyVariablesFilterText): This is the text that
 # appears in the filter text box for the variables view container.
 emptyVariablesFilterText		= 変数を検索
 
+# LOCALIZATION NOTE (searchPanelFilter): This is the text that appears in the
+# filter panel popup for the filter scripts operation.
+searchPanelFilter			= スクリプトを検索 (%S)
+
 # LOCALIZATION NOTE (searchPanelGlobal): This is the text that appears in the
 # filter panel popup for the global search operation.
 searchPanelGlobal			= すべてのファイルを検索 (%S)
 
 # LOCALIZATION NOTE (searchPanelFunction): This is the text that appears in the
 # filter panel popup for the function search operation.
 searchPanelFunction			= 関数定義を検索 (%S)
 
 # LOCALIZATION NOTE (searchPanelToken): This is the text that appears in the
 # filter panel popup for the token search operation.
 searchPanelToken			= このファイルを検索 (%S)
 
-# LOCALIZATION NOTE (searchPanelLine): This is the text that appears in the
+# LOCALIZATION NOTE (searchPanelGoToLine): This is the text that appears in the
 # filter panel popup for the line search operation.
-searchPanelLine				= 指定行へ移動 (%S)
+searchPanelGoToLine			= 指定行へ移動 (%S)
 
 # LOCALIZATION NOTE (searchPanelVariable): This is the text that appears in the
 # filter panel popup for the variables search operation.
 searchPanelVariable			= 変数を検索 (%S)
 
 # LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
 breakpointMenuItem.setConditional	= 条件付きブレークポイントを設定する
@@ -149,16 +120,20 @@ breakpointMenuItem.enableAll		= すべてのブレークポイントを有効にする
 breakpointMenuItem.disableAll		= すべてのブレークポイントを無効にする
 breakpointMenuItem.deleteAll		= すべてのブレークポイントを取り除く
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the loading process has started but there is no file to display
 # yet.
 loadingText				= ロード中...
 
+# LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
+# viewer when there is an error loading a file
+errorLoadingText			= ソースのロードに失敗しました :\n
+
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the watch
 # expressions list to add a new item.
 addWatchExpressionText			= ウォッチ式を追加
 
 # LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
 # variables pane when there are no variables to display.
 emptyVariablesText			= 表示できる変数はありません
 
@@ -172,26 +147,16 @@ scopeLabel				= %S スコープ
 # the watch expressions scope.
 watchExpressionsScopeLabel		= ウォッチ式
 
 # LOCALIZATION NOTE (globalScopeLabel): The name of the global scope. This text
 # is added to scopeLabel and displayed in the variables pane as a header for
 # the global scope.
 globalScopeLabel			= グローバル
 
-# LOCALIZATION NOTE (ToolboxDebugger.label):
-# This string is displayed in the title of the tab when the debugger is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxDebugger.label			= デバッガ
-
-# LOCALIZATION NOTE (ToolboxDebugger.tooltip):
-# This string is displayed in the tooltip of the tab when the debugger is
-# displayed inside the developer tools window..
-ToolboxDebugger.tooltip			= JavaScript デバッガ
-
 # LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
 # in the variables list on an item with an editable name.
 variablesEditableNameTooltip		= ダブルクリックすると編集
 
 # LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
 # in the variables list on an item with an editable value.
 variablesEditableValueTooltip		= クリックすると値を変更
 
@@ -210,8 +175,15 @@ variablesSeparatorLabel			= :
 # LOCALIZATION NOTE (watchExpressionsSeparatorLabel): The text that is displayed
 # in the watch expressions list as a separator between the code and evaluation.
 watchExpressionsSeparatorLabel		= \ \u2192
 
 # LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed
 # in the functions search panel as a separator between function's inferred name
 # and its real name (if available).
 functionSearchSeparatorLabel		= \u2190
+
+# LOCALIZATION NOTE (resumptionOrderPanelTitle): This is the text that appears
+# as a description in the notification panel popup, when multiple debuggers are
+# open in separate tabs and the user tries to resume them in the wrong order.
+# The substitution parameter is the URL of the last paused window that must be
+# resumed first.
+resumptionOrderPanelTitle		= ほかのデバッガが停止しています。最後の停止させたデバッガを復帰させてください: %S
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -6,381 +6,328 @@
 # command line which is available from the Web Developer sub-menu
 # -> 'Web Console'.
 # 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 (canonDescNone): Short string used to describe any command
-# or command parameter when no description has been provided.
+# For each command there are in general two strings. As an example consider
+# the 'pref' command.
+# commandDesc (e.g. prefDesc for the command 'pref'): this string contains a
+# very short description of the command. It's designed to be shown in a menu
+# alongside the command name, which is why it should be as short as possible.
+# commandManual (e.g. prefManual for the command 'pref'): this string will
+# contain a fuller description of the command. It's diplayed when the user
+# asks for help about a specific command (e.g. 'help pref').
+
+# LOCALIZATION NOTE: This message is used to describe any command or command
+# parameter when no description has been provided.
 canonDescNone		= (説明はありません)
 
-# LOCALIZATION NOTE (canonDefaultGroupName): The default name for a group of
-# parameters.
+# LOCALIZATION NOTE: The default name for a group of parameters.
 canonDefaultGroupName	= オプション
 
-# LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
-# of JavaScript like traditional developer tool command lines. This describes
-# the '{' command.
+# LOCALIZATION NOTE (canonProxyDesc, canonProxyManual): These commands are
+# used to execute commands on a remote system (using a proxy). Parameters: %S
+# is the name of the remote system.
+canonProxyDesc		= %S でコマンドを実行します
+canonProxyManual	= コマンドのセットはリモートで実行されます。%S を経由します。
+
+# LOCALIZATION NOTE: This error message is displayed when we try to add a new
+# command (using a proxy) where one already exists with the same name.
+canonProxyExists	= '%S' というコマンドはすでに存在します
+
+# LOCALIZATION NOTE: This message describes the '{' command, which allows
+# entry of JavaScript like traditional developer tool command lines.
 cliEvalJavascript	= JavaScript を直接実行します
 
-# LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
-# than the current command can understand this is the error message shown to
-# the user.
+# LOCALIZATION NOTE: This message is displayed when the command line has more
+# arguments than the current command can understand.
 cliUnusedArg		= 引数が多すぎます
 
-# LOCALIZATION NOTE (cliOptions): The title of the dialog which displays the
-# options that are available to the current command.
+# LOCALIZATION NOTE: The title of the dialog which displays the options that
+# are available to the current command.
 cliOptions		= 利用可能なオプション
 
-# LOCALIZATION NOTE (fieldSelectionSelect): When a command has a parameter
-# that has a number of pre-defined options the user interface presents these
-# in a drop-down menu, where the first 'option' is an indicator that a
-# selection should be made. This string describes that first option.
+# LOCALIZATION NOTE: The error message when the user types a command that
+# isn't registered
+cliUnknownCommand	= 無効なコマンド
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that does not exist, but should (e.g. for use with File->Open) %1$S is a
+# filename
+fileErrNotExists	= '%1$S' は存在しません
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a file
+# that exists, but should not (e.g. for use with File->Save As) %1$S is a
+# filename
+fileErrExists		= '%1$S' はすでに存在します
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-file, when a file is needed. %1$S is a filename
+fileErrIsNotFile	= '%1$S' はファイルではありません
+
+# LOCALIZATION NOTE: Error message given when a file argument points to a
+# non-directory, when a directory is needed (e.g. for use with 'cd') %1$S is a
+# filename
+fileErrIsNotDirectory	= '%1$S' はディレクトリではありません
+
+# LOCALIZATION NOTE: Error message given when a file argument does not match
+# the specified regular expression %1$S is a filename %2$S is a regular
+# expression
+fileErrDoesntMatch	= '%1$S' は '%2$S' とマッチしません
+
+# LOCALIZATION NOTE: When a command has a parameter that has a number of
+# pre-defined options the user interface presents these in a drop-down menu,
+# where the first 'option' is an indicator that a selection should be made.
+# This string describes that first option.
 fieldSelectionSelect	= %S を選択...
 
-# LOCALIZATION NOTE (fieldArrayAdd): When a command has a parameter that can
-# be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
-# user interface presents buttons to add and remove arguments. This string is
-# used to add arguments.
+# LOCALIZATION NOTE (fieldArrayAdd, fieldArrayDel): When a command has a
+# parameter that can be repeated multiple times (e.g. like the 'cat a.txt
+# b.txt' command) the user interface presents buttons to add and remove
+# arguments. This string is used to add arguments.
 fieldArrayAdd		= 追加
-
-# LOCALIZATION NOTE (fieldArrayDel): When a command has a parameter that can
-# be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
-# user interface presents buttons to add and remove arguments. This string is
-# used to remove arguments.
 fieldArrayDel		= 削除
 
-# LOCALIZATION NOTE (fieldMenuMore): When the menu has displayed all the
-# matches that it should (i.e. about 10 items) then we display this to alert
-# the user that more matches are available.
+# LOCALIZATION NOTE: When the menu has displayed all the matches that it
+# should (i.e. about 10 items) then we display this to alert the user that
+# more matches are available.
 fieldMenuMore		= 候補があります。タイプを続けてください
 
-# LOCALIZATION NOTE (jstypeParseScope): The command line provides completion
-# for JavaScript commands, however there are times when the scope of what
-# we're completing against can't be used. This error message is displayed when
-# this happens.
+# LOCALIZATION NOTE: The command line provides completion for JavaScript
+# commands, however there are times when the scope of what we're completing
+# against can't be used. This error message is displayed when this happens.
 jstypeParseScope	= スコープを見失いました
 
-# LOCALIZATION NOTE (jstypeParseMissing): When the command line is doing
-# JavaScript completion, sometimes the property to be completed does not
-# exist. This error message is displayed when this happens.
+# LOCALIZATION NOTE (jstypeParseMissing, jstypeBeginSyntax,
+# jstypeBeginUnterm): These error messages are displayed when the command line
+# is doing JavaScript completion and encounters errors.
 jstypeParseMissing	= '%S' プロパティが見つかりません
-
-# LOCALIZATION NOTE (jstypeBeginSyntax): When the command line is doing
-# JavaScript completion using invalid JavaScript, this error message is
-# displayed.
 jstypeBeginSyntax	= 構文エラー
-
-# LOCALIZATION NOTE (jstypeBeginUnterm): When the command line is doing
-# JavaScript completion using a string that is not properly terminated, this
-# error message is displayed.
 jstypeBeginUnterm	= 文字列リテラルが終了していません
 
-# LOCALIZATION NOTE (jstypeParseError): If the system for providing JavaScript
-# completions encounters and error it displays this.
+# LOCALIZATION NOTE: This message is displayed if the system for providing
+# JavaScript completions encounters and error it displays this.
 jstypeParseError	= エラー
 
-# LOCALIZATION NOTE (typesNumberNan): When the command line is passed a
-# number, however the input string is not a valid number, this error message
-# is displayed.
+# LOCALIZATION NOTE (typesNumberNan, typesNumberNotInt2, typesDateNan): These
+# error messages are displayed when the command line is passed a variable
+# which has the wrong format and can't be converted. Parameters: %S is the
+# passed variable.
 typesNumberNan		= "%S" を数値に変換できません。
-
-# LOCALIZATION NOTE (typesNumberMax): When the command line is passed a
-# number, but the number is bigger than the largest allowed number, this error
-# message is displayed.
-typesNumberMax		= %1$S が設定された最大値 %2$S より大きいです。
+typesNumberNotInt2	= "%S" を整数に変換できません。
+typesDateNan		= "%S" を日付に変換できません。
 
-# LOCALIZATION NOTE (typesNumberMin): When the command line is passed a
-# number, but the number is lower than the smallest allowed number, this error
-# message is displayed.
-typesNumberMin		= %1$S が設定された最小値 %2$S より小さいです。
+# LOCALIZATION NOTE (typesNumberMax, typesNumberMin, typesDateMax,
+# typesDateMin): These error messages are displayed when the command line is
+# passed a variable which has a value out of range (number or date).
+# Parameters: %1$S is the passed variable, %2$S is the limit value.
+typesNumberMax		= %1$S は数値型の最大値 %2$S より大きいです。
+typesNumberMin		= %1$S は数値型の最小値 %2$S より小さいです。
+typesDateMax		= %1$S は日付型の最大値 %2$S より大きいです。
+typesDateMin		= %1$S は日付型の最小値 %2$S より小さいです。
 
-# LOCALIZATION NOTE (typesNumberNotInt2): When the command line is passed a
-# number, but the number has a decimal part and floats are not allowed.
-typesNumberNotInt2	= "%S" を整数に変換できません。
-
-# LOCALIZATION NOTE (typesSelectionNomatch): When the command line is passed
-# an option with a limited number of correct values, but the passed value is
-# not one of them, this error message is displayed.
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# passed an option with a limited number of correct values, but the passed
+# value is not one of them.
 typesSelectionNomatch	= '%S' は使用できません。
 
-# LOCALIZATION NOTE (nodeParseSyntax): When the command line is expecting a
-# CSS query string, however the passed string is not valid, this error message
-# is displayed.
+# LOCALIZATION NOTE: This error message is displayed when the command line is
+# expecting a CSS query string, however the passed string is not valid.
 nodeParseSyntax		= CSS クエリの構文エラー
 
-# LOCALIZATION NOTE (nodeParseMultiple): When the command line is expecting a
-# CSS string that matches a single node, but more than one node matches, this
-# error message is displayed.
+# LOCALIZATION NOTE (nodeParseMultiple, nodeParseNone): These error messages
+# are displayed when the command line is expecting a CSS string that matches a
+# single node, but more nodes (or none) match.
 nodeParseMultiple	= 多すぎます (%S)
-
-# LOCALIZATION NOTE (nodeParseNone): When the command line is expecting a CSS
-# string that matches a single node, but no nodes match, this error message is
-# displayed.
 nodeParseNone		= 見つかりません
 
-# LOCALIZATION NOTE (helpDesc): A very short description of the 'help'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See helpManual for a
-# fuller description of what it does.
+# LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
+# These strings describe the "help" command, used to display a description of
+# a command (e.g. "help pref"), and its parameter 'search'.
 helpDesc		= 使用可能なコマンドのヘルプ
-
-# LOCALIZATION NOTE (helpManual): A fuller description of the 'help' command.
-# Displayed when the user asks for help on what it does.
 helpManual		= 特定のコマンド (検索文字列が一致した場合) または使用可能なコマンド (検索文字列がない、または一致するものがない場合) のヘルプを表示します。
-
-# LOCALIZATION NOTE (helpSearchDesc): A very short description of the 'search'
-# parameter to the 'help' command. See helpSearchManual3 for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
 helpSearchDesc		= コマンドを検索する
-
-# LOCALIZATION NOTE (helpSearchManual3): A fuller description of the 'search'
-# parameter to the 'help' command. Displayed when the user asks for help on
-# what it does.
 helpSearchManual3	= コマンドを絞り込む検索文字列を指定します。正規表現は使えません。
 
-# LOCALIZATION NOTE (helpManSynopsis): A heading shown at the top of a help
-# page for a command in the console It labels a summary of the parameters to
-# the command
+# LOCALIZATION NOTE (helpManSynopsis, helpManDescription): These strings are
+# displayed in the help page for a command in the console.
 helpManSynopsis		= 概要
-
-# LOCALIZATION NOTE (helpManDescription): A heading shown in a help page for a
-# command in the console. This heading precedes the top level description.
 helpManDescription	= 詳細
 
-# LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
-# in a help page for a command in the console.
-helpManParameters	= パラメータ
-
-# LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
-# heading in a help page for a command which has no parameters.
+# LOCALIZATION NOTE: This message is displayed in the help page if the command
+# has no parameters.
 helpManNone		= なし
 
-# LOCALIZATION NOTE (helpListAll): The heading shown in response to the 'help'
+# LOCALIZATION NOTE: This message is displayed in response to the 'help'
 # command when used without a filter, just above the list of known commands.
 helpListAll		= 利用可能なコマンド:
 
-# LOCALIZATION NOTE (helpListPrefix): The heading shown in response to the
-# 'help <search>' command (i.e. with a search string), just above the list of
-# matching commands.
+# LOCALIZATION NOTE (helpListPrefix, helpListNone): These messages are
+# displayed in response to the 'help <search>' command (i.e. with a search
+# string), just above the list of matching commands. Parameters: %S is the
+# search string.
 helpListPrefix		= '%1$S' ではじまるコマンド:
-
-# LOCALIZATION NOTE (helpListNone): The heading shown in response to the 'help
-# <search>' command (i.e. with a search string), when there are no matching
-# commands.
 helpListNone		= '%1$S' ではじまるコマンドはありません
 
-# LOCALIZATION NOTE (helpManRequired): When the 'help x' command wants to show
-# the manual for the 'x' command it needs to be able to describe the
-# parameters as either required or optional. See also 'helpManOptional'.
+# LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
+# the 'help x' command wants to show the manual for the 'x' command, it needs
+# to be able to describe the parameters as either required or optional, or if
+# they have a default value.
 helpManRequired		= 必須
+helpManOptional		= 任意
+helpManDefault		= 任意, デフォルト=%1$S
 
-# LOCALIZATION NOTE (helpManOptional): See description of 'helpManRequired'
-helpManOptional		= オプション
-
-# LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
-# 'help' command when the command in question has sub-commands, before a list
-# of the matching sub-commands
+# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
+# when the command in question has sub-commands, before a list of the matching
+# sub-commands.
 subCommands		= サブコマンド
 
-# LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
-# 'help' command when the command in question should have sub-commands but in
-# fact has none
+# LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
+# when the command in question should have sub-commands but in fact has none.
 subCommandsNone		= なし
 
-# LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See prefManual for a
-# fuller description of what it does.
-prefDesc		= 設定に関するコマンド
+# LOCALIZATION NOTE (contextDesc, contextManual, contextPrefixDesc): These
+# strings are used to describe the 'context' command and its 'prefix'
+# parameter. See localization comment for 'connect' for an explanation about
+# 'prefix'.
+contextDesc		= 省略コマンドを設定します
+contextManual		= タイプしなくても入力したと見なせる省略コマンドを設定します。たとえば、'context addon' とすると 'addon list' ではなく 'list' とタイプして実行できます。
+contextPrefixDesc	= 省略するコマンド
 
-# LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
-# Displayed when the user asks for help on what it does.
-prefManual		= GCLI や環境の設定を、表示または変更するコマンドです
+# LOCALIZATION NOTE: This message message displayed during the processing of
+# the 'context' command, when the found command is not a parent command.
+contextNotParentError	= '%1$S' は親コマンドではないため、省略コマンドとして使用できません。
 
-# LOCALIZATION NOTE (prefListDesc): A very short description of the 'pref
-# list' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# prefListManual for a fuller description of what it does.
-prefListDesc		= 利用可能な設定値を表示する
+# LOCALIZATION NOTE (contextReply, contextEmptyReply): These messages are
+# displayed during the processing of the 'context' command, to indicate
+# success or that there is no command prefix.
+contextReply		= 省略コマンドとして %1$S を使用します
+contextEmptyReply	= 省略コマンドを解除しました
 
-# LOCALIZATION NOTE (prefListManual): A fuller description of the 'pref list'
-# command. Displayed when the user asks for help on what it does.
-prefListManual		= 設定値の一覧を表示します。'search' パラメータで検索が可能です
-
-# LOCALIZATION NOTE (prefListSearchDesc): A short description of the 'search'
-# parameter to the 'pref list' command. See prefListSearchManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
-prefListSearchDesc	= 設定値の一覧から検索する
+# LOCALIZATION NOTE (connectDesc, connectManual, connectPrefixDesc,
+# connectPortDesc, connectHostDesc, connectDupReply): These strings describe
+# the 'connect' command and all its available parameters. A 'prefix' is an 
+# alias for the remote server (think of it as a "connection name"), and it
+# allows to identify a specific server when connected to multiple remote
+# servers.
+connectDesc		= サーバにコマンドを中継します
+connectManual		= サーバに接続して、ローカルのバージョンのコマンドをサーバ上に作成します。リモートのコマンドは、ローカルのコマンドと区別できる接頭辞が設定されます (まずは context コマンドを参照してください)
+connectPrefixDesc	= 読み込むされたコマンドの親接頭辞
+connectPortDesc		= 接続を許可する TCP ポート番号
+connectHostDesc		= 接続するホスト名
+connectDupReply		= %S にはすでに接続しています。
 
-# LOCALIZATION NOTE (prefListSearchManual): A fuller description of the
-# 'search' parameter to the 'pref list' command. Displayed when the user asks
-# for help on what it does.
-prefListSearchManual	= 入力された文字列で、利用可能な設定値を検索します
+# LOCALIZATION NOTE: The output of the 'connect' command, telling the user
+# what it has done. Parameters: %S is the prefix command. See localization
+# comment for 'connect' for an explanation about 'prefix'.
+connectReply		= %S コマンドを追加しました。
 
-# LOCALIZATION NOTE (prefShowDesc): A very short description of the 'pref
-# show' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# prefShowManual for a fuller description of what it does.
-prefShowDesc		= 設定を表示
+# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2, disconnectPrefixDesc,
+# disconnectForceDesc): These strings describe the 'disconnect' command and
+# all its available parameters. See localization comment for 'connect' for an
+# explanation about 'prefix'.
+disconnectDesc2		= サーバから切断
+disconnectManual2	= リモートのコマンドを実行するために現在接続しているサーバから切断します
+disconnectPrefixDesc	= 読み込むされたコマンドの親接頭辞
+disconnectForceDesc	= 未完了の要求を無視
+
+# LOCALIZATION NOTE: This is the output of the 'disconnect' command,
+# explaining the user what has been done. Parameters: %S is the number of
+# commands removed.
+disconnectReply		= %S コマンドを削除しました。
 
-# LOCALIZATION NOTE (prefShowManual): A fuller description of the 'pref show'
-# command. Displayed when the user asks for help on what it does.
-prefShowManual		= 指定された設定項目の値を表示します
+# LOCALIZATION NOTE: This error message is displayed when the user attempts to
+# disconnect before all requests have completed. Parameters: %S is a list of
+# incomplete requests.
+disconnectOutstanding	= 未完了の要求 (%1$S)
 
-# LOCALIZATION NOTE (prefShowSettingDesc): A short description of the
-# 'setting' parameter to the 'pref show' command. See prefShowSettingManual
-# for a fuller description of what it does. This string is designed to be
-# shown in a dialog with restricted space, which is why it should be as short
-# as possible.
+# LOCALIZATION NOTE (prefDesc, prefManual, prefListDesc, prefListManual,
+# prefListSearchDesc, prefListSearchManual, prefShowDesc, prefShowManual,
+# prefShowSettingDesc, prefShowSettingManual): These strings describe the
+# 'pref' command and all its available sub-commands and parameters.
+prefDesc		= 設定に関するコマンド
+prefManual		= GCLI や環境の設定を、表示または変更するコマンドです
+prefListDesc		= 利用可能な設定値を表示する
+prefListManual		= 設定値の一覧を表示します。'search' パラメータで検索が可能です
+prefListSearchDesc	= 設定値の一覧から検索する
+prefListSearchManual	= 入力された文字列で、利用可能な設定値を検索します
+prefShowDesc		= 設定を表示
+prefShowManual		= 指定された設定項目の値を表示します
 prefShowSettingDesc	= 表示する設定項目
-
-# LOCALIZATION NOTE (prefShowSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref show' command. Displayed when the user asks
-# for help on what it does.
 prefShowSettingManual	= 表示する設定項目の名前
 
-# LOCALIZATION NOTE (prefShowSettingValue): This is used to show the
-# preference name and the associated preference value. %1$S is replaced with
-# the preference name and %2$S is replaced with the preference value.
+# LOCALIZATION NOTE: This message is used to show the preference name and the
+# associated preference value. Parameters: %1$S is the preference name, %2$S
+# is the preference value.
 prefShowSettingValue	= %1$S: %2$S
 
-# LOCALIZATION NOTE (prefSetDesc): A very short description of the 'pref set'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See prefSetManual for
-# a fuller description of what it does.
+# LOCALIZATION NOTE (prefSetDesc, prefSetManual, prefSetSettingDesc,
+# prefSetSettingManual, prefSetValueDesc, prefSetValueManual): These strings
+# describe the 'pref set' command and all its parameters.
 prefSetDesc		= 設定を変更
-
-# LOCALIZATION NOTE (prefSetManual): A fuller description of the 'pref set'
-# command. Displayed when the user asks for help on what it does.
 prefSetManual		= 環境で定義された設定を変更します
-
-# LOCALIZATION NOTE (prefSetSettingDesc): A short description of the 'setting'
-# parameter to the 'pref set' command. See prefSetSettingManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
 prefSetSettingDesc	= 変更する設定項目
-
-# LOCALIZATION NOTE (prefSetSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref set' command. Displayed when the user asks
-# for help on what it does.
 prefSetSettingManual	= 変更する設定項目の名前
-
-# LOCALIZATION NOTE (prefSetValueDesc): A short description of the 'value'
-# parameter to the 'pref set' command. See prefSetValueManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
 prefSetValueDesc	= 新しい値
-
-# LOCALIZATION NOTE (prefSetValueManual): A fuller description of the 'value'
-# parameter to the 'pref set' command. Displayed when the user asks for help
-# on what it does.
 prefSetValueManual	= 指定された設定項目の新しい値
 
-# LOCALIZATION NOTE (prefSetCheckHeading): Title displayed to the user the
-# first time they try to alter a setting This is displayed directly above
-# prefSetCheckBody and prefSetCheckGo.
+# LOCALIZATION NOTE (prefSetCheckHeading, prefSetCheckBody, prefSetCheckGo):
+# These strings are displayed to the user the first time they try to alter a
+# setting.
 prefSetCheckHeading	= 動作保証対象外になります!
-
-# LOCALIZATION NOTE (prefSetCheckBody): The main text of the warning displayed
-# to the user the first time they try to alter a setting. See also
-# prefSetCheckHeading and prefSetCheckGo.
 prefSetCheckBody	= アプリケーションの高度な設定を変更すると、安定性、セキュリティ、パフォーマンスに深刻な問題を引き起こす恐れがあります。設定変更による影響を完全に理解している場合に限ってご利用ください。
-
-# LOCALIZATION NOTE (prefSetCheckGo): The text to enable preference editing.
-# Displayed in a button directly under prefSetCheckHeading and
-# prefSetCheckBody
 prefSetCheckGo		= 細心の注意を払って使用する
 
-# LOCALIZATION NOTE (prefResetDesc): A very short description of the 'pref
-# reset' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# prefResetManual for a fuller description of what it does.
+# LOCALIZATION NOTE (prefResetDesc, prefResetManual, prefResetSettingDesc,
+# prefResetSettingManual): These strings describe the 'pref reset' command and
+# all its parameters.
 prefResetDesc		= 設定をリセット
-
-# LOCALIZATION NOTE (prefResetManual): A fuller description of the 'pref
-# reset' command. Displayed when the user asks for help on what it does.
 prefResetManual		= 設定項目の値をシステムのデフォルトにリセットします
-
-# LOCALIZATION NOTE (prefResetSettingDesc): A short description of the
-# 'setting' parameter to the 'pref reset' command. See prefResetSettingManual
-# for a fuller description of what it does. This string is designed to be
-# shown in a dialog with restricted space, which is why it should be as short
-# as possible.
 prefResetSettingDesc	= リセットする設定項目
-
-# LOCALIZATION NOTE (prefResetSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref reset' command. Displayed when the user
-# asks for help on what it does.
 prefResetSettingManual	= システムのデフォルトにリセットする設定項目の名前
 
-# LOCALIZATION NOTE (prefOutputFilter): Displayed in the output from the 'pref
+# LOCALIZATION NOTE: This string is displayed in the output from the 'pref
 # list' command as a label to an input element that allows the user to filter
-# the results
+# the results.
 prefOutputFilter	= フィルタ
 
-# LOCALIZATION NOTE (prefOutputName): Displayed in the output from the 'pref
-# list' command as a heading to a table. The column contains the names of the
-# available preferences
+# LOCALIZATION NOTE (prefOutputName, prefOutputValue): These strings are
+# displayed in the output from the 'pref list' command as table headings.
 prefOutputName		= 名前
-
-# LOCALIZATION NOTE (prefOutputValue): Displayed in the output from the 'pref
-# list' command as a heading to a table. The column contains the values of the
-# available preferences
 prefOutputValue		= 値
 
-# LOCALIZATION NOTE (introDesc): A very short description of the 'intro'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See introManual for a
-# fuller description of what it does.
+# LOCALIZATION NOTE (introDesc, introManual): These strings describe the
+# 'intro' command. The localization of 'Got it!' should be the same used in
+# introTextGo.
 introDesc		= 初回メッセージを表示
-
-# LOCALIZATION NOTE (introManual): A fuller description of the 'intro'
-# command. Displayed when the user asks for help on what it does.
 introManual		= 'はじめる!' ボタンがクリックされるまで新しいユーザに表示されていた、初回メッセージを再表示します
 
-# LOCALIZATION NOTE (introTextOpening2): The 'intro text' opens when the user
+# LOCALIZATION NOTE (introTextOpening2, introTextCommands, introTextKeys2,
+# introTextF1Escape, introTextGo): These strings are displayed when the user
 # first opens the developer toolbar to explain the command line, and is shown
-# each time it is opened until the user clicks the 'Got it!' button. This
-# string is the opening paragraph of the intro text.
+# each time it is opened until the user clicks the 'Got it!' button.
 introTextOpening2	= このコマンドラインは開発者向けに設計されました。JavaScript 構文の入力と、単純出力以上の豊富な表示のスピードに注力しています。
-
-# LOCALIZATION NOTE (introTextCommands): For information about the 'intro
-# text' see introTextOpening2. The second paragraph is in 2 sections, the
-# first section points the user to the 'help' command.
 introTextCommands	= コマンド一覧は次のコマンドを入力してください
-
-# LOCALIZATION NOTE (introTextKeys2): For information about the 'intro text'
-# see introTextOpening2. The second section in the second paragraph points the
-# user to the F1/Escape keys which show and hide hints.
 introTextKeys2		= コマンドのヒントを表示または隠すには、次のキーを押してください
-
-# LOCALIZATION NOTE (introTextF1Escape): For information about the 'intro
-# text' see introTextOpening2. This string is used with introTextKeys2, and
-# contains the keys that are pressed to open and close hints.
 introTextF1Escape	= F1/Escape
-
-# LOCALIZATION NOTE (introTextGo): For information about the 'intro text' see
-# introTextOpening2. The text on the button that dismisses the intro text.
 introTextGo		= はじめる!
 
-# LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro'
-# setting. Displayed when the user asks for help on the settings.
+# LOCALIZATION NOTE: This is a short description of the 'hideIntro' setting.
 hideIntroDesc		= 初回メッセージを表示
 
-# LOCALIZATION NOTE (eagerHelperDesc): Short description of the 'eagerHelper'
-# setting. Displayed when the user asks for help on the settings.
+# LOCALIZATION NOTE: This is a description of the 'eagerHelper' setting. It's
+# displayed when the user asks for help on the settings. eagerHelper allows
+# users to select between showing no tooltips, permanent tooltips, and only
+# important tooltips.
 eagerHelperDesc		= ツールチップの表示頻度
 
-# LOCALIZATION NOTE (allowSetDesc): Short description of the 'allowSetDesc'
-# setting. Displayed when the user asks for help on the settings.
+# LOCALIZATION NOTE: This is a short description of the 'allowSetDesc'
+# setting.
 allowSetDesc		= ユーザは 'pref set' コマンドが利用可能になっていますか?
 
-# LOCALIZATION NOTE (introBody): The text displayed at the top of the output
-# for the help command, just before the list of commands. This text is wrapped
-# inside a link to a localized MDN article
+# LOCALIZATION NOTE: This text is displayed at the top of the output for the
+# help command, just before the list of commands. This text is wrapped inside
+# a link to a localized MDN article.
 introBody		= 詳しくは MDN をご覧ください。
-
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -7,189 +7,178 @@
 # -> 'Web Console'.
 #
 # 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 (echoDesc) A very short string used to describe the
-# function of the echo command.
-echoDesc		= メッセージを表示します
-
-# LOCALIZATION NOTE (echoMessageDesc) A very short string used to describe the
-# message parameter to the echo command.
-echoMessageDesc		= メッセージ
-
 # LOCALIZATION NOTE (helpDesc) A very short string used to describe the
 # function of the help command.
 helpDesc		= 使用可能なコマンドのヘルプを表示します
 
 # LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
 # explain the contents of the command help table.
 helpAvailable		= 使用可能なコマンド
 
 # LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
 # function of the console command.
 consoleDesc		= コンソールを操作するコマンドです
 
 # LOCALIZATION NOTE (consoleManual) A longer description describing the
 # set of commands that control the console.
-consoleManual		= コンソールにフィルタをかけたり\
-内容を消去したり、閉じたりします
+consoleManual		= Web コンソールの内容の絞り込みと消去またはコンソールを閉じます
 
 # LOCALIZATION NOTE (consoleclearDesc) A very short string used to describe the
 # function of the 'console clear' command.
 consoleclearDesc	= コンソールの内容を消去します
 
 # LOCALIZATION NOTE (screenshotDesc) A very short description of the
 # 'screenshot' command. See screenshotManual for a fuller description of what
 # it does. This string is designed to be shown in a menu alongside the
 # command name, which is why it should be as short as possible.
-screenshotDesc			= ページの画像を保存
+screenshotDesc			= ページのスクリーンショット画像を保存します
 
 # LOCALIZATION NOTE (screenshotManual) A fuller description of the 'screenshot'
 # command, displayed when the user asks for help on what it does.
-screenshotManual		= 表示されているウインドウ全体の画像を PNG 形式で保存します (タイマーも設定できます)
+screenshotManual		= 表示されているウインドウ全体の画像を PNG 形式で保存します (タイマー設定可)。
 
 # LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
 # the 'filename' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
 screenshotFilenameDesc		= 保存ファイル名
 
 # LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
 # 'filename' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
-screenshotFilenameManual	= 画像を保存する (拡張子が '.png' となっている) ファイルの名前
+screenshotFilenameManual	= 保存する画像ファイルの名前 (拡張子は '.png' になります)。
 
 # LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
 # the 'clipboard' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
-screenshotClipboardDesc		= 画像をクリップボードにコピーするか? (true/false)
+screenshotClipboardDesc		= 画像をクリップボードにコピーします (true/false)
 
 # LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
 # 'clipboard' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
-screenshotClipboardManual	= True を指定すると、ファイルに保存する代わりに、クリップボードにコピーします。
+screenshotClipboardManual	= 指定すると true。ファイルに保存せずにクリップボードにコピーします。
 
 # LOCALIZATION NOTE (screenshotChromeDesc) A very short string to describe
 # the 'chrome' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
 # The argument (%1$S) is the browser name.
-screenshotChromeDesc2		= ブラウザウインドウも含めるか? (true/false)
+screenshotChromeDesc2		= %1$S の chrome ウインドウも含めます (true/false)
 
 # LOCALIZATION NOTE (screenshotChromeManual) A fuller description of the
 # 'chrome' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
 # The argument (%1$S) is the browser name.
-screenshotChromeManual2		= True を指定すると、ブラウザウインドウも画像に含めます。
+screenshotChromeManual2		= 指定すると true。%1$S のウインドウも画像に含めます。
 
 # LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
 # the screenshot command.
 screenshotGroupOptions		= オプション
 
 # LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
 # the 'delay' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
 screenshotDelayDesc		= タイマー (秒)
 
 # LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
 # 'delay' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
-screenshotDelayManual		= 保存するタイミングをずらすタイマーを設定します (秒単位)
+screenshotDelayManual		= 保存するタイミングを遅らすタイマーを設定します (秒単位)
 
 # LOCALIZATION NOTE (screenshotFullscreenDesc) A very short string to describe
 # the 'fullscreen' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
-screenshotFullPageDesc		= Web ページ全体か? (true/false)
+screenshotFullPageDesc		= Web ページ全体を保存します (true/false)
 
 # LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
 # 'fullscreen' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
-screenshotFullPageManual	= True を指定すると、現在のスクロール範囲外の領域も画像に含まれます。
+screenshotFullPageManual	= 指定すると true。現在の表示範囲外の領域も画像に含めます。
 
 # LOCALIZATION NOTE (screenshotSelectorChromeConflict) Exception thrown when user
 # tries to use 'selector' option along with 'chrome' option of the screenshot
 # command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
-screenshotSelectorChromeConflict= chrome オプションが true の場合は、selector はサポートされません
+screenshotSelectorChromeConflict= chrome オプションが true の場合、selector オプションはサポートされません
 
 # LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
 # when no file name is provided. The first argument (%1$S) is the date string
 # in yyyy-mm-dd format and the second argument (%2$S) is the time string
 # in HH.MM.SS format. Please don't add the extension here.
 screenshotGeneratedFilename	= Screen Shot %1$S at %2$S
 
 # LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
 # encountering error while saving the screenshot to the file specified.
-screenshotErrorSavingToFile	= 保存時にエラーがありました
+screenshotErrorSavingToFile	= 保存時にエラーが発生しました:
 
 # LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
 # screenshot is successfully saved to the file specified.
 screenshotSavedToFile		= 保存しました
 
 # LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
 # encountering error while copying the screenshot to clipboard.
-screenshotErrorCopying		= クリップボードへのコピー時にエラーがありました。
+screenshotErrorCopying		= クリップボードへのコピー時にエラーが発生しました。
 
 # LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
 # screenshot is successfully copied to the clipboard.
 screenshotCopied		= クリップボードにコピーしました。
 
 # LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
 # 'restart' command. This string is designed to be shown in a menu alongside the
 # command name, which is why it should be as short as possible.
 # The argument (%1$S) is the browser name.
 restartBrowserDesc		= %1$S を再起動します
 
 # LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
 # describe the 'nocache' parameter to the 'restart' command, which is
 # displayed in a dialog when the user is using this command.
-restartBrowserNocacheDesc	= キャッシュからページを読み込ませずに再起動します
+restartBrowserNocacheDesc	= 再起動時にコンテンツのキャッシュからの読み込みを無効にします
 
 # LOCALIZATION NOTE (restartBrowserRequestCancelled) A string displayed to the
 # user when a scheduled restart has been aborted by the user.
-restartBrowserRequestCancelled	= ユーザによって再起動が取り消されました。
+restartBrowserRequestCancelled	= 再起動がユーザによって取り消されました。
 
 # LOCALIZATION NOTE (restartBrowserRestarting) A string displayed to the
 # user when a restart has been initiated without a delay.
 # The argument (%1$S) is the browser name.
 restartBrowserRestarting	= %1$S を再起動しています...
 
 # LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
 # command. See inspectManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 inspectDesc		= ノードを調査します
 
 # LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
 # command, displayed when the user asks for help on what it does.
-inspectManual		= CSS セレクタで DOM をハイライトし\
-要素の大きさとプロパティを調べます
+inspectManual		= CSS セレクタで DOM をハイライトし、要素の大きさとプロパティを調べます
 
 # LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
 # 'node' parameter to the 'inspect' command, which is displayed in a dialog
 # when the user is using this command.
 inspectNodeDesc		= CSS セレクタ
 
 # LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
 # parameter to the 'inspect' command, displayed when the user asks for help
 # on what it does.
-inspectNodeManual	= document.querySelector() で\
-一意に識別可能な CSS セレクタ
+inspectNodeManual	= document.querySelector() で一意に識別可能な CSS セレクタ
 
 # LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
 # command. See tiltManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltDesc		= Web ページを 3D 表示します
 
 # LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
 # command, displayed when the user asks for help on what it does.
-tiltManual		= Web ページのさまざまなパーツのつながりを 3D 空間に表示して調べます
+tiltManual		= Web ページとその祖先要素のさまざまなパーツのつながりを 3D 空間に表示して調べます
 
 # LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
 # command. See tiltOpenManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltOpenDesc		= 3D 調査ビューを開きます
 
 # LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
@@ -199,101 +188,101 @@ tiltOpenManual		= 3D 調査ビューを初期化して、CSS セレクタで指定されたノードをハイライトします
 # LOCALIZATION NOTE (tiltToggleTooltip) A string displayed as the
 # tooltip of button in devtools toolbox which toggles Tilt 3D View.
 tiltToggleTooltip	= 3D ビュー
 
 # LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
 # command. See tiltTranslateManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
-tiltTranslateDesc	= 3D オブジェクトを動かします
+tiltTranslateDesc	= 3D オブジェクトを移動します
 
 # LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
 # command, displayed when the user asks for help on what it does.
 tiltTranslateManual	= 3D オブジェクトを特定の方向へ平行移動させます
 
 # LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
 # 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
 # when the user is using this command.
-tiltTranslateXDesc	= X軸 (ピクセル)
+tiltTranslateXDesc	= X 軸 (ピクセル)
 
 # LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
 # parameter to the 'translate' command, displayed when the user asks for help
 # on what it does.
-tiltTranslateXManual	= X軸方向の移動量 (ピクセル単位)
+tiltTranslateXManual	= X 軸方向の移動量 (ピクセル単位)
 
 # LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
 # 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
 # when the user is using this command.
-tiltTranslateYDesc	= Y軸 (ピクセル)
+tiltTranslateYDesc	= Y 軸 (ピクセル)
 
 # LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
 # parameter to the 'translate' command, displayed when the user asks for help
 # on what it does.
-tiltTranslateYManual	= Y軸方向の移動量 (ピクセル単位)
+tiltTranslateYManual	= Y 軸方向の移動量 (ピクセル単位)
 
 # LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
 # command. See tiltRotateManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltRotateDesc		= 3D オブジェクトを回転させます
 
 # LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
 # command, displayed when the user asks for help on what it does.
 tiltRotateManual	= 3D オブジェクトを特定の方向へ回転させます
 
 # LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
 # 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
 # when the user is using this command.
-tiltRotateXDesc		= X軸 (角度)
+tiltRotateXDesc		= X 軸 (度)
 
 # LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
 # parameter to the 'rotate' command, displayed when the user asks for help
 # on what it does.
-tiltRotateXManual	= X軸方向の回転量 (角度)
+tiltRotateXManual	= X 軸方向の回転量 (角度)
 
 # LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
 # 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
 # when the user is using this command.
-tiltRotateYDesc		= Y軸 (角度)
+tiltRotateYDesc		= Y 軸 (度)
 
 # LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
 # parameter to the 'rotate' command, displayed when the user asks for help
 # on what it does.
-tiltRotateYManual	= Y軸方向の回転量 (角度)
+tiltRotateYManual	= Y 軸方向の回転量 (角度)
 
 # LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
 # 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
 # when the user is using this command.
-tiltRotateZDesc		= Z軸 (角度)
+tiltRotateZDesc		= Z 軸 (度)
 
 # LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
 # parameter to the 'rotate' command, displayed when the user asks for help
 # on what it does.
-tiltRotateZManual	= Z軸方向の回転量 (角度)
+tiltRotateZManual	= Z 軸方向の回転量 (角度)
 
 # LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
 # command. See tiltZoomManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltZoomDesc		= 3D オブジェクトを拡大/縮小します
 
 # LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
 # command, displayed when the user asks for help on what it does.
-tiltZoomManual		= 3D オブジェクトを Z 軸方向に動かします
+tiltZoomManual		= 3D オブジェクトを Z 軸方向に移動します
 
 # LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
 # 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
 # when the user is using this command.
-tiltZoomAmountDesc	= 拡大/縮小 (ピクセル単位)
+tiltZoomAmountDesc	= 拡大/縮小 (ピクセル)
 
 # LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
 # parameter to the 'zoom' command, displayed when the user asks for help
 # on what it does.
-tiltZoomAmountManual	= Z軸方向の移動量 (ピクセル単位)
+tiltZoomAmountManual	= Z 軸方向の移動量 (ピクセル単位)
 
 # LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
 # command. See tiltResetManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltResetDesc		= 平行移動、回転、拡大/縮小をリセットします
 
 # LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
@@ -303,54 +292,49 @@ tiltResetManual		= 3D オブジェクトに適用された変形処理をリセットします
 # LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
 # command. See tiltCloseManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 tiltCloseDesc		= 3D 調査ビューを閉じます
 
 # LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
 # command, displayed when the user asks for help on what it does.
-tiltCloseManual		= 3D 調査ビューを閉じて、標準ハイライトの調査ビューに戻ります
+tiltCloseManual		= 3D 調査ビューを閉じて標準の調査ビューに戻ります
 
 # LOCALIZATION NOTE (debuggerClosed) Used in the output of several commands
 # to explain that the debugger must be opened first.
-debuggerClosed		= このコマンドの前に、スクリプトデバッガを開いてください
+debuggerClosed		= このコマンドを使用する前にスクリプトデバッガを開いてください
 
 # LOCALIZATION NOTE (debuggerStopped) Used in the output of several commands
 # to explain that the debugger must be opened first before setting breakpoints.
 debuggerStopped		= ブレークポイントを設置する前に、スクリプトデバッガを開いてください
 
 # LOCALIZATION NOTE (breakDesc) A very short string used to describe the
 # function of the break command.
 breakDesc		= ブレークポイントを管理します
 
 # LOCALIZATION NOTE (breakManual) A longer description describing the
 # set of commands that control breakpoints.
-breakManual		= ブレークポイントの一覧を表示したり、追加や削除を行います
+breakManual		= ブレークポイントの一覧表示や追加、削除をするコマンドです
 
 # LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
 # function of the 'break list' command.
 breaklistDesc		= 既存のブレークポイントを表示します
 
-# LOCALIZATION NOTE (breaklistLineEntry) Used in the output of the 'break list'
-# command to display a single line breakpoint.
-# %1$S=script URL, %2$S=line number
-breaklistLineEntry	= 行ブレークポイント: %1$S:%2$S
-
 # LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
 # command to explain that the list is empty.
 breaklistNone		= 設置されているブレークポイントはありません
 
-# LOCALIZATION NOTE (breaklistIntro) Used in the output of the 'break list'
-# command to preface the list contents.
-breaklistIntro		= 次のブレークポイントが設置されています:
+# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
+# 'break list' command on a button which can be used to remove breakpoints
+breaklistOutRemove	= 削除
 
 # LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
 # command to explain that a breakpoint was added.
-breakaddAdded		= 設置されたブレークポイント
+breakaddAdded		= ブレークポイントを設置しました
 
 # LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
 # command to explain that a breakpoint could not be added.
 breakaddFailed		= ブレークポイントを設置できません: %S
 
 # LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
 # function of the 'break add' command.
 breakaddDesc		= ブレークポイントを設置します
@@ -360,115 +344,169 @@ breakaddDesc		= ブレークポイントを設置します
 breakaddManual		= 対応しているブレークポイントの種類: 行ブレークポイント
 
 # LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
 # function of the 'break add line' command.
 breakaddlineDesc	= 行ブレークポイントを設置します
 
 # LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
 # the function of the file parameter in the 'break add line' command.
-breakaddlineFileDesc	= JavaScript ファイル URI
+breakaddlineFileDesc	= JavaScript ファイルの URI
 
 # LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
 # the function of the line parameter in the 'break add line' command.
-breakaddlineLineDesc	= 行
+breakaddlineLineDesc	= 行番号
 
 # LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
 # function of the 'break del' command.
 breakdelDesc		= ブレークポイントを撤去します
 
 # LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
 # the function of the index parameter in the 'break del' command.
 breakdelBreakidDesc	= ブレークポイントのインデックス
 
 # LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
 # command to explain that a breakpoint was removed.
 breakdelRemoved		= ブレークポイントが撤去されました
 
-# LOCALIZATION NOTE (breakNotFound) Used in the output of the 'break del'
-# command to explain that the breakpoint was not found.
-breakNotFound		= ブレークポイントが見つかりません
-
 # LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
 # function of the dbg command.
 dbgDesc			= デバッガを管理します
 
 # LOCALIZATION NOTE (dbgManual) A longer description describing the
 # set of commands that control the debugger.
-dbgManual		= メインスレッドで割り込みや復帰したり、コードの行をステップイン、ステップアウト、ステップオーバーするコマンドです
+dbgManual		= メインスレッドへの割り込みや復帰、コードの行をステップイン、ステップアウト、ステップオーバーするコマンドです
 
 # LOCALIZATION NOTE (dbgOpen) A very short string used to describe the function
 # of the dbg open command.
-dbgOpen			= デバッガを開く
+dbgOpen			= デバッガを開きます
 
 # LOCALIZATION NOTE (dbgClose) A very short string used to describe the function
 # of the dbg close command.
-dbgClose		= デバッガを閉じる
+dbgClose		= デバッガを閉じます
 
 # LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
 # function of the dbg interrupt command.
-dbgInterrupt		= メインスレッドで停止します
+dbgInterrupt		= メインスレッドで一時停止します
 
 # LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
 # function of the dbg continue command.
-dbgContinue		= メインスレッドに復帰します。ブレークポイントの後続の処理を、次のブレークポイントかスクリプトの終わりまで実行します。
+dbgContinue		= メインスレッドに復帰します。ブレークポイントの後続の処理を、次のブレークポイントかスクリプトの終端まで実行します。
 
 # LOCALIZATION NOTE (dbgStepDesc) A very short string used to describe the
 # function of the dbg step command.
 dbgStepDesc		= ステッピングを管理します
 
 # LOCALIZATION NOTE (dbgStepManual) A longer description describing the
 # set of commands that control stepping.
 dbgStepManual		= コードの行をステップイン、ステップアウト、ステップオーバーするコマンドです
 
 # LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
 # function of the dbg step over command.
 dbgStepOverDesc		= 現在のステートメントを実行して、次のステートメントで停止します。現在のステートメントが関数呼び出しの場合は、関数内の処理をすべて実行してから、次のステートメントで停止します。
 
 # LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
 # function of the dbg step in command.
-dbgStepInDesc		= 現在のステートメントを実行して、次のステートメントで停止します。現在のステートメントが関数呼び出しの場合は、関数内にステッピングを進めます。そうでない場合は次のステートメントで停止します。
+dbgStepInDesc		= 現在のステートメントを実行し、次のステートメントで停止します。現在のステートメントが関数呼び出しの場合は、関数内にステッピングを進めます。そうでない場合は次のステートメントで停止します。
 
 # LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
 # function of the dbg step out command.
-dbgStepOutDesc		= 現在の関数から抜けます。関数がネストしてる場合は、1レベル上の関数に戻ります。呼び出し元がない場合は、次のブレークポイントかスクリプトの終わりまで実行します。スキップされたステートメントは実行されますが、ステッピングが通り過ぎるわけではありません。
+dbgStepOutDesc		= 現在の関数から抜けます。関数が入れ子になっている場合は、1 階層上の関数に戻ります。呼び出し元がない場合は、次のブレークポイントかスクリプトの終端まで実行します。スキップされたステートメントは実行されますが、ステッピングが通り過ぎるわけではありません。
 
 # LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
 # function of the dbg list command.
 dbgListSourcesDesc	= デバッガに読み込まれたソースの URL 一覧を表示します
 
+# LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg blackbox' command.
+dbgBlackBoxDesc		= デバッガのソースをブラックボックス化します
+
+# LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg blackbox' command.
+dbgBlackBoxSourceDesc	= ブラックボックス化するソース
+
+# LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgBlackBoxGlobDesc	= ブラックボックス化するソースのファイル名の glob パターン (例: "*.min.js")
+
+# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg blackbox' command.
+dbgBlackBoxInvertDesc	= glob パターンに一致しないソースをブラックボックス化します。ソースが指定されていない場合は、すべてのソースをブラックボックス化します。
+
+# LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
+# user know that no sources were black boxed.
+dbgBlackBoxEmptyDesc	= (ブラックボックス化したソースはありませんでした)
+
+# LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources were black boxed.
+dbgBlackBoxNonEmptyDesc	= 次のソースをブラックボックス化しました:
+
+# LOCALIZATION NOTE (dbgBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgBlackBoxErrorDesc	= ブラックボックス化エラー:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxDesc) A very short string used to describe the
+# function of the 'dbg unblackbox' command.
+dbgUnBlackBoxDesc	= デバッガのソースのブラックボックスを解除します
+
+# LOCALIZATION NOTE (dbgUnBlackBoxSourceDesc) A very short string used to describe the
+# 'source' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxSourceDesc	= ブラックボックスを解除するソース
+
+# LOCALIZATION NOTE (dbgUnBlackBoxGlobDesc) A very short string used to describe the
+# 'glob' parameter to the 'dbg blackbox' command.
+dbgUnBlackBoxGlobDesc	= ブラックボックスを解除するソースのファイル名のパターン (例: "*.min.js")
+
+# LOCALIZATION NOTE (dbgUnBlackBoxEmptyDesc) A very short string used to let the
+# user know that we did not stop black boxing any sources.
+dbgUnBlackBoxEmptyDesc	= (ブラックボックスを解除したソースはありませんでした)
+
+# LOCALIZATION NOTE (dbgUnBlackBoxNonEmptyDesc) A very short string used to let the
+# user know which sources we stopped black boxing.
+dbgUnBlackBoxNonEmptyDesc	= 次のソースのブラックボックスを解除しました:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
+# user know there was an error black boxing a source (whose url follows this
+# text).
+dbgUnBlackBoxErrorDesc	= ブラックボックス解除エラー:
+
+# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxInvertDesc	= glob パターンに一致しないソースのブラックボックスを解除します。ソースが指定されていない場合は、すべてのソースのブラックボックスを解除します。
+
 # LOCALIZATION NOTE (consolecloseDesc) A very short description of the
 # 'console close' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 consolecloseDesc	= コンソールを閉じます
 
 # LOCALIZATION NOTE (consoleopenDesc) A very short description of the
 # 'console open' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 consoleopenDesc		= コンソールを開きます
 
 # LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
 # command. See editManual2 for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
-editDesc		= Web ページを微調整します
+editDesc		= Web ページのリソースを微調整します
 
 # LOCALIZATION NOTE (editManual2) A fuller description of the 'edit' command,
 # displayed when the user asks for help on what it does.
-editManual2		= この Web ページのリソースのうちの1つを編集します
+editManual2		= この Web ページを構成するリソースの 1 つを編集します
 
 # LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
 # 'resource' parameter to the 'edit' command, which is displayed in a dialog
 # when the user is using this command.
 editResourceDesc	= 編集するリソースの URL
 
 # LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
 # 'line' parameter to the 'edit' command, which is displayed in a dialog
 # when the user is using this command.
-editLineToJumpToDesc	= 指定行へ移動
+editLineToJumpToDesc	= 指定行へ移動します
 
 # LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
 # 'resizepage' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 resizePageDesc		= ページのサイズを変更します
 
 # LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
 # 'width' parameter to the 'resizepage' command, which is displayed in a dialog
@@ -478,17 +516,17 @@ resizePageArgWidthDesc	= 幅 (ピクセル単位)
 # LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
 # 'height' parameter to the 'resizepage' command, which is displayed in a dialog
 # when the user is using this command.
 resizePageArgHeightDesc	= 高さ (ピクセル単位)
 
 # LOCALIZATION NOTE (resizeModeOnDesc) A very short string to describe the
 # 'resizeon ' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-resizeModeOnDesc	= レスポンシブデザインモードを起動します
+resizeModeOnDesc	= レスポンシブデザインモードを開始します
 
 # LOCALIZATION NOTE (resizeModeOffDesc) A very short string to describe the
 # 'resize off' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 resizeModeOffDesc	= レスポンシブデザインモードを終了します
 
 # LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
 # 'resize toggle' command. This string is designed to be shown in a menu
@@ -502,88 +540,125 @@ resizeModeToggleTooltip	= レスポンシブデザインモード
 # LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
 # 'resize to' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 resizeModeToDesc	= ページのサイズを変更します
 
 # LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
 # 'resize' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-resizeModeDesc		= レスポンシブデザインモードを操作します
+resizeModeDesc		= レスポンシブデザインモードを制御します
 
 # LOCALIZATION NOTE (resizeModeManual) A fuller description of the 'resize'
 # command, displayed when the user asks for help on what it does.
 # The argument (%1$S) is the browser name.
-resizeModeManual2	= レスポンシブな Web サイトとは、モバイルディスプレイからシネマディスプレイまでのすべての環境に適応する Web サイトです。レスポンシブデザインモードでは、ブラウザすべてをサイズ変更することなく、%1$S で様々なページサイズを簡単にテストできます。
+resizeModeManual2	= レスポンシブな Web サイトとは、モバイルディスプレイからシネマディスプレイまでのすべての環境に適応する Web サイトです。レスポンシブデザインモードでは、ブラウザごとサイズ変更せずに %1$S 内で様々なページサイズを簡単にテストできます。
 
 # LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
 cmdDesc			= コマンドを操作します
 
 # LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
 cmdRefreshDesc		= mozcmd ディレクトリを再読み込みします
 
+# LOCALIZATION NOTE (cmdStatus) When the we load new commands from mozcmd
+# directory, we report on how many we loaded. %1$S is a count of the number
+# of loaded commands, and %2$S is the directory we loaded from.
+cmdStatus		= %1$S コマンドを '%2$S' から読み込みます
+
+# LOCALIZATION NOTE (cmdSetdirDesc) 
+cmdSetdirDesc		= mozcmd ディレクトリをセットアップします
+
+# LOCALIZATION NOTE (cmdSetdirManual) 
+cmdSetdirManual		= 'mozcmd' ディレクトリは、Firefox のコマンドライン用の独自のコマンドを簡単に作成する手段です。詳細は <a href="https://developer.mozilla.org/ja/docs/Tools/GCLI/Customization">MDN ドキュメント</a> をご覧ください。
+
+# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
+# parameter to the 'cmd setdir' command.
+cmdSetdirDirectoryDesc	= .mozcmd ファイルが含まれるディレクトリ
+
 # LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
 addonDesc		= アドオンを操作します
 
 # LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
-addonListDesc		= インストールしたアドオンを表示します
+addonListDesc		= インストールされたアドオンを一覧表示します
 
 # LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
 # 'addon list <type>' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 addonListTypeDesc	= アドオンの種類を選択します
 
 # LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
 # addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
 # addonListUnknownHeading) Used in the output of the 'addon list' command as the
 # first line of output.
-addonListDictionaryHeading	= 現在、以下の辞書がインストールされています:
-addonListExtensionHeading	= 現在、以下の拡張機能がインストールされています:
-addonListLocaleHeading		= 現在、以下の言語がインストールされています:
-addonListPluginHeading		= 現在、以下のプラグインがインストールされています:
-addonListThemeHeading		= 現在、以下のテーマがインストールされています:
-addonListAllHeading		= 現在、以下のアドオンがインストールされています:
-addonListUnknownHeading		= 現在、以下の選択された種類のアドオンがインストールされています:
+addonListDictionaryHeading	= 現在インストールされている辞書:
+addonListExtensionHeading	= 現在インストールされている拡張機能:
+addonListLocaleHeading		= 現在インストールされている言語パック:
+addonListPluginHeading		= 現在インストールされているプラグイン:
+addonListThemeHeading		= 現在インストールされているテーマ:
+addonListAllHeading		= 現在インストールされているアドオン:
+addonListUnknownHeading		= 現在インストールされている選択された種類のアドオン:
+
+# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
+# output of the 'addon list' command as the labels for the enable/disable
+# action buttons in the listing. This string is designed to be shown in a
+# small action button next to the addon name, which is why it should be as
+# short as possible.
+addonListOutEnable		= 有効化
+addonListOutDisable		= 無効化
+
+# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
+# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
+# the output of the 'addon list' command as the descriptions of pending
+# addon operations. addonPending is used as a prefix for a list of pending
+# actions (named by the other lookup variables). These strings are designed
+# to be shown alongside addon names, which is why they should be as short
+# as possible.
+addonPending			= 再起動待ち
+addonPendingEnable		= 有効化
+addonPendingDisable		= 無効化
+addonPendingUninstall		= 削除
+addonPendingInstall		= インストール
+addonPendingUpgrade		= 更新
 
 # LOCALIZATION NOTE (addonNameDesc) A very short description of the
 # name parameter of numerous add-on commands. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
-addonNameDesc		= アドオンの名前
+addonNameDesc		= アドオン名
 
 # LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
 # command when a search for add-ons of a particular type were not found.
-addonNoneOfType		= 指定の種類のアドオンはインストールされていません。
+addonNoneOfType		= 指定された種類のアドオンはインストールされていません。
 
 # LOCALIZATION NOTE (addonEnableDesc) A very short description of the
 # 'addon enable <type>' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-addonEnableDesc		= 指定されたアドオンを有効化します
+addonEnableDesc		= 指定したアドオンを有効化します
 
 # LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
 # 'addon enable' command when an attempt is made to enable an add-on that is
 # already enabled.
 addonAlreadyEnabled	= %S はすでに有効化されています。
 
 # LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
 # command when an add-on is enabled.
 addonEnabled		= %S を有効化しました。
 
 # LOCALIZATION NOTE (addonDisableDesc) A very short description of the
 # 'addon disable <type>' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-addonDisableDesc	= 指定されたアドオンを無効かします
+addonDisableDesc	= 指定したアドオンを無効化します
 
 # LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
 # 'addon disable' command when an attempt is made to disable an add-on that is
 # already disabled.
 addonAlreadyDisabled	= %S はすでに無効化されています。
 
 # LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
 # command when an add-on is disabled.
@@ -715,34 +790,82 @@ pagemodRemoveAttributeRootDesc			= CSS セレクタのルートノード
 # to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
 # command, which is displayed in a dialog when the user is using this command.
 pagemodRemoveAttributeIgnoreCaseDesc		= 大文字と小文字を区別しない
 
 # LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
 # result of the 'pagemod remove attribute' command.
 pagemodRemoveAttributeResult			= セレクタにマッチした要素: %1$S. 削除した属性: %2$S.
 
+# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
+# command, the parent command for tool-hacking commands.
+# The argument (%1$S) is the browser name.
+toolsDesc2		= %1$S 開発ツールをハックします
+
+# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
+# command. The argument (%1$S) is the browser name.
+toolsManual2		= %1$S 開発ツールを直接ハックするためのさまざまなコマンドです。
+
+# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
+# command, for pointing your developer tools loader at a mozilla-central source tree.
+toolsSrcdirDesc		= mozilla-central からツールを読み込みます
+
+# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
+# an invalid srcdir.
+toolsSrcdirNotFound	= %1$S が見つかりません。または mozilla-central ではありません。
+
+# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
+# 'tools srcdir' command.
+toolsSrcdirReloaded	= %1$S からツールを読み込みました。
+
+# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
+# command. The argument (%1$S) is the browser name.
+toolsSrcdirManual2	= 完全な mozilla-central のソースツリーから %1$S 開発ツールを読み込みます。
+
+# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
+toolsSrcdirDir		= mozilla-central のソースツリー
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
+# command, which overrides a previous 'tools srcdir' command.
+toolsBuiltinDesc	= 組み込みのツールを使用します
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
+# command.
+toolsBuiltinManual	= srcdir コマンドで上書きされる前の組み込みのツールを使うようにします。
+
+# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
+# 'tools builtin' command.
+toolsBuiltinReloaded	= 組み込みのツールを読み込みました。
+
+# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
+# which will reload the tools from the current srcdir.
+toolsReloadDesc		= 開発ツールを再読み込みします
+
+# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
+# reload' command.
+toolsReloaded2		= ツールを再読み込みしました。
+
 # LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
 # command. See cookieManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
-cookieDesc		= Cookie を表示、変更します
+cookieDesc		= Cookie を表示または変更します
 
 # LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
 # command, displayed when the user asks for help on what it does.
-cookieManual		= 現在のドメインの Cookie を表示したり、作成、削除、変更するコマンドです。
+cookieManual		= 現在のドメインの Cookie を表示または作成、削除、変更するコマンドです。
 
 # LOCALIZATION NOTE (cookieListDesc) A very short description of the
 # 'cookie list' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 cookieListDesc		= Cookie を表示します
 
 # LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
 # command, displayed when the user asks for help on what it does.
-cookieListManual	= 現在のページと関係のある Cookie を表示します。
+cookieListManual	= 現在のページと関連する Cookie を表示します。
 
 # LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
 # The 'cookie list' command has a number of headings for cookie properties.
 # Particular care should be taken in translating these strings as they have
 # references to names in the cookies spec.
 cookieListOutHost	= ホスト:
 cookieListOutPath	= パス:
 cookieListOutExpires	= 有効期限:
@@ -755,62 +878,62 @@ cookieListOutNone	= なし
 # LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
 # command uses this string to describe a cookie with an expiry value of '0'
 # that is to say it is a session cookie
 cookieListOutSession	= ブラウザを終了するまで (セッション)
 
 # LOCALIZATION NOTE (cookieListOutNonePage) The output of the 'cookie list'
 # command uses this string for pages like 'about:blank' which can't contain
 # cookies
-cookieListOutNonePage	= このページの Cookie はありません
+cookieListOutNonePage	= このページに Cookie はありません
 
 # LOCALIZATION NOTE (cookieListOutNoneHost) The output of the 'cookie list'
 # command uses this string when there are no cookies on a given web page
-cookieListOutNoneHost	= ホスト %1$S の Cookie はありません
+cookieListOutNoneHost	= ホスト %1$S に Cookie はありません
 
 # LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
 # 'cookie list' command on a button which can be used to edit cookie values
 cookieListOutEdit	= 編集
 
 # LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
 # 'cookie list' command on a button which can be used to remove cookies
 cookieListOutRemove	= 削除
 
 # LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
 # 'cookie remove' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 cookieRemoveDesc	= Cookie を削除します
 
 # LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
 # command, displayed when the user asks for help on what it does.
-cookieRemoveManual	= 指定された名前の Cookie を削除します
+cookieRemoveManual	= 指定したキー名の Cookie を削除します
 
 # LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
 # 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
 # when the user is using this command.
-cookieRemoveKeyDesc	= 削除する Cookie の名前
+cookieRemoveKeyDesc	= 削除する Cookie のキー
 
 # LOCALIZATION NOTE (cookieSetDesc) A very short description of the
 # 'cookie set' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 cookieSetDesc		= Cookie を設定します
 
 # LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
 # command, displayed when the user asks for help on what it does.
-cookieSetManual		= 指定された名前の Cookie を設定します。内容とオプションで以下の一つ以上の属性を設定します: 有効期限 (max-age を秒数で指定するか、期限日を GMTString フォーマットで指定)、パス、ドメイン、送信制限
+cookieSetManual		= キー名とその値および次の任意の属性を持つ Cookie を設定します: 有効期限 (max-age を秒数で指定するか、期限日を GMTString 形式で指定)、パス、ドメイン、送信制限
 
 # LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
 # 'key' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
-cookieSetKeyDesc	= 設定する Cookie の名前
+cookieSetKeyDesc	= Cookie に設定するキー名
 
 # LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
 # 'value' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
-cookieSetValueDesc	= Cookie に設定する内容
+cookieSetValueDesc	= Cookie に設定する値
 
 # LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
 # the 'cookie set' command, displayed as a heading to the list of option.
 cookieSetOptionsDesc	= オプション
 
 # LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
 # 'path' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
@@ -819,27 +942,27 @@ cookieSetPathDesc	= Cookie に設定するパス
 # LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
 # 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetDomainDesc	= Cookie に設定するドメイン
 
 # LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
 # 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
-cookieSetSecureDesc	= https での送信に限定する
+cookieSetSecureDesc	= https 経由の送信に限定します
 
 # LOCALIZATION NOTE (cookieSetHttpOnlyDesc) A very short string to describe the
 # 'httpOnly' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
-cookieSetHttpOnlyDesc	= クライアントサイドスクリプトからアクセス不可
+cookieSetHttpOnlyDesc	= クライアント側のスクリプトからアクセス不可にします
 
 # LOCALIZATION NOTE (cookieSetSessionDesc) A very short string to describe the
 # 'session' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
-cookieSetSessionDesc	= ブラウザセッションの生存期間のみ有効
+cookieSetSessionDesc	= ブラウザセッションの生存期間のみ有効にします
 
 # LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
 # 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetExpiresDesc	= Cookie の有効期限となる日時 (RFC2822 または ISO 8601 の引用符つき日時)
 
 # LOCALIZATION NOTE (jsbDesc) A very short description of the
 # 'jsb' command. This string is designed to be shown in a menu
@@ -859,32 +982,32 @@ jsbIndentSizeDesc		= インデント文字数
 # LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
 # 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
 # does.
 jsbIndentSizeManual		= 各行のインデント幅の文字数
 
 # LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
 # 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-jsbIndentCharDesc		= 各行のインデントに使われる文字
+jsbIndentCharDesc		= 各行のインデントに使用する文字
 
 # LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
 # 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
 # does.
-jsbIndentCharManual		= 各行のインデントに使われる文字。スペースかタブを選択できます。
+jsbIndentCharManual		= 各行のインデントに使用する文字。スペースとタブのどちらかを選択します。
 
 # the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
 # shown in a menu alongside the command name, which is why it should be as short
 # as possible.
-jsbDoNotPreserveNewlinesDesc	= 改行を保持しない
+jsbDoNotPreserveNewlinesDesc	= 改行を保持しません
 
 # LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
 # 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
 # on what it does.
-jsbPreserveNewlinesManual	= 既存の改行をそのまま保持すべきかどうか
+jsbPreserveNewlinesManual	= 既存の改行を保持します
 
 # LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
 # 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 jsbPreserveMaxNewlinesDesc	= 連続する改行の最大数
 
 # LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
@@ -896,145 +1019,145 @@ jsbPreserveMaxNewlinesManual	= 連続する改行を保持する最大数
 # 'jsb <jslintHappy>' parameter. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 jsbJslintHappyDesc		= jslint-stricter モードを強制するか?
 
 # LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
 # 'jsb <jslintHappy>' parameter, displayed when the user asks for help
 # on what it does.
-jsbJslintHappyManual		= true に設定した場合は、jslint-stricter モードを強制します
+jsbJslintHappyManual		= 指定すると true。jslint-stricter モードを強制します
 
 # LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
 # 'jsb <braceStyle>' parameter. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
-jsbBraceStyleDesc2		= 括弧のコーディングスタイルを選択
+jsbBraceStyleDesc2		= 括弧の字下げスタイルを選択します
 
 # LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
 # 'jsb <braceStyle>' parameter, displayed when the user asks for help
 # on what it does.
 #
 # NOTES: The keywords collapse, expand, end-expand and expand-strict should not
 # be translated. "even if it will break your code" means that the resulting code
 # may no longer be functional.
-jsbBraceStyleManual2		= 括弧のコーディングスタイルを選択: collapse - 制御ステートメントと同じ行に括弧を置く; expand - 括弧を新しい行に置く (オールマン / ANSI スタイル); end-expand - 閉じ括弧を新しい行に置く; expand-strict - コードが壊れる場合でも括弧を新しい行に置く
+jsbBraceStyleManual2		= 括弧の字下げスタイルを選択します: collapse - 括弧を制御文と同じ行に置く。expand - 括弧を単独で次の行に置く (オールマン / ANSI スタイル)。end-expand - 閉じ括弧を単独で次の行に置く。expand-strict - コードが壊れる場合でも括弧を単独で新しい行に置く
 
 # LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
 # of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
 # be shown in a menu alongside the command name, which is why it should be as
 # short as possible.
-jsbNoSpaceBeforeConditionalDesc	= 条件分岐ステートメントの前にスペースを入れない
+jsbNoSpaceBeforeConditionalDesc	= 条件分岐文の前にスペースを入れない
 
 # LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
 # 'jsb <unescapeStrings>' parameter. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 jsbUnescapeStringsDesc		= \\xNN 文字をエスケープしない?
 
 # LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
 # 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
 # on what it does.
-jsbUnescapeStringsManual	= \\xNN 表記でエンコードされた文字列に含まれている表示可能な文字を、エスケープせずにすべきかどうか
+jsbUnescapeStringsManual	= \\xNN 表記でエンコードされた文字列に含まれている表示可能な文字を、エスケープせずにおきます
 
 # LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
 # the jsb command.
 jsbInvalidURL			= 正しい URL を入力してください
 
 # LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
 # the 'jsb' command, displayed as a heading to the list of options.
 jsbOptionsDesc			= オプション
 
 # LOCALIZATION NOTE (calllogDesc) A very short description of the
 # 'calllog' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-calllogDesc		= 関数呼び出しのロギングを操作するコマンドです
+calllogDesc			= 関数呼び出しのログ出力を操作するコマンドです
 
 # LOCALIZATION NOTE (calllogStartDesc) A very short description of the
 # 'calllog start' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-calllogStartDesc	= 関数呼び出しのコンソールへのロギングを開始します
+calllogStartDesc		= 関数呼び出しのコンソールへのログ出力を開始します
 
 # LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
 # the 'calllog start' command.
-calllogStartReply	= ロギングを開始しました。
+calllogStartReply		= ログ出力を開始しました。
 
 # LOCALIZATION NOTE (calllogStopDesc) A very short description of the
 # 'calllog stop' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-calllogStopDesc		= 関数呼び出しのロギングを停止します
+calllogStopDesc			= 関数呼び出しのログ出力を停止します
 
 # LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
 # the 'calllog stop' command when there is nothing to stop.
-calllogStopNoLogging	= 現在実行中のロギングはありません
+calllogStopNoLogging		= 現在実行中の関数呼び出しのログ出力はありません
 
 # LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
 # the 'calllog stop' command when there are logging actions to stop.
-calllogStopReply	= ロギングを停止しました。実行中のロギング: %1$S
+calllogStopReply		= ログ出力を停止しました。実行中のブラウザコンテキスト: %1$S
 
 # LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
 # 'calllog chromestart' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-calllogChromeStartDesc		= ブラウザコンテキストでの関数呼び出しのコンソールへのロギングを開始します
+calllogChromeStartDesc		= ブラウザコンテキストでの関数呼び出しのコンソールへのログ出力を開始します
 
 # LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
 # 'calllog chromestart <sourceType>' parameter. This string is designed to be
 # shown in a menu alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeDesc	= グローバルオブジェクト, JSM URI, またはグローバルオブジェクトから取得した JS
+calllogChromeSourceTypeDesc	= グローバルオブジェクト、JSM URI、またはグローバルオブジェクトを取得する JS
 
 # LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
 # 'calllog chromestart' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeManual	= グローバルオブジェクト, JSM を指す URI, またはグローバルオブジェクトから取得した、ブラウザウインドウで実行される JS
+calllogChromeSourceTypeManual	= グローバルオブジェクト、JSM の URI、またはグローバルオブジェクトを取得する chrome ウインドウ内で実行される JS
 
 # LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
 # of the 'calllog chromestart' command.
-calllogChromeStartReply		= ロギングを開始しました。
+calllogChromeStartReply		= ログ出力を開始しました。
 
 # LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
 # 'calllog chromestop' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-calllogChromeStopDesc		= 関数呼び出しのロギングを停止します
+calllogChromeStopDesc		= 関数呼び出しのログ出力を停止します
 
 # LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
 # result of the 'calllog chromestop' command when there is nothing to stop.
-calllogChromeStopNoLogging	= 現在実行中のブラウザコンテキストでのロギングはありません
+calllogChromeStopNoLogging	= 現在実行中のブラウザコンテキストでのログ出力はありません
 
 # LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
 # the 'calllog chromestop' command when there are logging actions to stop.
-calllogChromeStopReply		= ロギングを停止しました。実行中のロギング: %1$S
+calllogChromeStopReply		= ログ出力を停止しました。実行中のブラウザコンテキスト: %1$S
 
 # LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
 # of the 'calllog chromestart' command when an anonymouse function is to be
 # logged.
 callLogChromeAnonFunction	= <匿名関数>
 
 # LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
 # of the 'calllog chromestart' command to proceed a method name when it is to be
 # logged.
 callLogChromeMethodCall		= メソッド呼び出し
 
 # LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
 # of the 'calllog chromestart' command with an invalid JSM or JSM path.
-callLogChromeInvalidJSM		= JSM が不正です!
+callLogChromeInvalidJSM		= 不正な JSM です!
 
 # LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
 # result of the 'calllog chromestart' command with a source type of
 # content-variable and an invalid variable name.
-callLogChromeVarNotFoundContent	= Web ページ内で値が見つかりません。
+callLogChromeVarNotFoundContent	= Web ページ内に変数が見つかりません。
 
 # LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
 # result of the 'calllog chromestart' command with a source type of
 # chrome-variable and an invalid variable name.
-callLogChromeVarNotFoundChrome	= ブラウザウインドウ内で値が見つかりません。
+callLogChromeVarNotFoundChrome	= ブラウザウインドウ内に変数が見つかりません。
 
 # LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
 # result of the 'calllog chromestart' command with a source type of JavaScript
 # and invalid JavaScript code.
-callLogChromeEvalException	= 評価された JavaScript が以下の例外を送出しました。
+callLogChromeEvalException	= 評価された JavaScript が以下の例外を投げました。
 
 # LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
 # result of passing a non-JavaScript object creating source via the
 # 'calllog chromestart javascript' command.
 callLogChromeEvalNeedsObject	= JavaScript ソースは、メソッド呼び出しが記録されるオブジェクトを評価しなければなりません。例: "({a1: function() {this.a2()},a2: function() {}});"
 
 # LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
 # tooltip of button in devtools toolbox which opens Scratchpad.
@@ -1053,79 +1176,196 @@ paintflashingOnDesc		= ハイライトをオンにします
 paintflashingOffDesc		= ハイライトをオフにします
 
 # LOCALIZATION NOTE (paintflashingChrome) A very short string used to describe the
 # function of the "paintflashing on/off chrome" command.
 paintflashingChromeDesc		= ブラウザウインドウ
 
 # LOCALIZATION NOTE (paintflashingManual) A longer description describing the
 # set of commands that control paint flashing.
-paintflashingManual		= 再描画された領域を違う色で塗りつぶします
+paintflashingManual		= 再描画された領域を違うカラーで塗りつぶします
 
 # LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
 # tooltip of button in devtools toolbox which toggles paint flashing.
 paintflashingTooltip		= 描画された領域をハイライトします
 
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingToggleDesc		= ハイライトを切り替えます
+
+# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
+# function of the "appcache" command
+appCacheDesc			= アプリケーションキャッシュユーティリティ
+
+# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
+# the function of the "appcache validate" command.
+appCacheValidateDesc		= キャッシュのマニフェストを検証します
+
+# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
+# 'validate' parameter to the 'appcache' command, displayed when the user asks
+# for help on what it does.
+appCacheValidateManual		= キャッシュのマニフェストと参照されるファイルに関連する問題を見つけます
+
+# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
+# the function of the "uri" parameter of the appcache validate" command.
+appCacheValidateUriDesc		= 検証する URI
+
+# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
+# command when it has been successfully validated.
+appCacheValidatedSuccessfully	= 検証が完了しました。
+
+# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
+# the function of the "appcache clear" command.
+appCacheClearDesc		= アプリケーションキャッシュからエントリを消去します
+
+# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
+# 'appcache clear' command, displayed when the user asks for help on what it does.
+appCacheClearManual		= アプリケーションキャッシュから 1 個以上のエントリを消去します
+
+# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
+# command when entries are successfully cleared.
+appCacheClearCleared		= エントリを消去しました。
+
+# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
+# the function of the "appcache list" command.
+appCacheListDesc		= アプリケーションキャッシュのエントリ一覧を表示します。
+
+# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
+# 'appcache list' command, displayed when the user asks for help on what it does.
+appCacheListManual		= すべてのアプリケーションキャッシュのエントリ一覧を表示します。検索パラメータが指定された場合は、その検索語句を含むエントリを表示します。
+
+# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
+# the function of the "search" parameter of the appcache list" command.
+appCacheListSearchDesc		= 検索語句で結果を絞り込みます。
+
+# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
+appCacheListKey			= キー名:
+appCacheListDataSize		= サイズ:
+appCacheListDeviceID		= デバイス ID:
+appCacheListExpirationTime	= 有効期限:
+appCacheListFetchCount		= アクセス回数:
+appCacheListLastFetched		= アクセス日時:
+appCacheListLastModified	= 更新日時:
+
+# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
+# of the 'appcache list' command.
+appCacheListViewEntry		= エントリを確認
+
+# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
+# the function of the "appcache viewentry" command.
+appCacheViewEntryDesc		= 指定したキャッシュのエントリ情報を新規タブで開きます。
+
+# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
+# 'appcache viewentry' command, displayed when the user asks for help on what it
+# does.
+appCacheViewEntryManual		= 指定したキャッシュのエントリ情報を新規タブで開きます。
+
+# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
+# the function of the "key" parameter of the 'appcache viewentry' command.
+appCacheViewEntryKey		= 表示するエントリのキー名。
+
 # LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
 # function of the profiler command.
 profilerDesc			= プロファイラを管理します
 
 # LOCALIZATION NOTE (profilerManual) A longer description describing the
 # set of commands that control the profiler.
 profilerManual			= JavaScript プロファイラを開始または終了するコマンドです
 
 # LOCALIZATION NOTE (profilerOpen) A very short string used to describe the function
 # of the profiler open command.
-profilerOpenDesc		= プロファイラウインドウを開きます
+profilerOpenDesc		= プロファイラを開きます
 
 # LOCALIZATION NOTE (profilerClose) A very short string used to describe the function
 # of the profiler close command.
-profilerCloseDesc		= プロファイラウインドウを閉じます
+profilerCloseDesc		= プロファイラを閉じます
 
 # LOCALIZATION NOTE (profilerStart) A very short string used to describe the function
 # of the profiler start command.
 profilerStartDesc		= プロファイリングを開始します
 
+# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerStartManual		= 開始するプロファイルの名前。
+
 # LOCALIZATION NOTE (profilerStop) A very short string used to describe the function
 # of the profiler stop command.
 profilerStopDesc		= プロファイリングを終了します
 
+# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to lookup an existing profile by its name.
+profilerStopManual		= 終了するプロファイルの名前。
+
 # LOCALIZATION NOTE (profilerList) A very short string used to describe the function
 # of the profiler list command.
 profilerListDesc		= すべてのプロファイルを表示します
 
 # LOCALIZATION NOTE (profilerShow) A very short string used to describe the function
 # of the profiler show command.
 profilerShowDesc		= プロファイルを読み込みます
 
+# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerShowManual		= プロファイルの名前
+
 # LOCALIZATION NOTE (profilerAlreadyStarted) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has already
 # been started.
-profilerAlreadyStarted		= このプロファイルはすでにプロファイリングを開始しています。
-
-# LOCALIZATION NOTE (profilerAlreadyFinished) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has already
-# been finished. It also contains a hint to use the 'profile show' command to see
-# the profiling results.
-profilerAlreadyFinished		= このプロファイルはすでにプロファイリングを終了しています。'profile show' で結果を確認してください。
+profilerAlreadyStarted2		= すでにプロファイリングを開始しています。
 
 # LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
 # an operation cannot be completed because the profile in question could not be
 # found.
 profilerNotFound		= プロファイルが見つかりません
 
 # LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has not been
 # started yet. It also contains a hint to use the 'profile start' command to
 # start the profiler.
-profilerNotStarted		= このプロファイルはまだプロファイリングが開始されていません。'profile start' でプロファイリングを開始してください
+profilerNotStarted3		= プロファイリングはまだ開始されていません。'profile start' でプロファイリングを開始してください
 
-# LOCALIZATION NOTE (profilerStarting) A very short string that indicates that
-# we're starting the profiler.
-profilerStarting		= 開始中...
+# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
+# we have started recording.
+profilerStarted2		= 記録中...
 
-# LOCALIZATION NOTE (profilerStopping) A very short string that indicates that
-# we're stopping the profiler.
-profilerStopping		= 終了中...
+# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
+# we have stopped recording.
+profilerStopped			= 終了...
 
 # LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
 # an operation cannot be completed because the profiler has not been opened yet.
-profilerNotReady		= このコマンドを実行するには、先にプロファイラウインドウを開いてください
+profilerNotReady		= このコマンドを実行するには、プロファイラを開いておく必要があります
+
+# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
+# function of the 'listen' command.
+listenDesc			= リモートデバッガのポートを開きます
+
+# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
+# command.
+listenManual2			= %1$S は TCP/IP 経由でリモートデバッガと接続できます。安全のため、デフォルトでは無効になっていますが、このコマンドで接続可能になります。
+
+# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
+# function of 'port' parameter to the 'listen' command.
+listenPortDesc			= 接続を許可する TCP ポート番号
+
+# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenDisabledOutput		= 接続は devtools.debugger.remote-enabled 設定により無効化されています
+
+# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
+# execution of the 'listen' command. %1$S is a port number
+listenInitOutput		= ポート番号 %1$S で接続待機中
+
+# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenNoInitOutput		= DebuggerServer が初期化されていません
+
+# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
+# mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
+# the 'media' commands and all available parameters.
+mediaDesc			= CSS メディアタイプエミュレーション
+mediaEmulateDesc		= 指定の CSS メディアタイプをエミュレーションします
+mediaEmulateManual		= 指定のメディアタイプに対応するデバイス上で描画されたようにページを表示します。関連する CSS ルールも適用されます。
+mediaEmulateType		= エミュレートするメディアタイプ
+mediaResetDesc			= メディアタイプのエミュレートを終了します
+mediaResetManual		= メディアタイプのエミュレートを終了します
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -29,18 +29,18 @@ debuggerPausedWarning.message		= デバッガが停止しています。マウスによる選択のような一部の機能は動作しません。
 # LOCALIZATION NOTE (nodeMenu.tooltiptext)
 # This menu appears in the Infobar (on top of the highlighted node) once
 # the node is selected.
 nodeMenu.tooltiptext			= ノードの操作
 
 
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
-inspector.label				= 調査
-inspector.commandkey			= I
+inspector.label				= インスペクタ
+inspector.commandkey			= C
 inspector.accesskey			= I
 
 # LOCALIZATION NOTE (markupView.more.*)
 # When there are too many nodes to load at once, we will offer to
 # show all the nodes.
 markupView.more.showing			= いくつかのノードは隠されています。
 markupView.more.showAll			= すべてのノード (%S個) を表示
 inspector.tooltip			= DOM とスタイルシートの調査
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -0,0 +1,221 @@
+<!-- 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 Network Monitor strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
+
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice2): This is the label displayed
+  -  in the network table when empty. -->
+<!ENTITY netmonitorUI.emptyNotice2        "要求を送信するかページを更新すると、ネットワークの稼働状況を確認できます。">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status): This is the label displayed
+  -  in the network table toolbar, above the "status" column. -->
+<!ENTITY netmonitorUI.toolbar.status      "√">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
+  -  in the network table toolbar, above the "method" column. -->
+<!ENTITY netmonitorUI.toolbar.method      "メソッド">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.file): This is the label displayed
+  -  in the network table toolbar, above the "file" column. -->
+<!ENTITY netmonitorUI.toolbar.file        "ファイル">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.domain): This is the label displayed
+  -  in the network table toolbar, above the "domain" column. -->
+<!ENTITY netmonitorUI.toolbar.domain      "ドメイン">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.type): This is the label displayed
+  -  in the network table toolbar, above the "type" column. -->
+<!ENTITY netmonitorUI.toolbar.type        "タイプ">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.size): This is the label displayed
+  -  in the network table toolbar, above the "size" column. -->
+<!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
+  -  in the network details pane identifying the headers tab. -->
+<!ENTITY netmonitorUI.tab.headers         "ヘッダ">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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
+  -  in the network details pane identifying the params tab. -->
+<!ENTITY netmonitorUI.tab.params          "パラメータ">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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
+  -  in the network details pane identifying the timings tab. -->
+<!ENTITY netmonitorUI.tab.timings         "タイミング">
+
+<!-- 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">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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
+  -  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
+  -  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
+  -  in the network details footer for the "Fonts" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterFonts  "フォント">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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
+  -  in the network details footer for the "Media" filtering button. -->
+<!ENTITY netmonitorUI.footer.filterMedia  "メディア">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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.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
+  -  in the network details headers tab identifying the URL. -->
+<!ENTITY netmonitorUI.summary.url         "要求 URL:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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
+  -  in the network details headers tab identifying the status code. -->
+<!ENTITY netmonitorUI.summary.status      "ステータスコード:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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
+  -  in the network details headers tab identifying the headers size. -->
+<!ENTITY netmonitorUI.summary.size        "ヘッダサイズ:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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
+  -  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
+  -  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
+  -  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
+  -  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
+  -  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
+  -  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
+  -  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
+  -  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
+  -  in the network details timings tab identifying the amount of time spent
+  -  in a "receive" state. -->
+<!ENTITY netmonitorUI.timings.receive     "受信:">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
+  -  on the context menu that copies the selected request's url -->
+<!ENTITY netmonitorUI.context.copyUrl      "URL をコピー">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
+  -  for the Copy URL menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.context.copyUrl.accesskey  "C">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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
+  -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.summary.editAndResend.accesskey  "R">
+
+<!-- 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
+  -  as the title of the new custom request form -->
+<!ENTITY netmonitorUI.custom.newRequest   "新規要求">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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
+  -  above the request headers entry in the custom request form -->
+<!ENTITY netmonitorUI.custom.headers      "要求ヘッダ:">
+
+<!-- LOCALIZATION NOTE (debuggerUI.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
+  -  on the button which sends the custom request -->
+<!ENTITY netmonitorUI.custom.send         "送信">
+
+<!-- LOCALIZATION NOTE (debuggerUI.custom.cancel): This is the label displayed
+  -  on the button which cancels and closes the custom request form -->
+<!ENTITY netmonitorUI.custom.cancel       "キャンセル">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -0,0 +1,129 @@
+# 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 Network Monitor
+# which is available from the Web Developer sub-menu -> 'Network Monitor'.
+# 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 (netmonitor.label):
+# This string is displayed in the title of the tab when the Network Monitor is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+netmonitor.label	= ネットワーク
+
+# LOCALIZATION NOTE (netmonitor.commandkey, netmonitor.accesskey)
+# Used for the menuitem in the tool menu
+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 (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	= 要求の詳細を表示
+
+# LOCALIZATION NOTE (headersEmptyText): This is the text displayed in the
+# headers tab of the network details pane when there are no headers available.
+headersEmptyText	= この要求にはヘッダがありません
+
+# LOCALIZATION NOTE (headersFilterText): This is the text displayed in the
+# headers tab of the network details pane for the filtering input.
+headersFilterText	= ヘッダを検索
+
+# LOCALIZATION NOTE (cookiesEmptyText): This is the text displayed in the
+# cookies tab of the network details pane when there are no cookies available.
+cookiesEmptyText	= この要求には Cookie がありません
+
+# LOCALIZATION NOTE (cookiesFilterText): This is the text displayed in the
+# cookies tab of the network details pane for the filtering input.
+cookiesFilterText	= Cookie を検索
+
+# LOCALIZATION NOTE (paramsEmptyText): This is the text displayed in the
+# params tab of the network details pane when there are no params available.
+paramsEmptyText		= この要求にはパラメータがありません
+
+# LOCALIZATION NOTE (paramsFilterText): This is the text displayed in the
+# params tab of the network details pane for the filtering input.
+paramsFilterText	= 要求パラメータを検索
+
+# LOCALIZATION NOTE (paramsQueryString): This is the label displayed
+# in the network details params tab identifying the query string.
+paramsQueryString	= クエリ文字列
+
+# LOCALIZATION NOTE (paramsFormData): This is the label displayed
+# in the network details params tab identifying the form data.
+paramsFormData		= フォームデータ
+
+# LOCALIZATION NOTE (paramsPostPayload): This is the label displayed
+# in the network details params tab identifying the request payload.
+paramsPostPayload	= 要求ペイロード
+
+# LOCALIZATION NOTE (requestHeaders): This is the label displayed
+# in the network details headers tab identifying the request headers.
+requestHeaders		= 要求ヘッダ
+
+# LOCALIZATION NOTE (responseHeaders): This is the label displayed
+# in the network details headers tab identifying the response headers.
+responseHeaders		= 応答ヘッダ
+
+# LOCALIZATION NOTE (requestCookies): This is the label displayed
+# in the network details params tab identifying the request cookies.
+requestCookies		= 要求 Cookie
+
+# LOCALIZATION NOTE (responseCookies): This is the label displayed
+# in the network details params tab identifying the response cookies.
+responseCookies		= 応答 Cookie
+
+# LOCALIZATION NOTE (jsonFilterText): This is the text displayed
+# in the response tab of the network details pane for the JSON filtering input.
+jsonFilterText		= プロパティを検索
+
+# LOCALIZATION NOTE (jsonScopeName): This is the text displayed
+# in the response tab of the network details pane for a JSON scope.
+jsonScopeName		= JSON
+
+# LOCALIZATION NOTE (jsonpScopeName): This is the text displayed
+# in the response tab of the network details pane for a JSONP scope.
+jsonpScopeName		= JSONP \u2192 コールバック %S()
+
+# LOCALIZATION NOTE (networkMenu.sortedAsc): This is the tooltip displayed
+# in the network table toolbar, for any column that is sorted ascending.
+networkMenu.sortedAsc	= 昇順
+
+# LOCALIZATION NOTE (networkMenu.sortedDesc): This is the tooltip displayed
+# in the network table toolbar, for any column that is sorted descending.
+networkMenu.sortedDesc	= 降順
+
+# LOCALIZATION NOTE (networkMenu.empty): This is the label displayed
+# in the network table footer when there are no requests available.
+networkMenu.empty	= 要求はありません
+
+# LOCALIZATION NOTE (networkMenu.summary): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This label is displayed in the network table footer providing concise
+# information about all requests. Parameters: #1 is the number of requests,
+# #2 is the size, #3 is the number of seconds.
+networkMenu.summary	= #1 要求, #2 KB, #3 秒
+
+# LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
+# in the network menu specifying the size of a request (in kilobytes).
+networkMenu.sizeKB	= %S KB
+
+# LOCALIZATION NOTE (networkMenu.totalMS): This is the label displayed
+# in the network menu specifying the time for a request to finish (in milliseconds).
+networkMenu.totalMS	= \u2192 %S ms
+
+# LOCALIZATION NOTE (networkMenu.divisionMS): This is the label displayed
+# in the network menu specifying timing interval divisions (in milliseconds).
+networkMenu.divisionMS	= %S ms
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -5,11 +5,15 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the Profiler strings -->
 
 <!-- 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 (profilerNew.label): This is the label for the
-  -  button that creates a new profile. -->
-<!ENTITY profilerNew.label "新規作成">
+<!-- LOCALIZATION NOTE (profiler.importProfile): This string is displayed
+  -  on a button that opens a dialog to import a saved profile data file. -->
+<!ENTITY importProfile.label "読み込む...">
+
+<!-- LOCALIZATION NOTE (profiler.startProfiler): This string is displayed
+  -  on a button that starts a new profile  -->
+<!ENTITY startProfiler.tooltip "プロファイリングを開始する">
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -10,25 +10,25 @@
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (profiler.label):
 # This string is displayed in the title of the tab when the profiler is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label		= プロファイラ
 
-# LOCALIZATION NOTE (profiler.commandkey, profiler.accesskey)
+# LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
-profiler.commandkey	= VK_F5
+profiler2.commandkey	= VK_F5
 profiler.accesskey	= P
 
-# LOCALIZATION NOTE (profiler.tooltip):
+# LOCALIZATION NOTE (profiler.tooltip2):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
-profiler.tooltip	= プロファイラ
+profiler.tooltip2	= JavaScript プロファイラ
 
 # LOCALIZATION NOTE (profiler.profileName):
 # This string is the default name for new profiles. Its parameter is a number.
 # For example: "Profile 1", "Profile 2", etc.
 profiler.profileName	= プロファイル %S
 
 # LOCALIZATION NOTE (profiler.completeProfile):
 # This string is displayed as a tab in the profiler UI. Clicking on it
@@ -50,35 +50,64 @@ profiler.runningTime		= 実行時間
 # As opposed to the total time which is how much time was spent in that
 # function and in functions it called.
 profiler.self			= 滞在
 
 # LOCALIZATION NOTE (profiler.symbolName)
 # This string is displayed as a table header in the profiler UI.
 profiler.symbolName		= シンボル名
 
-# LOCALIZATION NOTE (profiler.startProfiling)
-# This string is displayed around the button that starts the profiler.
-# String argument will be replaced with a Start button.
-profiler.startProfiling		= プロファイリングを %S する
-
-# LOCALIZATION NOTE (profiler.stopProfiling)
-# This string is displayed around the button that stops the profiler.
-# String argument will be replaced with a Stop button.
-profiler.stopProfiling		= プロファイリングを %S する
-
 # LOCALIZATION NOTE (profiler.start)
 # This string is displayed on the button that starts the profiler.
 profiler.start			= 開始
 
 # LOCALIZATION NOTE (profiler.stop)
 # This string is displayed on the button that stops the profiler.
 profiler.stop			= 終了
 
 # LOCALIZATION NOTE (profiler.loading)
 # This string is displayed above the progress bar when the profiler
 # is busy loading and parsing the report.
 profiler.loading		= プロファイルを読み込み中...
 
-# LOCALIZATION NOTE (profiler.alreadyRunning)
-# This string is displayed in the profiler whenever there is already
-# another running profile. Users can run only one profile at a time.
-profiler.alreadyRunning		= 別のプロファイリングを実行中です。このプロファイリングを実行するには、先にプロファイル %S を終了してください。
+# LOCALIZATION NOTE (profiler.stateIdle)
+# This string is used to show that the profile in question is in IDLE
+# state meaning that it hasn't been started yet.
+profiler.stateIdle		= 待機中
+
+# LOCALIZATION NOTE (profiler.stateRunning)
+# This string is used to show that the profile in question is in RUNNING
+# state meaning that it has been started and currently gathering profile data.
+profiler.stateRunning		= 実行中
+
+# LOCALIZATION NOTE (profiler.stateCompleted)
+# This string is used to show that the profile in question is in COMPLETED
+# state meaning that it has been started and stopped already.
+profiler.stateCompleted		= 完了
+
+# LOCALIZATION NOTE (profiler.sidebarNotice)
+# This string is displayed in the profiler sidebar when there are no
+# existing profiles to show (usually happens when the user opens the
+# profiler for the first time).
+profiler.sidebarNotice		= プロファイルはまだありません。
+
+# LOCALIZATION NOTE (profiler.startProfilerString)
+# This string is displayed on the profiler button when no active
+# profiling sessions are running
+profiler.startProfilerString	= プロファイリングを開始する
+
+# LOCALIZATION NOTE (profiler.stopProfilerString)
+# This string is displayed on the profiler button when an active
+# profiling session is running
+profiler.stopProfilerString	= プロファイリングを終了する
+
+# LOCALIZATION NOTE (profiler.save)
+# This string is displayed as a label for a button that opens a Save File
+# dialog where user can save generated profiler to a file.
+profiler.save			= 保存
+
+# LOCALIZATION NOTE (profiler.saveFileAs)
+# This string as a title for a Save File dialog.
+profiler.saveFileAs		= 別名でプロファイルを保存
+
+# LOCALIZATION NOTE (profiler.openFile)
+# This string as a title for a Open File dialog.
+profiler.openFile		= プロファイルを読み込む
--- a/browser/chrome/browser/devtools/responsiveUI.properties
+++ b/browser/chrome/browser/devtools/responsiveUI.properties
@@ -8,17 +8,28 @@
 # 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  (responsiveUI.rotate): label of the rotate button.
-responsiveUI.rotate		= 高さと幅を入れ替え
+responsiveUI.rotate2		= 高さと幅を入れ替え
+
+# LOCALIZATION NOTE  (responsiveUI.screenshot): tooltip of the screenshot button.
+responsiveUI.screenshot		= スクリーンショット
+
+# LOCALIZATION NOTE (responsiveUI.screenshotGeneratedFilename): The auto generated filename.
+# The first argument (%1$S) is the date string in yyyy-mm-dd format and the second
+# argument (%2$S) is the time string in HH.MM.SS format.
+responsiveUI.screenshotGeneratedFilename	= Screen Shot %1$S at %2$S
+
+# LOCALIZATION NOTE  (responsiveUI.touch): tooltip of the touch button.
+responsiveUI.touch		= タッチイベントをシミュレート (必要な場合はページを再読み込みします)
 
 # LOCALIZATION NOTE  (responsiveUI.addPreset): label of the add preset button.
 responsiveUI.addPreset		= プリセットを追加
 
 # LOCALIZATION NOTE  (responsiveUI.removePreset): label of the remove preset button.
 responsiveUI.removePreset	= プリセットを削除
 
 # LOCALIZATION NOTE  (responsiveUI.customResolution): label of the first item
@@ -36,8 +47,20 @@ responsiveUI.namedResolution	= %S (%S)
 responsiveUI.customNamePromptTitle	= レスポンシブデザインビュー
 
 # LOCALIZATION NOTE (responsiveUI.close): tooltip text of the close button.
 responsiveUI.close			= レスポンシブデザインビューを終了する
 
 # LOCALIZATION NOTE  (responsiveUI.customNamePromptMsg): prompt message when asking
 # the user to specify a name for a new custom preset.
 responsiveUI.customNamePromptMsg	= プリセット %Sx%S の名前を入力してください
+
+# LOCALIZATION NOTE (responsiveUI.resizer): tooltip showed when
+# overring the resizers.
+responsiveUI.resizerTooltip		= Shift キーで大まかに、Ctrl キーで精密にサイズを変更できます。
+
+# LOCALIZATION NOTE (responsiveUI.needReload): notification that appears
+# when touch events are enabled
+responsiveUI.needReload					= これより前にタッチイベントリスナが追加されている場合は、ページを再読み込みする必要があります。
+responsiveUI.notificationReload				= 再読み込み
+responsiveUI.notificationReload_accesskey		= R
+responsiveUI.dontShowReloadNotification			= 再表示しない
+responsiveUI.dontShowReloadNotification_accesskey	= N
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -15,105 +15,108 @@
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
-<!ENTITY window.title			"スクラッチパッド">
+<!ENTITY window.title                 "スクラッチパッド">
 
-<!ENTITY fileMenu.label			"ファイル">
-<!ENTITY fileMenu.accesskey		"F">
+<!ENTITY fileMenu.label               "ファイル">
+<!ENTITY fileMenu.accesskey           "F">
 
-<!ENTITY newWindowCmd.label		"新規ウインドウ">
-<!ENTITY newWindowCmd.accesskey		"N">
-<!ENTITY newWindowCmd.commandkey	"n">
+<!ENTITY newWindowCmd.label           "新規ウインドウ">
+<!ENTITY newWindowCmd.accesskey       "N">
+<!ENTITY newWindowCmd.commandkey      "n">
 
-<!ENTITY openFileCmd.label		"ファイルを開く...">
-<!ENTITY openFileCmd.accesskey		"O">
-<!ENTITY openFileCmd.commandkey		"o">
+<!ENTITY openFileCmd.label            "ファイルを開く...">
+<!ENTITY openFileCmd.accesskey        "O">
+<!ENTITY openFileCmd.commandkey       "o">
+
+<!ENTITY openRecentMenu.label         "最近開いたファイルを開く">
+<!ENTITY openRecentMenu.accesskey     "R">
 
-<!ENTITY openRecentMenu.label		"最近開いたファイルを開く">
-<!ENTITY openRecentMenu.accesskey	"R">
+<!ENTITY revertCmd.label              "変更を破棄...">
+<!ENTITY revertCmd.accesskey          "t">
 
-<!ENTITY revertCmd.label		"変更を破棄...">
-<!ENTITY revertCmd.accesskey		"t">
+<!ENTITY saveFileCmd.label            "保存">
+<!ENTITY saveFileCmd.accesskey        "S">
+<!ENTITY saveFileCmd.commandkey       "s">
 
-<!ENTITY saveFileCmd.label		"保存">
-<!ENTITY saveFileCmd.accesskey		"S">
-<!ENTITY saveFileCmd.commandkey		"s">
+<!ENTITY saveFileAsCmd.label          "別名で保存...">
+<!ENTITY saveFileAsCmd.accesskey      "A">
 
-<!ENTITY saveFileAsCmd.label		"別名で保存...">
-<!ENTITY saveFileAsCmd.accesskey	"A">
+<!ENTITY closeCmd.label               "ウインドウを閉じる">
+<!ENTITY closeCmd.key                 "W">
+<!ENTITY closeCmd.accesskey           "C">
 
-<!ENTITY closeCmd.label			"ウインドウを閉じる">
-<!ENTITY closeCmd.key			"W">
-<!ENTITY closeCmd.accesskey		"C">
+<!ENTITY editMenu.label               "編集">
+<!ENTITY editMenu.accesskey           "E">
 
-<!ENTITY editMenu.label			"編集">
-<!ENTITY editMenu.accesskey		"E">
-
-<!ENTITY run.label			"実行">
-<!ENTITY run.accesskey			"R">
-<!ENTITY run.key			"r">
+<!ENTITY run.label                    "実行">
+<!ENTITY run.accesskey                "R">
+<!ENTITY run.key                      "r">
 
-<!ENTITY inspect.label			"調査">
-<!ENTITY inspect.accesskey		"I">
-<!ENTITY inspect.key			"i">
+<!ENTITY inspect.label                "調査">
+<!ENTITY inspect.accesskey            "I">
+<!ENTITY inspect.key                  "i">
 
-<!ENTITY display.label			"表示">
-<!ENTITY display.accesskey		"D">
-<!ENTITY display.key			"l">
+<!ENTITY display.label                "表示">
+<!ENTITY display.accesskey            "D">
+<!ENTITY display.key                  "l">
+
+<!ENTITY pprint.label                 "整形出力">
+<!ENTITY pprint.key                   "p">
 
 <!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
   -  renamed from "Context" to avoid confusion with the right-click context
   -  menu in the text area. It refers to the JavaScript Environment (or context)
   -  the user is evaluating against. I.e., Content (current tab) or Chrome
   -  (browser).
   -->
-<!ENTITY environmentMenu.label		"実行環境">
-<!ENTITY environmentMenu.accesskey	"N">
+<!ENTITY environmentMenu.label        "実行環境">
+<!ENTITY environmentMenu.accesskey    "N">
 
 
-<!ENTITY contentContext.label		"Web ページ">
-<!ENTITY contentContext.accesskey	"C">
+<!ENTITY contentContext.label         "Web ページ">
+<!ENTITY contentContext.accesskey     "C">
 
 <!-- LOCALIZATION NOTE (browserContext.label, accesskey): This menu item is used
   -  to select an execution environment for the browser window itself as opposed
   -  to content. This is a feature for browser and addon developers and only
   -  enabled via the devtools.chrome.enabled preference. Formerly, this label
   -  was called "Chrome".
   -->
-<!ENTITY browserContext.label		"ブラウザ">
-<!ENTITY browserContext.accesskey	"B">
+<!ENTITY browserContext.label         "ブラウザ">
+<!ENTITY browserContext.accesskey     "B">
 
 <!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
   -  for the help button in the menubar but Gnome does not.
   -->
-<!ENTITY helpMenu.label			"ヘルプ">
-<!ENTITY helpMenu.accesskey		"H">
-<!ENTITY helpMenuWin.label		"ヘルプ">
-<!ENTITY helpMenuWin.accesskey		"H">
+<!ENTITY helpMenu.label               "ヘルプ">
+<!ENTITY helpMenu.accesskey           "H">
+<!ENTITY helpMenuWin.label            "ヘルプ">
+<!ENTITY helpMenuWin.accesskey        "H">
 
-<!ENTITY documentationLink.label	"スクラッチパッドのヘルプ (MDN)">
-<!ENTITY documentationLink.accesskey	"D">
+<!ENTITY documentationLink.label      "スクラッチパッドのヘルプ (MDN)">
+<!ENTITY documentationLink.accesskey  "D">
 
 
 <!-- LOCALIZATION NOTE (resetContext2.label): This command allows the developer
   -  to reset/clear the global object of the environment where the code executes.
   -->
-<!ENTITY resetContext2.label		"変数をリセット">
-<!ENTITY resetContext2.accesskey	"T">
+<!ENTITY resetContext2.label          "変数をリセット">
+<!ENTITY resetContext2.accesskey      "T">
 
-<!ENTITY reloadAndRun.label		"再読み込みして実行">
-<!ENTITY reloadAndRun.accesskey		"E">
-<!ENTITY reloadAndRun.key		"r">
+<!ENTITY reloadAndRun.label           "再読み込みして実行">
+<!ENTITY reloadAndRun.accesskey       "E">
+<!ENTITY reloadAndRun.key             "r">
 
-<!ENTITY executeMenu.label		"実行メニュー">
-<!ENTITY executeMenu.accesskey		"X">
+<!ENTITY executeMenu.label            "実行メニュー">
+<!ENTITY executeMenu.accesskey        "X">
 
 <!-- LOCALIZATION NOTE (errorConsoleCmd.commandkey): This command key launches
   -  the browser Error Console, the key should be identical to the property of
   -  the same name in browser.dtd.
   -->
-<!ENTITY errorConsoleCmd.commandkey	"j">
+<!ENTITY errorConsoleCmd.commandkey   "j">
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -6,22 +6,16 @@
 # which is available from the Web Developer sub-menu -> 'Scratchpad'.
 #
 # 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  (propertyPanel.updateButton.label): Used in the Property
-# Panel that is opened by the Scratchpad window when inspecting an object. This
-# is the Update button label.
-propertyPanel.updateButton.label	= 更新
-propertyPanel.updateButton.accesskey	= U
-
 # LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
 # the user attempts to save to an already existing file.
 export.fileOverwriteConfirmation	= ファイルがすでに存在します。上書きしますか?
 
 # LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
 # when Scratchpad does not find any recently active window of navigator:browser
 # type.
 browserWindow.unavailable		= コードを実行するブラウザウインドウが見つかりません。
@@ -82,8 +76,20 @@ browserContext.notification		= このスクラッチパッドは、ブラウザコンテキストで実行されます。
 
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
 help.openDocumentationPage		= https://developer.mozilla.org/ja/Tools/Scratchpad
 
 # LOCALIZATION NOTE (fileExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification		= このファイルはもう存在しません。
+
+# LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
+# appears in the filter text box for the properties view container.
+propertiesFilterPlaceholder		= プロパティをフィルタ
+
+# LOCALIZATION NOTE (stringConversionFailed): Happens when a value cannot be
+# converted to a string for inspection.
+stringConversionFailed			= 値を文字列に変換できません。
+
+# LOCALIZATION NOTE (connectionTimeout): message displayed when the Remote Scratchpad
+# fails to connect to the server due to a timeout.
+connectionTimeout			= 接続がタイムアウトしました。原因と思われるエラーメッセージを、エラーコンソールで確認してください。スクラッチパッドを開きなおして、やり直してください。
--- a/browser/chrome/browser/devtools/styleeditor.dtd
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -5,55 +5,37 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the Style Editor window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 <!-- LOCALIZATION NOTE : 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 (window.title): This is the default title for Style Editor
-     main window. NB: the property chromeWindowTitle in styleeditor.properties
-     is used to dynamically update the Style Editor window title with the title
-     of the web page it is editing. -->
-<!ENTITY window.title			"スタイルエディタ">
-
 <!ENTITY newButton.label		"新規作成">
 <!ENTITY newButton.tooltip		"新規スタイルシートを作成して、ドキュメントに読み込む">
 <!ENTITY newButton.accesskey		"N">
-<!ENTITY newButton.commandkey		"n">
 
 <!ENTITY importButton.label		"読み込む...">
 <!ENTITY importButton.tooltip		"既存のスタイルシートをドキュメントに読み込む">
 <!ENTITY importButton.accesskey		"I">
-<!ENTITY importButton.commandkey	"i">
 
 <!ENTITY visibilityToggle.tooltip	"スタイルシートのオン/オフを切り替える">
-<!ENTITY visibilityToggle.accesskey	"V">
 
 <!ENTITY saveButton.label		"保存">
 <!ENTITY saveButton.tooltip		"このスタイルシートをファイルに保存する">
 <!ENTITY saveButton.accesskey		"S">
-<!ENTITY saveButton.commandkey		"s">
-
-<!-- (^^h 画面未確認 -->
-<!-- LOCALICATION NOTE  (scoped.label): This is shown in a stylesheets list item
-     when the stylesheet uses the scoped attribute on the <style> element. -->
-<!ENTITY scoped.label			"Scoped.">
 
 <!ENTITY editorTextbox.placeholder	"ここに CSS を入力します。">
 
 <!-- LOCALICATION NOTE  (noStyleSheet.label): This is shown when a page has no
      stylesheet. -->
 <!ENTITY noStyleSheet.label		"このページにはスタイルシートがありません。">
 
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-start.label): This is the start of a
      tip sentence shown when there is no stylesheet. It suggests to create a new
      stylesheet and provides an action link to do so. -->
 <!ENTITY noStyleSheet-tip-start.label	"それとも、">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-action.label): This is text for the
      link that triggers creation of a new stylesheet. -->
 <!ENTITY noStyleSheet-tip-action.label	"新規スタイルシートを追加">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-end.label): End of the tip sentence -->
 <!ENTITY noStyleSheet-tip-end.label	"しますか?">
-
-<!-- LOCALIZATION NOTE  (closeCmd.key): Accel + this key closes the window. -->
-<!ENTITY closeCmd.key			"W">
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -20,65 +20,55 @@ chromeWindowTitle		= スタイルエディタ [%S]
 # the argument is the index (order) of the containing <style> element in the
 # document.
 inlineStyleSheet		= <インラインスタイルシート #%S>
 
 # LOCALIZATION NOTE  (newStyleSheet): This is the default name for a new
 # user-created style sheet.
 newStyleSheet			= 新規スタイルシート #%S
 
-# LOCALIZATION NOTE  (ruleCount.label): Semi-colon list of plural forms.
+# LOCALIZATION NOTE  (ruleCount.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # This is shown in the style sheets list.
 # #1 rule.
 # example: 111 rules.
-ruleCount.label			= #1 個のルール;#1 個のルール
+ruleCount.label			= #1 個のルール
 
-# LOCALIZATION NOTE  (error-load.label): This is shown when loading fails.
+# LOCALIZATION NOTE  (error-load): This is shown when loading fails.
 error-load			= スタイルシートをロードできませんでした。
 
-# LOCALIZATION NOTE  (error-save.label): This is shown when saving fails.
+# LOCALIZATION NOTE  (error-save): This is shown when saving fails.
 error-save			= スタイルシートを保存できませんでした。
 
 # LOCALIZATION NOTE  (importStyleSheet.title): This is the file picker title,
 # when you import a style sheet into the Style Editor.
 importStyleSheet.title		= スタイルシートを読み込む
 
-# LOCALIZATION NOTE  (importStyleSheet.title): This is the *.css filter title
+# LOCALIZATION NOTE  (importStyleSheet.filter): This is the *.css filter title
 importStyleSheet.filter		= CSS ファイル
 
 # LOCALIZATION NOTE  (saveStyleSheet.title): This is the file picker title,
 # when you save a style sheet from the Style Editor.
 saveStyleSheet.title		= スタイルシートを保存
 
-# LOCALIZATION NOTE  (saveStyleSheet.title): This is the *.css filter title
+# LOCALIZATION NOTE  (saveStyleSheet.filter): This is the *.css filter title
 saveStyleSheet.filter		= CSS ファイル
 
 # LOCALIZATION NOTE  (open.commandkey): This the key to use in
 # conjunction with shift to open the style editor
 open.commandkey			= VK_F7
 
 # LOCALIZATION NOTE (open.accesskey): The access key used to open the style
 # editor.
 open.accesskey			= y
 
 # LOCALIZATION NOTE  (saveStyleSheet.commandkey): This the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey	= S
 
-# LOCALIZATION NOTE  (undo.commandkey): This the key to use in
-# conjunction with accel (Command on Mac or Ctrl on other platforms) to Undo a
-# change in the editor.
-undo.commandkey			= Z
-
-# LOCALIZATION NOTE  (redo.commandkey): This the key to use in
-# conjunction with accel+shift (accel is Command on Mac or Ctrl on other
-# platforms) to Redo a change in the editor.
-redo.commandkey			= Z
-
 # LOCALIZATION NOTE (ToolboxStyleEditor.label):
 # This string is displayed in the title of the tab when the debugger is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxStyleEditor.label	= スタイルエディタ
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.tooltip):
 # This string is displayed in the tooltip of the tab when the debugger is
 # displayed inside the developer tools window.
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -30,16 +30,24 @@ rule.sourceInline		= インライン
 rule.sourceElement		= 要素
 
 # LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
 # that were inherited from a parent node. Will be passed a node
 # identifier of the parent node.
 # e.g "Inherited from body#bodyID"
 rule.inheritedFrom		= %S から継承
 
+# LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
+# pseudo element header
+rule.pseudoElement		= 疑似要素
+
+# LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
+# pseudo element header
+rule.selectedElement		= この要素
+
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
 # quickly jump to the documentation from the Mozilla Developer Network site.
 # This is the link title shown in the hover tooltip.
 helpLinkTitle			= このプロパティに関するドキュメントを開く
 
 # LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
 # entered into the rule view a warning icon is displayed. This text is used for
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -1,7 +1,100 @@
 <!-- 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 Toolbox strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate key -->
+
 <!ENTITY closeCmd.key  "W">
 
-<!ENTITY toolboxCloseButton.tooltip  "開発ツールを閉じる">
+<!ENTITY toolboxCloseButton.tooltip    "開発ツールを閉じる">
+<!ENTITY toolboxOptionsButton.key      "O">
+<!ENTITY toolboxNextTool.key           "]">
+<!ENTITY toolboxPreviousTool.key       "[">
+
+<!ENTITY toolboxZoomIn.key             "+">
+<!ENTITY toolboxZoomIn.key2            "="> <!-- + is above this key on many keyboards -->
+<!ENTITY toolboxZoomOut.key            "-">
+<!ENTITY toolboxZoomReset.key          "0">
+
+<!-- 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.requiresRestart2): This is the requires
+  -  restart label at right of settings that require a browser restart to be
+  -  effective. -->
+<!ENTITY options.context.requiresRestart2  "ブラウザの再起動が必要">
+
+<!-- LOCALIZATION NOTE (options.restartButton.label): This is the label for the
+  -  restart button next to options.context.requiresRestart2 label. -->
+<!ENTITY options.restartButton.label  "今すぐ再起動">
+
+<!-- LOCALIZATION NOTE (options.context.triggersPageRefresh2): This is the
+  -  triggers page refresh label next to the settings in the advanced settings
+  -  group in the options panel which trigger page reload. -->
+<!ENTITY options.context.triggersPageRefresh2  "現在のセッションのみ有効。再読み込みで復帰">
+
+<!-- LOCALIZATION NOTE (options.enableChrome.label3): 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.label3    "ブラウザデバッガを有効">
+<!ENTITY options.enableChrome.tooltip   "さまざまな開発ツールがブラウザコンテキストで使えるようになります">
+
+<!-- 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.label2,
+  -  options.disableJavaScript.tooltip): This is the options panel label and
+  -  tooltip for the checkbox that toggles JavaScript on or off. -->
+<!ENTITY options.disableJavaScript.label2    "JavaScript を無効">
+<!ENTITY options.disableJavaScript.tooltip   "このオプションを有効にすると、現在のタブの JavaScript を無効にします。タブまたはツールボックスを閉じると、この設定は取り消されます。">
+
+<!-- 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
+  -  installed by add-ons. -->
+<!ENTITY options.selectAdditionalTools.label  "開発ツールのアドオン">
+
+<!-- LOCALIZATION NOTE (options.toolNotSupported.label): This is the label for
+  -  the explanation of the * marker on a tool which is currently not supported
+  -  for the target of the toolbox. -->
+<!ENTITY options.toolNotSupported.label  "* 現在のツールボックスには対応していません">
+
+<!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label): This is the label for
+  -  the heading of the radiobox corresponding to the theme of the developer
+  -  tools. -->
+<!ENTITY options.selectDevToolsTheme.label   "開発ツールのテーマを選択:">
+<!ENTITY options.darkTheme.label             "Dark theme">
+<!ENTITY options.lightTheme.label            "Light theme">
+
+<!-- LOCALIZATION NOTE (options.webconsole.label): This is the label for the
+  -  heading of the group of Web Console preferences in the options panel. -->
+<!ENTITY options.webconsole.label            "Web コンソール">
+
+<!-- LOCALIZATION NOTE (options.enablePersistentLogging.label): This is the
+  -  label for the checkbox that toggles persistent logs in the Web Console,
+  -  i.e. devtools.webconsole.persistlog a boolean preference in about:config,
+  -  in the options panel. -->
+<!ENTITY options.enablePersistentLogging.label    "ログ出力を残す">
+<!ENTITY options.enablePersistentLogging.tooltip  "このオプションを有効にすると、新しいページに誘導させられた場合でも Web コンソールの出力を消去しないようになります">
+
+<!-- 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 プロファイラ">
+
+<!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
+  -  label for the checkbox that toggles the display of the platform data in the,
+  -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
+  -  in about:config, in the options panel. -->
+<!ENTITY options.showPlatformData.label    "Gecko プラットフォームのデータを表示">
+<!ENTITY options.showPlatformData.tooltip  "このオプションを有効にすると、JavaScript プロファイラの出力に Gecko プラットフォームのシンボルが含まれるようになります">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -29,8 +29,28 @@ toolboxToggleButton.tooltip		= %1$S、%2$S\nクリックすると開発ツールを切り替えます。
 # used to format the title of the toolbox.
 # The name of the selected tool: %1$S.
 # The url of the page being tooled: %2$S.
 toolbox.titleTemplate			= %1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
 toolbox.defaultTitle			= 開発ツール
+
+# LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
+# for the options panel tab.
+optionsButton.tooltip			= 開発ツールのオプション
+
+# LOCALIZATION NOTE (options.toolNotSupported): This is the template
+# used to add a * marker to the label for the Options Panel tool checkbox for the
+# tool which is not supported for the current toolbox target.
+# The name of the tool: %1$S.
+options.toolNotSupportedMarker		= %1$S *
+
+# LOCALIZATION NOTE (scratchpad.keycode)
+# Used for opening scratchpad from the detached toolbox window
+# Needs to match scratchpad.keycode from browser.dtd
+scratchpad.keycode			= VK_F4
+
+# LOCALIZATION NOTE (browserConsoleCmd.commandkey)
+# Used for toggling the browser console from the detached toolbox window
+# Needs to match browserConsoleCmd.commandkey from browser.dtd
+browserConsoleCmd.commandkey		= j
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -4,16 +4,17 @@
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 <!ENTITY window.title				"Web コンソール">
+<!ENTITY browserConsole.title			"ブラウザコンソール">
 
 <!ENTITY networkPanel.requestURLColon		"要求 URL:">
 <!ENTITY networkPanel.requestMethodColon	"要求メソッド:">
 <!ENTITY networkPanel.statusCodeColon		"ステータスコード:">
 
 <!ENTITY networkPanel.requestHeaders		"要求ヘッダ">
 <!ENTITY networkPanel.requestCookie		"送信 Cookie">
 <!ENTITY networkPanel.requestBody		"要求ボディ">
@@ -39,40 +40,58 @@
 <!ENTITY openURL.accesskey			"T">
 
 <!-- LOCALIZATION NOTE (btnPageNet.label): This string is used for the menu
   -  button that allows users to toggle the network logging output.
   -  This string and the following strings toggle various kinds of output
   -  filters. -->
 <!ENTITY btnPageNet.label			"ネットワーク">
 <!ENTITY btnPageNet.tooltip			"ネットワークアクセスを記録します">
+<!ENTITY btnPageNet.accesskey			"N">
+<!-- LOCALIZATION NOTE (btnPageNet.accesskeyMacOSX): This string is used as
+  -  access key for the menu button that allows users to toggle the network
+  -  logging output. On MacOSX accesskeys are available with Ctrl-*. Please make
+  -  sure you do not use the following letters: A, E, N and P. These are used
+  -  for editing commands in text inputs. -->
+<!ENTITY btnPageNet.accesskeyMacOSX		"t">
 <!ENTITY btnPageCSS.label			"CSS">
 <!ENTITY btnPageCSS.tooltip			"CSS パースエラーを記録します">
+<!ENTITY btnPageCSS.accesskey			"C">
 <!ENTITY btnPageJS.label			"JS">
 <!ENTITY btnPageJS.tooltip			"JavaScript 例外を記録します">
+<!ENTITY btnPageJS.accesskey			"J">
+<!ENTITY btnPageSecurity.label			"セキュリティ">
+<!ENTITY btnPageSecurity.tooltip		"セキュリティのエラーと警告を記録します">
+<!ENTITY btnPageSecurity.accesskey		"u">
 
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
 <!ENTITY btnPageLogging.label			"ロギング">
 <!ENTITY btnPageLogging.tooltip			"window.console オブジェクトに送信されたメッセージを記録します">
+<!ENTITY btnPageLogging.accesskey2		"R">
 <!ENTITY btnConsoleErrors			"エラー">
 <!ENTITY btnConsoleInfo				"メッセージ">
 <!ENTITY btnConsoleWarnings			"警告">
 <!ENTITY btnConsoleLog				"ログ">
 
-<!ENTITY filterBox.placeholder			"フィルタ">
+<!ENTITY filterOutput.placeholder		"フィルタ出力">
 <!ENTITY btnClear.label				"消去">
 <!ENTITY btnClear.tooltip			"Web コンソールの内容を消去します">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey		"+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2		"="> <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey3		"">
 
 <!ENTITY fullZoomReduceCmd.commandkey		"-">
 <!ENTITY fullZoomReduceCmd.commandkey2		"">
 
 <!ENTITY fullZoomResetCmd.commandkey		"0">
 <!ENTITY fullZoomResetCmd.commandkey2		"">
 
 <!ENTITY copyURLCmd.label			"リンクの URL をコピー">
 <!ENTITY copyURLCmd.accesskey			"a">
+
+<!ENTITY closeCmd.key				"W">
+<!ENTITY findCmd.key				"F">
+<!ENTITY clearOutputCmd.key			"K">
+<!ENTITY clearOutputCtrl.key			"L">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -29,172 +29,170 @@ localConsole		= ローカルコンソール
 clearConsoleCmd.label		= ログ消去
 clearConsoleCmd.accesskey	= e
 close.button		= 閉じる
 close.accesskey		= C
 update.button		= 更新
 update.accesskey	= U
 cmd.commandkey		= k
 webConsoleCmd.accesskey	= W
-# LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
-#
-# The "PropertyPanel" is used to display a JS object to the user.
-# If it is clear which object is being inspected (e.g., window, document object)
-# the title of the panel is based on the `jsPropertyInspectTitle` string.
-# If it isn't clear which object is being inspected, the `jsPropertyTitle` string
-# gets used. This can be the case when the user logs an object to the WebConsole
-# output using the console.log(aObjectToInspect) method.
-#
-# You can find a screenshot of the PropertyPanel here:
-#   https://bug585030.bugzilla.mozilla.org/attachment.cgi?id=464034
-jsPropertyTitle		= オブジェクトインスペクタ
-# LOCALIZATION NOTE (jsPropertyInspectTitle):
-#
-# The %S is replaced by the evaluated code the user clicked on in the console.
-#
-# Example: The user executed `window.document` in the WebConsole. The `document`
-# object is written to the output. If the user clicks on the `document` output
-# in the console, a PropertyPanel will show up. The title of the PropertyPanel
-# is set to `Inspect: window.document` because the clicked `document` object was
-# evaluated based on the `window.document` string.
-jsPropertyInspectTitle	= 調査: %S
+
 # LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
 # %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
 timestampFormat		= %1$02S:%2$02S:%3$02S.%4$03S
 
 helperFuncUnsupportedTypeError	= この種類のオブジェクト上の pprint は呼び出せません。
 NetworkPanel.label	= ネットワーク要求調査
-# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
-#
-# This string is used to show the duration between two network events (e.g
-# request and response header or response header and response body).
+
+# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS): this string is used to
+# show the duration between two network events (e.g request and response
+# header or response header and response body). Parameters: %S is the duration.
 NetworkPanel.durationMS	= %Sms
-# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
-# This string is used to show the duration between the response header and the
-# response body event. It also shows the size of the received or cached image.
-#
-# The first %S is replace by the width of the inspected image.
-# The second %S is replaced by the height of the inspected image.
-# The third %S is replaced by the duration between the response header and the
-# response body event.
-NetworkPanel.imageSizeDeltaDurationMS	= %Sx%Spx, Δ%Sms
-# LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content):
-#
-# This string is displayed within the response body section of the NetworkPanel
-# if the content type of the network request can't be displayed in the
-# NetworkPanel. E.g. any kind of text is easy to display, but some audio or
-# flash data received from the server can't be displayed.
-#
-# The %S is replaced by the content type, that can't be displayed, examples are
-#  o application/x-shockwave-flash
-#  o music/crescendo
+
+# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS): this string is
+# used to show the duration between the response header and the response body
+# event. It also shows the size of the received or cached image. Parameters:
+# %1$S is the width of the inspected image, %2$S is the height of the
+# inspected image, %3$S is the duration between the response header and the
+# response body event. Example: 150x100px, Δ50ms.
+NetworkPanel.imageSizeDeltaDurationMS	= %1$Sx%2$Spx, Δ%3$Sms
+
+# LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content): this
+# string is displayed within the response body section of the NetworkPanel if
+# the content type of the network request can't be displayed. E.g. any kind of
+# text is easy to display, but some audio or flash data received from the
+# server can't be displayed. Parameters: %S is the content type that can't be
+# displayed, examples are application/x-shockwave-flash, music/crescendo.
 NetworkPanel.responseBodyUnableToDisplay.content	= "%S" の応答は表示できません。
+
 ConsoleAPIDisabled			= Web コンソールのログ記録 API (console.log, console.info, console.warn, console.error) は、このページ上のスクリプトにより無効化されています。
 
-# LOCALIZATION NOTE (webConsoleWindowTitleAndURL): The Web Console floating
-# panel title, followed by the web page URL.
-# For RTL languages you need to set the LRM in the string to give the URL
-# the correct direction.
+# LOCALIZATION NOTE (webConsoleWindowTitleAndURL): the Web Console floating
+# panel title. For RTL languages you need to set the LRM in the string to give
+# the URL the correct direction. Parameters: %S is the web page URL.
 webConsoleWindowTitleAndURL	= Web コンソール - %S
 
-# LOCALIZATION NOTE (webConsoleMixedContentWarning): Message displayed after a
-# URL in the Web Console that has been flagged for Mixed Content (i.e. http
-# content in an https page)
+# LOCALIZATION NOTE (webConsoleMixedContentWarning): the message displayed
+# after a URL in the Web Console that has been flagged for Mixed Content (i.e.
+# http content in an https page).
 webConsoleMixedContentWarning	= 混在コンテンツ
 
-# LOCALIZATION NOTE (scratchpad.linkText):
-# The text used in the right hand side of the web console command line when
-# JavaScript is being entered, to indicate how to jump into scratchpad mode
+# LOCALIZATION NOTE (webConsoleMoreInfoLabel): the more info tag displayed
+# after security related web console me