sync calendar with en-US rev9217:494757cf43d9
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Sat, 10 Dec 2011 12:02:21 +0900
changeset 412 68386cf40816ebeffd8da776ee3c2f8f3535ba17
parent 411 1912eebd632b6ad2c217660c07ff5da15e69aad9
child 413 bac734be3092f966a09e1bf7435434c1764373b0
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:57:17 +0000
sync calendar with en-US rev9217:494757cf43d9
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/preferences/alarms.dtd
calendar/chrome/calendar/preferences/preferences.dtd
calendar/chrome/calendar/timezones.properties
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -34,16 +34,17 @@
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 ## (^m^) plural forms を使用。
 ## pluralRule=0 にしている限り、「毎日;#1 日ごと」を分けられない。
+## ordinalWeekdayOrder, monthlyOrder, yearlyOrder, yearlyOrder2 には変数以外の文字を含めないこと!(Bug 449646)
 
 # LOCALIZATION NOTE (dailyEveryNth):
 # Edit recurrence window -> Recurrence pattern -> Daily repeat rules
 # #1 - number
 # e.g. "every 4 days"
 ## 毎日;#1 日ごと
 ## dailyEveryNth=every day;every #1 days
 dailyEveryNth=#1 日ごと
@@ -137,16 +138,17 @@ monthlyRuleNthOfEveryNounclass2=#2 カ月ごとの%1$S
 # This string allows to change the order of the elements "ordinal" and
 # "weekday" (or to insert a word between them) for the argument %1$S of the
 # string monthlyRuleNthOfEveryNounclass...
 # Without changing this string, the order is that one required from most
 # languages: ordinal + weekday (e.g. "'the first' 'Monday' of every 2 months").
 # %1$S - ordinal with article
 # %2$S - weekday noun
 # e.g. "'the first' 'Monday'"
+# DONT_TRANSLATE: Make sure there are no extra words in this property, just variables.
 ordinalWeekdayOrder=%1$S %2$S
 
 # LOCALIZATION NOTE (monthlyEveryOfEveryNounclass...):
 # Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
 # Translate these strings according to noun class/gender of weekday (%1$S)
 # set in 'repeadDetailsDay...Nounclass' strings.
 # Nounclass1 <-> Masculine gender; Nounclass2 <-> Feminine gender.
 # Add others strings with suffix 3, 4,... for others noun classes if your
@@ -373,34 +375,36 @@ enterLinkLocation=Web ページや文書ファイルの場所を入力してください。
 summaryDueTaskLabel=締切:
 
 # Attach File Dialog
 # (^a^) mail/chrome/messenger/messengercompose/composeMsgs.properties:chooseFileToAttach に合わせた
 selectAFile=添付ファイル
 removeCalendarsTitle=添付を削除
 removeCalendarsText=本当に %1$S 個の添付を削除しますか?
 
-## (^m^) monthlyOrder, yearlyOrder, yearlyOrder2 には変数以外の文字を含めないこと!(Bug 449646)
 # Recurrence Dialog Widget Order
 # LOCALIZATION NOTE: You can change the order of below params
 # Edit recurrence window -> Recurrence pattern -> Repeat monthly
 # %1$S - ordinal with article, %2$S - weekday
 # e.g. "the First Saturday"
+# DONT_TRANSLATE: Make sure there are no extra words in this property, just variables.
 monthlyOrder=%1$S %2$S
 
 # Edit recurrence window -> Recurrence pattern -> Repeat yearly
 # %1$S - day of month, %2$S - of, %3$S - month
 # e.g. "6 [of] September"
 # If you don't need %2$S in your locale - please put this on the third place.
+# DONT_TRANSLATE: Make sure there are no extra words in this property, just variables.
 yearlyOrder=%3$S %1$S %2$S
 
 # Edit recurrence window -> Recurrence pattern -> Repeat yearly
 # %1$S - ordinal with article, %2$S - weekday, %3$S  - of, %4$S - month
 # e.g. "the First Saturday of September"
 # If you don't need %3$S in your locale - please put this on the third place.
+# DONT_TRANSLATE: Make sure there are no extra words in this property, just variables.
 yearlyOrder2=%4$S %1$S %3$S %2$S
 
 # LOCALIZATION NOTE (pluralForWeekdays):
 # This string allows to set the use of weekdays nouns in plural form for
 # languages that need them in sentences like "every Monday" or "every Sunday
 # of March" etc.
 # Rule strings involved by this setting are:
 # - weeklyNthOn   (only the first part) e.g. "every Sunday"
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -318,17 +318,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.cache.label			"キャッシュ">
+<!ENTITY calendarproperties.cache2.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/calendar/preferences/alarms.dtd
+++ b/calendar/chrome/calendar/preferences/alarms.dtd
@@ -15,16 +15,17 @@
    -
    - The Initial Developer of the Original Code is
    - Matthew Willis
    - Portions created by the Initial Developer are Copyright (C) 2006
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s): 
    -   Cédric Corazza <cedric.corazza@wanadoo.fr>
+   -   Philipp Kewisch <mozilla@kewis.ch>
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
    - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
    - in which case the provisions of the GPL or the LGPL are applicable instead
    - of those above. If you wish to allow use of your version of this file only
    - under the terms of either the GPL or the LGPL, and not to allow others to
    - use your version of this file under the terms of the MPL, indicate your
@@ -34,17 +35,17 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
-
+<!-- (^m^) "Alarm" -> "Reminder"? (Bug 475376) -->
 <!ENTITY pref.alarmgoesoff.label "通知方法">
 <!ENTITY pref.playasound  "音を鳴らす" >
 <!ENTITY pref.calendar.alarms.playsound.accessKey "s">
 <!ENTITY pref.calendar.alarms.sound.useDefault.label "既定の音を使用">
 <!ENTITY pref.calendar.alarms.sound.useDefault.accessKey "d">
 <!ENTITY pref.calendar.alarms.sound.browse.label "参照...">
 <!ENTITY pref.calendar.alarms.sound.browse.accessKey "B">
 <!ENTITY pref.calendar.alarms.sound.preview.label "再生">
--- a/calendar/chrome/calendar/preferences/preferences.dtd
+++ b/calendar/chrome/calendar/preferences/preferences.dtd
@@ -18,16 +18,17 @@
    - Portions created by the Initial Developer are Copyright (C) 2001
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
    -   Mike Potter <mikep@oeone.com>
    -   ArentJan Banck <ajbanck@planet.nl>
    -   Eric Belhaire <belhaire@ief.u-psud.fr>
    -   Matthew Willis <mattwillis@gmail.com>
+   -   Philipp Kewisch <mozilla@kewis.ch>
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
    - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
    - in which case the provisions of the GPL or the LGPL are applicable instead
    - of those above. If you wish to allow use of your version of this file only
    - under the terms of either the GPL or the LGPL, and not to allow others to
    - use your version of this file under the terms of the MPL, indicate your
--- a/calendar/chrome/calendar/timezones.properties
+++ b/calendar/chrome/calendar/timezones.properties
@@ -469,8 +469,16 @@ pref.timezone.America.Santa_Isabel=アメリカ/サンタイサベル (America/Santa Isabel)
 pref.timezone.Antarctica.Macquarie=南極大陸/マッコーリー島 (Antarctica/Macquarie)
 pref.timezone.Asia.Novokuznetsk=アジア/ノヴォクズネツク (Asia/Novokuznetsk)
 
 #added with 0.1.2011b
 pref.timezone.America.Bahia_Banderas=アメリカ/バイーアデバンデラス (America/Bahia Banderas)
 pref.timezone.America.North_Dakota.Beulah=アメリカ/ノースダコタ/ビューラー (America/North Dakota/Beulah)
 pref.timezone.Pacific.Chuuk=太平洋/チューク諸島 (Pacific/Chuuk)
 pref.timezone.Pacific.Pohnpei=太平洋/ポンペイ島 (Pacific/Pohnpei)
+
+#added with 0.1.2011n
+pref.timezone.Africa.Juba=アフリカ/ジュバ (Africa/Juba)
+pref.timezone.America.Kralendijk=アメリカ/クラレンダイク (America/Kralendijk)
+pref.timezone.America.Lower_Princes=アメリカ/ローワープリンシズ (America/Lower Princes)
+pref.timezone.America.Metlakatla=アメリカ/メトラカトラ (America/Metlakatla)
+pref.timezone.America.Sitka=アメリカ/シトカ (America/Sitka)
+pref.timezone.Asia.Hebron=アジア/ヘブロン (Asia/Hebron)