45.0: sync calendar with en-US rev21298:2fd29471a395 THUNDERBIRD_45_0b1_BUILD1 THUNDERBIRD_45_0b1_BUILD2 THUNDERBIRD_45_0b1_BUILD3 THUNDERBIRD_45_0b1_RELEASE
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Mon, 25 Jan 2016 10:30:35 +0900
changeset 1991 f41e252ae4849a0f632cb82a6f6024f20dbec445
parent 1990 1ccebbb8e0ee3fd20bc8c4219a702ae44e954ecc
child 1992 884ac54832fd098f0b77af66d506050658c3f92e
child 1997 38e16530cc0e1ac7f320c99d2f2b3cc737244d45
child 2000 f1c48105d970f6122bf9daf4597291ff33ac2fd4
child 2001 124dfdc30e085ca7319724ddb9163b8de892f126
push id1073
push useraxel@mozilla.com
push dateMon, 25 Jan 2016 12:40:21 +0000
bugs45
45.0: sync calendar with en-US rev21298:2fd29471a395
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar.properties
calendar/chrome/lightning/lightning.properties
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -1,44 +1,46 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY event.title.label				"項目の編集" >
+<!ENTITY event.title.label				"項目の編集">
 
 <!ENTITY event.dialog.keepDurationButton.tooltip	"終了日時を変更しても期間の長さを維持します">
 <!ENTITY event.dialog.keepDurationButton.accesskey	"K">
 
-<!ENTITY newevent.from.label				"開始日時" >
-<!ENTITY newevent.to.label				"終了日時" >
+<!ENTITY newevent.from.label				"開始日時">
+<!ENTITY newevent.to.label				"終了日時">
 
-<!ENTITY newevent.status.label				"状態" >
-<!ENTITY newevent.status.accesskey			"S" >
-<!ENTITY newevent.eventStatus.none.label		"指定なし" >
-<!ENTITY newevent.eventStatus.none.accesskey		"o" >
-<!ENTITY newevent.todoStatus.none.label			"指定なし" >
-<!ENTITY newevent.eventStatus.cancelled.label		"キャンセル" >
-<!ENTITY newevent.eventStatus.cancelled.accesskey	"n" >
-<!ENTITY newevent.todoStatus.cancelled.label		"キャンセル" >
-<!ENTITY newevent.status.tentative.label		"未確認" >
-<!ENTITY newevent.status.tentative.accesskey		"T" >
-<!ENTITY newevent.status.confirmed.label		"確認済み" >
-<!ENTITY newevent.status.confirmed.accesskey		"C" >
-<!ENTITY newevent.status.needsaction.label		"行動が必要" >
-<!ENTITY newevent.status.inprogress.label		"進行中" >
-<!ENTITY newevent.status.completed.label		"完了" >
+<!ENTITY newevent.status.label				"状態">
+<!ENTITY newevent.status.accesskey			"S">
+<!ENTITY newevent.eventStatus.none.label		"指定なし">
+<!ENTITY newevent.eventStatus.none.accesskey		"o">
+<!ENTITY newevent.todoStatus.none.label			"指定なし">
+<!ENTITY newevent.eventStatus.cancelled.label		"キャンセル">
+<!ENTITY newevent.eventStatus.cancelled.accesskey	"n">
+<!ENTITY newevent.todoStatus.cancelled.label		"キャンセル">
+<!ENTITY newevent.status.tentative.label		"未確定">
+<!ENTITY newevent.status.tentative.accesskey		"T">
+<!ENTITY newevent.status.confirmed.label		"確認済み">
+<!ENTITY newevent.status.confirmed.accesskey		"C">
+<!ENTITY newevent.status.needsaction.label		"行動が必要">
+<!ENTITY newevent.status.inprogress.label		"進行中">
+<!ENTITY newevent.status.completed.label		"完了">
 
 <!-- The following entity is for New Task dialog only -->
 <!ENTITY newtodo.percentcomplete.label			"&#37;">
 
 <!-- LOCALIZATON NOTE(event.attendees.notify.label,event.attendees.notifyundisclosed.label)
    - These two labels are displayed side by side in the event dialog, make sure
    - they still fit in. -->
 <!ENTITY event.attendees.notify.label			"参加者に通知する">
+<!ENTITY event.attendees.notify.accesskey		"f">
 <!ENTITY event.attendees.notifyundisclosed.label	"参加者ごとに招待メールを分ける">
+<!ENTITY event.attendees.notifyundisclosed.accesskey	"x">
 <!ENTITY event.attendees.notifyundisclosed.tooltip	"このオプションは、参加者ごとに個別の招待メールを送信します。各招待メールには受信した参加者のみが含まれ、他の参加者の識別情報は非公開になります。">
 
 <!-- Keyboard Shortcuts -->
 <!ENTITY event.dialog.new.event.key2			"I">
 <!ENTITY event.dialog.new.task.key2			"D">
 <!ENTITY event.dialog.new.message.key2			"N">
 <!ENTITY event.dialog.close.key				"W">
 <!ENTITY event.dialog.save.key				"S">
@@ -128,24 +130,25 @@
 <!ENTITY  event.menu.options.show.time.label			"この時間の表示">
 <!ENTITY  event.menu.options.show.time.accesskey		"T">
 <!ENTITY  event.menu.options.show.time.busy.label		"予定あり">
 <!ENTITY  event.menu.options.show.time.busy.accesskey		"B">
 <!ENTITY  event.menu.options.show.time.free.label		"空き">
 <!ENTITY  event.menu.options.show.time.free.accesskey		"F">
 
 <!ENTITY event.invite.attendees.label			"参加者を追加...">
-<!ENTITY event.invite.attendees.accesskey		"Q">
+<!ENTITY event.invite.attendees.accesskey		"I">
 <!ENTITY event.email.attendees.label			"参加者全員にメッセージを作成...">
 <!ENTITY event.email.attendees.accesskey		"A">
 <!ENTITY event.email.tentative.attendees.label		"未確定な参加者にメッセージを作成...">
 <!ENTITY event.email.tentative.attendees.accesskey	"U">
-<!ENTITY event.remove.attendees.label			"すべての参加者を削除...">
-<!ENTITY event.remove.attendees.accesskey		"q">
+<!ENTITY event.remove.attendees.label2			"すべての参加者を削除">
+<!ENTITY event.remove.attendees.accesskey		"r">
 <!ENTITY event.remove.attendee.label			"参加者を削除">
+<!ENTITY event.remove.attendee.accesskey		"e">
 
 <!-- Toolbar -->
 <!ENTITY  event.toolbar.save.label			"保存して閉じる">
 <!ENTITY  event.toolbar.delete.label			"削除">
 <!ENTITY  event.toolbar.attendees.label			"参加者を追加">
 <!ENTITY  event.toolbar.privacy.label			"プライバシー">
 
 <!ENTITY  event.toolbar.save.tooltip			"保存して閉じます">
@@ -153,79 +156,79 @@
 <!ENTITY  event.toolbar.attendees.tooltip		"参加者を追加します">
 <!ENTITY  event.toolbar.attachments.tooltip		"URL を添付します">
 <!ENTITY  event.toolbar.privacy.tooltip			"プライバシー設定を変更します">
 <!ENTITY  event.toolbar.priority.tooltip		"重要度を変更します">
 <!ENTITY  event.toolbar.status.tooltip			"状態を変更します">
 <!ENTITY  event.toolbar.freebusy.tooltip		"空き時間情報の設定を切り替えます">
 
 <!-- Main page -->
-<!ENTITY event.title.textbox.label			"件名:" >
+<!ENTITY event.title.textbox.label			"件名:">
 <!ENTITY event.title.textbox.accesskey			"I">
-<!ENTITY event.location.label				"場所:" >
-<!ENTITY event.location.accesskey			"c">
+<!ENTITY event.location.label				"場所:">
+<!ENTITY event.location.accesskey			"L">
 <!ENTITY event.categories.label				"カテゴリ:">
 <!ENTITY event.categories.accesskey			"y">
-<!ENTITY event.categories.textbox.label			"新しいカテゴリを追加" >
-<!ENTITY event.calendar.label				"カレンダー:" >
+<!ENTITY event.categories.textbox.label			"新しいカテゴリを追加">
+<!ENTITY event.calendar.label				"カレンダー:">
 <!ENTITY event.calendar.accesskey			"C">
-<!ENTITY event.attendees.label				"参加者:" >
-<!ENTITY event.attendees.accesskey			"s" >
-<!ENTITY event.alldayevent.label			"終日の予定" >
+<!ENTITY event.attendees.label				"参加者:">
+<!ENTITY event.attendees.accesskey			"n">
+<!ENTITY event.alldayevent.label			"終日の予定">
 <!ENTITY event.alldayevent.accesskey			"d">
-<!ENTITY event.from.label				"開始日時:" >
+<!ENTITY event.from.label				"開始日時:">
 <!ENTITY event.from.accesskey				"S">
-<!ENTITY task.from.label				"着手日時:" >
-<!ENTITY task.from.accesskey				"B">
-<!ENTITY event.to.label					"終了日時:" >
-<!ENTITY event.to.accesskey				"x">
-<!ENTITY task.to.label					"締切日時:" >
+<!ENTITY task.from.label				"着手日時:">
+<!ENTITY task.from.accesskey				"S">
+<!ENTITY event.to.label					"終了日時:">
+<!ENTITY event.to.accesskey				"u">
+<!ENTITY task.to.label					"締切日時:">
 <!ENTITY task.to.accesskey				"u">
-<!ENTITY task.status.label				"状態:" >
+<!ENTITY task.status.label				"状態:">
 <!ENTITY task.status.accesskey				"a">
-<!ENTITY event.repeat.label				"繰り返し:" >
+<!ENTITY event.repeat.label				"繰り返し:">
 <!ENTITY event.repeat.accesskey				"R">
 <!ENTITY event.until.label				"終了日:">
-<!ENTITY event.until.accesskey				"i">
-<!ENTITY event.reminder.label				"アラーム:" >
+<!ENTITY event.until.accesskey				"B">
+<!ENTITY event.reminder.label				"アラーム:">
 <!ENTITY event.reminder.accesskey			"m">
-<!ENTITY event.description.label			"詳細:" >
+<!ENTITY event.description.label			"詳細:">
 <!ENTITY event.description.accesskey			"p">
-<!ENTITY event.attachments.label			"添付:" >
-<!ENTITY event.attachments.accesskey			"h" >
+<!ENTITY event.attachments.label			"添付:">
+<!ENTITY event.attachments.accesskey			"h">
 <!ENTITY event.attachments.menubutton.label		"添付">
 <!ENTITY event.attachments.menubutton.accesskey		"A">
 <!ENTITY event.attachments.url.label			"Web ページ...">
 <!ENTITY event.attachments.url.accesskey		"W">
 
-<!ENTITY event.attachments.popup.remove.label		"削除" >
-<!ENTITY event.attachments.popup.remove.accesskey	"R" >
-<!ENTITY event.attachments.popup.open.label		"開く" >
-<!ENTITY event.attachments.popup.open.accesskey		"O" >
-<!ENTITY event.attachments.popup.removeAll.label	"すべて削除" >
-<!ENTITY event.attachments.popup.removeAll.accesskey	"A" >
-<!ENTITY event.attachments.popup.attachPage.label	"URL を添付..." ><!-- (^a^) event.menu.options.attachments.label と同じ -->
-<!ENTITY event.attachments.popup.attachPage.accesskey	"g" >
-<!ENTITY event.url.label				"関連リンク:" >
+<!ENTITY event.attachments.popup.remove.label		"削除">
+<!ENTITY event.attachments.popup.remove.accesskey	"R">
+<!ENTITY event.attachments.popup.open.label		"開く">
+<!ENTITY event.attachments.popup.open.accesskey		"O">
+<!ENTITY event.attachments.popup.removeAll.label	"すべて削除">
+<!ENTITY event.attachments.popup.removeAll.accesskey	"A">
+<!ENTITY event.attachments.popup.attachPage.label	"URL を添付..."><!-- (^a^) event.menu.options.attachments.label と同じ -->
+<!ENTITY event.attachments.popup.attachPage.accesskey	"g">
+<!ENTITY event.url.label				"関連リンク:">
 <!ENTITY event.priority2.label				"重要度:">
 
-<!ENTITY event.reminder.none.label			"通知しない" >
-<!ENTITY event.reminder.0minutes.before.label		"0 分前" >
-<!ENTITY event.reminder.5minutes.before.label		"5 分前" >
-<!ENTITY event.reminder.15minutes.before.label		"15 分前" >
-<!ENTITY event.reminder.30minutes.before.label		"30 分前" >
-<!ENTITY event.reminder.1hour.before.label		"1 時間前" >
-<!ENTITY event.reminder.2hours.before.label		"2 時間前" >
-<!ENTITY event.reminder.12hours.before.label		"12 時間前" >
-<!ENTITY event.reminder.1day.before.label		"1 日前" >
-<!ENTITY event.reminder.2days.before.label		"2 日前" >
-<!ENTITY event.reminder.1week.before.label		"1 週間前" >
-<!ENTITY event.reminder.custom.label			"手動設定..." >
+<!ENTITY event.reminder.none.label			"通知しない">
+<!ENTITY event.reminder.0minutes.before.label		"0 分前">
+<!ENTITY event.reminder.5minutes.before.label		"5 分前">
+<!ENTITY event.reminder.15minutes.before.label		"15 分前">
+<!ENTITY event.reminder.30minutes.before.label		"30 分前">
+<!ENTITY event.reminder.1hour.before.label		"1 時間前">
+<!ENTITY event.reminder.2hours.before.label		"2 時間前">
+<!ENTITY event.reminder.12hours.before.label		"12 時間前">
+<!ENTITY event.reminder.1day.before.label		"1 日前">
+<!ENTITY event.reminder.2days.before.label		"2 日前">
+<!ENTITY event.reminder.1week.before.label		"1 週間前">
+<!ENTITY event.reminder.custom.label			"手動設定...">
 
-<!ENTITY event.reminder.multiple.label			"複数のアラーム..." >
+<!ENTITY event.reminder.multiple.label			"複数のアラーム...">
 
 <!ENTITY event.statusbarpanel.freebusy.label		"空き時間情報:">
 <!ENTITY event.statusbarpanel.privacy.label		"プライバシー:">
 
 <!-- Recurrence dialog -->
 <!ENTITY recurrence.title.label				"周期の編集">
 
 <!ENTITY event.repeat.does.not.repeat.label		"繰り返さない">
@@ -233,122 +236,122 @@
 <!ENTITY event.repeat.weekly.label			"毎週">
 <!ENTITY event.repeat.every.weekday.label		"平日">
 <!ENTITY event.repeat.bi.weekly.label			"隔週">
 <!ENTITY event.repeat.monthly.label			"毎月">
 <!ENTITY event.repeat.yearly.label			"毎年">
 <!ENTITY event.repeat.custom.label			"手動設定...">
 
 <!ENTITY event.recurrence.pattern.label			"繰り返す周期">
-<!ENTITY event.recurrence.occurs.label			"周期" >
-<!ENTITY event.recurrence.day.label			"毎日" >
-<!ENTITY event.recurrence.week.label			"毎週" >
-<!ENTITY event.recurrence.month.label			"毎月" >
-<!ENTITY event.recurrence.year.label			"毎年" >
+<!ENTITY event.recurrence.occurs.label			"周期">
+<!ENTITY event.recurrence.day.label			"毎日">
+<!ENTITY event.recurrence.week.label			"毎週">
+<!ENTITY event.recurrence.month.label			"毎月">
+<!ENTITY event.recurrence.year.label			"毎年">
 
-<!ENTITY event.recurrence.pattern.every.label		"間隔:" >
-<!ENTITY repeat.units.days.both				"日ごと" >
-<!ENTITY event.recurrence.pattern.every.weekday.label	"平日" >
+<!ENTITY event.recurrence.pattern.every.label		"間隔:">
+<!ENTITY repeat.units.days.both				"日ごと">
+<!ENTITY event.recurrence.pattern.every.weekday.label	"平日">
 
-<!ENTITY event.recurrence.pattern.weekly.every.label	"" >
-<!ENTITY repeat.units.weeks.both			"週ごとの次の曜日:" >
-<!ENTITY event.recurrence.on.label			"" >
+<!ENTITY event.recurrence.pattern.weekly.every.label	"">
+<!ENTITY repeat.units.weeks.both			"週ごとの次の曜日:">
+<!ENTITY event.recurrence.on.label			"">
 
-<!ENTITY event.recurrence.pattern.monthly.every.label	"" >
-<!ENTITY repeat.units.months.both			"カ月ごとの" >
-<!ENTITY event.recurrence.monthly.every.label		"" >
-<!ENTITY event.recurrence.monthly.first.label		"第 1" >
-<!ENTITY event.recurrence.monthly.second.label		"第 2" >
-<!ENTITY event.recurrence.monthly.third.label		"第 3" >
-<!ENTITY event.recurrence.monthly.fourth.label		"第 4" >
-<!ENTITY event.recurrence.monthly.fifth.label		"第 5" >
-<!ENTITY event.recurrence.monthly.last.label		"最終" >
-<!ENTITY event.recurrence.pattern.monthly.week.1.label	"日曜日" >
-<!ENTITY event.recurrence.pattern.monthly.week.2.label	"月曜日" >
-<!ENTITY event.recurrence.pattern.monthly.week.3.label	"火曜日" >
-<!ENTITY event.recurrence.pattern.monthly.week.4.label	"水曜日" >
-<!ENTITY event.recurrence.pattern.monthly.week.5.label	"木曜日" >
-<!ENTITY event.recurrence.pattern.monthly.week.6.label	"金曜日" >
-<!ENTITY event.recurrence.pattern.monthly.week.7.label	"土曜日" >
+<!ENTITY event.recurrence.pattern.monthly.every.label	"">
+<!ENTITY repeat.units.months.both			"カ月ごとの">
+<!ENTITY event.recurrence.monthly.every.label		"">
+<!ENTITY event.recurrence.monthly.first.label		"第 1">
+<!ENTITY event.recurrence.monthly.second.label		"第 2">
+<!ENTITY event.recurrence.monthly.third.label		"第 3">
+<!ENTITY event.recurrence.monthly.fourth.label		"第 4">
+<!ENTITY event.recurrence.monthly.fifth.label		"第 5">
+<!ENTITY event.recurrence.monthly.last.label		"最終">
+<!ENTITY event.recurrence.pattern.monthly.week.1.label	"日曜日">
+<!ENTITY event.recurrence.pattern.monthly.week.2.label	"月曜日">
+<!ENTITY event.recurrence.pattern.monthly.week.3.label	"火曜日">
+<!ENTITY event.recurrence.pattern.monthly.week.4.label	"水曜日">
+<!ENTITY event.recurrence.pattern.monthly.week.5.label	"木曜日">
+<!ENTITY event.recurrence.pattern.monthly.week.6.label	"金曜日">
+<!ENTITY event.recurrence.pattern.monthly.week.7.label	"土曜日">
 <!ENTITY event.recurrence.repeat.dayofmonth.label	"日">
 <!ENTITY event.recurrence.repeat.recur.label		"指定日">
 
-<!ENTITY event.recurrence.every.label			"" >
-<!ENTITY repeat.units.years.both			"年ごとの" >
-<!ENTITY event.recurrence.pattern.yearly.every.month.label	"指定日" >
+<!ENTITY event.recurrence.every.label			"">
+<!ENTITY repeat.units.years.both			"年ごとの">
+<!ENTITY event.recurrence.pattern.yearly.every.month.label	"指定日">
 
 <!-- LOCALIZATON NOTE
      Some languages use a preposition when describing dates:
      Portuguese: 6 de Setembro
      English: 6 [of] September
      event.recurrence.pattern.yearly.of.label is "of" in
      Edit recurrence window -> Recurrence pattern -> Repeat yearly
 -->
-<!ENTITY event.recurrence.pattern.yearly.of.label	"" >
+<!ENTITY event.recurrence.pattern.yearly.of.label	"">
 
-<!ENTITY event.recurrence.pattern.yearly.month.1.label		"1月" >
-<!ENTITY event.recurrence.pattern.yearly.month.2.label		"2月" >
-<!ENTITY event.recurrence.pattern.yearly.month.3.label		"3月" >
-<!ENTITY event.recurrence.pattern.yearly.month.4.label		"4月" >
-<!ENTITY event.recurrence.pattern.yearly.month.5.label		"5月" >
-<!ENTITY event.recurrence.pattern.yearly.month.6.label		"6月" >
-<!ENTITY event.recurrence.pattern.yearly.month.7.label		"7月" >
-<!ENTITY event.recurrence.pattern.yearly.month.8.label		"8月" >
-<!ENTITY event.recurrence.pattern.yearly.month.9.label		"9月" >
-<!ENTITY event.recurrence.pattern.yearly.month.10.label		"10月" >
-<!ENTITY event.recurrence.pattern.yearly.month.11.label		"11月" >
-<!ENTITY event.recurrence.pattern.yearly.month.12.label		"12月" >
+<!ENTITY event.recurrence.pattern.yearly.month.1.label		"1月">
+<!ENTITY event.recurrence.pattern.yearly.month.2.label		"2月">
+<!ENTITY event.recurrence.pattern.yearly.month.3.label		"3月">
+<!ENTITY event.recurrence.pattern.yearly.month.4.label		"4月">
+<!ENTITY event.recurrence.pattern.yearly.month.5.label		"5月">
+<!ENTITY event.recurrence.pattern.yearly.month.6.label		"6月">
+<!ENTITY event.recurrence.pattern.yearly.month.7.label		"7月">
+<!ENTITY event.recurrence.pattern.yearly.month.8.label		"8月">
+<!ENTITY event.recurrence.pattern.yearly.month.9.label		"9月">
+<!ENTITY event.recurrence.pattern.yearly.month.10.label		"10月">
+<!ENTITY event.recurrence.pattern.yearly.month.11.label		"11月">
+<!ENTITY event.recurrence.pattern.yearly.month.12.label		"12月">
 <!ENTITY event.recurrence.yearly.every.label			"毎">
 <!ENTITY event.recurrence.yearly.first.label			"第 1">
 <!ENTITY event.recurrence.yearly.second.label			"第 2">
 <!ENTITY event.recurrence.yearly.third.label			"第 3">
 <!ENTITY event.recurrence.yearly.fourth.label			"第 4">
 <!ENTITY event.recurrence.yearly.fifth.label			"第 5">
 <!ENTITY event.recurrence.yearly.last.label			"最終">
-<!ENTITY event.recurrence.pattern.yearly.week.1.label		"日曜日" >
-<!ENTITY event.recurrence.pattern.yearly.week.2.label		"月曜日" >
-<!ENTITY event.recurrence.pattern.yearly.week.3.label		"火曜日" >
-<!ENTITY event.recurrence.pattern.yearly.week.4.label		"水曜日" >
-<!ENTITY event.recurrence.pattern.yearly.week.5.label		"木曜日" >
-<!ENTITY event.recurrence.pattern.yearly.week.6.label		"金曜日" >
-<!ENTITY event.recurrence.pattern.yearly.week.7.label		"土曜日" >
-<!ENTITY event.recurrence.pattern.yearly.day.label		"日" >
-<!ENTITY event.recurrence.of.label				"" >
-<!ENTITY event.recurrence.pattern.yearly.month2.1.label		"1月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.2.label		"2月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.3.label		"3月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.4.label		"4月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.5.label		"5月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.6.label		"6月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.7.label		"7月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.8.label		"8月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.9.label		"9月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.10.label	"10月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.11.label	"11月" >
-<!ENTITY event.recurrence.pattern.yearly.month2.12.label	"12月" >
+<!ENTITY event.recurrence.pattern.yearly.week.1.label		"日曜日">
+<!ENTITY event.recurrence.pattern.yearly.week.2.label		"月曜日">
+<!ENTITY event.recurrence.pattern.yearly.week.3.label		"火曜日">
+<!ENTITY event.recurrence.pattern.yearly.week.4.label		"水曜日">
+<!ENTITY event.recurrence.pattern.yearly.week.5.label		"木曜日">
+<!ENTITY event.recurrence.pattern.yearly.week.6.label		"金曜日">
+<!ENTITY event.recurrence.pattern.yearly.week.7.label		"土曜日">
+<!ENTITY event.recurrence.pattern.yearly.day.label		"日">
+<!ENTITY event.recurrence.of.label				"">
+<!ENTITY event.recurrence.pattern.yearly.month2.1.label		"1月">
+<!ENTITY event.recurrence.pattern.yearly.month2.2.label		"2月">
+<!ENTITY event.recurrence.pattern.yearly.month2.3.label		"3月">
+<!ENTITY event.recurrence.pattern.yearly.month2.4.label		"4月">
+<!ENTITY event.recurrence.pattern.yearly.month2.5.label		"5月">
+<!ENTITY event.recurrence.pattern.yearly.month2.6.label		"6月">
+<!ENTITY event.recurrence.pattern.yearly.month2.7.label		"7月">
+<!ENTITY event.recurrence.pattern.yearly.month2.8.label		"8月">
+<!ENTITY event.recurrence.pattern.yearly.month2.9.label		"9月">
+<!ENTITY event.recurrence.pattern.yearly.month2.10.label	"10月">
+<!ENTITY event.recurrence.pattern.yearly.month2.11.label	"11月">
+<!ENTITY event.recurrence.pattern.yearly.month2.12.label	"12月">
 
 <!ENTITY event.recurrence.range.label			"繰り返す期間">
-<!ENTITY event.recurrence.forever.label			"永久に繰り返す" >
-<!ENTITY event.recurrence.repeat.for.label		"" >
-<!ENTITY event.recurrence.appointments.label		"回繰り返す" >
-<!ENTITY event.repeat.until.label			"指定日まで繰り返す" >
+<!ENTITY event.recurrence.forever.label			"永久に繰り返す">
+<!ENTITY event.recurrence.repeat.for.label		"">
+<!ENTITY event.recurrence.appointments.label		"回繰り返す">
+<!ENTITY event.repeat.until.label			"指定日まで繰り返す">
 <!ENTITY event.recurrence.preview.label			"プレビュー">
 
 <!-- Attendees dialog -->
 <!ENTITY invite.title.label				"参加者の追加">
 <!ENTITY event.organizer.label				"主催者">
 <!ENTITY event.freebusy.suggest.slot			"提案時間帯:">
 <!ENTITY event.freebusy.button.next.slot		"次の時間帯">
 <!ENTITY event.freebusy.button.previous.slot		"前の時間帯">
 <!ENTITY event.freebusy.zoom				"拡大/縮小:">
-<!ENTITY event.freebusy.legend.free			"空き" >
-<!ENTITY event.freebusy.legend.busy			"予定あり" >
-<!ENTITY event.freebusy.legend.busy_tentative		"未確認" >
-<!ENTITY event.freebusy.legend.busy_unavailable		"不在" >
-<!ENTITY event.freebusy.legend.unknown			"不明" >
+<!ENTITY event.freebusy.legend.free			"空き">
+<!ENTITY event.freebusy.legend.busy			"予定あり">
+<!ENTITY event.freebusy.legend.busy_tentative		"未確定">
+<!ENTITY event.freebusy.legend.busy_unavailable		"不在">
+<!ENTITY event.freebusy.legend.unknown			"不明">
 <!ENTITY event.attendee.role.required			"参加必須">
 <!ENTITY event.attendee.role.optional			"参加任意">
 <!ENTITY event.attendee.role.chair			"司会者">
 <!ENTITY event.attendee.role.nonparticipant		"非参加者">
 <!ENTITY event.attendee.usertype.individual		"個人">
 <!ENTITY event.attendee.usertype.group			"グループ">
 <!ENTITY event.attendee.usertype.resource		"リソース">
 <!ENTITY event.attendee.usertype.room			"部屋">
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -31,17 +31,17 @@ warningUntilBeforeStart=繰り返す期間を開始日時より前に設定することはできません。
 # The name of the calendar provided with the application by default
 homeCalendarName=Home
 
 # The name given to a calendar if an opened calendar has an empty filename
 untitledCalendarName=新しいカレンダー
 
 # Event status: Tentative, Confirmed, Cancelled
 # ToDo task status: NeedsAction, InProcess, Completed, Cancelled
-statusTentative     =未確認
+statusTentative     =未確定
 statusConfirmed     =確認済み
 eventStatusCancelled=キャンセル
 todoStatusCancelled =キャンセル
 statusNeedsAction   =行動が必要
 statusInProcess     =進行中
 statusCompleted     =完了
 
 # Task priority, these should match the priority.level.* labels in calendar.dtd
@@ -146,73 +146,83 @@ tooltipOrganizer=主催者:
 # start date time, due date time, task priority number, completed date time
 tooltipStart=開始:
 tooltipDue=締切:
 tooltipPriority=重要度:
 tooltipPercent=% 完了:
 tooltipCompleted=完了:
 
 # Tooltips for attendees and organizer in event and summary dialog
-# LOCALIZATION_NOTE(tooltip.attendeeRole.CHAIR): tooltip for itip icon in summary/event dialog
-# %1$S - value of tooltip.attendeeUserType.*
-# %2$S - value of tooltip.attendeePartStat.*
-dialog.tooltip.attendeeRole.CHAIR=%1$Sは司会者で、%2$S。
-# LOCALIZATION_NOTE(dialog.tooltip.attendeeRole.NON-PARTICIPANT): tooltip for itip icon in summary
-# and event dialog
-# %1$S - value of dialog.tooltip.attendeeUserType.*
-# %2$S - value of dialog.tooltip.attendeePartStat.*
-dialog.tooltip.attendeeRole.NON-PARTICIPANT=%1$Sは非参加者で、%2$S。
-# LOCALIZATION_NOTE(dialog.tooltip.attendeeRole.OPT-PARTICIPANT): tooltip for itip icon in summary
-# and event dialog
-# %1$S - value of dialog.tooltip.attendeeUserType.*
-# %2$S - value of dialog.tooltip.attendeePartStat.*
-dialog.tooltip.attendeeRole.OPT-PARTICIPANT=%1$Sは参加任意で、%2$S。
-# LOCALIZATION_NOTE(dialog.tooltip.attendeeRoleREQ-PARTICIPANT): tooltip for itip icon in summary
-# and event dialog
-# %1$S - value of dialog.tooltip.attendeeUserType.*
-# %2$S - value of dialog.tooltip.attendeePartStat.*
-dialog.tooltip.attendeeRole.REQ-PARTICIPANT=%1$Sは参加必須で、%2$S。
-# LOCALIZATION_NOTE(dialog.tooltip.attendeePartStatACCEPTED): used to compose
-# dialog.tooltip.attendeeRole*
-dialog.tooltip.attendeePartStat.ACCEPTED=参加します
-# LOCALIZATION_NOTE(dialog.tooltip.attendeePartStatDECLINED): used to compose
-# dialog.tooltip.attendeeRole*
-dialog.tooltip.attendeePartStat.DECLINED=参加しません
-# LOCALIZATION_NOTE(dialog.tooltip.attendeePartStat.DELEGATED): used to compose
-# dialog.tooltip.attendeeRole.*
-# %1$S - single delegatee or comma separated list of delegatees
-# delegation is different from invitation forwarding - in case of the former the original attendee
-# is replaced, while on the latter the receiver may take part additionally
-dialog.tooltip.attendeePartStat.DELEGATED=%1$S に参加を委任しています
-# LOCALIZATION_NOTE(dialog.tooltip.attendeePartStat.NEEDS-ACTION): used to compose
-# dialog.tooltip.attendeeRole.*
-dialog.tooltip.attendeePartStat.NEEDS-ACTION=参加を確認する必要があります
-# LOCALIZATION_NOTE(dialog.tooltip.attendeePartStat.TENTATIVE): used to compose
-# dialog.tooltip.attendeeRole.*
-dialog.tooltip.attendeePartStat.TENTATIVE=仮参加しますが未確定です
-# LOCALIZATION_NOTE(dialog.tooltip.attendeeUserType.INDIVIDUAL): used to compose
-# dialog.tooltip.attendeeRole.*
-# %1$S - an individiual attendee
-dialog.tooltip.attendeeUserType.INDIVIDUAL=%1$S さん
-# LOCALIZATION_NOTE(dialog.tooltip.attendeeUserType.GROUP): used to compose
-# dialog.tooltip.attendeeRole.*
-# %1$S - an attendee representing a group (e.g. a distribution list)
-dialog.tooltip.attendeeUserType.GROUP=%1$S のグループ
-# LOCALIZATION_NOTE(dialog.tooltip.attendeeUserType.RESOURCE): used to compose
-# dialog.tooltip.attendeeRole.*
-# %1$S - an attendee representing a resource (e.g. projector)
-dialog.tooltip.attendeeUserType.RESOURCE=%1$S のリソース
-# LOCALIZATION_NOTE(dialog.tooltip.attendeeUserType.ROOM): used to compose
-# dialog.tooltip.attendeeRole.*
-# %1$S - an attendee representing a room
-dialog.tooltip.attendeeUserType.ROOM=%1$S の部屋
-# LOCALIZATION_NOTE(dialog.tooltip.attendeeUserType.UNKNOWN): used to compose
-# dialog.tooltip.attendeeRole.*
-# %1$S - an attendee of unknown type
-dialog.tooltip.attendeeUserType.UNKNOWN=%1$S 
+
+# LOCALIZATION_NOTE(dialog.tooltip.attendee.combined): tooltip for itip icon in summary/event dialog.
+# Given an attendee loungeexample.org of type room is a mandatory participant and has accepted the
+# invitation, the tooltip would be:
+# lounge@example.org (room) is a required participant. lounge@example.org has confirmed attendance.
+# %1$S - value of dialog.tooltip.attendeeRole2.*
+# %2$S - value of dialog.tooltip.attendeePartStat2.*
+dialog.tooltip.attendee.combined=%1$S%2$S
+
+# LOCALIZATION_NOTE(dialog.tooltip.attendeeRole2.CHAIR): used to compose
+# dialog.tooltip.attendee.combined
+# %1$S - value of dialog.tooltip.attendeeUserType2.*
+dialog.tooltip.attendeeRole2.CHAIR		=%1$S は司会者です。
+# LOCALIZATION_NOTE(dialog.tooltip.attendeeRole2.NON-PARTICIPANT): used to compose
+# dialog.tooltip.attendee.combined
+# %1$S - value of dialog.tooltip.attendeeUserType2.*
+dialog.tooltip.attendeeRole2.NON-PARTICIPANT	=%1$S は非参加者です。
+# LOCALIZATION_NOTE(dialog.tooltip.attendeeRole2.OPT-PARTICIPANT): used to compose
+# dialog.tooltip.attendee.combined
+# %1$S - value of dialog.tooltip.attendeeUserType2.*
+dialog.tooltip.attendeeRole2.OPT-PARTICIPANT	=%1$S は参加任意です。
+# LOCALIZATION_NOTE(dialog.tooltip.attendeeRole2.REQ-PARTICIPANT): used to compose
+# dialog.tooltip.attendee.combined
+# %1$S - value of dialog.tooltip.attendeeUserType2.*
+dialog.tooltip.attendeeRole2.REQ-PARTICIPANT	=%1$S は参加必須です。
+
+# LOCALIZATION_NOTE(dialog.tooltip.attendeePartStat2.ACCEPTED): used to compose
+# dialog.tooltip.attendee.combined
+# %1$S - common name or email address of the attendee
+dialog.tooltip.attendeePartStat2.ACCEPTED	=%1$S は参加します。
+# LOCALIZATION_NOTE(dialog.tooltip.attendeePartStat2.DECLINED): used to compose
+# dialog.tooltip.attendee.combined
+# %1$S - common name or email address of the attendee
+dialog.tooltip.attendeePartStat2.DECLINED	=%1$S は参加しません。
+# LOCALIZATION_NOTE(dialog.tooltip.attendeePartStat2.DELEGATED): used to compose
+# dialog.tooltip.attendee.combined
+# %1$S - common name or email address of the attendee
+dialog.tooltip.attendeePartStat2.DELEGATED	=%1$S は参加を委任しています。
+# LOCALIZATION_NOTE(dialog.tooltip.attendeePartStat2.NEEDS-ACTION): used to compose
+# dialog.tooltip.attendee.combined
+# %1$S - common name or email address of the attendee
+dialog.tooltip.attendeePartStat2.NEEDS-ACTION	=%1$S は参加を確認する必要があります。
+# LOCALIZATION_NOTE(dialog.tooltip.attendeePartStat2.TENTATIVE): used to compose
+# dialog.tooltip.attendee.combined
+# %1$S - common name or email address of the attendee
+dialog.tooltip.attendeePartStat2.TENTATIVE	=%1$S は参加しますが未確定です。
+
+# LOCALIZATION_NOTE(dialog.tooltip.attendeeUserType2.INDIVIDUAL): used to compose
+# dialog.tooltip.attendeeRole2.*
+# %1$S - email address or common name <email address> representing individual attendee
+dialog.tooltip.attendeeUserType2.INDIVIDUAL=%1$S さん
+# LOCALIZATION_NOTE(dialog.tooltip.attendeeUserType2.GROUP): used to compose
+# dialog.tooltip.attendeeRole2.*
+# %1$S - email address or common name <email address> representing a group (e.g. a distribution list)
+dialog.tooltip.attendeeUserType2.GROUP=%1$S (グループ)
+# LOCALIZATION_NOTE(dialog.tooltip.attendeeUserType2.RESOURCE): used to compose
+# dialog.tooltip.attendeeRole2.*
+# %1$S - email address or common name <email address> representing a resource (e.g. projector)
+dialog.tooltip.attendeeUserType2.RESOURCE=%1$S (リソース)
+# LOCALIZATION_NOTE(dialog.tooltip.attendeeUserType2.ROOM): used to compose
+# dialog.tooltip.attendeeRole2.*
+# %1$S - email address or common name <email address> representing a room
+dialog.tooltip.attendeeUserType2.ROOM=%1$S (部屋)
+# LOCALIZATION_NOTE(dialog.tooltip.attendeeUserType2.UNKNOWN): used to compose
+# dialog.tooltip.attendeeRole2.*
+# %1$S - email address or common name <email address> representing an attendee of unknown type
+dialog.tooltip.attendeeUserType2.UNKNOWN=%1$S
 
 #File commands and dialogs
 New=新規
 Open=開く
 filepickerTitleImport=インポート
 filepickerTitleExport=エクスポート
 
 # Filters for export/import/open file picker.  %1$S will be replaced with
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -32,61 +32,86 @@ imipHtml.newLocation=新しい場所: %1$S
 # LOCALIZATION_NOTE(imipHtml.attendeeDelegatedFrom): this is appended behind an attendee name in the
 # email invitation preview - don't add leading/trailing whitespaces here
 # %1$S - a single delegator or a comma separated list of delegators
 imipHtml.attendeeDelegatedFrom=(%1$S から委任)
 # LOCALIZATION_NOTE(imipHtml.attendeeDelegatedTo): this is appended behind an attendee name in the
 # email invitation preview - don't add leading/trailing whitespaces here
 # %1$S - a single delegatee or a comma separated list of delegatees
 imipHtml.attendeeDelegatedTo=(%1$S へ委任)
-# LOCALIZATION_NOTE(imipHtml.attendeeRole.CHAIR): tooltip for itip icon in email invitation preview
-# %1$S - value of imipHtml.attendeeUserType.*
-# %2$S - value of imipHtml.attendeePartStat.*
-imipHtml.attendeeRole.CHAIR=%1$Sは司会者で、%2$S。
-# LOCALIZATION_NOTE(imipHtml.attendeeRole.NON-PARTICIPANT): tooltip for itip icon in email invitation
-# preview
-# %1$S - value of imipHtml.attendeeUserType.*
-# %2$S - value of imipHtml.attendeePartStat.*
-imipHtml.attendeeRole.NON-PARTICIPANT=%1$Sは非参加者で、%2$S。
-# LOCALIZATION_NOTE(imipHtml.attendeeRole.OPT-PARTICIPANT): tooltip for itip icon in email invitation
-# preview
-# %1$S - value of imipHtml.attendeeUserType.*
-# %2$S - value of imipHtml.attendeePartStat.*
-imipHtml.attendeeRole.OPT-PARTICIPANT=%1$Sは参加任意で、%2$S。
-# LOCALIZATION_NOTE(imipHtml.attendeeRoleREQ-PARTICIPANT): tooltip for itip icon in email invitation
-# preview
-# %1$S - value of imipHtml.attendeeUserType.*
-# %2$S - value of imipHtml.attendeePartStat.*
-imipHtml.attendeeRole.REQ-PARTICIPANT=%1$Sは参加必須で、%2$S。
-# LOCALIZATION_NOTE(imipHtml.attendeePartStatACCEPTED): used to compose imipHtml.attendeeRole*
-imipHtml.attendeePartStat.ACCEPTED=参加します
-# LOCALIZATION_NOTE(imipHtml.attendeePartStatDECLINED): used to compose imipHtml.attendeeRole*
-imipHtml.attendeePartStat.DECLINED=参加しません
-# LOCALIZATION_NOTE(imipHtml.attendeePartStat.DELEGATED): used to compose imipHtml.attendeeRole.*
-# %1$S - single delegatee or comma separated list of delegatees
-imipHtml.attendeePartStat.DELEGATED=%1$S に出席を委任しています
-# LOCALIZATION_NOTE(imipHtml.attendeePartStat.NEEDS-ACTION): used to compose imipHtml.attendeeRole.*
-imipHtml.attendeePartStat.NEEDS-ACTION=出欠を確認する必要があります
-# LOCALIZATION_NOTE(imipHtml.attendeePartStat.TENTATIVE): used to compose imipHtml.attendeeRole.*
-imipHtml.attendeePartStat.TENTATIVE=仮参加しますが未確定です
-# LOCALIZATION_NOTE(imipHtml.attendeeUserType.INDIVIDUAL): used to compose imipHtml.attendeeRole.*
-# %1$S - an individiual attendee
-imipHtml.attendeeUserType.INDIVIDUAL=%1$S さん
-# LOCALIZATION_NOTE(imipHtml.attendeeUserType.GROUP): used to compose imipHtml.attendeeRole.*
-# %1$S - an attendee representing a group (e.g. a distribution list)
-imipHtml.attendeeUserType.GROUP=%1$S のグループ
-# LOCALIZATION_NOTE(imipHtml.attendeeUserType.RESOURCE): used to compose imipHtml.attendeeRole.*
-# %1$S - an attendee representing a resource (e.g. projector)
-imipHtml.attendeeUserType.RESOURCE=%1$S のリソース
-# LOCALIZATION_NOTE(imipHtml.attendeeUserType.ROOM): used to compose imipHtml.attendeeRole.*
-# %1$S - an attendee representing a room
-imipHtml.attendeeUserType.ROOM=%1$S の部屋
-# LOCALIZATION_NOTE(imipHtml.attendeeUserType.UNKNOWN): used to compose imipHtml.attendeeRole.*
-# %1$S - an attendee of unknown type
-imipHtml.attendeeUserType.UNKNOWN=%1$S 
+
+# LOCALIZATION_NOTE(imipHtml.attendee.combined): tooltip for itip icon in email invitation preview.
+# Given an attendee loungeexample.org of type room is a mandatory participant and has accepted the
+# invitation, the tooltip would be:
+# lounge@example.org (room) is a required participant. lounge@example.org has confirmed attendance.
+# %1$S - value of imipHtml.attendeeRole2.*
+# %2$S - value of imipHtml.attendeePartStat2.*
+imipHtml.attendee.combined=%1$S %2$S
+
+# LOCALIZATION_NOTE(imipHtml.attendeeRole2.CHAIR): used to compose
+# imipHtml.attendee.combined
+# %1$S - value of imipHtml.attendeeUserType2.*
+imipHtml.attendeeRole2.CHAIR=%1$S は司会者です。
+# LOCALIZATION_NOTE(imipHtml.attendeeRole2.NON-PARTICIPANT): used to compose
+# imipHtml.attendee.combined
+# %1$S - value of imipHtml.attendeeUserType2.*
+imipHtml.attendeeRole2.NON-PARTICIPANT=%1$S は非参加者です。
+# LOCALIZATION_NOTE(imipHtml.attendeeRole2.OPT-PARTICIPANT): used to compose
+# imipHtml.attendee.combined
+# %1$S - value of imipHtml.attendeeUserType2.*
+imipHtml.attendeeRole2.OPT-PARTICIPANT=%1$S は参加任意です。
+# LOCALIZATION_NOTE(imipHtml.attendeeRole2.REQ-PARTICIPANT): used to compose
+# imipHtml.attendee.combined
+# %1$S - value of imipHtml.attendeeUserType2.*
+imipHtml.attendeeRole2.REQ-PARTICIPANT=%1$S は参加必須です。
+
+# LOCALIZATION_NOTE(imipHtml.attendeePartStat2.ACCEPTED): used to compose
+# imipHtml.attendee.combined
+# %1$S - common name or email address of the attendee
+imipHtml.attendeePartStat2.ACCEPTED=%1$S は参加します。
+# LOCALIZATION_NOTE(imipHtml.attendeePartStat2.DECLINED): used to compose
+# imipHtml.attendee.combined
+# %1$S - common name or email address of the attendee
+imipHtml.attendeePartStat2.DECLINED=%1$S は参加しません。
+# LOCALIZATION_NOTE(imipHtml.attendeePartStat2.DELEGATED): used to compose
+# imipHtml.attendee.combined
+# %1$S - common name or email address of the attendee
+# %2$S - single delegatee or comma separated list of delegatees
+# delegation is different from invitation forwarding - in case of the former the original attendee
+# is replaced, while on the latter the receiver may take part additionally
+imipHtml.attendeePartStat2.DELEGATED=%1$S は %2$S に参加を委任しています
+# LOCALIZATION_NOTE(imipHtml.attendeePartStat2.NEEDS-ACTION): used to compose
+# imipHtml.attendee.combined
+# %1$S - common name or email address of the attendee
+imipHtml.attendeePartStat2.NEEDS-ACTION=%1$S は参加を確認する必要があります。
+# LOCALIZATION_NOTE(imipHtml.attendeePartStat2.TENTATIVE): used to compose
+# imipHtml.attendee.combined
+# %1$S - common name or email address of the attendee
+imipHtml.attendeePartStat2.TENTATIVE=%1$S は参加しますが未確定です。
+
+# LOCALIZATION_NOTE(imipHtml.attendeeUserType2.INDIVIDUAL): used to compose
+# imipHtml.attendeeRole2.*
+# %1$S - email address or common name <email address> representing an individual attendee
+imipHtml.attendeeUserType2.INDIVIDUAL=%1$S さん
+# LOCALIZATION_NOTE(imipHtml.attendeeUserType2.GROUP): used to compose
+# imipHtml.attendeeRole2.*
+# %1$S - email address or common name <email address> representing a group (e.g. a distribution list)
+imipHtml.attendeeUserType2.GROUP=%1$S (グループ)
+# LOCALIZATION_NOTE(imipHtml.attendeeUserType2.RESOURCE): used to compose
+# imipHtml.attendeeRole2.*
+# %1$S - email address or common name <email address> representing a resource (e.g. projector)
+imipHtml.attendeeUserType2.RESOURCE=%1$S (リソース)
+# LOCALIZATION_NOTE(imipHtml.attendeeUserType2.ROOM): used to compose
+# imipHtml.attendeeRole2.*
+# %1$S - email address or common name <email address> representing a room
+imipHtml.attendeeUserType2.ROOM=%1$S (部屋)
+# LOCALIZATION_NOTE(imipHtml.attendeeUserType2.UNKNOWN): used to compose
+# imipHtml.attendeeRole2.*
+# %1$S - email address or common name <email address> representing an attendee of unknown type
+imipHtml.attendeeUserType2.UNKNOWN=%1$S
 
 imipAddToCalendar.label=カレンダーに追加する
 imipAddedItemToCal=予定をカレンダーに追加しました
 imipCanceledItem=予定が削除されました
 imipUpdatedItem=予定が更新されました
 imipBarCancelText=メッセージに予定のキャンセルが含まれています。
 imipBarRefreshText=メッセージに含まれている予定に更新しますか?
 imipBarPublishText=メッセージに予定が含まれています。