56.0: sync mail, suite with en-US rev28542:b51c9adf2c9e (mozilla-beta)
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Thu, 03 Aug 2017 13:07:31 +0900
changeset 2002 813d3029c783296d7b350854ff76d0fbb35493eb
parent 2001 9d6b763591f189a6fdf02560eecfcdb178413bc9
child 2003 1dfb74ce255031637d73656395858e0ddebadcef
push id903
push userchimantaea_mirabilis@yahoo.co.jp
push dateThu, 03 Aug 2017 04:09:33 +0000
bugs56
56.0: sync mail, suite with en-US rev28542:b51c9adf2c9e (mozilla-beta)
mail/chrome/messenger/glodaFacetView.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/preferences/preferences.properties
suite/chrome/mailnews/compose/composeMsgs.properties
--- a/mail/chrome/messenger/glodaFacetView.properties
+++ b/mail/chrome/messenger/glodaFacetView.properties
@@ -1,23 +1,30 @@
 # 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/.
 
 # (^^; Plural forms を使用。
 
-# LOCALIZATION NOTE (glodaFacetView.tab.query.label): The title to display for
-#  tabs that are based on a gloda (global database) query or collection rather
-#  than a user search.  In the case of a user search, we just display the
-#  search string they entered.  At some point we might try and explain what
-#  the query/collection is an automatic fashion, but not today.
+# LOCALIZATION NOTE (glodaFacetView.tab.query.label):
+#  The tab title to display for tabs that are based on a gloda (global database)
+#  query or collection rather than a user search.  At some point we might try
+#  and explain what the query/collection is in automatic fashion, but not today.
 glodaFacetView.tab.query.label				=検索結果
 
+# LOCALIZATION NOTE (glodaFacetView.tab.search.label):
+#  The tab title to display for tabs with a new gloda (global database)
+#  user search (rather than a query or collection) without a search string.
+#  After the search has been started, we just display the search string entered
+#  by the user.
+glodaFacetView.tab.search.label				=検索結果
+
 # LOCALIZATION NOTE(glodaFacetView.search.label):
 #  The heading for the search page.
+#  A short description of user's search query will be appended.
 glodaFacetView.search.label				=検索:
 
 # LOCALIZATION NOTE(glodaFacetView.constraints.query.fulltext.label):
 #  The label to display to describe when our base query was a fulltext search
 #  across messages.  The value is displayed following the label.
 glodaFacetView.constraints.query.fulltext.label		=検索語: #1
 glodaFacetView.constraints.query.fulltext.andJoinWord	=および
 glodaFacetView.constraints.query.fulltext.orJoinWord	=または
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -949,8 +949,10 @@
 <!ENTITY hideThisAppCmdMac.modifiers	"accel">
 <!ENTITY hideOtherAppsCmdMac.label	"ほかを隠す">
 <!ENTITY hideOtherAppsCmdMac.commandkey	"H">
 <!ENTITY hideOtherAppsCmdMac.modifiers	"accel,alt">
 <!ENTITY showAllAppsCmdMac.label	"すべてを表示">
 
 <!-- Mac OS X Dock Icon pop-up menu -->
 <!ENTITY dockOptions.label		"アプリケーションアイコンのオプション...">
+<!ENTITY writeNewMessageDock.label	"新規メッセージを作成する">
+<!ENTITY openAddressBookDock.label	"アドレス帳を開く">
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -6,16 +6,17 @@
 <!ENTITY dataChoicesTab.label			"データの選択">
 <!ENTITY itemUpdate.label			"更新">
 <!ENTITY itemNetworking.label			"ネットワークとディスク領域">
 <!ENTITY itemCertificates.label			"証明書">
 
 <!-- General Settings -->
 <!ENTITY enableGlodaSearch.label		"グローバル検索と索引データベースを有効にする"><!-- (^^; Enable Global Search and Indexer -->
 <!ENTITY enableGlodaSearch.accesskey		"E">
+<!ENTITY dateTimeFormatting.label		"日付と時刻の書式">
 <!ENTITY allowHWAccel.label			"ハードウェアアクセラレーション機能を使用する (可能な場合)">
 <!ENTITY allowHWAccel.accesskey			"h">
 <!ENTITY storeType.label			"新しいアカウントのメッセージ格納形式:">
 <!ENTITY storeType.accesskey			"T">
 <!ENTITY mboxStore2.label			"フォルダー単位 (mbox 形式)">
 <!ENTITY maildirStore.label			"メッセージ単位 (maildir 形式)">
 
 <!ENTITY scrolling.label			"スクロール">
--- a/mail/chrome/messenger/preferences/preferences.properties
+++ b/mail/chrome/messenger/preferences/preferences.properties
@@ -106,8 +106,17 @@ defaultUserContextLabel		=なし
 #   e.g., "Your cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
 actualDiskCacheSize		=キャッシュはディスク領域の %1$S %2$S を使用しています
 actualDiskCacheSizeCalculated	=キャッシュサイズを計算しています...
 
 # LOCALIZATION NOTE (labelDefaultFont): %S = font name
 labelDefaultFont		=デフォルト (%S)
+
+# LOCALIZATION NOTE (appLocaleString): %S = Name of the application locale,
+# e.g. English (United States)
+appLocale.label			=アプリケーションの言語: %S
+appLocale.accesskey		=p
+# LOCALIZATION NOTE (rsLocaleString): %S = Name of the locale chosen in regional settings,
+# e.g. German (Germany)
+rsLocale.label			=地域設定の言語: %S
+rsLocale.accesskey		=g
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -262,8 +262,25 @@ buttonLabelRetry=再試行
 ## %3$S will be replaced with the local folders account name (typically "Local Folders").
 promptToSaveTemplateLocally=テンプレートはテンプレートフォルダー (%1$S) に保存されませんでした。おそらくネットワークエラーが原因です。\n"再試行" は、保存をもう一度試します。\n"保存" は、テンプレートを %3$S/%1$S-%2$S にコピーして作成を続けます。\n"キャンセル" は、テンプレートを保存せずに作成を続けます。
 
 ## LOCALIZATION NOTE(saveToLocalFoldersFailed): Message appears after normal
 ## save fails (e.g., to Sent) and save to Local Folders also fails. This could
 ## occur if network is down and filesystem problems are present such as disk
 ## full, permission issues or hardware failure.
 saveToLocalFoldersFailed=メッセージをローカルフォルダーに保存できませんでした。ファイルストレージの空き領域が足りません。
+
+## LOCALIZATION NOTE(blockedAllowResource): %S is the URL to load.
+blockedAllowResource=%S のブロックを解除
+## LOCALIZATION NOTE (blockedContentMessage): Semi-colon list of plural forms.
+## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## %S will be replaced by brandShortName.
+## Files must be unblocked individually, therefore the plural form reads:
+## Unblocking a file (one of several) will include it (that one file) in your sent message.
+## In other words:
+## Unblocking one/several file(s) will include it/them in your message.
+blockedContentMessage=%S がこのメッセージへのファイルの読み込みをブロックしました。ファイルのブロックを解除すると送信メッセージに含まれます。
+
+## LOCALIZATION NOTE (blockedContentPrefLabel, blockedContentPrefAccesskey):
+## Same content as (blockedContentPrefLabel, blockedContentPrefAccesskey)
+## in mail directory. SeaMonkey does only use Options and not Preferences.
+blockedContentPrefLabel=オプション
+blockedContentPrefAccesskey=O