merge
authorKechol <kechol28@gmail.com>
Mon, 01 Sep 2014 23:09:39 +0900
changeset 1519 d8da4c10c2ffc2409a5b7cf28a614476a074ea4c
parent 1518 fd425f57697f97aa4cc807d2996a20c13120601e (current diff)
parent 1517 3c8dd892906e3a1e70b0907d2833dd8d8c7dd54d (diff)
child 1520 358f0c3219c11e2c04a803dd32c044e8a7cf4e1d
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
merge
--- a/suite/chrome/browser/region.properties
+++ b/suite/chrome/browser/region.properties
@@ -3,17 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # navigator.properties
 #
 # all.js
 #
 browser.startup.homepage=http://www.seamonkey-project.org/start/
 browser.throbber.url=http://www.seamonkey.jp/
-browser.search.defaulturl=https://www.google.co.jp/search?q=
 
 browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
 browser.translation.serviceDomain=translate.google.com
 browser.validate.html.service=http://validator.w3.org/check?charset=%28detect+automatically%29&doctype=Inline&uri=
 
 #config.js
 #
 startup.homepage_override_url=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
--- a/suite/chrome/browser/webDeveloper.dtd
+++ b/suite/chrome/browser/webDeveloper.dtd
@@ -1,6 +1,8 @@
 <!-- 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 validatePage.label	"このページを検証">
-<!ENTITY validatePage.accesskey	"V">
+<!ENTITY validatePage.label            "このページを検証">
+<!ENTITY validatePage.accesskey        "V">
+<!ENTITY allowRemoteDebugging.label     "リモートデバッグを許可">
+<!ENTITY allowRemoteDebugging.accesskey "A">
--- a/suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
+++ b/suite/chrome/common/bookmarks/editBookmarkOverlay.dtd
@@ -17,14 +17,12 @@
 <!ENTITY editBookmarkOverlay.tags.label                      "タグ:">
 <!ENTITY editBookmarkOverlay.tags.accesskey                  "a">
 <!ENTITY editBookmarkOverlay.tagsEmptyDesc.label             "カンマ区切りで複数入力できます">
 <!ENTITY editBookmarkOverlay.description.label               "説明:">
 <!ENTITY editBookmarkOverlay.description.accesskey           "D">
 <!ENTITY editBookmarkOverlay.keyword.label                   "キーワード:">
 <!ENTITY editBookmarkOverlay.keyword.accesskey               "K">
 <!ENTITY editBookmarkOverlay.tagsExpanderDown.tooltip        "既存のタグ一覧を表示します">
-<!ENTITY editBookmarkOverlay.loadInSidebar.label             "このブックマークはサイドバーに読み込む">
-<!ENTITY editBookmarkOverlay.loadInSidebar.accesskey         "o">
 <!ENTITY editBookmarkOverlay.choose.label                    "選択...">
 <!ENTITY editBookmarkOverlay.newFolderButton.label           "新しいフォルダ">
 <!ENTITY editBookmarkOverlay.newFolderButton.accesskey       "o">
 <!ENTITY editBookmarkOverlay.newFolderButton.tooltip         "新しいフォルダを作成します">
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -320,57 +320,66 @@
   If permitted, websites can store their content and any data you entered
   locally in &brandShortName;. In this way, web applications can be used even
   without a network connection.</p>
 
 <p>The <strong>Offline Web Content and User Data</strong> section provides the
   following functions:</p>
 
 <ul>
-  <li><strong>Your application cache is currently using [__] of disk
-    space</strong>: This entry is informational and provides you with an
-    estimate of the offline data currently used by all web applications
-    combined.</li>
+  <li><strong>Your offline storage currently uses [__] of disk space</strong>:
+    This entry is informational and provides you with an estimate of the
+    offline data currently used by all web applications combined.</li>
   <li><strong>Clear</strong>: Immediately clears data that has been saved
     by all websites for use when you are offline.</li>
-  <li><strong>Notify me when a website wants to store data for offline
+  <li><strong>Allow all websites to store data for offline use</strong>: Select
+    this option if you want to permit websites by default to store web content
+    and user data locally on the disk of your computer.</li>
+  <li><strong>Only allow websites with explicit permissions</strong>: Select
+    this option if you want to control whether or not a website can store web
+    content for offline use locally. Unless explicit permission has been
+    granted, the website&apos;s request to access the offline storage is
+    blocked or a notification shown to give you the option to allow it.</li>
+  <li><strong>Notify me when websites want to store data for offline
     use</strong>: Check this box if you want to be notified when a website
-    wants to utilize the offline feature but does not currently have the
-    permissions to do so. An information bar will appear for this site with
-    the following options:
+    requests to store content or data in the offline storage but does not
+    currently have any permissions set whether or not it is allowed to do so.
+    An information bar will appear for this site offering the following options:
     <ul>
-      <li><strong>Allow</strong>: Permanently allow this site the use of the
-        offline storage for this and future accesses.</li>
+      <li><strong>Always Allow</strong>: Permanently allow this site the use
+        of the offline storage for this and future accesses.</li>
       <li><strong>Never for This Site</strong>: Permanently deny this site
         the use of the offline storage for this and future accesses.</li>
       <li><strong>Not Now</strong>: Deny this site the use of the offline
         storage for this request but ask again for future accesses.</li>
     </ul>
-    <p><strong>Note</strong>: If the notification box is <em>not</em> checked,
-      &brandShortName; will proceed as if <q>Not Now</q> was selected.</p>
+    <p><strong>Note</strong>: The offline storage is <em>not</em> available in
+      a <a href="using_priv_help.xhtml#browsing_in_a_private_window">private
+      window</a>. You will receive a notification if this option is checked,
+      but all requests will be blocked.</p>
   </li>
   <!-- NOTE: link "Data Manager" below once bug 599097 has been fixed -->
   <li><strong>Manage Permissions</strong>: Opens the Data Manager in a new
     tab or window where you can modify the Offline Web Applications permissions
     for each domain:
     <ul>
       <li><strong>Use Default</strong>: Check this box to return to the default
         behavior, thus presenting the information bar with the next request
         from a site within each domain if the notification option is chosen
         (effectively removes the entry from this listing).</li>
       <li><strong>Allow</strong>: Select this option to allow this site
         the use of the offline storage for all accesses.</li>
       <li><strong>Block</strong>: Select this option to deny this site
         the use of the offline storage for all accesses.</li>
     </ul>
   </li>
-  <li><strong>The following websites are allowed to store data for offline
-    use</strong>: Lists the domains of all websites which have stored offline
-    data, along with the amount of data currently used by this domain.</li>
-  <li><strong>Clear data</strong>: Select a website domain and click this
+  <li><strong>The following websites are using offline storage</strong>:
+    Lists the domains of all websites which have stored offline data, along
+    with the amount of data currently used by this domain.</li>
+  <li><strong>Clear Data</strong>: Select a website domain and click this
     button to delete all offline data for the specified domain. Click <q>Remove
     offline data</q> after being prompted for confirmation to do so.</li>
 </ul>
        
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="proxies">Advanced Preferences - Proxies</h2>
 
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/notification.dtd
@@ -0,0 +1,15 @@
+<!-- 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 closeNotification.tooltip "このメッセージを閉じます">
+
+<!-- LOCALIZATION NOTE (closeNotificationItem.label): This entity is used
+     to replace the Toolkit default closeNotificationItem.label ("Not Now")
+     which is ambiguous in some cases. Thus, make sure to select a phrase
+     that clearly relates to closing the current doorhanger. -->
+<!ENTITY closeNotificationItem.label "通知を表示しない">
+
+<!ENTITY checkForUpdates "更新を確認...">
+
+<!ENTITY learnMore "詳細...">
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -114,54 +114,59 @@ lwthemeInstallNotification.manageButton.
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message			= %S は再起動後にインストールされます。
 lwthemeNeedsRestart.restartButton		= 今すぐ再起動
 lwthemeNeedsRestart.restartButton.accesskey	= R
 
 # Geolocation UI
-# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareLocation geolocation.alwaysShare geolocation.neverShare):
-#If you're having trouble with the word Share, please use Allow and Block in your language.
-geolocation.shareLocation			= 許可
+# LOCALIZATION NOTE (geolocation.shareLocation geolocation.dontShareThisRequest geolocation.alwaysShareForSite geolocation.neverShareForSite):
+#shareLocation is always visible, other entries are contextually relative to it
+#if this doesn't work for your language, use explicit Share or Allow/Block.
+geolocation.shareLocation			= 共有
 geolocation.shareLocation.accesskey		= a
-geolocation.dontShareLocation			= ブロック
-geolocation.dontShareLocation.accesskey		= o
-geolocation.alwaysShareLocation			= 常に共有
-geolocation.alwaysShareLocation.accesskey	= A
-geolocation.neverShareLocation			= 共有しない
-geolocation.neverShareLocation.accesskey	= N
+geolocation.dontShareThisRequest		= 今回は共有しない
+geolocation.dontShareThisRequest.accesskey	= o
+geolocation.alwaysShareForSite			= このサイトでは常に共有
+geolocation.alwaysShareForSite.accesskey	= A
+geolocation.neverShareForSite			= このサイトでは共有しない
+geolocation.neverShareForSite.accesskey		= N
 geolocation.siteWantsToKnow			= この Web サイト (%S) があなたの位置情報を求めています。
 geolocation.fileWantsToKnow			= ファイル %S があなたの位置情報を求めてきています。
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." unless \u2026 doesn't suit traditions in your locale.
 geolocation.learnMore				= 詳細を表示...
 geolocation.remember				= このサイトでは今後も同様に処理する
 
 # Desktop Notifications
-webNotifications.showForSession=通知を表示する
-webNotifications.showForSession.accesskey=w
-webNotifications.dontShowForSession=このセッションのみ表示しない
-webNotifications.dontShowForSession.accesskey=o
-webNotifications.alwaysShow=常に表示する
-webNotifications.alwaysShow.accesskey=A
-webNotifications.neverShow=表示しない
-webNotifications.neverShow.accesskey=N
-webNotifications.showFromSite=%S からの通知を表示しますか?
-webNotifications.remember=このサイトでは今後も同様に処理する
+# LOCALIZATION NOTE (webnotifications.showForSession webnotifications.dontShowThisSession webnotifications.alwaysShowForSite webnotifications.neverShowForSite):
+#showForSession is always visible, other entries are contextually relative to it
+#if this doesn't work for your language, use explicit Show or Allow/Block.
+webNotifications.showForSession			= 通知を表示する
+webNotifications.showForSession.accesskey	= w
+webNotifications.dontShowThisSession		= このセッションのみ表示しない
+webNotifications.dontShowThisSession.accesskey	= o
+webNotifications.alwaysShowForSite		= このサイトでは常に表示
+webNotifications.alwaysShowForSite.accesskey	= A
+webNotifications.neverShowForSite		= このサイトでは表示しない
+webNotifications.neverShowForSite.accesskey	= N
+webNotifications.showFromSite			= %S からの通知を表示しますか?
+webNotifications.remember			= このサイトでは今後も同様に処理する
 
 # IndexedDB
 offlineApps.permissions				= このサイト (%S) はオフラインで利用するデータをコンピュータに保存することを求めています。
+offlineApps.private				= プライベートウィンドウで閲覧しているため、この Web サイト (%S) はオフラインで利用するデータをコンピュータに保存することは許可されません。
 offlineApps.quota				= この Web サイト (%1$S) は、オフラインで利用するデータとしてあなたのコンピュータに %2$SMB のデータを保存しようとしています。
-offlineApps.allow				= 許可
-offlineApps.allow.accesskey			= A
+offlineApps.always				= 常に許可
+offlineApps.always.accesskey			= A
 offlineApps.later				= 今回は拒否
 offlineApps.later.accesskey			= N
-offlineApps.deny				= このサイトは常に拒否
-offlineApps.deny.accesskey			= e
+offlineApps.never				= このサイトでは常に拒否
+offlineApps.never.accesskey			= e
 
 # Block autorefresh
 refreshBlocked.goButton				= 許可
 refreshBlocked.goButton.accesskey		= A
 refreshBlocked.refreshLabel			= 自動的に再読み込みを繰り返すため、%S がこのページをブロックしました。
 refreshBlocked.redirectLabel			= 自動的に別のページへリダイレクトしようとしたため、%S がこのページをブロックしました。
 
 # LOCALIZATION NOTE (lockPrompt.text)
--- a/suite/chrome/common/pref/pref-advanced.dtd
+++ b/suite/chrome/common/pref/pref-advanced.dtd
@@ -1,19 +1,29 @@
 <!-- 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 'Advanced' prefs settings -->
-<!ENTITY pref.advanced.title        "詳細">
+<!ENTITY pref.advanced.title              "詳細">
 
-<!ENTITY systemPref.caption         "システム設定">
-<!ENTITY systemPrefCheck.label      "システムの標準設定を使用する">
-<!ENTITY systemPrefCheck.accesskey  "U">
-<!ENTITY systemPref.desc            "この項目にチェックを入れると、&brandShortName; 独自の設定よりもシステム標準の設定を優先するようになります。">
+<!ENTITY systemPref.caption               "システム設定">
+<!ENTITY systemPrefCheck.label            "システムの標準設定を使用する">
+<!ENTITY systemPrefCheck.accesskey        "U">
+<!ENTITY systemPref.desc                  "この項目にチェックを入れると、&brandShortName; 独自の設定よりもシステム標準の設定を優先するようになります。">
 
-<!ENTITY prefCheckDefault.caption   "システム統合">
-<!ENTITY prefCheckDefaultClient.label "起動時に既定のプログラムの設定を確認する">
+<!ENTITY prefCheckDefault.caption         "システム統合">
+<!ENTITY prefCheckDefaultClient.label     "起動時に既定のプログラムの設定を確認する">
 <!ENTITY prefCheckDefaultClient.accesskey "C">
 
-<!ENTITY crashReports.caption       "クラッシュレポータ">
-<!ENTITY submitCrashes.label        "クラッシュレポートを送信する">
-<!ENTITY submitCrashes.accesskey    "S">
+<!ENTITY crashReports.caption             "クラッシュレポータ">
+<!ENTITY submitCrashes.label              "クラッシュレポートを送信する">
+<!ENTITY submitCrashes.accesskey          "S">
+
+<!ENTITY devTools.caption                 "開発ツール">
+<!ENTITY allowDebugger.label              "&brandShortName; にデバッガの接続を許可する">
+<!ENTITY allowDebugger.accesskey          "A">
+<!ENTITY allowRemoteConnections.label     "他のコンピュータからの接続を許可する">
+<!ENTITY allowRemoteConnections.accesskey "o">
+<!ENTITY connectionPrompt.label           "接続要求があったときは確認する">
+<!ENTITY connectionPrompt.accesskey       "P">
+<!ENTITY remoteDebuggerPort.label         "接続ポート番号:">
+<!ENTITY remoteDebuggerPort.accesskey     "n">
--- a/suite/chrome/common/pref/pref-history.dtd
+++ b/suite/chrome/common/pref/pref-history.dtd
@@ -7,16 +7,18 @@
 <!ENTITY  pref.history.caption              "訪問履歴">
 <!ENTITY  historyPages.label                "履歴は過去に訪問したページの一覧です。">
 <!ENTITY  enableHistory.label               "履歴を記憶させる">
 <!ENTITY  enableHistory.accesskey           "R">
 <!ENTITY  clearHistory.label                "履歴を消去">
 <!ENTITY  clearHistory.accesskey            "s">
 
 <!ENTITY  locationBarHistory.caption        "アドレスバーの履歴"><!-- en-US: "Location Bar History" -->
+<!ENTITY  urlBarHistoryEnabled.caption      "アドレスバーの履歴を有効にする">
+<!ENTITY  urlBarHistoryEnabled.accesskey    "E">
 <!ENTITY  clearLocationBar.label            "アドレスバーメニューに保存されているサイト一覧を消去します。">
 <!ENTITY  clearLocationBarButton.label      "アドレスバーの履歴を消去">
 <!ENTITY  clearLocationBarButton.accesskey  "L">
 <!ENTITY  formfillHistory.caption           "フォームと検索の履歴">
 <!ENTITY  enableFormfill.label              "フォームと検索の入力履歴を記憶させる">
 <!ENTITY  enableFormfill.accesskey          "n">
 <!ENTITY  formfillExpire.label              "フォームと検索の履歴を">
 <!ENTITY  formfillExpire.accesskey          "f">
--- a/suite/chrome/common/pref/pref-offlineapps.dtd
+++ b/suite/chrome/common/pref/pref-offlineapps.dtd
@@ -1,19 +1,24 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- extracted from content/pref-offlineapps.xul -->
 
 <!--LOCALIZATION NOTE : FILE Offline Apps prefs dialog -->
 <!ENTITY pref.offlineapps.title             "オフライン Web アプリケーション">
 <!ENTITY pref.offlineCache.caption          "オフラインの Web コンテンツとユーザデータ">
 
 <!ENTITY clearOfflineAppCache.label         "消去">
 <!ENTITY clearOfflineAppCache.accesskey     "C">
 
-<!ENTITY offlineNotify.label                "Web サイトがオフラインで使用するデータの格納を求めてきたときに通知する">
-<!ENTITY offlineNotify.accesskey            "N">
+<!ENTITY offlineAlwaysAllow.label           "すべての Web サイトでオフラインで使用するデータの格納を許可する">
+<!ENTITY offlineAlwaysAllow.accesskey       "A">
+<!ENTITY offlineExplicit.label              "明示的な権限のある Web サイトのみ許可する">
+<!ENTITY offlineExplicit.accesskey          "O">
+<!ENTITY offlineNotifyAsk.label             "Web サイトがオフラインで使用するデータの格納を求めてきたときに通知する">
+<!ENTITY offlineNotifyAsk.accesskey         "N">
 <!ENTITY offlineNotifyPermissions.label     "許可設定を管理">
 <!ENTITY offlineNotifyPermissions.accesskey "P">
 
-<!ENTITY offlineAppsList.label              "以下の Web サイトにオフラインで使用するデータの格納を許可します:">
+<!ENTITY offlineAppsUsage.label             "以下の Web サイトがオフラインデータを使用しています:">
 <!ENTITY offlineAppsListRemove.label        "データ消去...">
-<!ENTITY offlineAppsListRemove.accesskey    "d">
+<!ENTITY offlineAppsListRemove.accesskey    "D">
--- a/suite/chrome/common/pref/pref-security.dtd
+++ b/suite/chrome/common/pref/pref-security.dtd
@@ -10,16 +10,23 @@
 
 <!ENTITY dntTellSites.label               "トラッキングに関する設定をサイトに通知する">
 <!ENTITY dntTellSites.accesskey           "T">
 <!ENTITY dntTrackingNotOkay.label         "トラッキングを拒否する">
 <!ENTITY dntTrackingNotOkay.accesskey     "n">
 <!ENTITY dntTrackingOkay.label            "トラッキングを許可する">
 <!ENTITY dntTrackingOkay.accesskey        "c">
 
+<!ENTITY geoLocation.label                "位置情報の通知">
+<!ENTITY geoIntro.label                   "Web サイトはあなたの詳細な位置情報を要求することがあります。">
+
+<!ENTITY geoEnabled.label                 "位置情報を要求されたときに確認する">
+<!ENTITY geoEnabled.accesskey             "m">
+<!ENTITY geoDisabled.label                "この機能を無効にして、すべての要求を拒否する">
+<!ENTITY geoDisabled.accesskey            "D">
 
 <!-- LOCALIZATION NOTE (safeBrowsing.label, blockWebForgeries.label, blockAttackSites.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics
   to a combination of both, so it's important that these strings convey the
   meaning "reported" (and not something like "known").
 -->
 <!ENTITY safeBrowsing.label               "セーフブラウジング">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/prefutilities.dtd
@@ -0,0 +1,40 @@
+<!-- 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 FallbackCharset.auto         "現在のロケールの既定値">
+<!-- LOCALIZATION NOTE (FallbackCharset.arabic):
+     Translate "Arabic" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.arabic       "アラビア語">
+<!ENTITY FallbackCharset.baltic       "バルト諸語">
+<!ENTITY FallbackCharset.ceiso        "中欧 (ISO)">
+<!ENTITY FallbackCharset.cewindows    "中欧 (Windows)">
+<!-- LOCALIZATION NOTE (FallbackCharset.simplified):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.simplified   "簡体字中国語">
+<!-- LOCALIZATION NOTE (FallbackCharset.traditional):
+     Translate "Chinese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.traditional  "繁体字中国語">
+<!ENTITY FallbackCharset.cyrillic     "キリル文字">
+<!-- LOCALIZATION NOTE (FallbackCharset.greek):
+     Translate "Greek" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.greek        "ギリシャ語">
+<!-- LOCALIZATION NOTE (FallbackCharset.hebrew):
+     Translate "Hebrew" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.hebrew       "ヘブライ語">
+<!-- LOCALIZATION NOTE (FallbackCharset.japanese):
+     Translate "Japanese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.japanese     "日本語">
+<!-- LOCALIZATION NOTE (FallbackCharset.korean):
+     Translate "Korean" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.korean       "韓国語">
+<!-- LOCALIZATION NOTE (FallbackCharset.thai):
+     Translate "Thai" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.thai         "タイ語">
+<!-- LOCALIZATION NOTE (FallbackCharset.turkish):
+     Translate "Turkish" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.turkish      "トルコ語">
+<!-- LOCALIZATION NOTE (FallbackCharset.vietnamese):
+     Translate "Vietnamese" as an adjective for an encoding, not as the name of the language. -->
+<!ENTITY FallbackCharset.vietnamese   "ベトナム語">
+<!ENTITY FallbackCharset.other        "その他 (西欧含む)">
--- a/suite/chrome/common/pref/prefutilities.properties
+++ b/suite/chrome/common/pref/prefutilities.properties
@@ -2,17 +2,17 @@
 # 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/.
 
 cachefolder		= キャッシュフォルダを選択
 #LOCALIZATION NOTE (%1$S) is the size and (%2$S) is the unit of disk space.
 cacheSizeInfo		= 現在のディスクキャッシュ量は %1$S %2$S です。
 
 # Offline apps
-appCacheSizeInfo	= アプリケーションキャッシュは現在、ディスク領域を %1$S %2$S 使用しています。
+offlineAppSizeInfo	= オフラインデータは現在、ディスク領域を %1$S %2$S 使用しています。
 offlineAppRemoveTitle	= オフライン Web サイトデータの削除
 offlineAppRemovePrompt	= このデータを削除すると、%S をオフラインで利用できなくなります。この Web サイトのオフラインデータを削除してもよろしいですか?
 offlineAppRemoveConfirm	= オフラインデータを削除
 
 # LOCALIZATION NOTE: The next string is for the disk usage of the
 # offline application
 #   e.g. offlineAppUsage : "50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
--- a/suite/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/chrome/mailnews/addressbook/addressBook.properties
@@ -56,19 +56,20 @@ propertyBirthday=誕生日
 propertyCustom1=追加情報 1
 propertyCustom2=追加情報 2
 propertyCustom3=追加情報 3
 propertyCustom4=追加情報 4
 
 ## LOCALIZATION NOTE (dateformat)
 ## Only used if the year isn't present and should be in the format used by Date.toLocaleFormat
 ## see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Date/toLocaleFormat
-## %B is the month's localized name and %e is the day of the month [1-31]
+## %B is the month's localized name and %d is the day of the month [1-31].
+## Don't go using %e here, since it breaks things on Windows!
 ## Separators (a space, dash, etc.) can be used
-dateformat=%B%e日
+dateFormatMonthDay=%B%d日
 
 ## LOCALIZATION NOTE (cityAndStateAndZip): 
 ## %1$S is city, %2$S is state, %3$S is zip
 cityAndStateAndZip=%3$S %2$S %1$S
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%2$S %1$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -245,17 +245,19 @@ assemblingMailInformation	=メール情報を構築しています...
 gatheringAttachment		=%S を添付しています...
 creatingMailMessage		=メールメッセージを作成しています...
 
 ## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
 copyMessageStart		=%S フォルダへメッセージをコピーしています...
 copyMessageComplete		=コピーが完了しました。
 copyMessageFailed		=コピーできませんでした。
 
-sendLargeMessageWarning		=警告! %d バイトのメッセージを送信しようとしています。送信を実行しますか?
+## LOCALIZATION NOTE (largeMessageSendWarning):
+## %S is the message size in user-friendly notation. Do not translate.
+largeMessageSendWarning		=警告! メールサーバで許可された上限サイズに近い %S のメッセージを送信しようとしています。本当に送信してもよろしいですか?
 
 sendingMessage			=メッセージを送信しています...
 sendMessageErrorTitle		=メッセージの送信エラー
 postingMessage			=メッセージを投稿しています...
 
 sendLaterErrorTitle		=後で送信のエラー
 saveDraftErrorTitle		=下書きの保存エラー
 saveTemplateErrorTitle		=テンプレートの保存エラー
--- a/suite/installer/windows/custom.properties
+++ b/suite/installer/windows/custom.properties
@@ -21,18 +21,16 @@
 REG_APP_DESC=$BrandShortName では誰でもインターネット (Web サイト) を安心して快適にご利用いただける環境をご提供します。操作方法は直感的で使いやすく、個人情報の流出や詐欺サイトによる被害を防ぐ高度なセキュリティ機能を搭載し、検索エンジンの統合や表示履歴の検索により求める情報が素早く得られます。
 OPTIONAL_COMPONENTS_TITLE=追加コンポーネントの選択
 OPTIONAL_COMPONENTS_SUBTITLE=$BrandFullNameDA にインストールしたい機能を選んでください。
 OPTIONAL_COMPONENTS_LABEL=追加コンポーネント:
 DOMI_TITLE=DOM インスペクタ
 DOMI_TEXT=ウィンドウとそのコンテンツの構造や属性を調査します。
 DEBUGQA_TITLE=デバッグと品質管理の UI
 DEBUGQA_TEXT=$BrandShortName 開発のためのデバッグと品質管理の UI を追加します。
-VENKMAN_TITLE=JavaScript デバッガ
-VENKMAN_TEXT=JavaScript デバッガとプロファイラ
 CHATZILLA_TITLE=ChatZilla
 CHATZILLA_TEXT=簡単に使用できる拡張可能な IRC クライアント。
 CONTEXT_OPTIONS=$BrandShortName オプション(&O)
 CONTEXT_SAFE_MODE=$BrandShortName セーフモード(&S)
 SAFE_MODE=セーフモード
 # MAILNEWS_TEXT appears in Windows (All) Programs menu as "SeaMonkey $(MAILNEWS_TEXT)"
 MAILNEWS_TEXT=メール
 PROFILE_TEXT=プロファイルマネージャ