25.0: sync calendar with en-US rev14540:a3ea653d4337
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Mon, 16 Sep 2013 14:38:24 +0900
changeset 1189 48e06bc47b77d1c13df6909cad73d7f460f697fd
parent 1188 562b13acb0c905f47d14288d327793b5780f0263
child 1190 220a5ba272741c39cc9402a6f5ead2489d5b25d3
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs25
25.0: sync calendar with en-US rev14540:a3ea653d4337
calendar/chrome/calendar/calendar-extract.properties
--- a/calendar/chrome/calendar/calendar-extract.properties
+++ b/calendar/chrome/calendar/calendar-extract.properties
@@ -6,18 +6,18 @@
 # Strings here are used to create events and tasks with start and end times
 # based on email content.
 # None of the strings are displayed in the user interface.
 #
 # You don't have to fill all from.*, until.*, *.prefix and *.suffix patterns.
 # It's ok to leave some empty.
 # Please consider declensions and gender if your language has them.
 # Don't just translate directly. The number of variants doesn't have to be
-# the same as in en-US. All of 0, 1, 2, etc is allowed in patterns except alphabet.
-# patterns. You can and should add language specific variants.
+# the same as in en-US. All of 0, 1, 2, etc is allowed in patterns except alphabet
+# pattern. You can and should add language specific variants.
 ## (^m^) 半角数字はデフォルトでパターンに含まれるため記述する必要なし
 #
 # There are two different ways to find a start time text in email:
 # 1) it matches a from.* pattern and does not have end.prefix or end.suffix next to it
 # 2) it matches until.* pattern and has start.prefix or start.suffix next to it
 # Similar inverse logic applies to end times.
 # These rules enable using prefix and suffix values with only start.* or only until.*
 # patterns localized for some languages and thus not having to repeat the same
@@ -34,80 +34,80 @@
 # can be a list of values, separate variants by |
 start.prefix = 時 :|時 :|始 :|始 :|にちじ :|にちじ :
 
 # LOCALIZATION NOTE (start.suffix):
 # datetimes followed by these are extracted as start times
 start.suffix = から|より|開|以降
 
 # LOCALIZATION NOTE (end.prefix):
-# datetimes followed by these are extracted as end times
+# datetimes with these in front are extracted as end times
 end.prefix = 期 日 :|期 日 :|限 :|限 : |期 :|期 :|切り :|切り :|切 :|切 :|切日:|切り日:|きり :|~|〜
 
 # LOCALIZATION NOTE (end.suffix):
 # datetimes followed by these are extracted as end times
 # can be a list of values, separate variants by |
 end.suffix = まで|必着|中に|閉|締|〆
 
 # LOCALIZATION NOTE (no.datetime.prefix):
 # datetimes with these in front won't be used
 # specify full words here
 ## en-US: no.datetime.prefix = last week|sent|email|e-mail|instead of|>|unfortunately|in|not
 ## (^m^) 元号に対応していないため除外しておく
 no.datetime.prefix = 平成|昭和|大正|明治|昨日|先日|昨週|先週|昨月|先月|昨年|去年|>|¥|$|€
 
 # LOCALIZATION NOTE (no.datetime.suffix):
-# datetimes follwed by these won't be used
+# datetimes followed by these won't be used
 ## en-US: no.datetime.suffix = floor|flr|:|email|e-mail|>|%|usd|dollars
 no.datetime.suffix = 以前|以来|来|F|F|>|%|%|円|銭|ドル|ユーロ
 
 # LOCALIZATION NOTE (from.*):
 # can be a list of values, separate variants by |
 
 # LOCALIZATION NOTE (from.today):
 # must not be empty!
 from.today = 今日|本日|きょう
 
 from.tomorrow = 明日|あした|あす
 # LOCALIZATION NOTE (until.*):
 # can be a list of values, separate variants by |
 until.tomorrow = 一両日中
 
-# LOCALIZATION NOTE (ordinal.date):
+# LOCALIZATION NOTE (from.ordinal.date):
 # %1$S = matches numbers 1-31 and number.x
 # should not have "%1$S" as this would match any single number in email to a time
 from.ordinal.date =
 
 # LOCALIZATION NOTE (until.ordinal.date):
 # %1$S = matches numbers 1-31 and number.x
 until.ordinal.date =
 
 from.noon = 正午
 until.noon = 昼|午前中
 
-# LOCALIZATION NOTE (hour.only):
+# LOCALIZATION NOTE (from.hour):
 # %1$S = matches numbers 0-23 and number.0-number.23
 # should not have "%1$S" as this would match any single number in email to a time
 from.hour = %1$S 時|%1$S 時頃|%1$S 時ごろ|%1$S 時開|%1$S 時始|%1$S じ
 
 # LOCALIZATION NOTE (until.hour):
 # %1$S = matches numbers 0-23 and number.0-number.23
 # should also list how to find end of a timeframe
 until.hour = %1$S 時|%1$S 時頃|%1$S 時ごろ|%1$S 時閉|%1$S 時終
 
-# LOCALIZATION NOTE (hour.only.am):
+# LOCALIZATION NOTE (from.hour.am):
 # %1$S = matches numbers 0-23 and number.0-number.23
 from.hour.am = 午前 %1$S 時|%1$S am|%1$S a.m|am %1$S|a.m. %1$S|ごぜん %1$S じ
 
 # LOCALIZATION NOTE (until.hour.am):
 # %1$S = matches numbers 0-23 and number.0-number.23
 # should also list how to find end of a timeframe
 until.hour.am =
 
-# LOCALIZATION NOTE (hour.only.pm):
+# LOCALIZATION NOTE (from.hour.pm):
 # %1$S = matches numbers 0-23 and number.0-number.23
 from.hour.pm = 午後 %1$S 時|%1$S pm|%1$S p.m|pm %1$S|p.m. %1$S|ごご %1$S じ
 
 # LOCALIZATION NOTE (until.hour.pm):
 # %1$S = matches numbers 0-23 and number.0-number.23
 # should also list how to find end of a timeframe
 until.hour.pm =
 
@@ -122,79 +122,79 @@ until.half.hour.before =
 # LOCALIZATION NOTE (from.half.hour.after):
 # denotes times 30 minutes after last full hour
 from.half.hour.after = %1$S 時半|%1$S 時半頃|%1$S 時半ごろ
 
 # LOCALIZATION NOTE (until.half.hour.after):
 # denotes times 30 minutes after last full hour
 until.half.hour.after =
 
-# LOCALIZATION NOTE (hour.minutes):
+# LOCALIZATION NOTE (from.hour.minutes):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 from.hour.minutes = %1$S 時 %2$S 分|%1$S:%2$S|%1$S:%2$S|%1$S じ %2$S ふん|%1$S じ %2$S ぷん
 
 # LOCALIZATION NOTE (until.hour.minutes):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 until.hour.minutes = - %1$S:%2$S|- %1$S:%2$S|~ %1$S:%2$S|~ %1$S:%2$S
 
-# LOCALIZATION NOTE (hour.minutes.am):
+# LOCALIZATION NOTE (from.hour.minutes.am):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 from.hour.minutes.am = 午前 %1$S 時 %2$S 分|%1$S:%2$S am|%1$S:%2$S a.m|am %1$S:%2$S|a.m. %1$S:%2$S|%1$S:%2$S am|%1$S:%2$S a.m|am %1$S:%2$S|a.m. %1$S:%2$S|ごぜん %1$S じ %2$S ふん|ごぜん %1$S じ %2$S ぷん
 
 # LOCALIZATION NOTE (until.hour.minutes.am):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 until.hour.minutes.am =
 
-# LOCALIZATION NOTE (hour.minutes.pm):
+# LOCALIZATION NOTE (from.hour.minutes.pm):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 from.hour.minutes.pm = 午後 %1$S 時 %2$S 分|%1$S:%2$S pm|%1$S:%2$S p.m|pm %1$S:%2$S|p.m. %1$S:%2$S|%1$S:%2$S pm|%1$S:%2$S p.m|pm %1$S:%2$S|p.m. %1$S:%2$S|ごご %1$S じ %2$S ふん|ごご %1$S じ %2$S ぷん
 
 # LOCALIZATION NOTE (until.hour.minutes.pm):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
 until.hour.minutes.pm =
 
-# LOCALIZATION NOTE (monthname.day):
+# LOCALIZATION NOTE (from.monthname.day):
 # %1$S = matches numbers 1-31 and number.x
 # %2$S = matches monthname
 from.monthname.day = %2$S %1$S日|%2$S の %1$S 日
 
 # LOCALIZATION NOTE (until.monthname.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches monthname
 until.monthname.day =
 
-# LOCALIZATION NOTE (month.day):
+# LOCALIZATION NOTE (from.month.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches numbers 1-12
 from.month.day = %2$S 月 %1$S 日|%2$S / %1$S|%2$S/%1$S|%2$S がつ %1$S にち
 
 # LOCALIZATION NOTE (until.month.day):
 # %1$S = matches numbers 1-31 and number.x
 # %2$S = matches numbers 1-12
 until.month.day =
 
-# LOCALIZATION NOTE (year.month.day):
+# LOCALIZATION NOTE (from.year.month.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches numbers 1-12
 # %3$S = matches 2/4 numbers
 from.year.month.day = %3$S 年 %2$S 月 %1$S 日|%3$S / %2$S / %1$S|%3$S - %2$S - %1$S|%3$S/%2$S/%1$S|%3$S ねん %2$S がつ %1$S にち
 
 # LOCALIZATION NOTE (until.year.month.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches numbers 1-12
 # %3$S = matches 2/4 numbers
 until.year.month.day =
 
-# LOCALIZATION NOTE (year.monthname.day):
+# LOCALIZATION NOTE (from.year.monthname.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches monthname
 # %3$S = matches 2/4 numbers
 from.year.monthname.day = %3$S 年 %2$S %1$S 日|%3$S 年 %2$S の %1$S 日|%3$S 年 の %2$S %1$S 日
 
 # LOCALIZATION NOTE (until.year.monthname.day):
 # %1$S = matches numbers 1-31
 # %2$S = matches monthname
@@ -226,20 +226,20 @@ month.5 = 5月|五月|伍月|皐月
 month.6 = 6月|六月|水無月
 month.7 = 7月|七月|文月
 month.8 = 8月|八月|葉月
 month.9 = 9月|九月|長月
 month.10 = 10月|十月|一〇月|拾月|神無月
 month.11 = 11月|十一月|一一月|拾壱月|霜月
 month.12 = 12月|十二月|一二月|拾弐月|師走
 
-# LOCALIZATION NOTE (weekday.*):
+# LOCALIZATION NOTE (from.weekday.*):
 # used to derive start date based on weekdays mentioned
 # can be a list of values, separate variants by |
-# LOCALIZATION NOTE (weekday.0):
+# LOCALIZATION NOTE (from.weekday.0):
 # Regardless of what the first day of the week is in your country, 0 is Sunday here.
 from.weekday.0 = (日|日曜
 from.weekday.1 = (月|月曜
 from.weekday.2 = (火|火曜
 from.weekday.3 = (水|水曜
 from.weekday.4 = (木|木曜
 from.weekday.5 = (金|金曜
 from.weekday.6 = (土|土曜|週末