17.0: sync calendar with en-US rev12123:9a8111084ff8
--- a/calendar/chrome/calendar/calendar-event-dialog-attendees.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog-attendees.properties
@@ -2,8 +2,14 @@
# 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/.
event.attendee.role.required = 参加必須
event.attendee.role.optional = 参加任意
event.attendee.role.nonparticipant = 参加者なし
event.attendee.role.chair = 司会者
event.attendee.role.unknown = 参加不明 (%1$S)
+
+event.attendee.usertype.individual = 個人
+event.attendee.usertype.group = グループ
+event.attendee.usertype.resource = リソース
+event.attendee.usertype.room = 部屋
+event.attendee.usertype.unknown = タイプ不明 (%1$S)
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -92,18 +92,16 @@
<!ENTITY event.menu.view.toolbars.event.accesskey "E">
<!ENTITY event.menu.view.toolbars.customize.label "カスタマイズ...">
<!ENTITY event.menu.view.toolbars.customize.accesskey "C">
<!ENTITY event.menu.view.showlink.label "関連リンクを表示">
<!ENTITY event.menu.view.showlink.accesskey "R">
<!ENTITY event.menu.options.label "オプション">
<!ENTITY event.menu.options.accesskey "O">
-<!ENTITY event.menu.options.attachments.label "URL を添付..."><!-- (^a^) en-US: Attach Webpage… https://bugzilla.mozilla.org/show_bug.cgi?id=319909#c25 Tb とは機能が違うので、合わせない -->
-<!ENTITY event.menu.options.attachments.accesskey "W">
<!ENTITY event.menu.options.attendees.label "参加者を追加...">
<!ENTITY event.menu.options.attendees.accesskey "I">
<!ENTITY event.menu.options.spellcheck.label "スペルチェック...">
<!ENTITY event.menu.options.spellcheck.accesskey "h">
<!ENTITY event.menu.options.inline.spellcheck.label "自動スペルチェック">
<!ENTITY event.menu.options.inline.spellcheck.accesskey "S">
<!ENTITY event.menu.options.link.label "リンクを追加...">
<!ENTITY event.menu.options.link.accesskey "L">
@@ -142,17 +140,16 @@
<!ENTITY event.email.tentative.attendees.accesskey "U">
<!-- Toolbar -->
<!ENTITY event.toolbar.save.label "保存して閉じる">
<!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 "I">
<!ENTITY event.location.label "場所:" >
<!ENTITY event.location.accesskey "L">
<!ENTITY event.categories.label "カテゴリ:">
<!ENTITY event.categories.accesskey "y">
@@ -175,21 +172,16 @@
<!ENTITY event.repeat.label "繰り返し:" >
<!ENTITY event.repeat.accesskey "R">
<!ENTITY event.reminder.label "アラーム:" >
<!ENTITY event.reminder.accesskey "m">
<!ENTITY event.description.label "詳細:" >
<!ENTITY event.description.accesskey "p">
<!ENTITY event.attachments.label "添付:" >
<!ENTITY event.attachments.accesskey "h" >
-
-<!-- LOCALIZATION NOTE - These 4 strings are not in production yet,
- but I want to land Filelink support for Lightning soon. The attach
- button will become a dropdown button that allows to attach links
- as usual, but also files via the Filelink providers. -->
<!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 "開く" >
@@ -333,16 +325,20 @@
<!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 "部屋">
<!-- Timezone dialog -->
<!ENTITY timezone.title.label "タイムゾーンを指定してください">
<!ENTITY event.timezone.custom.label "他のタイムゾーン...">
<!-- Read-Only dialog -->
<!ENTITY read.only.general.label "一般">
<!ENTITY read.only.title.label "件名:">
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -314,20 +314,25 @@ repeatDetailsInfinite=%1$S、\n%2$S から繰り返します。\n時間: %3$S から %4$S まで。
# %2%$ - event start date (e.g. mm/gg/yyyy)
# e.g. with monthlyDayOfNth and all day event:
# "Occurs day 3 of every 5 month
# effective 1/1/2009"
## en-US: Occurs %1$S\neffective %2$S.
repeatDetailsInfiniteAllDay=%1$S、\n%2$S から繰り返します。
# LOCALIZATION NOTE (ruleTooComplex):
-# This string is shown in the reminder details area if our code can't handle the
+# This string is shown in the repeat details area if our code can't handle the
# complexity of the recurrence rule yet.
ruleTooComplex=詳細はここをクリックしてしてください
+# LOCALIZATION NOTE (ruleTooComplexSummary):
+# This string is shown in the event summary dialog if our code can't handle the
+# complexity of the recurrence rule yet.
+ruleTooComplexSummary=繰り返しの詳細不明
+
# differences between the dialog for an Event or a Task
newEvent=新しい予定
newTask=新しい ToDo
itemMenuLabelEvent=予定
itemMenuAccesskeyEvent2=T
itemMenuLabelTask=ToDo
itemMenuAccesskeyTask2=T
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -304,17 +304,17 @@
<!ENTITY calendarproperties.wcap.label "Sun Java System Calendar Server (WCAP)">
<!ENTITY calendarproperties.format.label "フォーマット:">
<!ENTITY calendarproperties.location.label "場所:">
<!ENTITY calendarproperties.refreshInterval.label "カレンダーの更新:">
<!ENTITY calendarproperties.refreshInterval.manual.label "手動">
<!ENTITY calendarproperties.name.label "名前:">
<!ENTITY calendarproperties.readonly.label "読み込み専用">
<!ENTITY calendarproperties.firealarms.label "アラーム通知する">
-<!ENTITY calendarproperties.cache2.label "キャッシュ">
+<!ENTITY calendarproperties.cache3.label "オフラインサポート">
<!ENTITY calendarproperties.enabled.label "このカレンダーを有効にする">
<!ENTITY calendarproperties.forceDisabled.label "このカレンダーのプロバイダが見つかりませんでした。対象のアドオンが無効にされているかアンインストールされています。">
<!ENTITY calendarproperties.unsubscribe.label "登録解除">
<!ENTITY calendarproperties.unsubscribe.accesskey "U">
<!-- Calendar Publish Dialog -->
<!ENTITY calendar.publish.dialog.title "カレンダーの公開">
<!ENTITY calendar.publish.url.label "公開 URL">
--- a/calendar/chrome/lightning/lightning-toolbar.dtd
+++ b/calendar/chrome/lightning/lightning-toolbar.dtd
@@ -1,26 +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/. -->
<!ENTITY lightning.toolbar.calendar.name "カレンダーツールバー">
-<!ENTITY lightning.toolbar.calendar.accesskey "C">
+<!ENTITY lightning.toolbar.calendar.name.accesskey "C">
<!ENTITY lightning.toolbar.task.name "ToDo ツールバー">
-<!ENTITY lightning.toolbar.task.accesskey "T">
+<!ENTITY lightning.toolbar.task.name.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 -->
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -59,9 +59,12 @@ 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 ≫
+confirmProcessInvitation=このアイテムは最近削除されました。この招待を処理ますか？
+confirmProcessInvitationTitle=招待状の処理
+
invitationsLink.label=招待内容: %1$S
