Fix bug 563813 - Localization issue for menu "Status" in "New event/New task" dialogs.
authorBenoit Leseul <benoit.leseul@gmail.com>
Thu, 06 May 2010 23:25:30 +0200
changeset 1147 b01dc82ca894c6eae74dc2070335c085022ddf6b
parent 1146 7865483b6ed6e852b9f053f7d21a9c1f688a7df8
child 1148 752f38058f38ef534976eabaf023f1c5ae945c6f
push id1117
push userbenoit.leseul@gmail.com
push dateThu, 06 May 2010 21:26:56 +0000
bugs563813
Fix bug 563813 - Localization issue for menu "Status" in "New event/New task" dialogs.
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar.properties
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -43,29 +43,31 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY event.title.label "Modifier l'élément" >
 
 <!ENTITY newevent.from.label "Du" >
 <!ENTITY newevent.to.label "Au" >
 <!ENTITY newevent.attendees.notify.label "Notifier les participants">
 
-<!ENTITY newevent.status.label "Statut" >
-<!ENTITY newevent.status.accesskey "S" >
-<!ENTITY newevent.status.none.label "Aucun" >
-<!ENTITY newevent.status.none.accesskey "A" >
-<!ENTITY newevent.status.cancelled.label "Annulé" >
-<!ENTITY newevent.status.cancelled.accesskey "n" >
-<!ENTITY newevent.status.tentative.label "Provisoire" >
-<!ENTITY newevent.status.tentative.accesskey  "P" >
-<!ENTITY newevent.status.confirmed.label "Confirmé" >
-<!ENTITY newevent.status.confirmed.accesskey "C" >
-<!ENTITY newevent.status.needsaction.label "Une action est requise" >
-<!ENTITY newevent.status.inprogress.label "En cours" >
-<!ENTITY newevent.status.completed.label "Achevé le" >
+<!ENTITY newevent.status.label                    "Statut" >
+<!ENTITY newevent.status.accesskey                "S" >
+<!ENTITY newevent.eventStatus.none.label          "Aucun" >
+<!ENTITY newevent.eventStatus.none.accesskey      "A" >
+<!ENTITY newevent.todoStatus.none.label           "Not specified" >
+<!ENTITY newevent.eventStatus.cancelled.label     "Annulé" >
+<!ENTITY newevent.eventStatus.cancelled.accesskey "n" >
+<!ENTITY newevent.todoStatus.cancelled.label      "Annulé" >
+<!ENTITY newevent.status.tentative.label          "Provisoire" >
+<!ENTITY newevent.status.tentative.accesskey      "P" >
+<!ENTITY newevent.status.confirmed.label          "Confirmé" >
+<!ENTITY newevent.status.confirmed.accesskey      "C" >
+<!ENTITY newevent.status.needsaction.label        "Une action est requise" >
+<!ENTITY newevent.status.inprogress.label         "En cours" >
+<!ENTITY newevent.status.completed.label          "Achevé le" >
 
 <!-- The following entity is for New Task dialog only -->
 <!ENTITY newtodo.percentcomplete.label "&#37; d'achèvement">
 
 <!-- Keyboard Shortcuts -->
 <!ENTITY event.dialog.new.event.key2 "I">
 <!ENTITY event.dialog.new.task.key2 "D">
 <!ENTITY event.dialog.new.message.key2 "N">
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -65,22 +65,23 @@ warningNegativeDuration=La date de fin spécifiée se situe avant la date de début
 # The name of the calendar provided with the application by default
 homeCalendarName=Mon agenda
 
 # The name given to a calendar if an opened calendar has an empty filename
 untitledCalendarName=Agenda sans nom
 
 # Event status: Tentative, Confirmed, Cancelled
 # ToDo task status: NeedsAction, InProcess, Completed, Cancelled
-statusTentative  =Provisoire
-statusConfirmed  =Confirmé
-statusCancelled  =Annulé
-statusNeedsAction=Une action est requise
-statusInProcess  =En cours
-statusCompleted  =Achevé
+statusTentative     =Provisoire
+statusConfirmed     =Confirmé
+eventStatusCancelled=Annulé
+todoStatusCancelled =Annulé
+statusNeedsAction   =Une action est requise
+statusInProcess     =En cours
+statusCompleted     =Achevé
 
 # Task priority, these should match the priority.level.* labels in calendar.dtd
 highPriority=Haute
 mediumPriority=Moyenne
 lowPriority=Basse
 
 importPrompt=Dans quel agenda voulez-vous importer ces éléments ?
 exportPrompt=Quel agenda souhaitez-vous exporter ?