12.0: sync calendar with en-US rev9863:785cee15cf2b CALENDAR_1_4b1_BUILD1 CALENDAR_1_4b1_RELEASE CALENDAR_1_4b3_BUILD1 CALENDAR_1_4b3_RELEASE
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Sun, 19 Feb 2012 21:29:03 +0900
changeset 553 f861f4d8fe32fb5683f3df47d1fa8d91e7c8912b
parent 496 4cf7e5335e00521911fafe958e018bf71a94dad2
child 554 6e21a0eaeeafb6b433d5c496dc273aaa0bfda843
child 568 cf038d8a12bea20d2956634d6a3a0cba794df9c9
child 580 2f22087b6ce4834f2f76612d1d98df9133842bf5
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs12
12.0: sync calendar with en-US rev9863:785cee15cf2b
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/calendar/calendar.dtd
calendar/chrome/lightning/lightning-toolbar.dtd
calendar/chrome/lightning/lightning.dtd
calendar/chrome/lightning/lightning.properties
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -187,17 +187,17 @@
 <!ENTITY  event.toolbar.delete.label			"削除">
 <!ENTITY  event.toolbar.attendees.label			"参加者を追加">
 <!ENTITY  event.toolbar.spellcheck.label		"スペル">
 <!ENTITY  event.toolbar.privacy.label			"プライバシー">
 <!ENTITY  event.toolbar.attachments.label		"URL 添付">
 
 <!-- Main page -->
 <!ENTITY event.title.textbox.label			"件名:" >
-<!ENTITY event.title.textbox.accesskey			"T">
+<!ENTITY event.title.textbox.accesskey			"I">
 <!ENTITY event.location.label				"場所:" >
 <!ENTITY event.location.accesskey			"L">
 <!ENTITY event.categories.label				"カテゴリ:">
 <!ENTITY event.categories.accesskey			"y">
 <!ENTITY event.calendar.label				"カレンダー:" >
 <!ENTITY event.calendar.accesskey			"C">
 <!ENTITY event.attendees.label				"参加者:" >
 <!ENTITY event.attendees.accesskey			"I" >
@@ -355,18 +355,16 @@
 
 <!-- Attendees dialog -->
 <!ENTITY invite.title.label				"参加者の追加">
 <!ENTITY event.organizer.label				"主催者">
 <!ENTITY event.freebusy.suggest.slot			"提案時間帯:">
 <!ENTITY event.freebusy.next.slot			"次の時間帯 " >
 <!ENTITY event.freebusy.previous.slot			" 前の時間帯" >
 <!ENTITY event.freebusy.zoom				"拡大/縮小:">
-<!ENTITY event.freebusy.plus				"次の時間" >
-<!ENTITY event.freebusy.minus				"前の時間" >
 <!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			"司会者">
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -357,19 +357,19 @@ repeatDetailsInfiniteAllDay=%1$S、\n%2$S から繰り返します。
 # This string is shown in the reminder details area if our code can't handle the
 # complexity of the recurrence rule yet.
 ruleTooComplex=詳細はここをクリックしてしてください
 
 # differences between the dialog for an Event or a Task
 newEvent=新しい予定
 newTask=新しい ToDo
 itemMenuLabelEvent=予定
-itemMenuAccesskeyEvent2=F
+itemMenuAccesskeyEvent2=T
 itemMenuLabelTask=ToDo
-itemMenuAccesskeyTask2=F
+itemMenuAccesskeyTask2=T
 
 emailSubjectReply=Re: %1$S
 
 # Link Location Dialog
 specifyLinkLocation=添付する URL を指定してください
 enterLinkLocation=Web ページや文書ファイルの場所を入力してください。
 
 summaryDueTaskLabel=締切:
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -59,16 +59,17 @@
 <!ENTITY calendar.today.button.label			"今日">
 <!ENTITY calendar.tomorrow.button.label			"明日">
 <!ENTITY calendar.soon.button.label			"1 週間以内">
 
 <!ENTITY calendar.events.filter.all.label		"すべての予定">
 <!ENTITY calendar.events.filter.today.label		"今日の予定">
 <!ENTITY calendar.events.filter.future.label		"今後すべての予定">
 <!ENTITY calendar.events.filter.current.label		"選択した日の予定">
+<!ENTITY calender.events.filter.currentview.label	"現在のビューの予定">
 <!ENTITY calendar.events.filter.next7Days.label		"1 週間後までの予定">
 <!ENTITY calendar.events.filter.next14Days.label	"2 週間後までの予定">
 <!ENTITY calendar.events.filter.next31Days.label	"今後 1 カ月間の予定">
 <!ENTITY calendar.events.filter.thisCalendarMonth.label	"今月の予定">
 
 <!ENTITY calendar.unifinder.tree.done.label		"完了">
 <!ENTITY calendar.unifinder.tree.priority.label		"重要度">
 <!ENTITY calendar.unifinder.tree.title.label		"件名">
@@ -175,16 +176,20 @@
 <!ENTITY calendar.task-details.attachments.label	"添付">
 <!ENTITY calendar.task-details.start.label		"着手日時">
 <!ENTITY calendar.task-details.due.label		"締切日時">
 
 <!ENTITY calendar.task.category.button.tooltip		"ToDo をカテゴリに分けます">
 <!ENTITY calendar.task.complete.button.tooltip		"選択した ToDo を完了にします">
 <!ENTITY calendar.task.priority.button.tooltip		"重要度を変更します">
 
+<!ENTITY calendar.task.text-filter.textbox.emptytext.base		"ToDo の絞り込み... #1"><!-- #1: emptytext.keylabel.* -->
+<!ENTITY calendar.task.text-filter.textbox.emptytext.keylabel.nonmac	"&lt;Ctrl+Shift+K&gt;">
+<!ENTITY calendar.task.text-filter.textbox.emptytext.keylabel.mac	"&lt;&#x21E7;&#x2318;K&gt;">
+
 <!-- Statusbar -->
 <!ENTITY statusText.label				"ドキュメント: 完了">
 
 <!-- Context Menu -->
 <!ENTITY calendar.context.modifyorviewitem.label	"開く">
 <!ENTITY calendar.context.modifyorviewitem.accesskey	"O">
 <!ENTITY calendar.context.modifyorviewtask.label	"ToDo を開く...">
 <!ENTITY calendar.context.modifyorviewtask.accesskey	"O">
@@ -209,16 +214,18 @@
 <!ENTITY calendar.context.attendance.occurrence.label	"この予定のみ" >
 <!ENTITY calendar.context.attendance.all.label		"すべての予定" >
 
 <!-- Task Context Menu -->
 <!ENTITY calendar.context.progress.label		"進行状況">
 <!ENTITY calendar.context.progress.accesskey		"P">
 <!ENTITY calendar.context.priority.label		"重要度">
 <!ENTITY calendar.context.priority.accesskey		"r">
+<!ENTITY calendar.context.postpone.label		"ToDo を延期">
+<!ENTITY calendar.context.postpone.accesskey		"s">
 
 <!ENTITY percnt						"&#38;#37;" ><!--=percent sign-->
 
 <!ENTITY calendar.context.markcompleted.label		"完了にする">
 <!ENTITY calendar.context.markcompleted.accesskey	"o">
 
 <!ENTITY progress.level.0				"0&percnt; 完了">
 <!ENTITY progress.level.0.accesskey			"0">
@@ -235,16 +242,23 @@
 <!ENTITY priority.level.none.accesskey			"s">
 <!ENTITY priority.level.low				"低">
 <!ENTITY priority.level.low.accesskey			"L">
 <!ENTITY priority.level.normal				"標準">
 <!ENTITY priority.level.normal.accesskey		"N">
 <!ENTITY priority.level.high				"高">
 <!ENTITY priority.level.high.accesskey			"H">
 
+<!ENTITY calendar.context.postpone.1hour.label		"1 時間">
+<!ENTITY calendar.context.postpone.1hour.accesskey	"H">
+<!ENTITY calendar.context.postpone.1day.label		"1 日">
+<!ENTITY calendar.context.postpone.1day.accesskey	"D">
+<!ENTITY calendar.context.postpone.1week.label		"1 週間">
+<!ENTITY calendar.context.postpone.1week.accesskey	"W">
+
 <!-- Task View -->
 <!-- Note that the above *.context.* strings are currently used for the other
      task action buttons -->
 <!ENTITY calendar.taskview.delete.label			"削除">
 <!ENTITY calendar.taskview.delete.accesskey		"l">
 
 <!-- Server Context Menu -->
 <!ENTITY calendar.context.newserver.label		"新しいカレンダー...">
--- a/calendar/chrome/lightning/lightning-toolbar.dtd
+++ b/calendar/chrome/lightning/lightning-toolbar.dtd
@@ -35,8 +35,36 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY lightning.toolbar.calendar.name	"カレンダーツールバー">
 <!ENTITY lightning.toolbar.calendar.accesskey	"C">
 <!ENTITY lightning.toolbar.task.name		"ToDo ツールバー">
 <!ENTITY lightning.toolbar.task.accesskey	"T">
 
 <!ENTITY lightning.toolbar.sync.label		"同期">
+<!ENTITY lightning.toolbar.delete.label		"削除">
+<!ENTITY lightning.toolbar.edit.label		"編集">
+<!ENTITY lightning.toolbar.gototoday.label	"今日に移動">
+<!ENTITY lightning.toolbar.print.label		"印刷">
+
+<!-- Mode Toolbar -->
+<!ENTITY lightning.toolbar.mail.label		"メール">
+<!ENTITY lightning.toolbar.mail.accesskey	"M">
+<!ENTITY lightning.toolbar.calendar.label	"カレンダー">
+<!ENTITY lightning.toolbar.calendar.tooltip	"カレンダータブに切り替えます">
+<!ENTITY lightning.toolbar.calendar.accesskey	"C">
+<!ENTITY lightning.toolbar.task.label		"ToDo">
+<!ENTITY lightning.toolbar.task.tooltip		"ToDo タブに切り替えます">
+<!ENTITY lightning.toolbar.task.accesskey	"T">
+
+<!-- Toolbar write button -->
+<!ENTITY lightning.toolbar.newevent.label	"予定">
+<!ENTITY lightning.toolbar.newtask.label	"ToDo">
+
+<!-- Calendar and Task Mode Toolbar -->
+<!ENTITY lightning.toolbar.day.label		"日表示">
+<!ENTITY lightning.toolbar.day.accesskey	"D">
+<!ENTITY lightning.toolbar.week.label		"週表示">
+<!ENTITY lightning.toolbar.week.accesskey	"W">
+<!ENTITY lightning.toolbar.multiweek.label	"多週表示">
+<!ENTITY lightning.toolbar.multiweek.accesskey	"u">
+<!ENTITY lightning.toolbar.month.label		"月表示">
+<!ENTITY lightning.toolbar.month.accesskey	"M">
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -69,40 +69,16 @@
 <!ENTITY lightning.menu.view.calendar.accesskey		"n">
 <!ENTITY lightning.menu.view.tasks.label		"ToDo">
 <!ENTITY lightning.menu.view.tasks.accesskey		"k">
 
 <!-- Events and Tasks menu -->
 <!ENTITY lightning.menu.eventtask.label			"予定とToDo">
 <!ENTITY lightning.menu.eventtask.accesskey		"n">
 
-<!-- Mode Toolbar -->
-<!ENTITY lightning.toolbar.mail.label			"メール">
-<!ENTITY lightning.toolbar.mail.accesskey		"M">
-<!ENTITY lightning.toolbar.calendar.label		"カレンダー">
-<!ENTITY lightning.toolbar.calendar.tooltip		"カレンダータブに切り替えます">
-<!ENTITY lightning.toolbar.calendar.accesskey		"C">
-<!ENTITY lightning.toolbar.task.label			"ToDo">
-<!ENTITY lightning.toolbar.task.tooltip			"ToDo タブに切り替えます">
-<!ENTITY lightning.toolbar.task.accesskey		"T">
-
-<!-- Toolbar write button -->
-<!ENTITY lightning.toolbar.newevent.label		"予定">
-<!ENTITY lightning.toolbar.newtask.label		"ToDo">
-
-<!-- Messenger Toolbar -->
-<!ENTITY lightning.toolbar.day.label			"日表示">
-<!ENTITY lightning.toolbar.day.accesskey		"D">
-<!ENTITY lightning.toolbar.week.label			"週表示">
-<!ENTITY lightning.toolbar.week.accesskey		"W">
-<!ENTITY lightning.toolbar.multiweek.label		"多週表示">
-<!ENTITY lightning.toolbar.multiweek.accesskey		"u">
-<!ENTITY lightning.toolbar.month.label			"月表示">
-<!ENTITY lightning.toolbar.month.accesskey		"M">
-
 <!-- properties dialog, calendar creation wizard -->
 <!ENTITY lightning.calendarproperties.showevents.inagenda.label	"Today ペインに予定を表示する">
 <!ENTITY lightning.calendarproperties.showtasks.label		"Today ペインと ToDo モードに ToDo を表示する">
 <!ENTITY lightning.calendarproperties.email.label		"メール:">
 
 <!-- iMIP Bar (meeting support) -->
 <!ENTITY lightning.imipbar.description			"メッセージに参加依頼が含まれています。">
 
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -84,14 +84,18 @@ imipSendMail.title=メール通知
 imipSendMail.text=通知を今すぐメールで送信しますか?
 imipSendMail.Outlook2000CompatMode.text=Outlook 2000 と Outlook 2002/XP をサポートする
 imipNoIdentity=なし
 imipNoCalendarAvailable=利用できる書き込み可能なカレンダーはありません。
 
 itipReplySubject=参加依頼への返信: %1$S
 itipReplyBodyAccept=%1$S は参加を承諾しました。
 itipReplyBodyDecline=%1$S は参加を辞退しました。
+itipReplySubjectAccept=参加依頼への返信 (承諾): %1$S
+itipReplySubjectDecline=参加依頼への返信 (辞退): %1$S
+itipReplySubjectTentative=参加依頼への返信 (仮承諾): %1$S
 itipRequestSubject=参加依頼: %1$S
+itipRequestUpdatedSubject=参加依頼 (内容更新): %1$S
 itipRequestBody=%1$S から %2$S への参加を招待されています。
 itipCancelSubject=予定のキャンセル: %1$S
 itipCancelBody=%1$S はこの予定をキャンセルしました: ≪ %2$S ≫
 
 invitationsLink.label=招待内容: %1$S