sync calendar with en-US
authorRomi Hardiyanto <romihardiyanto@gmail.com>
Sun, 09 May 2010 18:47:22 +0200
changeset 94 33a3fe6cf5da14a17a0c03fcd54328ca1e8550ee
parent 93 6cc472f887d2a65b892431fb6bfba0b8d23c448d
child 95 ecfc33a5df8ff38dd4a148b92c28bf6483ad85ff
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:55:50 +0000
sync calendar with en-US
calendar/chrome/calendar/calendar-event-dialog-attendees.properties
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/calendar/calendar-invitations-dialog.dtd
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/calendar.properties
calendar/chrome/calendar/calendarCreation.properties
calendar/chrome/calendar/menuOverlay.dtd
calendar/chrome/calendar/timezones.properties
calendar/chrome/lightning/lightning.dtd
calendar/chrome/lightning/lightning.properties
new file mode 100644
--- /dev/null
+++ b/calendar/chrome/calendar/calendar-event-dialog-attendees.properties
@@ -0,0 +1,41 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Calendar code.
+#
+# The Initial Developer of the Original Code is
+#   Marc Zahnlecker <m.zahnlecker@googlemail.com>
+# Portions created by the Initial Developer are Copyright (C) 2009
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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
+# decision by deleting the provisions above and replace them with the notice
+# 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 *****
+
+event.attendee.role.required =Undangan Wajib
+event.attendee.role.optional =Undangan Opsional
+event.attendee.role.nonparticipant =Bukan Peserta
+event.attendee.role.chair =Pimpinan
+event.attendee.role.unknown =Peserta Tidak Dikenali (%1$S)
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -46,52 +46,71 @@
 
 
 <!ENTITY newevent.from.label                "Dari" >
 <!ENTITY newevent.to.label                  "Ke" >
 <!ENTITY newevent.attendees.notify.label    "Beritahu para undangan">
 
 <!ENTITY newevent.status.label                "Status" >
 <!ENTITY newevent.status.accesskey            "S" >
-<!ENTITY newevent.status.none.label           "Tidak Ditentukan" >
-<!ENTITY newevent.status.none.accesskey       "T" >
-<!ENTITY newevent.status.cancelled.label      "Dibatalkan" >
-<!ENTITY newevent.status.cancelled.accesskey  "b" >
+<!ENTITY newevent.eventStatus.none.label      "Tidak Ditentukan" >
+<!ENTITY newevent.eventStatus.none.accesskey  "T" >
+<!ENTITY newevent.todoStatus.none.label       "Tidak Ditentukan" >
+<!ENTITY newevent.eventStatus.cancelled.label "Dibatalkan" >
+<!ENTITY newevent.eventStatus.cancelled.accesskey  "b" >
+<!ENTITY newevent.todoStatus.cancelled.label  "Dibatalkan" >
 <!ENTITY newevent.status.tentative.label      "Tentatif" >
 <!ENTITY newevent.status.tentative.accesskey  "f" >
 <!ENTITY newevent.status.confirmed.label      "Telah Dikonfirmasi" >
 <!ENTITY newevent.status.confirmed.accesskey  "k" >
 <!ENTITY newevent.status.needsaction.label    "Butuh Tindakan" >
 <!ENTITY newevent.status.inprogress.label     "Dalam Proses" >
 <!ENTITY newevent.status.completed.label      "Selesai pada" >
 
 <!-- The following entity is for New Task dialog only -->
 <!ENTITY newtodo.percentcomplete.label      "&#37; selesai">
 
+<!-- Keyboard Shortcuts -->
+<!ENTITY event.dialog.new.event.key2              "I">
+<!ENTITY event.dialog.new.task.key2               "D">
+<!ENTITY event.dialog.new.message.key2            "N">
+<!ENTITY event.dialog.close.key                   "W">
+<!ENTITY event.dialog.save.key                    "S">
+<!ENTITY event.dialog.saveandclose.key            "L">
+<!ENTITY event.dialog.print.key                   "P">
+<!ENTITY event.dialog.undo.key                    "Z">
+<!ENTITY event.dialog.redo.key                    "Y">
+<!ENTITY event.dialog.cut.key                     "X">
+<!ENTITY event.dialog.copy.key                    "C">
+<!ENTITY event.dialog.paste.key                   "V">
+<!ENTITY event.dialog.select.all.key              "A">
+
 <!-- Menubar -->
-<!ENTITY  event.menu.file.label                           "Berkas">
-<!ENTITY  event.menu.file.accesskey                       "B">
-<!ENTITY  event.menu.file.new.label                       "Baru">
-<!ENTITY  event.menu.file.new.accesskey                   "B">
-<!ENTITY  event.menu.file.new.event.label                 "Acara">
-<!ENTITY  event.menu.file.new.event.accesskey             "A">
-<!ENTITY  event.menu.file.new.message.label               "Pesan">
-<!ENTITY  event.menu.file.new.message.accesskey           "P">
-<!ENTITY  event.menu.file.new.contact.label               "Kontak Daftar Alamat">
-<!ENTITY  event.menu.file.new.contact.accesskey           "K">
-<!ENTITY  event.menu.file.close.label                     "Tutup">
-<!ENTITY  event.menu.file.close.accesskey                 "T">
-<!ENTITY  event.menu.file.save.label                      "Simpan">
-<!ENTITY  event.menu.file.save.accesskey                  "S">
+<!ENTITY  event.menu.item.new.label                       "Baru">
+<!ENTITY  event.menu.item.new.accesskey                   "B">
+<!ENTITY  event.menu.item.new.event.label                 "Acara">
+<!ENTITY  event.menu.item.new.event.accesskey             "A">
+<!ENTITY  event.menu.item.new.task.label                  "Tugas">
+<!ENTITY  event.menu.item.new.task.accesskey              "T">
+<!ENTITY  event.menu.item.new.message.label               "Pesan">
+<!ENTITY  event.menu.item.new.message.accesskey           "P">
+<!ENTITY  event.menu.item.new.contact.label               "Kontak Daftar Alamat">
+<!ENTITY  event.menu.item.new.contact.accesskey           "K">
+<!ENTITY  event.menu.item.close.label                     "Tutup">
+<!ENTITY  event.menu.item.close.accesskey                 "T">
+<!ENTITY  event.menu.item.save.label                      "Simpan">
+<!ENTITY  event.menu.item.save.accesskey                  "S">
+<!ENTITY  event.menu.item.saveandclose.label              "Simpan dan Tutup">
+<!ENTITY  event.menu.item.saveandclose.accesskey          "m">
 <!ENTITY  event.menu.item.delete.label                    "Hapus…">
 <!ENTITY  event.menu.item.delete.accesskey                "H">
-<!ENTITY  event.menu.file.page.setup.label                "Tata Laman">
-<!ENTITY  event.menu.file.page.setup.accesskey            "L">
-<!ENTITY  event.menu.file.print.label                     "Cetak">
-<!ENTITY  event.menu.file.print.accesskey                 "C">
+<!ENTITY  event.menu.item.page.setup.label                "Tata Laman">
+<!ENTITY  event.menu.item.page.setup.accesskey            "L">
+<!ENTITY  event.menu.item.print.label                     "Cetak">
+<!ENTITY  event.menu.item.print.accesskey                 "C">
 
 <!ENTITY  event.menu.edit.label                           "Ubah">
 <!ENTITY  event.menu.edit.accesskey                       "U">
 <!ENTITY  event.menu.edit.undo.label                      "Batal">
 <!ENTITY  event.menu.edit.undo.accesskey                  "B">
 <!ENTITY  event.menu.edit.redo.label                      "Ulangi">
 <!ENTITY  event.menu.edit.redo.accesskey                  "U">
 <!ENTITY  event.menu.edit.cut.label                       "Potong">
@@ -206,25 +225,23 @@
 <!ENTITY event.attachments.popup.removeAll.label          "Hapus Semua" >
 <!ENTITY event.attachments.popup.removeAll.accesskey      "a" >
 <!ENTITY event.attachments.popup.attachPage.label         "Lampirkan Laman Web…" >
 <!ENTITY event.attachments.popup.attachPage.accesskey     "W" >
 <!ENTITY event.url.label                                  "Tautan Terkait:" >
 <!ENTITY event.priority2.label                            "Prioritas:">
 
 <!ENTITY event.reminder.none.label                        "Tidak ada" >
+<!ENTITY event.reminder.0minutes.before.label             "0 menit sebelumnya" >
 <!ENTITY event.reminder.5minutes.before.label             "5 menit sebelumnya" >
-<!ENTITY event.reminder.10minutes.before.label            "10 menit sebelumnya" >
 <!ENTITY event.reminder.15minutes.before.label            "15 menit sebelumnya" >
 <!ENTITY event.reminder.30minutes.before.label            "30 menit sebelumnya" >
-<!ENTITY event.reminder.45minutes.before.label            "45 menit sebelumnya" >
 <!ENTITY event.reminder.1hour.before.label                "1 jam sebelumnya" >
 <!ENTITY event.reminder.2hours.before.label               "2 jam sebelumnya" >
-<!ENTITY event.reminder.5hours.before.label               "5 jam sebelumnya" >
-<!ENTITY event.reminder.15hours.before.label              "15 jam sebelumnya" >
+<!ENTITY event.reminder.12hours.before.label              "12 jam sebelumnya" >
 <!ENTITY event.reminder.1day.before.label                 "1 hari sebelumnya" >
 <!ENTITY event.reminder.2days.before.label                "2 hari sebelumnya" >
 <!ENTITY event.reminder.1week.before.label                "1 minggu sebelumnya" >
 <!ENTITY event.reminder.custom.label                      "Suka-suka…" >
 
 <!ENTITY event.reminder.multiple.label                    "Multialarm…" >
 
 <!-- Recurrence dialog -->
@@ -345,16 +362,17 @@
 <!ENTITY event.freebusy.legend.free             "Bebas" >
 <!ENTITY event.freebusy.legend.busy             "Sibuk" >
 <!ENTITY event.freebusy.legend.busy_tentative   "Tentatif" >
 <!ENTITY event.freebusy.legend.busy_unavailable "Tidak di Kantor" >
 <!ENTITY event.freebusy.legend.unknown          "Tidak ada keterangan" >
 <!ENTITY event.attendee.role.required           "Undangan yang Wajib">
 <!ENTITY event.attendee.role.optional           "Undangan yang Opsional">
 <!ENTITY event.attendee.role.chair              "Pimpinan">
+<!ENTITY event.attendee.role.nonparticipant     "Bukan Peserta">
 
 <!-- Timezone dialog -->
 <!ENTITY timezone.title.label            "Tentukan Zona Waktu">
 
 <!-- Read-Only dialog -->
 <!ENTITY read.only.general.label         "Umum">
 <!ENTITY read.only.title.label           "Judul:">
 <!ENTITY read.only.repeat.label          "Perulangan:">
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -98,31 +98,44 @@ repeatDetailsDay6Nounclass=nounclass1
 repeatDetailsDay7=Sabtu
 repeatDetailsDay7Nounclass=nounclass1
 
 # LOCALIZATION NOTE (repeatDetailsAnd)
 # Used to show a number of weekdays in a list
 # i.e. "Sunday, Monday, Tuesday " + and + " Wednesday"
 repeatDetailsAnd=dan
 
-# LOCALIZATION NOTE (monthlyNthOfEveryNounclass...):
+# LOCALIZATION NOTE (monthlyRuleNthOfEveryNounclass...):
 # Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
-# Translate these strings according to noun class/gender of weekday (%2$S) 
+# Translate these strings according to noun class/gender of weekday (%2$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
 # language need them. In this case, corresponding strings must be added for
-# others rule strings with 'Nounclass...' suffix and corresponding values 
-# "nounclass..." must be written in 'repeatDetailsDayxNounclass' strings. 
-# %1$S - ordinal with article and noun class/gender corresponding to weekday
-# %2$S - weekday
-# #3 - interval
-# i.e. "the FIRST MONDAY of every 3 months"
-monthlyNthOfEveryNounclass1=%1$S %2$S setiap bulan;%1$S %2$S setiap #3 bulan
-monthlyNthOfEveryNounclass2=%1$S %2$S setiap bulan;%1$S %2$S setiap #3 bulan
+# others rule strings with 'Nounclass...' suffix and corresponding values
+# "nounclass..." must be written in 'repeatDetailsDayxNounclass' strings.
+# %1$S - list of weekdays with ordinal, article and noun class/gender
+#        (ordinal and weekday of every element in the list follow the order
+#         and the rule of ordinalWeekdayOrder string)
+# #2 - interval
+# e.g. "the first Monday and the last Friday of every 3 months"
+monthlyRuleNthOfEveryNounclass1=%1$S %2$S setiap bulan;%1$S %2$S setiap #2 bulan
+monthlyRuleNthOfEveryNounclass2=%1$S %2$S setiap bulan;%1$S %2$S setiap #2 bulan
+
+# LOCALIZATION NOTE (ordinalWeekdayOrder):
+# Edit recurrence window -> Recurrence pattern -> Monthly repeat rules
+# 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'"
+ordinalWeekdayOrder=%2$S %1$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
 # language need them. In this case, corresponding strings must be added for
@@ -308,16 +321,20 @@ repeatDetailsInfiniteAllDay=Pada %1$S\ne
 
 # LOCALIZATION NOTE (ruleTooComplex):
 # This string is shown in the reminder details area if our code can't handle the
 # complexity of the recurrence rule yet.
 ruleTooComplex=Klik di sini untuk keterangan lebih lanjut
 
 newEvent=Acara Baru
 newTask=Tugas Baru
+itemMenuLabelEvent=Acara
+itemMenuAccesskeyEvent2=A
+itemMenuLabelTask=Tugas
+itemMenuAccesskeyTask2=T
 
 emailSubjectReply=Bls: %1$S
 
 # Link Location Dialog
 specifyLinkLocation=Tentukan lokasi tautan
 enterLinkLocation=Masukkan sebuah laman web atau lokasi dokumen
 
 summaryDueTaskLabel=Hingga:
@@ -340,8 +357,42 @@ monthlyOrder=%2$S %1$S
 # If you don't need %2$S in your locale - please put this on the third place.
 yearlyOrder=%1$S %3$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.
 yearlyOrder2=%1$S %2$S %3$S %4$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"
+# - monthlyEveryOfEvery
+#     e.g. "every Monday of every month;every Monday every 2 months"
+# - yearlyOnEveryNthOfNth
+#     e.g. "every Friday of March;every 2 years on every Friday of March"
+# In your local write:
+#  "true"    if sentences like those above need weekday in plural form;
+#  "false"   if sentences like those above don't need weekday in plural form;
+pluralForWeekdays=false
+
+# LOCALIZATION NOTE (repeatDetailsDayxxxPlural):
+# Edit recurrence window -> Recurrence details link on Event/Task dialog window
+# Weekdays in plural form used inside sentences like "every Monday" or
+# "every Sunday of May" etc. for languages that need them.
+# These plurals will be used inside the following rule strings only if string
+# 'pluralForWeekdays' (see above) is set to "true":
+# - weeklyNthOn   (only the first part) e.g. "every Sunday"
+# - monthlyEveryOfEvery
+#     e.g. "every Monday of every month;every Monday every 2 months"
+# - yearlyOnEveryNthOfNth
+#     e.g. "every Friday of March;every 2 years on every Friday of March"
+repeatDetailsDay1Plural=Minggu
+repeatDetailsDay2Plural=Senin
+repeatDetailsDay3Plural=Selasa
+repeatDetailsDay4Plural=Rabu
+repeatDetailsDay5Plural=Kamis
+repeatDetailsDay6Plural=Jumat
+repeatDetailsDay7Plural=Sabtu
--- a/calendar/chrome/calendar/calendar-invitations-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-invitations-dialog.dtd
@@ -41,9 +41,10 @@
 
 <!-- Calendar Invitations List -->
 <!ENTITY calendar.invitations.list.accept.button.label                  "Terima">
 <!ENTITY calendar.invitations.list.decline.button.label                 "Tolak">
 <!ENTITY calendar.invitations.list.recurrentevent.text                  "Acara Berulang">
 <!ENTITY calendar.invitations.list.alldayevent.text                     "Acara Seharian">
 <!ENTITY calendar.invitations.list.location.text                        "Tempat: ">
 <!ENTITY calendar.invitations.list.organizer.text                       "Organizer: ">
+<!ENTITY calendar.invitations.list.attendee.text                        "Undangan: ">
 <!ENTITY calendar.invitations.list.none.text                            "Tidak ada">
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -41,21 +41,16 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- General -->
 <!ENTITY calendar.calendar.label     "Kalender">
 <!ENTITY calendar.calendar.accesskey "K">
 
-<!ENTITY calendar.dayView.key                  "1" >
-<!ENTITY calendar.weekView.key                 "2" >
-<!ENTITY calendar.multiweekView.key            "3" >
-<!ENTITY calendar.monthView.key                "4" >
-
 <!ENTITY calendar.newevent.button.tooltip         "Buat acara baru" >
 <!ENTITY calendar.newtask.button.tooltip          "Buat tugas baru" >
 
 <!ENTITY calendar.unifinder.todoitems.label       "Tugas" >
 <!ENTITY calendar.unifinder.showcompletedtodos.label "Tampilkan Tugas yang selesai">
 
 <!ENTITY calendar.today.button.label       "Hari Ini">
 <!ENTITY calendar.tomorrow.button.label       "Besok">
@@ -88,22 +83,28 @@
 <!ENTITY calendar.today.button.tooltip            "Buka Hari Ini" >
 <!ENTITY calendar.todaypane.button.tooltip        "Tampilkan Panel Hari Ini" >
 
 <!ENTITY calendar.day.button.tooltip            "Pindah ke tampilan harian" >
 <!ENTITY calendar.week.button.tooltip           "Pindah ke tampilan mingguan" >
 <!ENTITY calendar.month.button.tooltip          "Pindah ke tampilan bulan" >
 <!ENTITY calendar.multiweek.button.tooltip      "Pindah ke tampilan multiminggu" >
 
-<!ENTITY calendar.nextday.button.tooltip        "Hari Selanjutnya" >
-<!ENTITY calendar.prevday.button.tooltip        "Hari Sebelumnya" >
-<!ENTITY calendar.nextweek.button.tooltip       "Minggu Depan" >
-<!ENTITY calendar.prevweek.button.tooltip       "Minggu Sebelumnya" >
-<!ENTITY calendar.nextmonth.button.tooltip      "Bulan Depan" >
-<!ENTITY calendar.prevmonth.button.tooltip      "Bulan Sebelumnya" >
+<!ENTITY calendar.nextday.label                 "Hari Selanjutnya" >
+<!ENTITY calendar.prevday.label                 "Hari Sebelumnya" >
+<!ENTITY calendar.nextday.accesskey             "t" >
+<!ENTITY calendar.prevday.accesskey             "m" >
+<!ENTITY calendar.nextweek.label                "Minggu Depan" >
+<!ENTITY calendar.prevweek.label                "Minggu Sebelumnya" >
+<!ENTITY calendar.nextweek.accesskey            "t" >
+<!ENTITY calendar.prevweek.accesskey            "m" >
+<!ENTITY calendar.nextmonth.label               "Bulan Depan" >
+<!ENTITY calendar.prevmonth.label               "Bulan Sebelumnya" >
+<!ENTITY calendar.nextmonth.accesskey           "t" >
+<!ENTITY calendar.prevmonth.accesskey           "m" >
 
 <!ENTITY calendar.navigation.nextday.tooltip    "Maju Satu Hari" >
 <!ENTITY calendar.navigation.prevday.tooltip    "Mundur Satu Hari" >
 <!ENTITY calendar.navigation.nextweek.tooltip   "Maju Satu Minggu" >
 <!ENTITY calendar.navigation.prevweek.tooltip   "Mundur Satu Minggu" >
 <!ENTITY calendar.navigation.nextmonth.tooltip  "Maju Satu Bulan" >
 <!ENTITY calendar.navigation.prevmonth.tooltip  "Mundur Satu Bulan" >
 
@@ -151,16 +152,17 @@
 <!ENTITY calendar.task-details.organizer.label       "Dari:">
 <!ENTITY calendar.task-details.priority.label        "Prioritas:">
 <!ENTITY calendar.task-details.priority.low.label    "Rendah">
 <!ENTITY calendar.task-details.priority.normal.label "Normal">
 <!ENTITY calendar.task-details.priority.high.label   "Tinggi">
 <!ENTITY calendar.task-details.status.label          "Status:">
 <!ENTITY calendar.task-details.category.label        "Kategori:">
 <!ENTITY calendar.task-details.repeat.label          "Diulang:">
+<!ENTITY calendar.task-details.attachments.label     "Lampiran">
 
 <!ENTITY calendar.task.category.button.tooltip  "Masukkan tugas ke kategori">
 <!ENTITY calendar.task.complete.button.tooltip  "Tandar selesai pada tugas terpilih ">
 <!ENTITY calendar.task.priority.button.tooltip  "Ubah prioritas">
 
 <!-- Statusbar -->
 <!ENTITY statusText.label            "Dokumen: Selesai">
 
@@ -318,21 +320,28 @@
 
 <!-- Select Calendar Dialog -->
 <!ENTITY calendar.select.dialog.title    "Pilih Kalender">
 
 <!-- Calendar Printing -->
 <!ENTITY calendar.print.window.title "Cetak Kalender">
 <!ENTITY calendar.print.title.label "Judul:">
 <!ENTITY calendar.print.layout.label "Layout:">
-<!ENTITY calendar.print.range.label "Yang akan Dicetak">
-<!ENTITY calendar.print.currentview.label "Acara pada tampilan sekarang">
-<!ENTITY calendar.print.selected.label "Acara yang dipilih">
-<!ENTITY calendar.print.custom.label "Jangkauan Tanggal Khusus">
-<!ENTITY calendar.print.from.label "Dari:">
-<!ENTITY calendar.print.to.label "Kepada:">
+<!ENTITY calendar.print.range.label "Yang akan DicetakWhat to Print">
+<!ENTITY calendar.print.currentView2.label "Tampilan Sekarang">
+<!ENTITY calendar.print.completedtasks.label "Tugas yang selesai">
+<!ENTITY calendar.print.selectedEventsAndTasks.label "Acara/tugas terpilih">
+<!ENTITY calendar.print.tasks.label "Tugas">
+<!ENTITY calendar.print.events.label "Acara">
+<!ENTITY calendar.print.selected.label "Acara terpilih">
+<!ENTITY calendar.print.custom.label "Rentang waktu tertentu:">
+<!ENTITY calendar.print.from.label "Sejak:">
+<!ENTITY calendar.print.to.label "Hingga:">
 <!ENTITY calendar.print.settingsGroup.label "Pengaturan Cetak">
+<!ENTITY calendar.print.optionsGroup.label "Pilihan">
+<!ENTITY calendar.print.taskswithnoduedate.label "Tugas tanpa tenggat waktu">
+<!ENTITY calendar.print.completedtasks.label "Tugas yang selesai">
 
 <!-- Error reporting -->
 <!ENTITY calendar.error.detail "Detail…">
 <!ENTITY calendar.error.code "Kode kesalahan:">
 <!ENTITY calendar.error.description "Deskripsi:">
 <!ENTITY calendar.error.title "Terjadi kesalahan">
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -67,17 +67,18 @@ homeCalendarName=Beranda
 
 # The name given to a calendar if an opened calendar has an empty filename
 untitledCalendarName=Kalender Tak Berjudul
 
 # Event status: Tentative, Confirmed, Cancelled
 # ToDo task status: NeedsAction, InProcess, Completed, Cancelled
 statusTentative  =Tentatif
 statusConfirmed  =Dikonfirmasi
-statusCancelled  =Dibatalkan
+eventStatusCancelled=Dibatalkan
+todoStatusCancelled=Dibatalkan
 statusNeedsAction=Butuh Tindakan
 statusInProcess  =Dalam Proses
 statusCompleted  =Selesai
 
 # Task priority, these should match the priority.level.* labels in calendar.dtd
 highPriority=Tinggi
 mediumPriority=Sedang
 lowPriority=Rendah
@@ -158,16 +159,18 @@ eventUntitled=Tidak Berjudul
 
 # Tooltips of events or todos
 tooltipTitle    =Judul:
 tooltipLocation =Lokasi:
 # event date, usually an interval, such as
 #  Date: 7:00--8:00 Thu 9 Oct 2011
 #  Date: Thu 9 Oct 2000 -- Fri 10 Oct 2000
 tooltipDate     =Tanggal:
+# event calendar name
+tooltipCalName=Nama Kalender:
 # event status: tentative, confirmed, cancelled
 tooltipStatus   =Status:
 # task/todo fields
 # start date time, due date time, task priority number, completed date time
 tooltipStart    =Mulai:
 tooltipDue      =Jatuh Tempo:
 tooltipPriority =Prioritas:
 tooltipPercent  =% Selesai:
@@ -313,29 +316,31 @@ TZFromOS=Zona waktu ZoneInfo dipilih ber
 TZFromLocale=Zona waktu ZoneInfo dipilih berdasarkan zona waktu sistem operasi yang cocok yang pada umumnya digunakan pengguna Internet yang berbahasa Inggris (Amerika)
   
 TZFromKnownTimezones=Zona waktu ZoneInfo dipilih berdasarkan zona waktu sistem operasi yang cocok dengan zona waktu yang dikenali diurutkan dalam alfabet untuk id zona waktu.
 
 # Print Layout
 formatListName = Daftar
 weekPrinterName = Kotak Mingguan
 monthPrinterName = Kotak Bulanan
+tasksWithNoDueDate = Tugas tanpa tenggat waktu
 
 # Providers
 caldavName=CalDAV
 compositeName=Gabungan
 icsName=iCalendar (ICS)
 memoryName=Sementara (dalam memori)
 storageName=Lokal (SQLite)
 
 # Used in created html code for list layout print and html export
 htmlPrefixTitle=Judul
 htmlPrefixWhen=Waktu
 htmlPrefixLocation=Lokasi
 htmlPrefixDescription=Deskripsi
+htmlTaskCompleted=%1$S (selesai)
 
 # Categories
 addCategory=Tambah Kategori
 
 today=Hari Ini
 tomorrow=Besok
 yesterday=Kemarin
 
@@ -523,16 +528,23 @@ dayIntervalBetweenMonths=%1$S %2$S – %3$S %4$S, %5$S
 #    %1$S will be replaced with name of the month of the start date
 #    %2$S will be replaced with the day-index of the start date
 #    %3$S will be replaced with the year of the start date
 #    %4$S will be replaced with name of the month of the end date
 #    %5$S will be replaced with the day-index of the end date
 #    %6$S will be replaced with the year of the end date
 dayIntervalBetweenYears=%1$S %2$S, %3$S – %4$S %5$S, %6$S
 
+# LOCALIZATION NOTE (datetimeIntervalOnSameDateTime):
+# used for intervals where end is equals to start
+# displayed form is '5 Jan 2006 13:00'
+#    %1$S will be replaced with the date of the start date
+#    %2$S will be replaced with the time of the start date
+datetimeIntervalOnSameDateTime=%1$S %2$S
+
 # LOCALIZATION NOTE (datetimeIntervalOnSameDay):
 # used for intervals where end is on the same day as start, so we can leave out the
 # end date but still include end time
 # displayed form is '5 Jan 2006 13:00 - 17:00'
 #    %1$S will be replaced with the date of the start date
 #    %2$S will be replaced with the time of the start date
 #    %3$S will be replaced with the time of the end date
 datetimeIntervalOnSameDay=%1$S %2$S – %3$S
new file mode 100644
--- /dev/null
+++ b/calendar/chrome/calendar/calendarCreation.properties
@@ -0,0 +1,38 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla Calendar code.
+#
+# The Initial Developer of the Original Code is
+#   Philipp Kewisch <mozilla@kewis.ch>
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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
+# decision by deleting the provisions above and replace them with the notice
+# 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 *****
+
+error.invalidUri=Silakan masukkan lokasi yang benar.
+error.alreadyExists=Anda telah melanggan kalender pada lokasi ini.
--- a/calendar/chrome/calendar/menuOverlay.dtd
+++ b/calendar/chrome/calendar/menuOverlay.dtd
@@ -87,23 +87,13 @@
 <!ENTITY calendar.menu.numberofweeks.3          "Tiga Minggu">
 <!ENTITY calendar.menu.numberofweeks.4          "Empat Minggu">
 <!ENTITY calendar.menu.numberofweeks.5          "Lima Minggu">
 <!ENTITY calendar.menu.numberofweeks.6          "Enam Minggu">
 
 <!ENTITY goTodayCmd.label                       "Hari Ini">
 <!ENTITY goTodayCmd.accesskey                   "H">
 
-<!ENTITY goPreviousCmd.day.label                "Hari Sebelumnya">
-<!ENTITY goPreviousCmd.week.label               "Hari Selanjutnya">
-<!ENTITY goPreviousCmd.month.label              "Bulan Sebelumnya">
-<!ENTITY goPreviousCmd.accesskey                "S">
-
-<!ENTITY goNextCmd.day.label                    "Hari Selanjutnya">
-<!ENTITY goNextCmd.week.label                   "Minggu Selanjutnya">
-<!ENTITY goNextCmd.month.label                  "Bulan Selanjutnya">
-<!ENTITY goNextCmd.all.accesskey                "e">
-
 <!ENTITY showCurrentView.label                  "Tampilan Sekarang">
 <!ENTITY showCurrentView.accesskey              "T">
 
 <!ENTITY calendar.properties.label              "Properti Kalender…">
 <!ENTITY calendar.properties.accesskey          "K">
--- a/calendar/chrome/calendar/timezones.properties
+++ b/calendar/chrome/calendar/timezones.properties
@@ -456,8 +456,15 @@ pref.timezone.America.St_Barthelemy=Amer
 # added with 0.1.2008d:
 pref.timezone.America.Argentina.San_Luis=Amerika/Argentina/San Luis
 pref.timezone.America.Santarem=Amerika/Santarem
 pref.timezone.Asia.Ho_Chi_Minh=Asia/Ho Chi Minh
 pref.timezone.Asia.Kolkata=Asia/Kalkuta
 
 # added with 0.1.2008i:
 pref.timezone.America.Argentina.Salta=Amerika/Argentina/Salta
+
+# added with 0.1.2010i
+pref.timezone.America.Matamoros=Amerika/Matamoros
+pref.timezone.America.Ojinaga=Amerika/Ojinaga
+pref.timezone.America.Santa_Isabel=Amerika/Santa Isabel
+pref.timezone.Antarctica.Macquarie=Antarktika/Macquarie
+pref.timezone.Asia.Novokuznetsk=Asia/Novokuznetsk
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -100,16 +100,18 @@
 <!ENTITY lightning.calendarproperties.showevents.inagenda.label "Tampilkan Acara pada Panel Hari Ini">
 <!ENTITY lightning.calendarproperties.showtasks.label           "Tampilkan Tugas pada Panel Hari Ini dan Mode Tugas">
 <!ENTITY lightning.calendarproperties.email.label               "Email:">
 
 <!-- iMIP Bar (meeting support) -->
 <!ENTITY lightning.imipbar.description "Pesan in berisi undangan sebuah acara.">
 
 <!-- Lightning specific keybindings -->
+<!ENTITY lightning.keys.event.showCalendar.key "C">
+<!ENTITY lightning.keys.event.showTasks.key "D">
 <!ENTITY lightning.keys.event.new "U">
 <!ENTITY lightning.keys.todo.new "D">
 
 <!-- Account Central page -->
 <!ENTITY lightning.acctCentral.newCalendar.label "Buat kalender baru">
 
 <!-- today-pane-specific -->
 <!ENTITY todaypane.showMinimonth.label "Tampilkan Bulan-Mini">
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -43,16 +43,20 @@ extensions.{e2fda1a4-762b-4020-b5ad-a41d
 extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project
 
 # Lightning branding
 brandShortName=Lightning
 
 # Task mode title
 taskModeApplicationTitle=Tugas
 
+# Tab titles
+tabTitleCalendar=Kalender
+tabTitleTasks=Tugas
+
 # Html event display in message
 imipHtml.header=Undangan Acara
 imipHtml.summary=Judul:
 imipHtml.location=Tempat:
 imipHtml.when=Waktu:
 imipHtml.organizer=Organizer:
 imipHtml.description=Keterangan:
 imipHtml.comment=Komentar:
@@ -75,16 +79,17 @@ imipCancelInvitation.label=Hapus
 imipDeclineInvitation.label=Tolak
 imipUpdate.label=Perbarui
 imipAcceptTentativeInvitation.label=Tentatif
 imipSend.label=Kirim
 imipSendMail.title=Peringatan Lewat Email
 imipSendMail.text=Apakah Anda ingin mengirim peringatan lewat Email sekarang?
 imipSendMail.Outlook2000CompatMode.text=Dukungan Outlook 2000 dan Outlook 2002/XP
 imipNoIdentity=Tidak Ada
+imipNoCalendarAvailable=Tidak ada kalender yang dapat ditulus tersedia.
 
 itipReplySubject=Balasan Undangan Acara: %1$S
 itipReplyBodyAccept=%1$S telah menyetujui undangan acara Anda.
 itipReplyBodyDecline=%1$S telah menolak undangan acara Anda.
 itipRequestSubject=Undangan Acara: %1$S
 itipRequestBody=%1$S telah mengundang Anda pada acara %2$S
 itipCancelSubject=Pembatalan Acara: %1$S
 itipCancelBody=%1$S telah membatalkan acara ini: « %2$S »