42.0: sync chat, mail with en-US rev20575:46c5b0f447ee
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Tue, 01 Sep 2015 22:11:26 +0900
changeset 1868 8466ba2e7cd21af078c38bd902ff481981893488
parent 1867 9bfe0380979b74b7f2fc4b5f765b918d0b992e52
child 1869 11b98407d39cad77fd922b9dd77f6690daa5685b
push id996
push useraxel@mozilla.com
push dateMon, 21 Sep 2015 14:19:14 +0000
42.0: sync chat, mail with en-US rev20575:46c5b0f447ee
new file mode 100644
--- /dev/null
+++ b/chat/skype.properties
@@ -0,0 +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/.
+# LOCALIZATION NOTE (connection.*):
+#   These will show in the account manager to show progress during a connection.
+#   These will show in the account manager if the account is disconnected
+#   because of an error.
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -478,16 +478,18 @@ openTabWarningConfirmation		=#1 件のメッセージを開くには時間がかかります。本当に開きますか?
 tagExists				=この名前のタグはすでに存在します。
 # title of the edit tag dialog
 editTagTitle				=タグの編集
 # for the virtual folder list dialog title
 # %S is the name of the saved search folder
 editVirtualFolderPropertiesTitle	=検索フォルダ %S のプロパティを変更
+# LOCALIZATION NOTE (foldersChosen): #1 number of chosen folders
+virtualFolderSourcesChosen		=#1 個のフォルダを選択しています
 #alert to inform the user to choose one or more folders to search for a saved search folder
 alertNoSearchFoldersSelected		=検索対象フォルダを 1 つ以上選択してください。
 # These are displayed in the message and folder pane windows
 # LOCALIZATION NOTE %.*f is the abbreviated size in the appropriate units
 byteAbbreviation2			=%.*f バイト
 kiloByteAbbreviation2			=%.*f KB
--- a/mail/chrome/messenger/preferences/dockoptions.dtd
+++ b/mail/chrome/messenger/preferences/dockoptions.dtd
@@ -8,8 +8,9 @@
 <!ENTITY bounceSystemDockIcon.label		"新着メッセージ受信時にアイコンをアニメーションで表示する">
 <!ENTITY bounceSystemDockIcon.accesskey		"i">
 <!ENTITY newMessagesCountDock.label		"新着メッセージ数を表示する">
 <!ENTITY newMessagesCountDock.accesskey		"n">
 <!ENTITY showAllUnreadMessagesCount.label	"未読メッセージ数を表示する">
 <!ENTITY showAllUnreadMessagesCount.accesskey	"u">
 <!ENTITY dockIconBadge.label			"アプリケーションアイコンのバッジ">
 <!ENTITY dockIconShow.label			"アイコンにバッジを付ける:">
+<!ENTITY directNotificationSettings.label	"バッジはシステム環境設定の通知ペインで無効化できます。">