diff --git a/plugins/calendar/localization/et_EE.inc b/plugins/calendar/localization/et_EE.inc
index 7589f385..edfba0c2 100644
--- a/plugins/calendar/localization/et_EE.inc
+++ b/plugins/calendar/localization/et_EE.inc
@@ -3,125 +3,125 @@
 $labels = array();
 
 // preferences
-$labels['default_view'] = 'Default view';
-$labels['time_format'] = 'Time format';
-$labels['timeslots'] = 'Timeslots per hour';
-$labels['first_day'] = 'First weekday';
-$labels['first_hour'] = 'First hour to show';
-$labels['workinghours'] = 'Working hours';
-$labels['add_category'] = 'Add category';
-$labels['remove_category'] = 'Remove category';
-$labels['defaultcalendar'] = 'Create new events in';
-$labels['eventcoloring'] = 'Event coloring';
-$labels['coloringmode0'] = 'According to calendar';
-$labels['coloringmode1'] = 'According to category';
-$labels['coloringmode2'] = 'Calendar for outline, category for content';
-$labels['coloringmode3'] = 'Category for outline, calendar for content';
+$labels['default_view'] = 'Vaikevaade';
+$labels['time_format'] = 'Aja vorming';
+$labels['timeslots'] = 'Ajaühikuid päevas';
+$labels['first_day'] = 'Esimene päev';
+$labels['first_hour'] = 'Esimene tund';
+$labels['workinghours'] = 'Tööaeg';
+$labels['add_category'] = 'Lisa kategooria';
+$labels['remove_category'] = 'Kustuta kategooria';
+$labels['defaultcalendar'] = 'Loo uued sündmused';
+$labels['eventcoloring'] = 'Sündmuste värvid';
+$labels['coloringmode0'] = 'Vastavalt kalendrile';
+$labels['coloringmode1'] = 'Vastavalt kategooriale';
+$labels['coloringmode2'] = 'Kalender väljaspool, kategooria sisul';
+$labels['coloringmode3'] = 'Kategooria väljaspool, kalender sisul';
 
 // calendar
-$labels['calendar'] = 'Calendar';
-$labels['calendars'] = 'Calendars';
-$labels['category'] = 'Category';
-$labels['categories'] = 'Categories';
-$labels['createcalendar'] = 'Create new calendar';
-$labels['editcalendar'] = 'Edit calendar properties';
+$labels['calendar'] = 'Kalender';
+$labels['calendars'] = 'Kalendrid';
+$labels['category'] = 'Kategooria';
+$labels['categories'] = 'Kategooriad';
+$labels['createcalendar'] = 'Uus kalender';
+$labels['editcalendar'] = 'Muuda seadeid';
 $labels['name'] = 'Nimi';
-$labels['color'] = 'Color';
-$labels['day'] = 'Day';
-$labels['week'] = 'Week';
-$labels['month'] = 'Month';
+$labels['color'] = 'Värv';
+$labels['day'] = 'Päev';
+$labels['week'] = 'Nädal';
+$labels['month'] = 'Kuu';
 $labels['agenda'] = 'Agenda';
-$labels['new'] = 'New';
-$labels['new_event'] = 'New event';
-$labels['edit_event'] = 'Edit event';
-$labels['edit'] = 'Edit';
+$labels['new'] = 'Uus';
+$labels['new_event'] = 'Uus sündmus';
+$labels['edit_event'] = 'Muuda sündmust';
+$labels['edit'] = 'Redigeeri';
 $labels['save'] = 'Salvesta';
-$labels['remove'] = 'Remove';
-$labels['cancel'] = 'Cancel';
-$labels['select'] = 'Select';
-$labels['print'] = 'Print';
-$labels['printtitle'] = 'Print calendars';
-$labels['title'] = 'Summary';
-$labels['description'] = 'Description';
-$labels['all-day'] = 'all-day';
-$labels['export'] = 'Export';
-$labels['exporttitle'] = 'Export to iCalendar';
-$labels['location'] = 'Location';
-$labels['date'] = 'Date';
-$labels['start'] = 'Start';
-$labels['end'] = 'End';
-$labels['selectdate'] = 'Choose date';
-$labels['freebusy'] = 'Show me as';
-$labels['free'] = 'Free';
-$labels['busy'] = 'Busy';
-$labels['outofoffice'] = 'Out of Office';
-$labels['tentative'] = 'Tentative';
-$labels['priority'] = 'Priority';
-$labels['sensitivity'] = 'Privacy';
-$labels['public'] = 'public';
-$labels['private'] = 'private';
-$labels['confidential'] = 'confidential';
-$labels['alarms'] = 'Reminder';
-$labels['generated'] = 'generated at';
-$labels['printdescriptions'] = 'Print descriptions';
-$labels['parentcalendar'] = 'Insert inside';
-$labels['searchearlierdates'] = '« Search for earlier events';
-$labels['searchlaterdates'] = 'Search for later events »';
-$labels['andnmore'] = '$nr more...';
-$labels['togglerole'] = 'Click to toggle role';
-$labels['createfrommail'] = 'Save as event';
-$labels['importevents'] = 'Import events';
-$labels['importrange'] = 'Events from';
-$labels['onemonthback'] = '1 month back';
-$labels['nmonthsback'] = '$nr months back';
-$labels['showurl'] = 'Show calendar URL';
-$labels['showurldescription'] = 'Use the following address to access (read only) your calendar from other applications. You can copy and paste this into any calendar software that supports the iCal format.';
+$labels['remove'] = 'Kustuta';
+$labels['cancel'] = 'Tühista';
+$labels['select'] = 'Märgi';
+$labels['print'] = 'Trüki';
+$labels['printtitle'] = 'Trüki kalendrid';
+$labels['title'] = 'Kokkuvõte';
+$labels['description'] = 'Selgitus';
+$labels['all-day'] = 'kogu päev';
+$labels['export'] = 'Ekspordi';
+$labels['exporttitle'] = 'Ekspordi iCalendar';
+$labels['location'] = 'Askukoht';
+$labels['date'] = 'Kuupäev';
+$labels['start'] = 'Algus';
+$labels['end'] = 'Lõpp';
+$labels['selectdate'] = 'Vali kuupäev';
+$labels['freebusy'] = 'Näita mind';
+$labels['free'] = 'vabana';
+$labels['busy'] = 'hõivatuna';
+$labels['outofoffice'] = 'kontorist eemal';
+$labels['tentative'] = 'ei tea';
+$labels['priority'] = 'Prioriteet';
+$labels['sensitivity'] = 'Privaatsus';
+$labels['public'] = 'avalik';
+$labels['private'] = 'varjatud';
+$labels['confidential'] = 'konfidentsiaalne';
+$labels['alarms'] = 'Meeldetuletus';
+$labels['generated'] = 'loodud';
+$labels['printdescriptions'] = 'Väljuta kirjeldus';
+$labels['parentcalendar'] = 'Sisesta';
+$labels['searchearlierdates'] = '« Otsi varasemaid sündmusi';
+$labels['searchlaterdates'] = 'Otsi hilisemaid sündmusi »';
+$labels['andnmore'] = '$nr rohkem...';
+$labels['togglerole'] = 'Kliki rolli muutmiseks';
+$labels['createfrommail'] = 'Salvesta sündmusena';
+$labels['importevents'] = 'Impordi sündmused';
+$labels['importrange'] = 'Sündmused alates';
+$labels['onemonthback'] = '1 kuu tagasi';
+$labels['nmonthsback'] = '$nr kuud tagasi';
+$labels['showurl'] = 'Näita kalendi URLi';
+$labels['showurldescription'] = 'Kasuta seda aadressi kalendri lugemisõiguse andmiseks iCal vormingus.';
 
 // agenda view
-$labels['listrange'] = 'Range to display:';
-$labels['listsections'] = 'Divide into:';
-$labels['smartsections'] = 'Smart sections';
-$labels['until'] = 'until';
-$labels['today'] = 'Today';
-$labels['tomorrow'] = 'Tomorrow';
-$labels['thisweek'] = 'This week';
-$labels['nextweek'] = 'Next week';
-$labels['thismonth'] = 'This month';
-$labels['nextmonth'] = 'Next month';
-$labels['weekofyear'] = 'Week';
-$labels['pastevents'] = 'Past';
-$labels['futureevents'] = 'Future';
+$labels['listrange'] = 'Näita ajavahemikku:';
+$labels['listsections'] = 'Jaga:';
+$labels['smartsections'] = 'nutikad osad';
+$labels['until'] = 'kuni';
+$labels['today'] = 'täna';
+$labels['tomorrow'] = 'homme';
+$labels['thisweek'] = 'see nädal';
+$labels['nextweek'] = 'järgmine nädal';
+$labels['thismonth'] = 'Sel kuul';
+$labels['nextmonth'] = 'Järgmisel kuul';
+$labels['weekofyear'] = 'Nädal aastas';
+$labels['pastevents'] = 'Möödunud';
+$labels['futureevents'] = 'Tulevased';
 
 // alarm/reminder settings
-$labels['showalarms'] = 'Show alarms';
-$labels['defaultalarmtype'] = 'Default reminder setting';
-$labels['defaultalarmoffset'] = 'Default reminder time';
+$labels['showalarms'] = 'Näita meeldetuletusi';
+$labels['defaultalarmtype'] = 'Meeldetuletuse vaiketüüp';
+$labels['defaultalarmoffset'] = 'Meeldetuletuse vaikeaeg';
 
 // attendees
-$labels['attendee'] = 'Participant';
-$labels['role'] = 'Role';
-$labels['availability'] = 'Avail.';
-$labels['confirmstate'] = 'Status';
-$labels['addattendee'] = 'Add participant';
-$labels['roleorganizer'] = 'Organizer';
-$labels['rolerequired'] = 'Kohustuslik';
-$labels['roleoptional'] = 'Optional';
-$labels['roleresource'] = 'Resource';
-$labels['availfree'] = 'Free';
-$labels['availbusy'] = 'Busy';
-$labels['availunknown'] = 'Unknown';
-$labels['availtentative'] = 'Tentative';
-$labels['availoutofoffice'] = 'Out of Office';
-$labels['scheduletime'] = 'Find availability';
-$labels['sendinvitations'] = 'Send invitations';
-$labels['sendnotifications'] = 'Notify participants about modifications';
-$labels['sendcancellation'] = 'Notify participants about event cancellation';
-$labels['onlyworkinghours'] = 'Find availability within my working hours';
-$labels['reqallattendees'] = 'Required/all participants';
-$labels['prevslot'] = 'Previous Slot';
-$labels['nextslot'] = 'Next Slot';
-$labels['noslotfound'] = 'Unable to find a free time slot';
-$labels['invitationsubject'] = 'You\'ve been invited to "$title"';
+$labels['attendee'] = 'Ósavõtja';
+$labels['role'] = 'Roll';
+$labels['availability'] = 'Saadavus';
+$labels['confirmstate'] = 'Staatus';
+$labels['addattendee'] = 'Lisa osaleja';
+$labels['roleorganizer'] = 'Korraldaja';
+$labels['rolerequired'] = 'Vajalik';
+$labels['roleoptional'] = 'Teised';
+$labels['roleresource'] = 'Ressurss';
+$labels['availfree'] = 'Vaba';
+$labels['availbusy'] = 'Hõivatud';
+$labels['availunknown'] = 'Teadmata';
+$labels['availtentative'] = 'Tinglik';
+$labels['availoutofoffice'] = 'Kontorist eemal';
+$labels['scheduletime'] = 'Otsi saadavust';
+$labels['sendinvitations'] = 'Saada kutsed';
+$labels['sendnotifications'] = 'Anna osavõtjaile muutustest teada';
+$labels['sendcancellation'] = 'Anna osavõtjaile tühistamisest teada';
+$labels['onlyworkinghours'] = 'Leia vaba aeg minu tööajast';
+$labels['reqallattendees'] = 'Vajalikud/teised osavõtjad';
+$labels['prevslot'] = 'Eelnev aeg';
+$labels['nextslot'] = 'Järgnev aeg';
+$labels['noslotfound'] = 'Ei õnnestu leida vaba aega';
+$labels['invitationsubject'] = 'Olete kutsutud "$title"';
 $labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with all the event details which you can import to your calendar application.";
 $labels['invitationattendlinks'] = "In case your email client doesn't support iTip requests you can use the following link to either accept or decline this invitation:\n\$url";
 $labels['eventupdatesubject'] = '"$title" has been updated';
@@ -145,86 +145,86 @@ $labels['itipmailbodyaccepted'] = "\$sender has accepted the invitation to the f
 $labels['itipmailbodytentative'] = "\$sender has tentatively accepted the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender has declined the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
 $labels['itipdeclineevent'] = 'Do you want to decline your invitation to this event?';
-$labels['importtocalendar'] = 'Save to my calendar';
-$labels['removefromcalendar'] = 'Remove from my calendar';
-$labels['updateattendeestatus'] = 'Update the participant\'s status';
-$labels['acceptinvitation'] = 'Do you accept this invitation?';
-$labels['youhaveaccepted'] = 'You have accepted this invitation';
-$labels['youhavetentative'] = 'You have tentatively accepted this invitation';
-$labels['youhavedeclined'] = 'You have declined this invitation';
-$labels['notanattendee'] = 'You\'re not listed as an attendee of this event';
-$labels['eventcancelled'] = 'The event has been cancelled';
-$labels['saveincalendar'] = 'save in';
+$labels['importtocalendar'] = 'Salvesta minu kalendrisse';
+$labels['removefromcalendar'] = 'Kustuta kalendrist';
+$labels['updateattendeestatus'] = 'Värskenda osavõtja staatust';
+$labels['acceptinvitation'] = 'Kas kutse vastu võtta?';
+$labels['youhaveaccepted'] = 'Oled kutse vastu võtnud';
+$labels['youhavetentative'] = 'Oled kutse tingimisi vastu võtnud';
+$labels['youhavedeclined'] = 'Oled kutsest keeldunud';
+$labels['notanattendee'] = 'Sa ei ole osavõtjate nimekirjas';
+$labels['eventcancelled'] = 'Sündmus on tühistatud';
+$labels['saveincalendar'] = 'salvesta';
 
 // event dialog tabs
-$labels['tabsummary'] = 'Summary';
-$labels['tabrecurrence'] = 'Recurrence';
-$labels['tabattendees'] = 'Participants';
-$labels['tabattachments'] = 'Attachments';
-$labels['tabsharing'] = 'Sharing';
+$labels['tabsummary'] = 'Kokkuvõte';
+$labels['tabrecurrence'] = 'Kordumine';
+$labels['tabattendees'] = 'Osavõtjad';
+$labels['tabattachments'] = 'Manused';
+$labels['tabsharing'] = 'Jagamine';
 
 // messages
-$labels['deleteventconfirm'] = 'Do you really want to delete this event?';
-$labels['deletecalendarconfirm'] = 'Do you really want to delete this calendar with all its events?';
-$labels['savingdata'] = 'Saving data...';
-$labels['errorsaving'] = 'Failed to save changes.';
-$labels['operationfailed'] = 'The requested operation failed.';
-$labels['invalideventdates'] = 'Invalid dates entered! Please check your input.';
-$labels['invalidcalendarproperties'] = 'Invalid calendar properties! Please set a valid name.';
-$labels['searchnoresults'] = 'No events found in the selected calendars.';
-$labels['successremoval'] = 'The event has been deleted successfully.';
-$labels['successrestore'] = 'The event has been restored successfully.';
-$labels['errornotifying'] = 'Failed to send notifications to event participants';
-$labels['errorimportingevent'] = 'Failed to import the event';
-$labels['newerversionexists'] = 'A newer version of this event already exists! Aborted.';
-$labels['nowritecalendarfound'] = 'No calendar found to save the event';
-$labels['importedsuccessfully'] = 'The event was successfully added to \'$calendar\'';
-$labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
-$labels['itipsendsuccess'] = 'Invitation sent to participants.';
-$labels['itipresponseerror'] = 'Failed to send the response to this event invitation';
-$labels['itipinvalidrequest'] = 'This invitation is no longer valid';
-$labels['sentresponseto'] = 'Successfully sent invitation response to $mailto';
-$labels['localchangeswarning'] = 'You are about to make changes that will only be reflected on your personal calendar';
-$labels['importsuccess'] = 'Successfully imported $nr events';
-$labels['importnone'] = 'No events found to be imported';
-$labels['importerror'] = 'An error occured while importing';
-$labels['aclnorights'] = 'You do not have administrator rights on this calendar.';
+$labels['deleteventconfirm'] = 'Kas tõsti kustutada see sündmus?';
+$labels['deletecalendarconfirm'] = 'Kas tõesti kustutada see kalender koos kõigi sündmustega?';
+$labels['savingdata'] = 'Andmete salvestamine...';
+$labels['errorsaving'] = 'Andmete salvestamine ebaõnnestus.';
+$labels['operationfailed'] = 'Operatsioon nurjus.';
+$labels['invalideventdates'] = 'Kuupäev on vigane! Kontrollige vormingut.';
+$labels['invalidcalendarproperties'] = 'Vigane kalendri atribuut! Valige sobiv atribuut.';
+$labels['searchnoresults'] = 'Sellest kalendrist ei leitud ühtki sündmust.';
+$labels['successremoval'] = 'Sündmus on edukalt kustutatud.';
+$labels['successrestore'] = 'Sündmus on edukalt taastatud.';
+$labels['errornotifying'] = 'Teate saatmine osavõtjaile ebaõnnestus.';
+$labels['errorimportingevent'] = 'Sündmuse import ebaõnnestus.';
+$labels['newerversionexists'] = 'Uuem versioon sündmusest on juba olemas! Täitmine peatatud.';
+$labels['nowritecalendarfound'] = 'Kirjutamiseks sobivat kalendrit ei leitud.';
+$labels['importedsuccessfully'] = 'Sündmus on edukalt lisatud kalendrisse \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Osavõtja staatus on uuendatud';
+$labels['itipsendsuccess'] = 'Kutse on saadetud osavõtjaile.';
+$labels['itipresponseerror'] = 'Vastuse saatmine kutsele ebaõnnestus.';
+$labels['itipinvalidrequest'] = 'See kutse pole enam kehtiv.';
+$labels['sentresponseto'] = 'Vastus kutsele on edukalt saadetud aadressile $mailto';
+$labels['localchangeswarning'] = 'Muutuseid on näha ainult teie isiklikus kalendris.';
+$labels['importsuccess'] = 'Edukalt imporditud $nr sündmust';
+$labels['importnone'] = 'Ühtki imporditavat sündmust ei leitud';
+$labels['importerror'] = 'Importimise käigus tekkis viga';
+$labels['aclnorights'] = 'Ei ole selle kalendri administreerimisõigusi.';
 
 // recurrence form
-$labels['repeat'] = 'Repeat';
-$labels['frequency'] = 'Repeat';
-$labels['never'] = 'never';
-$labels['daily'] = 'daily';
-$labels['weekly'] = 'weekly';
-$labels['monthly'] = 'monthly';
-$labels['yearly'] = 'annually';
-$labels['every'] = 'Every';
-$labels['days'] = 'day(s)';
-$labels['weeks'] = 'week(s)';
-$labels['months'] = 'month(s)';
-$labels['years'] = 'year(s) in:';
+$labels['repeat'] = 'Korda';
+$labels['frequency'] = 'Sagedus';
+$labels['never'] = 'mitte kunagi';
+$labels['daily'] = 'iga päev';
+$labels['weekly'] = 'nädalati';
+$labels['monthly'] = 'iga kuu';
+$labels['yearly'] = 'iga aasta';
+$labels['every'] = 'Iga';
+$labels['days'] = 'päevad';
+$labels['weeks'] = 'nädalad';
+$labels['months'] = 'kuud';
+$labels['years'] = 'aastad:';
 $labels['bydays'] = 'On';
 $labels['untildate'] = 'the';
-$labels['each'] = 'Each';
-$labels['onevery'] = 'On every';
-$labels['onsamedate'] = 'On the same date';
-$labels['forever'] = 'forever';
-$labels['recurrencend'] = 'until';
-$labels['forntimes'] = 'for $nr time(s)';
-$labels['first'] = 'first';
-$labels['second'] = 'second';
-$labels['third'] = 'third';
-$labels['fourth'] = 'fourth';
-$labels['last'] = 'last';
-$labels['dayofmonth'] = 'Day of month';
+$labels['each'] = 'Iga';
+$labels['onevery'] = 'Igal';
+$labels['onsamedate'] = 'samal kuupäeval';
+$labels['forever'] = 'alati';
+$labels['recurrencend'] = 'kuni';
+$labels['forntimes'] = ' $nr korda';
+$labels['first'] = 'esimesel';
+$labels['second'] = 'teisel';
+$labels['third'] = 'kolmandal';
+$labels['fourth'] = 'neljandal';
+$labels['last'] = 'viimasel';
+$labels['dayofmonth'] = 'Kuupäev';
 
-$labels['changeeventconfirm'] = 'Change event';
-$labels['removeeventconfirm'] = 'Remove event';
-$labels['changerecurringeventwarning'] = 'This is a recurring event. Would you like to edit the current event only, this and all future occurences, all occurences or save it as a new event?';
-$labels['removerecurringeventwarning'] = 'This is a recurring event. Would you like to remove the current event only, this and all future occurences or all occurences of this event?';
-$labels['currentevent'] = 'Current';
-$labels['futurevents'] = 'Future';
-$labels['allevents'] = 'All';
-$labels['saveasnew'] = 'Save as new';
+$labels['changeeventconfirm'] = 'Muuda sündmust';
+$labels['removeeventconfirm'] = 'Kustuta sündmus';
+$labels['changerecurringeventwarning'] = 'See on korduv sündmus. Kas muuta seda sündmust, seda ja kõiki järgnevaid, või salvestada uue sündmusena?';
+$labels['removerecurringeventwarning'] = 'See on korduv sündmus. Kas kustudada see sündmus, see ja kõik järgnevad sündmused?';
+$labels['currentevent'] = 'Praegune';
+$labels['futurevents'] = 'Tulevikusündmused';
+$labels['allevents'] = 'Kõik sündmused';
+$labels['saveasnew'] = 'Salvesta uuena';
 
 ?>