# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1406800447 -32400
# Node ID 91aade6bdf501d7175cd0239b30d6192991c041e
# Parent  3649f73757180b647070c2c523da9c2314f6b380
merge Part4: compare-locales -m $(LOCALE_MERGEDIR) -r en-US calendar/locales/l10n.ini $(L10NBASEDIR) pt-BR

diff --git a/calendar/chrome/calendar/calendar-event-dialog.dtd b/calendar/chrome/calendar/calendar-event-dialog.dtd
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -383,8 +383,16 @@
 <!ENTITY event.until.label "Até:">
 
 <!ENTITY newevent.attendees.notifyundisclosed.label    "Manter anonimato dos participantes nos convites">
 <!ENTITY newevent.attendees.notifyundisclosed.tooltip  "Se ativar esta opção, os participantes do evento não serão informados dos restantes participantes. Apenas aplicável para convites por correio eletrónico.">
 <!ENTITY read.only.event.end.label "Data de fim:">
 <!ENTITY read.only.event.start.label "Data de início:">
 <!ENTITY read.only.task.due.label "Data de fim:">
 <!ENTITY read.only.task.start.label "Data de início:">
+
+
+<!-- LOCALIZATON NOTE(event.attendees.notify.label,event.attendees.notifyundisclosed.label)
+   - These two labels are displayed side by side in the event dialog, make sure
+   - they still fit in. -->
+<!ENTITY event.attendees.notify.label               "Notify attendees">
+<!ENTITY event.attendees.notifyundisclosed.label    "Separate invitation per attendee">
+<!ENTITY event.attendees.notifyundisclosed.tooltip  "This option sends one invitation email per attendee. Each invitation only contains the recipient attendee so that other attendee identities are not disclosed.">
diff --git a/calendar/chrome/calendar/calendar.dtd b/calendar/chrome/calendar/calendar.dtd
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -365,8 +365,23 @@
 <!ENTITY calendar.unifinder.tree.percentcomplete.tooltip "Clique para ordenar por  &#37; concluído">
 <!ENTITY calendar.unifinder.tree.priority.tooltip "Clique para ordenar por prioridade">
 <!ENTITY calendar.unifinder.tree.startdate.tooltip "Clique para ordenar por data de início">
 <!ENTITY calendar.unifinder.tree.status.tooltip "Clique para ordenar por estado">
 <!ENTITY calendar.unifinder.tree.title.tooltip "Clique para ordenar por título">
 <!ENTITY calendarproperties.cache3.label "Suporte no modo desligado">
 <!ENTITY calendarproperties.refreshInterval.label "Atualização de calendário:">
 <!ENTITY calendarproperties.refreshInterval.manual.label "Manualmente">
+
+<!ENTITY calendar.print.button.accesskey        "P">
+<!ENTITY calendar.unifinder.tree.calendarname.tooltip2     "Sort by calendar name">
+<!ENTITY calendar.unifinder.tree.categories.tooltip2       "Sort by category">
+<!ENTITY calendar.unifinder.tree.completeddate.tooltip2    "Sort by completed date">
+<!ENTITY calendar.unifinder.tree.done.tooltip2             "Sort by completion">
+<!ENTITY calendar.unifinder.tree.duedate.tooltip2          "Sort by due date">
+<!ENTITY calendar.unifinder.tree.duration.tooltip2         "Sort by time until due">
+<!ENTITY calendar.unifinder.tree.enddate.tooltip2          "Sort by end date">
+<!ENTITY calendar.unifinder.tree.location.tooltip2         "Sort by location">
+<!ENTITY calendar.unifinder.tree.percentcomplete.tooltip2  "Sort by &#37; complete">
+<!ENTITY calendar.unifinder.tree.priority.tooltip2         "Sort by priority">
+<!ENTITY calendar.unifinder.tree.startdate.tooltip2        "Sort by start date">
+<!ENTITY calendar.unifinder.tree.status.tooltip2           "Sort by status">
+<!ENTITY calendar.unifinder.tree.title.tooltip2            "Sort by title">
diff --git a/calendar/chrome/calendar/calendar.properties b/calendar/chrome/calendar/calendar.properties
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -609,8 +609,15 @@
 normalPriority=Normal
 
 # event organizer
 tooltipOrganizer=Agenda:
 
 # Event Dialog Warnings
 warningEndBeforeStart=A data de fim introduzida é anterior à data de início
 warningUntilBeforeStart=A data "Até" introduzida é anterior à data de início
+
+unitDays=#1 day;#1 days
+unitHours=#1 hour;#1 hours
+
+# LOCALIZATION NOTE (unit)
+# Used to determine the correct plural form of a unit
+unitMinutes=#1 minute;#1 minutes
diff --git a/calendar/chrome/calendar/preferences/alarms.dtd b/calendar/chrome/calendar/preferences/alarms.dtd
--- a/calendar/chrome/calendar/preferences/alarms.dtd
+++ b/calendar/chrome/calendar/preferences/alarms.dtd
@@ -28,8 +28,12 @@
 <!ENTITY pref.alarm.on "Ativado">
 <!ENTITY pref.alarm.off "Desativado">
 <!ENTITY pref.defalarmlen4events.label "Antecedência padrão de alarmes para eventos:">
 <!ENTITY pref.defalarmlen4events.accesskey "A">
 <!ENTITY pref.defalarmlen4todos.label "Antecedência padrão de alarmes para tarefas:">
 <!ENTITY pref.defalarmlen4todos.accesskey "n">
 <!ENTITY pref.defaultemail.label "Endereço padrão para onde enviar alarmes:">
 <!ENTITY pref.defaulttext.label "Texto padrão para alarmes:">
+
+<!ENTITY pref.defaultsnoozelength.accesskey "S">
+
+<!ENTITY pref.defaultsnoozelength.label "Default Snooze Length:" >
diff --git a/calendar/chrome/calendar/preferences/general.dtd b/calendar/chrome/calendar/preferences/general.dtd
--- a/calendar/chrome/calendar/preferences/general.dtd
+++ b/calendar/chrome/calendar/preferences/general.dtd
@@ -19,8 +19,25 @@
 <!ENTITY pref.refreshbox.label "Atualizar" >
 <!ENTITY pref.autorefresh.label "Atualizar calendários a cada" >
 <!ENTITY pref.autorefresh.accesskey "A" >
 
 
 <!ENTITY pref.accessibility.label "Acessibilidade" >
 <!ENTITY pref.systemcolors.accesskey "c">
 <!ENTITY pref.systemcolors.label "Optimizar cores para acessibilidade" >
+
+<!ENTITY pref.default_event_length.accesskey "E">
+
+<!ENTITY pref.default_event_length.label "Default Length:" >
+<!ENTITY pref.default_task_end_of_day.label "End of Day">
+<!ENTITY pref.default_task_next_week.label "Next Week">
+
+<!ENTITY pref.default_task_none.label "None">
+<!ENTITY pref.default_task_offset_current.label "Relative to Current Time">
+<!ENTITY pref.default_task_offset_next_hour.label "Relative to Next Hour">
+<!ENTITY pref.default_task_offset_start.label "Relative to Start">
+<!ENTITY pref.default_task_start_of_day.label "Start of Day">
+<!ENTITY pref.default_task_tomorrow.label "Tomorrow">
+
+<!ENTITY pref.defaults.label "Default Values for New Items">
+<!ENTITY pref.events.label "Events">
+<!ENTITY pref.tasks.label "Tasks">
diff --git a/calendar/chrome/lightning/lightning.dtd b/calendar/chrome/lightning/lightning.dtd
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -90,8 +90,35 @@
 
 <!-- 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!
   -->
 
 <!-- Tools menu -->
 <!ENTITY lightning.preferencesLabel "Calendário">
+
+
+<!-- iMIP Bar (meeting support) -->
+<!ENTITY lightning.imipbar.btnAccept.label                                  "Accept">
+<!ENTITY lightning.imipbar.btnAccept2.tooltiptext                           "Accept event invitation">
+<!ENTITY lightning.imipbar.btnAcceptRecurrences.label                       "Accept all">
+<!ENTITY lightning.imipbar.btnAcceptRecurrences2.tooltiptext                "Accept event invitation for all occurrences of the event">
+<!ENTITY lightning.imipbar.btnAdd.label                                     "Add">
+<!ENTITY lightning.imipbar.btnAdd.tooltiptext                               "Add the event to the calendar">
+<!ENTITY lightning.imipbar.btnDecline.label                                 "Decline">
+<!ENTITY lightning.imipbar.btnDecline2.tooltiptext                          "Decline event invitation">
+<!ENTITY lightning.imipbar.btnDeclineRecurrences.label                      "Decline all">
+<!ENTITY lightning.imipbar.btnDeclineRecurrences2.tooltiptext               "Decline event invitation for all occurrences of the event">
+<!ENTITY lightning.imipbar.btnDelete.label                                  "Delete">
+<!ENTITY lightning.imipbar.btnDelete.tooltiptext                            "Delete from calendar">
+<!ENTITY lightning.imipbar.btnDetails.label                                 "Details…">
+<!ENTITY lightning.imipbar.btnDetails.tooltiptext                           "Show event details">
+<!ENTITY lightning.imipbar.btnMore.label                                    "More">
+<!ENTITY lightning.imipbar.btnMore.tooltiptext                              "Click to show more options">
+<!ENTITY lightning.imipbar.btnReconfirm.tooltiptext                         "Sends a reconfirmation to the organizer">
+<!ENTITY lightning.imipbar.btnReconfirm2.label                              "Reconfirm">
+<!ENTITY lightning.imipbar.btnTentative.label                               "Tentative">
+<!ENTITY lightning.imipbar.btnTentative2.tooltiptext                        "Accept event invitation tentatively">
+<!ENTITY lightning.imipbar.btnTentativeRecurrences.label                    "Tentative all">
+<!ENTITY lightning.imipbar.btnTentativeRecurrences2.tooltiptext             "Accept event invitation tentatively for all occurrences of the event">
+<!ENTITY lightning.imipbar.btnUpdate.label                                  "Update">
+<!ENTITY lightning.imipbar.btnUpdate.tooltiptext                            "Update event in calendar">
