27.0: sync calendar with en-US rev14955:12fb8e3a9088
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Tue, 12 Nov 2013 09:36:52 +0900
changeset 1256 8ed5342ee04de754ddf7a02c904593227729a992
parent 1255 7f2ede3a1a85c3ef1443325f5043165f6888dfba
child 1257 8694e693843793f957c363b15aabcc52acfe3e03
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
bugs27
27.0: sync calendar with en-US rev14955:12fb8e3a9088
calendar/chrome/calendar/calendar-extract.properties
calendar/chrome/calendar/calendar.properties
calendar/chrome/lightning/lightning-toolbar.dtd
--- a/calendar/chrome/calendar/calendar-extract.properties
+++ b/calendar/chrome/calendar/calendar-extract.properties
@@ -116,17 +116,17 @@ until.hour.pm =
 from.half.hour.before = %1$S 時前
 
 # LOCALIZATION NOTE (until.half.hour.before):
 # denotes times 30 minutes before next full hour
 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 時半ごろ
+from.half.hour.after = %1$S 時半
 
 # LOCALIZATION NOTE (until.half.hour.after):
 # denotes times 30 minutes after last full hour
 until.half.hour.after =
 
 # LOCALIZATION NOTE (from.hour.minutes):
 # %1$S = matches numbers 0-23
 # %2$S = matches numbers 0-59
@@ -165,17 +165,18 @@ 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 (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 にち
+from.month.day = %2$S/%1$S
+#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 (from.year.month.day):
 # %1$S = matches numbers 1-31
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -599,8 +599,14 @@ deleteEventAccesskey=l
 
 #(^m^) plural forms.
 calendarPropertiesEveryMinute=#1 分ごと
 
 # LOCALIZATION NOTE (extractUsing)
 # Used in message header
 #    %1$S will be replaced with language name from languageNames.properties
 extractUsing=%1$Sを使用
+
+# LOCALIZATION NOTE (extractUsingRegion)
+# Used in message header
+#    %1$S will be replaced with language name from languageNames.properties
+#    %2$S will be replaced with region like US in en-US
+extractUsingRegion=%1$S (%2$S) を使用
--- a/calendar/chrome/lightning/lightning-toolbar.dtd
+++ b/calendar/chrome/lightning/lightning-toolbar.dtd
@@ -31,10 +31,14 @@
 <!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">
 <!-- LOCALIZATION NOTE: the same as appmenuButton.label and appmenuButton1.tooltip
      from messenger.dtd -->
-<!ENTITY lightning.toolbar.appmenuButton.label	"アプリメニュー">
+<!ENTITY lightning.toolbar.appmenuButton.label		"アプリメニュー">
 <!ENTITY lightning.toolbar.appmenuButton1.tooltip	"&brandShortName; のメニューを表示します">
+<!ENTITY lightning.toolbar.calendarmenu.label		"カレンダーペイン">
+<!ENTITY lightning.toolbar.calendarmenu.accesskey	"P">
+<!ENTITY lightning.toolbar.calendarpane.label		"カレンダーペインを表示します">
+<!ENTITY lightning.toolbar.calendarpane.accesskey	"P">