diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 912f6cee..62b263bc 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -445,7 +445,7 @@ function rcube_calendar_ui(settings)
 
       if (event.status) {
         var status_lc = String(event.status).toLowerCase();
-        $('#event-status').show().children('.event-text').html(Q(rcmail.gettext(status_lc,'calendar')));
+        $('#event-status').show().children('.event-text').html(Q(rcmail.gettext('status-'+status_lc,'calendar')));
         $dialog.addClass('status-'+status_lc);
       }
       if (event.sensitivity && event.sensitivity != 'public') {
@@ -868,7 +868,7 @@ function rcube_calendar_ui(settings)
       };
 
       if (event.id) {
-        buttons[rcmail.gettext('remove', 'calendar')] = function() {
+        buttons[rcmail.gettext('delete', 'calendar')] = function() {
           me.delete_event(event);
           $dialog.dialog('close');
         };
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 612bda5d..722d54fc 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -407,8 +407,8 @@ class calendar_ui
     $attrib['name'] = 'status';
     $select = new html_select($attrib);
     $select->add('---', '');
-    $select->add($this->cal->gettext('confirmed'), 'CONFIRMED');
-    $select->add($this->cal->gettext('cancelled'), 'CANCELLED');
+    $select->add($this->cal->gettext('status-confirmed'), 'CONFIRMED');
+    $select->add($this->cal->gettext('status-cancelled'), 'CANCELLED');
     //$select->add($this->cal->gettext('tentative'), 'TENTATIVE');
     return $select->show(null);
   }
diff --git a/plugins/calendar/localization/ca_ES.inc b/plugins/calendar/localization/ca_ES.inc
index 53c02ec3..a49f56a2 100644
--- a/plugins/calendar/localization/ca_ES.inc
+++ b/plugins/calendar/localization/ca_ES.inc
@@ -73,8 +73,8 @@ $labels['outofoffice'] = 'Fora de l\'oficina';
 $labels['tentative'] = 'Provisional';
 $labels['mystatus'] = 'El meu estat';
 $labels['status'] = 'Estat';
-$labels['confirmed'] = 'Confirmat';
-$labels['cancelled'] = 'Cancel·lat';
+$labels['status-confirmed'] = 'Confirmat';
+$labels['status-cancelled'] = 'Cancel·lat';
 $labels['priority'] = 'Prioritat';
 $labels['sensitivity'] = 'Privadesa';
 $labels['public'] = 'públic';
diff --git a/plugins/calendar/localization/da_DK.inc b/plugins/calendar/localization/da_DK.inc
index 006d49f0..f76df92b 100644
--- a/plugins/calendar/localization/da_DK.inc
+++ b/plugins/calendar/localization/da_DK.inc
@@ -62,8 +62,8 @@ $labels['busy'] = 'Optaget';
 $labels['outofoffice'] = 'Ikke på kontoret';
 $labels['tentative'] = 'Forsøgsvis';
 $labels['status'] = 'Status';
-$labels['confirmed'] = 'Bekræftet';
-$labels['cancelled'] = 'Annulleret';
+$labels['status-confirmed'] = 'Bekræftet';
+$labels['status-cancelled'] = 'Annulleret';
 $labels['priority'] = 'Prioritet';
 $labels['sensitivity'] = 'Privatliv';
 $labels['public'] = 'offentlig';
diff --git a/plugins/calendar/localization/de_DE.inc b/plugins/calendar/localization/de_DE.inc
index e68d8b25..9ec5ba47 100644
--- a/plugins/calendar/localization/de_DE.inc
+++ b/plugins/calendar/localization/de_DE.inc
@@ -80,8 +80,8 @@ $labels['outofoffice'] = 'Abwesend';
 $labels['tentative'] = 'Mit Vorbehalt';
 $labels['mystatus'] = 'Mein Status';
 $labels['status'] = 'Status';
-$labels['confirmed'] = 'Bestätigt';
-$labels['cancelled'] = 'Gekündigt';
+$labels['status-confirmed'] = 'Bestätigt';
+$labels['status-cancelled'] = 'Gekündigt';
 $labels['priority'] = 'Priorität';
 $labels['sensitivity'] = 'Sichtbarkeit';
 $labels['public'] = 'öffentlich';
diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc
index 630a47bb..d802153c 100644
--- a/plugins/calendar/localization/en_US.inc
+++ b/plugins/calendar/localization/en_US.inc
@@ -80,8 +80,8 @@ $labels['outofoffice'] = 'Out of Office';
 $labels['tentative'] = 'Tentative';
 $labels['mystatus'] = 'My status';
 $labels['status'] = 'Status';
-$labels['confirmed'] = 'Confirmed';
-$labels['cancelled'] = 'Cancelled';
+$labels['status-confirmed'] = 'Confirmed';
+$labels['status-cancelled'] = 'Cancelled';
 $labels['priority'] = 'Priority';
 $labels['sensitivity'] = 'Privacy';
 $labels['public'] = 'public';
diff --git a/plugins/calendar/localization/es_AR.inc b/plugins/calendar/localization/es_AR.inc
index 353e8673..a0d44202 100644
--- a/plugins/calendar/localization/es_AR.inc
+++ b/plugins/calendar/localization/es_AR.inc
@@ -73,8 +73,8 @@ $labels['outofoffice'] = 'Fuera de la oficina';
 $labels['tentative'] = 'Tentativo';
 $labels['mystatus'] = 'Mi estado';
 $labels['status'] = 'Estado';
-$labels['confirmed'] = 'Confirmado';
-$labels['cancelled'] = 'Cancelado';
+$labels['status-confirmed'] = 'Confirmado';
+$labels['status-cancelled'] = 'Cancelado';
 $labels['priority'] = 'Prioridad';
 $labels['sensitivity'] = 'Privacidad';
 $labels['public'] = 'público';
diff --git a/plugins/calendar/localization/fi_FI.inc b/plugins/calendar/localization/fi_FI.inc
index 71eeaad7..e4736194 100644
--- a/plugins/calendar/localization/fi_FI.inc
+++ b/plugins/calendar/localization/fi_FI.inc
@@ -55,8 +55,8 @@ $labels['freebusy'] = 'Aseta tilakseni';
 $labels['free'] = 'Vapaa';
 $labels['busy'] = 'Varattu';
 $labels['status'] = 'Tila';
-$labels['confirmed'] = 'Vahvistettu';
-$labels['cancelled'] = 'Peruttu';
+$labels['status-confirmed'] = 'Vahvistettu';
+$labels['status-cancelled'] = 'Peruttu';
 $labels['priority'] = 'Tärkeys';
 $labels['sensitivity'] = 'Yksityisyys';
 $labels['public'] = 'julkinen';
diff --git a/plugins/calendar/localization/fr_FR.inc b/plugins/calendar/localization/fr_FR.inc
index 31fed826..c096375d 100644
--- a/plugins/calendar/localization/fr_FR.inc
+++ b/plugins/calendar/localization/fr_FR.inc
@@ -61,8 +61,8 @@ $labels['busy'] = 'Occupé';
 $labels['outofoffice'] = 'Absent';
 $labels['tentative'] = 'Provisoire';
 $labels['status'] = 'Statut';
-$labels['confirmed'] = 'Confirmé';
-$labels['cancelled'] = 'Annulé';
+$labels['status-confirmed'] = 'Confirmé';
+$labels['status-cancelled'] = 'Annulé';
 $labels['priority'] = 'Priorité';
 $labels['sensitivity'] = 'Diffusion';
 $labels['public'] = 'publique';
diff --git a/plugins/calendar/localization/hu_HU.inc b/plugins/calendar/localization/hu_HU.inc
index 74963624..7ba7c0b4 100644
--- a/plugins/calendar/localization/hu_HU.inc
+++ b/plugins/calendar/localization/hu_HU.inc
@@ -63,8 +63,8 @@ $labels['busy'] = 'Foglalt';
 $labels['outofoffice'] = 'Házon kívűl';
 $labels['tentative'] = 'Feltételes';
 $labels['status'] = 'Stát.';
-$labels['confirmed'] = 'Confirmed';
-$labels['cancelled'] = 'Cancelled';
+$labels['status-confirmed'] = 'Confirmed';
+$labels['status-cancelled'] = 'Cancelled';
 $labels['priority'] = 'Prioritás';
 $labels['sensitivity'] = 'Manánszféra';
 $labels['public'] = 'publikus';
diff --git a/plugins/calendar/localization/nl_NL.inc b/plugins/calendar/localization/nl_NL.inc
index 4f18e211..9c0c3316 100644
--- a/plugins/calendar/localization/nl_NL.inc
+++ b/plugins/calendar/localization/nl_NL.inc
@@ -63,8 +63,8 @@ $labels['busy'] = 'Bezet';
 $labels['outofoffice'] = 'Niet Aanwezig';
 $labels['tentative'] = 'Misschien';
 $labels['status'] = 'Status';
-$labels['confirmed'] = 'Bevestigd';
-$labels['cancelled'] = 'Afgelast';
+$labels['status-confirmed'] = 'Bevestigd';
+$labels['status-cancelled'] = 'Afgelast';
 $labels['priority'] = 'Prioriteit';
 $labels['sensitivity'] = 'Zichtbaarheid';
 $labels['public'] = 'publiek';
diff --git a/plugins/calendar/localization/pl_PL.inc b/plugins/calendar/localization/pl_PL.inc
index 6df3d202..8bae25a8 100644
--- a/plugins/calendar/localization/pl_PL.inc
+++ b/plugins/calendar/localization/pl_PL.inc
@@ -73,8 +73,8 @@ $labels['outofoffice'] = 'Poza biurem';
 $labels['tentative'] = 'Niepewny';
 $labels['mystatus'] = 'Mój status';
 $labels['status'] = 'Status';
-$labels['confirmed'] = 'Potwierdzony';
-$labels['cancelled'] = 'Anulowany';
+$labels['status-confirmed'] = 'Potwierdzony';
+$labels['status-cancelled'] = 'Anulowany';
 $labels['priority'] = 'Priorytet';
 $labels['sensitivity'] = 'Poufność';
 $labels['public'] = 'publiczny';
diff --git a/plugins/calendar/localization/pt_BR.inc b/plugins/calendar/localization/pt_BR.inc
index 78650fb0..a959a72b 100644
--- a/plugins/calendar/localization/pt_BR.inc
+++ b/plugins/calendar/localization/pt_BR.inc
@@ -63,8 +63,8 @@ $labels['busy'] = 'Ocupado';
 $labels['outofoffice'] = 'Fora de escritório';
 $labels['tentative'] = 'Tentativa';
 $labels['status'] = 'Situação';
-$labels['confirmed'] = 'Confirmado';
-$labels['cancelled'] = 'Cancalado';
+$labels['status-confirmed'] = 'Confirmado';
+$labels['status-cancelled'] = 'Cancalado';
 $labels['priority'] = 'Prioridade';
 $labels['sensitivity'] = 'Privacidade';
 $labels['public'] = 'público';
diff --git a/plugins/calendar/localization/ru_RU.inc b/plugins/calendar/localization/ru_RU.inc
index 84ae1374..b15f32ed 100644
--- a/plugins/calendar/localization/ru_RU.inc
+++ b/plugins/calendar/localization/ru_RU.inc
@@ -73,8 +73,8 @@ $labels['outofoffice'] = 'Вне офиса';
 $labels['tentative'] = 'Неопределённо';
 $labels['mystatus'] = 'Мой статус';
 $labels['status'] = 'Статус';
-$labels['confirmed'] = 'Подтвеждённый';
-$labels['cancelled'] = 'Отмененный';
+$labels['status-confirmed'] = 'Подтвеждённый';
+$labels['status-cancelled'] = 'Отмененный';
 $labels['priority'] = 'Приоритет';
 $labels['sensitivity'] = 'Секретность';
 $labels['public'] = 'общедоступная';