From 7f93ff46e0381fd86406505651b473312a14b9d9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 11 Oct 2013 15:06:22 +0200
Subject: [PATCH] Update and cleanup localizations

---
 plugins/calendar/localization/bg_BG.inc       | 113 ++++-
 plugins/calendar/localization/cs_CZ.inc       |  32 +-
 plugins/calendar/localization/de_CH.inc       |  31 +-
 plugins/calendar/localization/de_DE.inc       |  31 +-
 plugins/calendar/localization/es_ES.inc       |  51 +--
 plugins/calendar/localization/et_EE.inc       | 227 +--------
 plugins/calendar/localization/fr_FR.inc       |  38 +-
 plugins/calendar/localization/hu_HU.inc       |  21 +-
 plugins/calendar/localization/it_IT.inc       |  23 +-
 plugins/calendar/localization/ja_JP.inc       | 432 +++++++++---------
 plugins/calendar/localization/nl_NL.inc       | 146 +++++-
 plugins/calendar/localization/pl_PL.inc       | 208 +--------
 plugins/calendar/localization/pt_BR.inc       | 212 ++++++++-
 plugins/calendar/localization/ru_RU.inc       | 182 +++-----
 .../kolab_activesync/localization/bg_BG.inc   |  26 ++
 .../kolab_activesync/localization/cs_CZ.inc   |   5 +
 .../kolab_activesync/localization/de_CH.inc   |   6 +-
 .../kolab_activesync/localization/de_DE.inc   |   6 +-
 .../kolab_activesync/localization/es_ES.inc   |  24 -
 .../kolab_activesync/localization/et_EE.inc   |  30 --
 .../kolab_activesync/localization/fr_FR.inc   |   4 -
 .../kolab_activesync/localization/ja_JP.inc   |  54 +--
 .../kolab_activesync/localization/nl_NL.inc   |  15 -
 .../kolab_activesync/localization/pl_PL.inc   |  21 +-
 .../kolab_activesync/localization/pt_BR.inc   |  29 ++
 .../kolab_activesync/localization/ru_RU.inc   |   4 -
 .../kolab_addressbook/localization/bg_BG.inc  |  13 +
 .../kolab_addressbook/localization/de_CH.inc  |   8 -
 .../kolab_addressbook/localization/de_DE.inc  |   8 -
 .../kolab_addressbook/localization/es_ES.inc  |  44 +-
 .../kolab_addressbook/localization/et_EE.inc  |  45 --
 .../kolab_addressbook/localization/fr_FR.inc  |   6 -
 .../kolab_addressbook/localization/ja_JP.inc  |  45 +-
 .../kolab_addressbook/localization/nl_NL.inc  |  11 +-
 .../kolab_addressbook/localization/pl_PL.inc  |  50 +-
 .../kolab_addressbook/localization/pt_BR.inc  |  41 ++
 .../kolab_addressbook/localization/ru_RU.inc  |  54 ++-
 plugins/kolab_auth/localization/bg_BG.inc     |   3 +
 plugins/kolab_auth/localization/de_CH.inc     |   2 -
 plugins/kolab_auth/localization/de_DE.inc     |   2 -
 plugins/kolab_auth/localization/es_ES.inc     |   3 -
 plugins/kolab_auth/localization/et_EE.inc     |   3 -
 plugins/kolab_auth/localization/fr_FR.inc     |   2 -
 plugins/kolab_auth/localization/ja_JP.inc     |   4 +-
 plugins/kolab_auth/localization/nl_NL.inc     |   2 -
 plugins/kolab_auth/localization/pl_PL.inc     |   2 -
 plugins/kolab_auth/localization/pt_BR.inc     |   3 +
 plugins/kolab_auth/localization/ru_RU.inc     |   2 -
 .../kolab_delegation/localization/bg_BG.inc   |   8 +
 .../kolab_delegation/localization/cs_CZ.inc   |   5 +
 .../kolab_delegation/localization/de_CH.inc   |   6 -
 .../kolab_delegation/localization/de_DE.inc   |  27 +-
 .../kolab_delegation/localization/es_ES.inc   |  20 -
 .../kolab_delegation/localization/et_EE.inc   |  27 --
 .../kolab_delegation/localization/fr_FR.inc   |   6 -
 .../kolab_delegation/localization/ja_JP.inc   |  48 +-
 .../kolab_delegation/localization/nl_NL.inc   |   6 -
 .../kolab_delegation/localization/pl_PL.inc   |  31 +-
 .../kolab_delegation/localization/pt_BR.inc   |  24 +
 .../kolab_delegation/localization/ru_RU.inc   |   6 -
 plugins/kolab_files/localization/bg_BG.inc    |   9 +
 plugins/kolab_files/localization/cs_CZ.inc    |   8 +
 plugins/kolab_files/localization/de_CH.inc    |   9 +
 plugins/kolab_files/localization/de_DE.inc    |   9 +
 plugins/kolab_files/localization/es_ES.inc    |   8 +
 plugins/kolab_files/localization/et_EE.inc    |   5 +
 plugins/kolab_files/localization/fr_FR.inc    |  10 +
 plugins/kolab_files/localization/hu_HU.inc    |   5 +
 plugins/kolab_files/localization/it_IT.inc    |   5 +
 plugins/kolab_files/localization/ja_JP.inc    |  10 +
 plugins/kolab_files/localization/nl_NL.inc    |   9 +
 plugins/kolab_files/localization/pl_PL.inc    |   8 +
 plugins/kolab_files/localization/pt_BR.inc    |  10 +
 plugins/kolab_files/localization/ru_RU.inc    |   9 +
 plugins/kolab_folders/localization/bg_BG.inc  |  19 +
 plugins/kolab_folders/localization/cs_CZ.inc  |   3 +
 plugins/kolab_folders/localization/de_CH.inc  |  10 +-
 plugins/kolab_folders/localization/de_DE.inc  |  14 +-
 plugins/kolab_folders/localization/es_ES.inc  |  21 +-
 plugins/kolab_folders/localization/et_EE.inc  |  25 +-
 plugins/kolab_folders/localization/fr_FR.inc  |   6 -
 plugins/kolab_folders/localization/ja_JP.inc  |  40 +-
 plugins/kolab_folders/localization/nl_NL.inc  |   6 -
 plugins/kolab_folders/localization/pl_PL.inc  |  15 +-
 plugins/kolab_folders/localization/pt_BR.inc  |  20 +
 plugins/kolab_folders/localization/ru_RU.inc  |   6 -
 plugins/kolab_folders/localization/vi.inc     |   3 +
 plugins/kolab_zpush/localization/de_CH.inc    |   3 -
 plugins/kolab_zpush/localization/de_DE.inc    |   3 -
 plugins/kolab_zpush/localization/pl_PL.inc    |   3 -
 plugins/libcalendaring/localization/bg_BG.inc |   2 +
 plugins/libcalendaring/localization/cs_CZ.inc |   6 -
 plugins/libcalendaring/localization/de_CH.inc |   5 -
 plugins/libcalendaring/localization/de_DE.inc |   5 -
 plugins/libcalendaring/localization/fr_FR.inc |   6 -
 plugins/libcalendaring/localization/ja_JP.inc |  24 +
 plugins/libcalendaring/localization/nl_NL.inc |  22 +
 plugins/libcalendaring/localization/pl_PL.inc |  14 +-
 plugins/libcalendaring/localization/pt_BR.inc |  24 +
 plugins/libcalendaring/localization/ru_RU.inc |   5 -
 plugins/owncloud/localization/bg_BG.inc       |   3 +
 plugins/owncloud/localization/de_CH.inc       |   3 -
 plugins/owncloud/localization/de_DE.inc       |   3 -
 plugins/owncloud/localization/es_ES.inc       |   4 -
 plugins/owncloud/localization/et_EE.inc       |   4 -
 plugins/owncloud/localization/fr_FR.inc       |   3 -
 plugins/owncloud/localization/ja_JP.inc       |   5 +-
 plugins/owncloud/localization/nl_NL.inc       |   3 -
 plugins/owncloud/localization/pl_PL.inc       |   3 -
 plugins/owncloud/localization/pt_BR.inc       |   3 +
 plugins/owncloud/localization/ru_RU.inc       |   3 -
 plugins/tasklist/localization/bg_BG.inc       |  15 +
 plugins/tasklist/localization/cs_CZ.inc       |  52 +--
 plugins/tasklist/localization/de_CH.inc       |  14 -
 plugins/tasklist/localization/de_DE.inc       |  61 +--
 plugins/tasklist/localization/es_ES.inc       |  65 +--
 plugins/tasklist/localization/et_EE.inc       |  63 ---
 plugins/tasklist/localization/fr_FR.inc       |  12 -
 plugins/tasklist/localization/hu_HU.inc       |   6 +
 plugins/tasklist/localization/it_IT.inc       |   6 +
 plugins/tasklist/localization/ja_JP.inc       | 122 +++--
 plugins/tasklist/localization/nl_NL.inc       |  12 -
 plugins/tasklist/localization/pl_PL.inc       | 111 ++---
 plugins/tasklist/localization/pt_BR.inc       |  56 +++
 plugins/tasklist/localization/ru_RU.inc       |  12 -
 125 files changed, 1527 insertions(+), 2079 deletions(-)
 create mode 100644 plugins/kolab_activesync/localization/bg_BG.inc
 create mode 100644 plugins/kolab_activesync/localization/cs_CZ.inc
 create mode 100644 plugins/kolab_activesync/localization/pt_BR.inc
 create mode 100644 plugins/kolab_addressbook/localization/bg_BG.inc
 create mode 100644 plugins/kolab_addressbook/localization/pt_BR.inc
 create mode 100644 plugins/kolab_auth/localization/bg_BG.inc
 create mode 100644 plugins/kolab_auth/localization/pt_BR.inc
 create mode 100644 plugins/kolab_delegation/localization/bg_BG.inc
 create mode 100644 plugins/kolab_delegation/localization/cs_CZ.inc
 create mode 100644 plugins/kolab_delegation/localization/pt_BR.inc
 create mode 100644 plugins/kolab_files/localization/bg_BG.inc
 create mode 100644 plugins/kolab_files/localization/cs_CZ.inc
 create mode 100644 plugins/kolab_files/localization/de_CH.inc
 create mode 100644 plugins/kolab_files/localization/de_DE.inc
 create mode 100644 plugins/kolab_files/localization/es_ES.inc
 create mode 100644 plugins/kolab_files/localization/et_EE.inc
 create mode 100644 plugins/kolab_files/localization/fr_FR.inc
 create mode 100644 plugins/kolab_files/localization/hu_HU.inc
 create mode 100644 plugins/kolab_files/localization/it_IT.inc
 create mode 100644 plugins/kolab_files/localization/ja_JP.inc
 create mode 100644 plugins/kolab_files/localization/nl_NL.inc
 create mode 100644 plugins/kolab_files/localization/pl_PL.inc
 create mode 100644 plugins/kolab_files/localization/pt_BR.inc
 create mode 100644 plugins/kolab_files/localization/ru_RU.inc
 create mode 100644 plugins/kolab_folders/localization/bg_BG.inc
 create mode 100644 plugins/kolab_folders/localization/cs_CZ.inc
 create mode 100644 plugins/kolab_folders/localization/pt_BR.inc
 create mode 100644 plugins/kolab_folders/localization/vi.inc
 create mode 100644 plugins/libcalendaring/localization/bg_BG.inc
 mode change 100755 => 100644 plugins/libcalendaring/localization/cs_CZ.inc
 create mode 100644 plugins/libcalendaring/localization/ja_JP.inc
 create mode 100644 plugins/libcalendaring/localization/nl_NL.inc
 create mode 100644 plugins/libcalendaring/localization/pt_BR.inc
 create mode 100644 plugins/owncloud/localization/bg_BG.inc
 create mode 100644 plugins/owncloud/localization/pt_BR.inc
 create mode 100644 plugins/tasklist/localization/bg_BG.inc
 create mode 100644 plugins/tasklist/localization/hu_HU.inc
 create mode 100644 plugins/tasklist/localization/it_IT.inc
 create mode 100644 plugins/tasklist/localization/pt_BR.inc

diff --git a/plugins/calendar/localization/bg_BG.inc b/plugins/calendar/localization/bg_BG.inc
index 79a79eeb..993fd5fc 100644
--- a/plugins/calendar/localization/bg_BG.inc
+++ b/plugins/calendar/localization/bg_BG.inc
@@ -1,38 +1,107 @@
 <?php
-/**
- * RoundCube Calendar
- *
- * Plugin to add a calendar to RoundCube.
- *
- * @version 0.2 BETA 2
- * @author Lazlo Westerhof
- * @url http://rc-calendar.lazlo.me
- * @licence GNU GPL
- * @copyright (c) 2010 Lazlo Westerhof - Netherlands
- *
- **/
-
-$labels = array();
-
-// config
-$labels['default_view'] = 'Изглед';
+$labels['default_view'] = 'Изглед по подразбиране';
 $labels['time_format'] = 'Формат на часовете';
 $labels['timeslots'] = 'Полета на час';
 $labels['first_day'] = 'Първи ден от седмицата';
-
-// calendar
+$labels['first_hour'] = 'Първи час при показване';
+$labels['workinghours'] = 'Работни часове';
+$labels['add_category'] = 'Добавяне на категория';
+$labels['remove_category'] = 'Премахване на категория';
+$labels['defaultcalendar'] = 'Създаване на нови събития в ';
+$labels['eventcoloring'] = 'Оцветяване на събитията';
+$labels['coloringmode0'] = 'Според календара';
+$labels['coloringmode1'] = 'Относно категорията';
+$labels['coloringmode2'] = 'Календар за очертание, категория за съдържание';
+$labels['coloringmode3'] = 'Категория за очертание, календар за съдържание';
 $labels['calendar'] = 'Календар';
+$labels['calendars'] = 'Календари';
+$labels['category'] = 'Категория';
+$labels['categories'] = 'Категории';
+$labels['createcalendar'] = 'Създаване на нов календар';
+$labels['editcalendar'] = 'Промяна на свойствата на календара';
+$labels['name'] = 'Име';
+$labels['color'] = 'Цвят';
 $labels['day'] = 'Ден';
 $labels['week'] = 'Седмица';
 $labels['month'] = 'Месец';
+$labels['agenda'] = 'Бележник';
+$labels['new'] = 'Ново';
 $labels['new_event'] = 'Добавяне на събитие';
 $labels['edit_event'] = 'Промяна на събитие';
+$labels['edit'] = 'Промяна';
 $labels['save'] = 'Запис';
 $labels['remove'] = 'Изтриване';
 $labels['cancel'] = 'Отказ';
+$labels['select'] = 'Избиране';
+$labels['print'] = 'Печат';
+$labels['printtitle'] = 'Печат на календарите';
 $labels['title'] = 'Заглавие';
 $labels['description'] = 'Описание';
 $labels['all-day'] = 'цял ден';
-$labels['export'] = 'Запази като ICS';
-$labels['category'] = 'Категория';
-?>
\ No newline at end of file
+$labels['export'] = 'Извличане';
+$labels['exporttitle'] = 'Извличане към iCalendar';
+$labels['location'] = 'Местоположение';
+$labels['date'] = 'Дата';
+$labels['start'] = 'Начало';
+$labels['end'] = 'Край';
+$labels['selectdate'] = 'Избор на дата';
+$labels['freebusy'] = 'Показване като';
+$labels['free'] = 'Свободно';
+$labels['busy'] = 'Заето';
+$labels['outofoffice'] = 'Извън офиса';
+$labels['tentative'] = 'Предварително';
+$labels['priority'] = 'Приоритет';
+$labels['sensitivity'] = 'Частност';
+$labels['public'] = 'публично';
+$labels['private'] = 'частно';
+$labels['confidential'] = 'конфиденциално';
+$labels['alarms'] = 'Напомняне';
+$labels['generated'] = 'генерирано в';
+$labels['printdescriptions'] = 'Печат на описанията';
+$labels['parentcalendar'] = 'Внасяне вътре';
+$labels['searchearlierdates'] = '« Търсене за по- стари събития';
+$labels['searchlaterdates'] = 'Търсене за по- нови събития »';
+$labels['andnmore'] = '$nr повече...';
+$labels['createfrommail'] = 'Запазване като събитие';
+$labels['importevents'] = 'Внасяне на събития';
+$labels['importrange'] = 'Събития от';
+$labels['onemonthback'] = '1 месец назад';
+$labels['nmonthsback'] = '$nr месеца назад';
+$labels['showurl'] = 'Показване на URL на календара';
+$labels['showurldescription'] = 'Използвайте следния адрес, за да достъпвате (само за четене) вашия календар от други приложения. Можете да копирате и поставяте това във всеки календарен софтуер, поддържащ форматът iCal';
+$labels['listrange'] = 'Оразмеряване към екран:';
+$labels['listsections'] = 'Разделяне на:';
+$labels['smartsections'] = 'Интелигентни секции';
+$labels['until'] = 'до';
+$labels['today'] = 'Днес';
+$labels['tomorrow'] = 'Утре';
+$labels['thisweek'] = 'Тази седмица';
+$labels['nextweek'] = 'Следващата седмица';
+$labels['thismonth'] = 'Този месец';
+$labels['nextmonth'] = 'Следващия месец';
+$labels['weekofyear'] = 'Седмица';
+$labels['pastevents'] = 'Минали';
+$labels['futureevents'] = 'Бъдещи';
+$labels['showalarms'] = 'Показване на аларми';
+$labels['defaultalarmtype'] = 'Настройка за напомняне по подразбиране';
+$labels['defaultalarmoffset'] = 'Време за напомняне по подразбиране';
+$labels['attendee'] = 'Участник';
+$labels['role'] = 'Роля';
+$labels['confirmstate'] = 'Статус';
+$labels['addattendee'] = 'Добавяне на участник';
+$labels['roleorganizer'] = 'Организатор';
+$labels['rolerequired'] = 'Задължителен';
+$labels['roleoptional'] = 'По избор';
+$labels['availfree'] = 'Свободно';
+$labels['availbusy'] = 'Заето';
+$labels['availunknown'] = 'Неизвестно';
+$labels['availtentative'] = 'Предварително';
+$labels['availoutofoffice'] = 'Извън офиса';
+$labels['sendinvitations'] = 'Изпращане на покани';
+$labels['sendnotifications'] = 'Известяване на участниците относно промените';
+$labels['sendcancellation'] = 'Известяване на участниците относно отмяна на събития';
+$labels['tabsummary'] = 'Заглавие';
+$labels['savingdata'] = 'Запазване на данни...';
+$labels['recurrencend'] = 'до';
+$labels['futurevents'] = 'Бъдещи';
+?>
diff --git a/plugins/calendar/localization/cs_CZ.inc b/plugins/calendar/localization/cs_CZ.inc
index dbc1a521..fe882537 100644
--- a/plugins/calendar/localization/cs_CZ.inc
+++ b/plugins/calendar/localization/cs_CZ.inc
@@ -1,18 +1,8 @@
 <?php
-
-$labels = array();
-
-// config
 $labels['default_view'] = 'Výchozí pohled';
 $labels['time_format'] = 'Formát data';
 $labels['timeslots'] = 'Slotů na hodinu';
 $labels['first_day'] = 'První den v týdnu';
-
-// preferences
-$labels['default_view'] = 'Výchozí pohled';
-$labels['time_format'] = 'Formát času';
-$labels['timeslots'] = 'Slotů na hodinu';
-$labels['first_day'] = 'První den týdne';
 $labels['first_hour'] = 'První hodina k zobrazení';
 $labels['workinghours'] = 'Pracovní hodiny';
 $labels['add_category'] = 'Přidat kategorii';
@@ -23,8 +13,6 @@ $labels['coloringmode0'] = 'Podle kalendáře';
 $labels['coloringmode1'] = 'Podle kategorie';
 $labels['coloringmode2'] = 'Kalendář pro orámování, kategorie pro obsah';
 $labels['coloringmode3'] = 'Kategorie pro orámování, kalendář pro obsah';
-
-// calendar
 $labels['calendar'] = 'Kalendář';
 $labels['calendars'] = 'Kalendáře';
 $labels['category'] = 'Kategorie';
@@ -82,8 +70,6 @@ $labels['onemonthback'] = '1 měsíc nazpátek';
 $labels['nmonthsback'] = '$nr měsíců nazpátek';
 $labels['showurl'] = 'Ukázat URL kalendáře';
 $labels['showurldescription'] = 'Tuto adresu použijte pro přístup (jen ke čtení) ke kalendáři z jiných aplikací. Můžete ji zkopírovat a vložit do jakéhokoli kalendářového softwaru, který podporuje formát iCal.';
-
-// agenda view
 $labels['listrange'] = 'Rozsah k zobrazení:';
 $labels['listsections'] = 'Rozdělit na:';
 $labels['smartsections'] = 'Chytré sekce';
@@ -97,13 +83,9 @@ $labels['nextmonth'] = 'Příští měsíc';
 $labels['weekofyear'] = 'Týden';
 $labels['pastevents'] = 'Minulost';
 $labels['futureevents'] = 'Budoucnost';
-
-// alarm/reminder settings
 $labels['showalarms'] = 'Zobrazit upozornění';
 $labels['defaultalarmtype'] = 'Výchozí nastavení připomenutí';
 $labels['defaultalarmoffset'] = 'Výchozí čas připomenutí';
-
-// attendees
 $labels['attendee'] = 'Účastník';
 $labels['role'] = 'Role';
 $labels['availability'] = 'Dost.';
@@ -112,7 +94,6 @@ $labels['addattendee'] = 'Přidat účastníka';
 $labels['roleorganizer'] = 'Organizátor';
 $labels['rolerequired'] = 'Povinný';
 $labels['roleoptional'] = 'Nepovinný';
-$labels['roleresource'] = 'Prostředek';
 $labels['availfree'] = 'volno';
 $labels['availbusy'] = 'obsazeno';
 $labels['availunknown'] = 'neznámý';
@@ -135,8 +116,6 @@ $labels['eventupdatesubjectempty'] = 'Událost, která se vás týká, byla aktu
 $labels['eventupdatemailbody'] = "*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees\n\nPodrobnosti o aktualizované události najdete v přiloženém souboru typu iCalendar. Můžete si ho naimportovat do kalendářového programu.";
 $labels['eventcancelsubject'] = 'Událost "$title" byla zrušena';
 $labels['eventcancelmailbody'] = "*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees\n\nUdálost byla zrušena organizátorem (\$organizer).\n\nPodrobnosti najdete v přiloženém souboru ve formátu iCalendar.";
-
-// invitation handling
 $labels['itipinvitation'] = 'Pozvání na událost';
 $labels['itipupdate'] = 'Aktualizace události';
 $labels['itipcancellation'] = 'Zrušeno:';
@@ -161,15 +140,11 @@ $labels['youhavedeclined'] = 'Odmítl(a) jste toto pozvání';
 $labels['notanattendee'] = 'Nejste na seznamu účastníků této události';
 $labels['eventcancelled'] = 'Tato událost byla zrušena';
 $labels['saveincalendar'] = 'uložit do';
-
-// event dialog tabs
 $labels['tabsummary'] = 'Souhrn';
 $labels['tabrecurrence'] = 'Opakování';
 $labels['tabattendees'] = 'Účastníci';
 $labels['tabattachments'] = 'Přílohy';
 $labels['tabsharing'] = 'Sdílení';
-
-// messages
 $labels['deleteventconfirm'] = 'Opravdu chcete smazat tuto událost?';
 $labels['deletecalendarconfirm'] = 'Opravdu chcete smazat tento kalendář se všemi událostmi?';
 $labels['savingdata'] = 'Ukládám data...';
@@ -190,13 +165,10 @@ $labels['itipsendsuccess'] = 'Pozvánky byly rozeslány účastníkům.';
 $labels['itipresponseerror'] = 'Nelze odeslat odpověď na tuto pozvánku';
 $labels['itipinvalidrequest'] = 'Tato pozvánka již není platná';
 $labels['sentresponseto'] = 'Odpověď na pozvánku byla úspěšně odeslána na adresu $mailto';
-$labels['localchangeswarning'] = 'Chystáte se provést změny, které se projeví jen ve vašem vlastním kalendáři a nelze je poslat organizátorovi události.';
 $labels['importsuccess'] = 'Úspěšně importováno $nr událostí';
 $labels['importnone'] = 'Nebyly nalezeny žádné události k importu';
 $labels['importerror'] = 'Při importu došlo k chybě';
 $labels['aclnorights'] = 'Nemáte administrátorská práva k tomuto kalendáři.';
-
-// recurrence form
 $labels['repeat'] = 'Opakování';
 $labels['frequency'] = 'Opakovat';
 $labels['never'] = 'nikdy';
@@ -209,7 +181,6 @@ $labels['days'] = 'den (dny)';
 $labels['weeks'] = 'týden (týdny)';
 $labels['months'] = 'měsíc(e/ů)';
 $labels['years'] = 'rok(y/ů) v:';
-$labels['bydays'] = ' ';
 $labels['untildate'] = 'do';
 $labels['each'] = 'Každý';
 $labels['onevery'] = 'Vždy v';
@@ -223,7 +194,6 @@ $labels['third'] = 'třetí';
 $labels['fourth'] = 'čtvrtý';
 $labels['last'] = 'poslední';
 $labels['dayofmonth'] = 'Den v měsíci';
-
 $labels['changeeventconfirm'] = 'Změnit událost';
 $labels['removeeventconfirm'] = 'Odstranit událost';
 $labels['changerecurringeventwarning'] = 'Toto je opakovaná událost. Chcete upravit jen toto konání, toto a všechna následující konání, úplně všechna konání nebo uložit událost jako novou?';
@@ -232,4 +202,4 @@ $labels['currentevent'] = 'Aktuální';
 $labels['futurevents'] = 'Budoucí';
 $labels['allevents'] = 'Všechny';
 $labels['saveasnew'] = 'Uložit jako novou';
-
+?>
diff --git a/plugins/calendar/localization/de_CH.inc b/plugins/calendar/localization/de_CH.inc
index b580fc20..de3def7a 100644
--- a/plugins/calendar/localization/de_CH.inc
+++ b/plugins/calendar/localization/de_CH.inc
@@ -1,8 +1,4 @@
 <?php
-
-$labels = array();
-
-// preferences
 $labels['default_view'] = 'Ansicht';
 $labels['time_format'] = 'Zeitformatierung';
 $labels['timeslots'] = 'Zeitraster pro Stunde';
@@ -17,8 +13,6 @@ $labels['coloringmode0'] = 'Farbe des Kalenders';
 $labels['coloringmode1'] = 'Farbe der Kategorie';
 $labels['coloringmode2'] = 'Kalenderfarbe aussen, Kategoriefarbe innen';
 $labels['coloringmode3'] = 'Kategoriefarbe aussen, Kalenderfarbe innen';
-
-// calendar
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalender';
 $labels['category'] = 'Kategorie';
@@ -76,9 +70,6 @@ $labels['onemonthback'] = '1 Monat zurück';
 $labels['nmonthsback'] = '$nr Monate zurück';
 $labels['showurl'] = 'URL anzeigen';
 $labels['showurldescription'] = 'Über die folgende Adresse können Sie mit einem beliebigen Kalenderprogramm Ihren Kalender abrufen (nur lesend), sofern dieses das iCal-Format unterstützt.';
-$labels['caldavurldescription'] = 'Benutzen Sie folgende Addresse in einer <a href="http://de.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-Anwendung (wie z.B. Evolution oder Mozilla Thunderbird) um diesen spezifischen Kalender mit dem Computer oder Mobiltelefon zu synchronisieren.';
-
-// agenda view
 $labels['listrange'] = 'Angezeigter Bereich:';
 $labels['listsections'] = 'Unterteilung:';
 $labels['smartsections'] = 'Intelligent';
@@ -92,13 +83,9 @@ $labels['nextmonth'] = 'Nächsten Monat';
 $labels['weekofyear'] = 'KW';
 $labels['pastevents'] = 'Vergangene';
 $labels['futureevents'] = 'Zukünftige';
-
-// alarm/reminder settings
 $labels['showalarms'] = 'Erinnerungen anzeigen';
 $labels['defaultalarmtype'] = 'Standard-Erinnerungseinstellung';
 $labels['defaultalarmoffset'] = 'Standard-Erinnerungszeit';
-
-// attendees
 $labels['attendee'] = 'Teilnehmer';
 $labels['role'] = 'Rolle';
 $labels['availability'] = 'Verfüg.';
@@ -107,7 +94,6 @@ $labels['addattendee'] = 'Hinzufügen';
 $labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Erforderlich';
 $labels['roleoptional'] = 'Optional';
-$labels['rolechair'] = 'Vorsitz';
 $labels['availfree'] = 'Frei';
 $labels['availbusy'] = 'Gebucht';
 $labels['availunknown'] = 'Unbekannt';
@@ -130,12 +116,10 @@ $labels['eventupdatesubjectempty'] = 'Termin wurde aktualisiert';
 $labels['eventupdatemailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nIm Anhang finden Sie eine iCalendar-Datei mit den aktualisiereten Termindaten. Diese können Sie in Ihre Kalenderanwendung importieren.";
 $labels['eventcancelsubject'] = '"$title" wurde abgesagt';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nDer Termin wurde von \$organizer abgesagt.\n\nIm Anhang finden Sie eine iCalendar-Datei mit den Termindaten.";
-
-// invitation handling
 $labels['itipinvitation'] = 'Einladung zu';
-$labels['itipreply'] = 'Antwort zu';
 $labels['itipupdate'] = 'Aktialisiert:';
 $labels['itipcancellation'] = 'Abgesagt:';
+$labels['itipreply'] = 'Antwort zu';
 $labels['itipaccepted'] = 'Akzeptieren';
 $labels['itiptentative'] = 'Mit Vorbehalt';
 $labels['itipdeclined'] = 'Ablehnen';
@@ -146,7 +130,6 @@ $labels['itipmailbodyaccepted'] = "\$sender hat die Einladung zum folgenden Term
 $labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
-$labels['declinedeleteconfirm'] = 'Möchten Sie den abgelehnten Termin ebenfalls aus Ihrem Kalender löschen?';
 $labels['importtocalendar'] = 'In Kalender übernehmen';
 $labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
 $labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
@@ -157,18 +140,13 @@ $labels['youhavedeclined'] = 'Sie haben die Einladung abgelehnt';
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
 $labels['eventcancelled'] = 'Der Termin wurde vom Organisator abgesagt';
 $labels['saveincalendar'] = 'speichern in';
-
-// event dialog tabs
 $labels['tabsummary'] = 'Übersicht';
 $labels['tabrecurrence'] = 'Wiederholung';
 $labels['tabattendees'] = 'Teilnehmer';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
-
-// messages
 $labels['deleteventconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
 $labels['deletecalendarconfirm'] = 'Möchten Sie diesen Kalender mit allen Terminen wirklich löschen?';
-$labels['deletecalendarconfirmrecursive'] = 'Möchten Sie diesen Kalender mit allen Terminen und Unter-Kalendern wirklich löschen?';
 $labels['savingdata'] = 'Speichere Daten...';
 $labels['errorsaving'] = 'Fehler beim Speichern.';
 $labels['operationfailed'] = 'Die Aktion ist fehlgeschlagen.';
@@ -185,13 +163,12 @@ $labels['importedsuccessfully'] = 'Der Termin wurde erfolgreich in \'$calendar\'
 $labels['attendeupdateesuccess'] = 'Teilnehmerstatus erfolgreich aktualisiert';
 $labels['itipsendsuccess'] = 'Einladung an Teilnehmer versendet.';
 $labels['itipresponseerror'] = 'Die Antwort auf diese Einladung konnte nicht versendet werden';
+$labels['itipinvalidrequest'] = 'Diese Einladung ist nicht mehr gültig';
 $labels['sentresponseto'] = 'Antwort auf diese Einladung erfolgreich an $mailto gesendet';
-$labels['localchangeswarning'] = 'Änderungen an diesem Termin werden nur in Ihrem Kalender gespeichert und nicht an den Organisator des Termins gesendet.';
 $labels['importsuccess'] = 'Es wurden $nr Termine erfolgreich importiert';
 $labels['importnone'] = 'Keine Termine zum Importieren gefunden';
 $labels['importerror'] = 'Fehler beim Importieren';
-
-// recurrence form
+$labels['aclnorights'] = 'Sie haben keine Administrator-Rechte für diesen Kalender.';
 $labels['repeat'] = 'Wiederholung';
 $labels['frequency'] = 'Wiederholung';
 $labels['never'] = 'nie';
@@ -218,7 +195,6 @@ $labels['third'] = 'dritter';
 $labels['fourth'] = 'vierter';
 $labels['last'] = 'letzter';
 $labels['dayofmonth'] = 'Tag des Montats';
-
 $labels['changeeventconfirm'] = 'Termin ändern';
 $labels['removeeventconfirm'] = 'Termin löschen';
 $labels['changerecurringeventwarning'] = 'Dies ist eine Terminreihe. Möchten Sie nur den aktuellen, diesen und alle zukünftigen oder alle Termine bearbeiten oder die Änderungen als neuen Termin speichern?';
@@ -227,5 +203,4 @@ $labels['currentevent'] = 'Aktuellen';
 $labels['futurevents'] = 'Zukünftige';
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Als neu speichern';
-
 ?>
diff --git a/plugins/calendar/localization/de_DE.inc b/plugins/calendar/localization/de_DE.inc
index 60e6ad2d..11a82057 100644
--- a/plugins/calendar/localization/de_DE.inc
+++ b/plugins/calendar/localization/de_DE.inc
@@ -1,8 +1,4 @@
 <?php
-
-$labels = array();
-
-// preferences
 $labels['default_view'] = 'Ansicht';
 $labels['time_format'] = 'Zeitformatierung';
 $labels['timeslots'] = 'Zeitraster pro Stunde';
@@ -17,8 +13,6 @@ $labels['coloringmode0'] = 'Farbe des Kalenders';
 $labels['coloringmode1'] = 'Farbe der Kategorie';
 $labels['coloringmode2'] = 'Kalenderfarbe außen, Kategoriefarbe innen';
 $labels['coloringmode3'] = 'Kategoriefarbe außen, Kalenderfarbe innen';
-
-// calendar
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalender';
 $labels['category'] = 'Kategorie';
@@ -76,9 +70,6 @@ $labels['onemonthback'] = '1 Monat zurück';
 $labels['nmonthsback'] = '$nr Monate zurück';
 $labels['showurl'] = 'URL anzeigen';
 $labels['showurldescription'] = 'Über die folgende Adresse können Sie mit einem beliebigen Kalenderprogramm Ihren Kalender abrufen (nur lesend), sofern dieses das iCal-Format unterstützt.';
-$labels['caldavurldescription'] = 'Benutzen Sie folgende Addresse in einer <a href="http://de.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-Anwendung (wie z.B. Evolution oder Mozilla Thunderbird) um diesen spezifischen Kalender mit dem Computer oder Mobiltelefon zu synchronisieren.';
-
-// agenda view
 $labels['listrange'] = 'Angezeigter Bereich:';
 $labels['listsections'] = 'Unterteilung:';
 $labels['smartsections'] = 'Intelligent';
@@ -92,13 +83,9 @@ $labels['nextmonth'] = 'Nächsten Monat';
 $labels['weekofyear'] = 'Woche';
 $labels['pastevents'] = 'Vergangene';
 $labels['futureevents'] = 'Zukünftige';
-
-// alarm/reminder settings
 $labels['showalarms'] = 'Erinnerungen anzeigen';
 $labels['defaultalarmtype'] = 'Standard-Erinnerungseinstellung';
 $labels['defaultalarmoffset'] = 'Standard-Erinnerungszeit';
-
-// attendees
 $labels['attendee'] = 'Teilnehmer';
 $labels['role'] = 'Rolle';
 $labels['availability'] = 'Verfüg.';
@@ -107,7 +94,6 @@ $labels['addattendee'] = 'Hinzufügen';
 $labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Erforderlich';
 $labels['roleoptional'] = 'Optional';
-$labels['rolechair'] = 'Vorsitz';
 $labels['availfree'] = 'Frei';
 $labels['availbusy'] = 'Gebucht';
 $labels['availunknown'] = 'Unbekannt';
@@ -130,12 +116,10 @@ $labels['eventupdatesubjectempty'] = 'Termin wurde aktualisiert';
 $labels['eventupdatemailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nIm Anhang finden Sie eine iCalendar-Datei mit den aktualisiereten Termindaten. Diese können Sie in Ihre Kalenderanwendung importieren.";
 $labels['eventcancelsubject'] = '"$title" wurde abgesagt';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nDer Termin wurde von \$organizer abgesagt.\n\nIm Anhang finden Sie eine iCalendar-Datei mit den Termindaten.";
-
-// invitation handling
 $labels['itipinvitation'] = 'Einladung zu';
-$labels['itipreply'] = 'Antwort zu';
 $labels['itipupdate'] = 'Aktialisiert:';
 $labels['itipcancellation'] = 'Abgesagt:';
+$labels['itipreply'] = 'Antwort zu';
 $labels['itipaccepted'] = 'Akzeptieren';
 $labels['itiptentative'] = 'Mit Vorbehalt';
 $labels['itipdeclined'] = 'Ablehnen';
@@ -146,7 +130,6 @@ $labels['itipmailbodyaccepted'] = "\$sender hat die Einladung zum folgenden Term
 $labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
-$labels['declinedeleteconfirm'] = 'Möchten Sie den abgelehnten Termin ebenfalls aus Ihrem Kalender löschen?';
 $labels['importtocalendar'] = 'In Kalender übernehmen';
 $labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
 $labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
@@ -157,18 +140,13 @@ $labels['youhavedeclined'] = 'Sie haben die Einladung abgelehnt';
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
 $labels['eventcancelled'] = 'Der Termin wurde vom Organisator abgesagt';
 $labels['saveincalendar'] = 'speichern in';
-
-// event dialog tabs
 $labels['tabsummary'] = 'Übersicht';
 $labels['tabrecurrence'] = 'Wiederholung';
 $labels['tabattendees'] = 'Teilnehmer';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
-
-// messages
 $labels['deleteventconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
 $labels['deletecalendarconfirm'] = 'Möchten Sie diesen Kalender mit allen Terminen wirklich löschen?';
-$labels['deletecalendarconfirmrecursive'] = 'Möchten Sie diesen Kalender mit allen Terminen und Unter-Kalendern wirklich löschen?';
 $labels['savingdata'] = 'Speichere Daten...';
 $labels['errorsaving'] = 'Fehler beim Speichern.';
 $labels['operationfailed'] = 'Die Aktion ist fehlgeschlagen.';
@@ -185,13 +163,12 @@ $labels['importedsuccessfully'] = 'Der Termin wurde erfolgreich in \'$calendar\'
 $labels['attendeupdateesuccess'] = 'Teilnehmerstatus erfolgreich aktualisiert';
 $labels['itipsendsuccess'] = 'Einladung an Teilnehmer versendet.';
 $labels['itipresponseerror'] = 'Die Antwort auf diese Einladung konnte nicht versendet werden';
+$labels['itipinvalidrequest'] = 'Diese Einladung ist nicht mehr gültig.';
 $labels['sentresponseto'] = 'Antwort auf diese Einladung erfolgreich an $mailto gesendet';
-$labels['localchangeswarning'] = 'Änderungen an diesem Termin werden nur in Ihrem Kalender gespeichert und nicht an den Organisator des Termins gesendet.';
 $labels['importsuccess'] = 'Es wurden $nr Termine erfolgreich importiert';
 $labels['importnone'] = 'Keine Termine zum Importieren gefunden';
 $labels['importerror'] = 'Fehler beim Importieren';
-
-// recurrence form
+$labels['aclnorights'] = 'Der Zugriff auf diesen Kalender erfordert Administrator-Rechte.';
 $labels['repeat'] = 'Wiederholung';
 $labels['frequency'] = 'Wiederholung';
 $labels['never'] = 'nie';
@@ -218,7 +195,6 @@ $labels['third'] = 'dritter';
 $labels['fourth'] = 'vierter';
 $labels['last'] = 'letzter';
 $labels['dayofmonth'] = 'Tag des Montats';
-
 $labels['changeeventconfirm'] = 'Termin ändern';
 $labels['removeeventconfirm'] = 'Termin löschen';
 $labels['changerecurringeventwarning'] = 'Dies ist eine Terminreihe. Möchten Sie nur den aktuellen, diesen und alle zukünftigen oder alle Termine bearbeiten oder die Änderungen als neuen Termin speichern?';
@@ -227,5 +203,4 @@ $labels['currentevent'] = 'Aktuellen';
 $labels['futurevents'] = 'Zukünftige';
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Als neu speichern';
-
 ?>
diff --git a/plugins/calendar/localization/es_ES.inc b/plugins/calendar/localization/es_ES.inc
index bfa4865e..2a09b06e 100644
--- a/plugins/calendar/localization/es_ES.inc
+++ b/plugins/calendar/localization/es_ES.inc
@@ -1,39 +1,12 @@
-<?php
-/**
- * RoundCube Calendar
- *
- * Plugin to add a calendar to RoundCube.
- *
- * @version 0.2 BETA 3
- * @author Lazlo Westerhof
- * @author David Iribas
- * @url http://rc-calendar.lazlo.me
- * @licence GNU GPL
- * @copyright (c) 2010 Lazlo Westerhof - Netherlands
- *
- **/
-
-$labels = array();
-
-// config
-$labels['default_view'] = 'Vista por defecto';
-$labels['time_format'] = 'Formato hora';
-$labels['timeslots'] = 'Periodos de hora';
-$labels['first_day'] = 'Primer dia';
-
-// calendar
-$labels['calendar'] = 'Calendario';
-$labels['day'] = 'Dia';
-$labels['week'] = 'Semana';
-$labels['month'] = 'Mes';
-$labels['new_event'] = 'Nuevo evento';
-$labels['edit_event'] = 'Editar evento';
-$labels['save'] = 'Guardar';
-$labels['remove'] = 'Borrar';
-$labels['cancel'] = 'Cancelar';
-$labels['title'] = 'Resumen';
-$labels['description'] = 'Descripcion';
-$labels['all-day'] = 'dia-completo';
-$labels['export'] = 'Exportar a ICS';
-$labels['category'] = 'Categoria';
-?>
+<?php
+$labels['calendars'] = 'Calendarios';
+$labels['name'] = 'Nombre';
+$labels['edit'] = 'Editar';
+$labels['save'] = 'Guardar';
+$labels['cancel'] = 'Cancelar';
+$labels['description'] = 'Descripción';
+$labels['role'] = 'Rol';
+$labels['rolerequired'] = 'Requerido';
+$labels['roleoptional'] = 'Opcional';
+$labels['savingdata'] = 'Guardando datos...';
+?>
diff --git a/plugins/calendar/localization/et_EE.inc b/plugins/calendar/localization/et_EE.inc
index edfba0c2..6aab13a1 100644
--- a/plugins/calendar/localization/et_EE.inc
+++ b/plugins/calendar/localization/et_EE.inc
@@ -1,230 +1,5 @@
 <?php
-
-$labels = array();
-
-// preferences
-$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'] = 'Kalender';
-$labels['calendars'] = 'Kalendrid';
-$labels['category'] = 'Kategooria';
-$labels['categories'] = 'Kategooriad';
-$labels['createcalendar'] = 'Uus kalender';
-$labels['editcalendar'] = 'Muuda seadeid';
 $labels['name'] = 'Nimi';
-$labels['color'] = 'Värv';
-$labels['day'] = 'Päev';
-$labels['week'] = 'Nädal';
-$labels['month'] = 'Kuu';
-$labels['agenda'] = 'Agenda';
-$labels['new'] = 'Uus';
-$labels['new_event'] = 'Uus sündmus';
-$labels['edit_event'] = 'Muuda sündmust';
-$labels['edit'] = 'Redigeeri';
 $labels['save'] = 'Salvesta';
-$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'] = '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'] = 'Näita meeldetuletusi';
-$labels['defaultalarmtype'] = 'Meeldetuletuse vaiketüüp';
-$labels['defaultalarmoffset'] = 'Meeldetuletuse vaikeaeg';
-
-// attendees
-$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';
-$labels['eventupdatesubjectempty'] = 'An event that concerns you has been updated';
-$labels['eventupdatemailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with the updated event details which you can import to your calendar application.";
-$labels['eventcancelsubject'] = '"$title" has been canceled';
-$labels['eventcancelmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nThe event has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated event details.";
-
-// invitation handling
-$labels['itipinvitation'] = 'Invitation to';
-$labels['itipupdate'] = 'Update of';
-$labels['itipcancellation'] = 'Cancelled:';
-$labels['itipreply'] = 'Reply to';
-$labels['itipaccepted'] = 'Accept';
-$labels['itiptentative'] = 'Maybe';
-$labels['itipdeclined'] = 'Decline';
-$labels['itipsubjectaccepted'] = '"$title" has been accepted by $name';
-$labels['itipsubjecttentative'] = '"$title" has been tentatively accepted by $name';
-$labels['itipsubjectdeclined'] = '"$title" has been declined by $name';
-$labels['itipmailbodyaccepted'] = "\$sender has accepted the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
-$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'] = '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'] = 'Kokkuvõte';
-$labels['tabrecurrence'] = 'Kordumine';
-$labels['tabattendees'] = 'Osavõtjad';
-$labels['tabattachments'] = 'Manused';
-$labels['tabsharing'] = 'Jagamine';
-
-// messages
-$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'] = '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'] = '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'] = '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';
-
+$labels['rolerequired'] = 'Kohustuslik';
 ?>
diff --git a/plugins/calendar/localization/fr_FR.inc b/plugins/calendar/localization/fr_FR.inc
index cb4e3f82..37f8dd92 100644
--- a/plugins/calendar/localization/fr_FR.inc
+++ b/plugins/calendar/localization/fr_FR.inc
@@ -1,8 +1,4 @@
 <?php
-
-$labels = array();
-
-// preferences
 $labels['default_view'] = 'Vue par défaut';
 $labels['time_format'] = 'Format de l\'heure';
 $labels['timeslots'] = 'Nombre d\'intervalle par heure';
@@ -17,8 +13,6 @@ $labels['coloringmode0'] = 'Selon l\'agenda';
 $labels['coloringmode1'] = 'Selon la catégorie';
 $labels['coloringmode2'] = 'Calendrier en contour, catégorie en contenu';
 $labels['coloringmode3'] = 'Catégorie en contour, calendrier en contenu';
-
-// calendar
 $labels['calendar'] = 'Agenda';
 $labels['calendars'] = 'Agendas';
 $labels['category'] = 'Catégorie';
@@ -76,8 +70,6 @@ $labels['onemonthback'] = '1 mois précédent';
 $labels['nmonthsback'] = '$nr mois précédents';
 $labels['showurl'] = 'Afficher l\'URL de l\'agenda';
 $labels['showurldescription'] = 'Utilisez l\'adresse suivante pour accéder(lecture seule) à votre agenda depuis une autre application. Vous pouvez copier/coller celle-ci dans n\'importe quel agenda électronique gérant le format iCal.';
-
-// agenda view
 $labels['listrange'] = 'Intervalle à afficher :';
 $labels['listsections'] = 'Diviser en :';
 $labels['smartsections'] = 'Section intelligente';
@@ -91,13 +83,9 @@ $labels['nextmonth'] = 'Mois prochain';
 $labels['weekofyear'] = 'Semaine';
 $labels['pastevents'] = 'Passé';
 $labels['futureevents'] = 'Futur';
-
-// alarm/reminder settings
 $labels['showalarms'] = 'Afficher les alarmes';
 $labels['defaultalarmtype'] = 'Paramètre de rappel par défaut';
 $labels['defaultalarmoffset'] = 'Durée de rappel par défaut';
-
-// attendees
 $labels['attendee'] = 'Participant';
 $labels['role'] = 'Rôle';
 $labels['availability'] = 'Dispo.';
@@ -106,7 +94,6 @@ $labels['addattendee'] = 'Ajouter participant';
 $labels['roleorganizer'] = 'Organisateur';
 $labels['rolerequired'] = 'Requis';
 $labels['roleoptional'] = 'Optionel';
-$labels['roleresource'] = 'Ressource';
 $labels['availfree'] = 'Disponible';
 $labels['availbusy'] = 'Occupé';
 $labels['availunknown'] = 'Inconnu';
@@ -122,15 +109,13 @@ $labels['prevslot'] = 'Créneau précédent';
 $labels['nextslot'] = 'Créneau suivant';
 $labels['noslotfound'] = 'Impossible de trouver un créneau disponible';
 $labels['invitationsubject'] = 'Vous avez invité à "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les détails de l'évènement que vous pourrez importer dans votre agenda électronique.";
-$labels['invitationattendlinks'] = "Dans le cas où votre application de messagerie ne gère pas les demandes \"iTip\". Vous pouvez utiliser ce lien pour accepter ou refuser l'invitation :\n\$url";
+$labels['invitationmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les détails de l'évènement que vous pourrez importer dans votre agenda électronique.";
+$labels['invitationattendlinks'] = "Dans le cas où votre application de messagerie ne gère pas les demandes \"iTip\". Vous pouvez utiliser ce lien pour accepter ou refuser l'invitation : \n\$url";
 $labels['eventupdatesubject'] = '"$title" a été modifié';
 $labels['eventupdatesubjectempty'] = 'Un évènement vous concernant a été modifié';
-$labels['eventupdatemailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
+$labels['eventupdatemailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
 $labels['eventcancelsubject'] = '"$title" a été annulé';
-$labels['eventcancelmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nL'évènement a été annulé par \$organizer.\n\nVous trouverez en pièce jointe un fichier iCalendar avec les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
-
-// invitation handling
+$labels['eventcancelmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nL'évènement a été annulé par \$organizer.\n\nVous trouverez en pièce jointe un fichier iCalendar avec les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
 $labels['itipinvitation'] = 'Invitation à';
 $labels['itipupdate'] = 'Mise à jour de';
 $labels['itipcancellation'] = 'Annulation:';
@@ -141,9 +126,9 @@ $labels['itipdeclined'] = 'Refuser';
 $labels['itipsubjectaccepted'] = '"$title" a été accepté par $name';
 $labels['itipsubjecttentative'] = '"$title" a été accepté provisoirement par $name';
 $labels['itipsubjectdeclined'] = '"$title" a été refusé par $name';
-$labels['itipmailbodyaccepted'] = "\$sender a accepté l'invitation à l'évènement suivant :\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
-$labels['itipmailbodytentative'] = "\$sender a accepté provisoirement l'invitation à l'évènement suivant :\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
-$labels['itipmailbodydeclined'] = "\$sender a refusé l'invitation à l'évènement suivant :\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
+$labels['itipmailbodyaccepted'] = "\$sender a accepté l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender a accepté provisoirement l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender a refusé l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
 $labels['itipdeclineevent'] = 'Voulez-vous refuser l\'invitation à cet évènement?';
 $labels['importtocalendar'] = 'Enregistrer mon agenda';
 $labels['removefromcalendar'] = 'Supprimer de mon agenda';
@@ -155,15 +140,11 @@ $labels['youhavedeclined'] = 'Vous avez refusé cette invitation';
 $labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet évènement';
 $labels['eventcancelled'] = 'L\'évènement a été annulé';
 $labels['saveincalendar'] = 'Enregistrer sous';
-
-// event dialog tabs
 $labels['tabsummary'] = 'Résumé';
 $labels['tabrecurrence'] = 'Récurrence';
 $labels['tabattendees'] = 'Participants';
 $labels['tabattachments'] = 'Pièces jointes';
 $labels['tabsharing'] = 'Partage';
-
-// messages
 $labels['deleteventconfirm'] = 'Voulez-vous vraiment supprimer cet évènement?';
 $labels['deletecalendarconfirm'] = 'Voulez-vous vraiment supprimer cet agenda et tous ses évènements?';
 $labels['savingdata'] = 'Enregistrer...';
@@ -184,13 +165,10 @@ $labels['itipsendsuccess'] = 'Invitation envoyé aux participants.';
 $labels['itipresponseerror'] = 'Échec de l\'envoi d\'une réponse à cette invitation.';
 $labels['itipinvalidrequest'] = 'C\'est invitation n\'est plus valide.';
 $labels['sentresponseto'] = 'La réponse à l\'invitation a été envoyé à $mailto';
-$labels['localchangeswarning'] = 'Vous êtes sur le point de faire des changements uniquement visible sur votre agenda personnel.';
 $labels['importsuccess'] = '$nr évènements importés.';
 $labels['importnone'] = 'Pas d\'évènements à importer';
 $labels['importerror'] = 'Une erreur est arrivée lors de l\'import';
 $labels['aclnorights'] = 'Vous n\'avez pas les droits d\'administration sur cet agenda.';
-
-// recurrence form
 $labels['repeat'] = 'Répéter';
 $labels['frequency'] = 'Répéter';
 $labels['never'] = 'Jamais';
@@ -217,7 +195,6 @@ $labels['third'] = 'troisième';
 $labels['fourth'] = 'quatrième';
 $labels['last'] = 'dernier';
 $labels['dayofmonth'] = 'Jour du mois';
-
 $labels['changeeventconfirm'] = 'Modifier l\'évènement';
 $labels['removeeventconfirm'] = 'Supprimer l\'évènement';
 $labels['changerecurringeventwarning'] = 'Ceci est un évènement récurant. Voulez vous éditer seulement cette occurrence, celle-ci et toutes les suivantes, toutes les occurrences ou l\'enregistrer comme un nouvel évènement? ';
@@ -226,5 +203,4 @@ $labels['currentevent'] = 'Cette occurrence';
 $labels['futurevents'] = 'Cette occurrence et toutes les suivantes';
 $labels['allevents'] = 'Toutes les occurrences';
 $labels['saveasnew'] = 'Enregistrer comme un nouvel évènement';
-
 ?>
diff --git a/plugins/calendar/localization/hu_HU.inc b/plugins/calendar/localization/hu_HU.inc
index fbd2bd98..9a8f780b 100644
--- a/plugins/calendar/localization/hu_HU.inc
+++ b/plugins/calendar/localization/hu_HU.inc
@@ -1,27 +1,10 @@
 <?php
-/**
- * RoundCube Calendar
- *
- * Plugin to add a calendar to RoundCube.
- *
- * @version 0.2 BETA 2
- * @author Lazlo Westerhof
- * @url http://rc-calendar.lazlo.me
- * @licence GNU GPL
- * @copyright (c) 2010 Lazlo Westerhof - Netherlands
- *
- **/
-
-$labels = array();
-
-// config
 $labels['default_view'] = 'Alap nézet';
 $labels['time_format'] = 'Idõ formátum';
 $labels['timeslots'] = 'Idõrés óránként';
 $labels['first_day'] = 'A hét elsõ napja';
-
-// calendar
 $labels['calendar'] = 'Naptár';
+$labels['category'] = 'Kategória';
 $labels['day'] = 'Nap';
 $labels['week'] = 'Hét';
 $labels['month'] = 'Hónap';
@@ -34,5 +17,5 @@ $labels['title'] = 'Tárgy';
 $labels['description'] = 'Leírás';
 $labels['all-day'] = 'Egész nap';
 $labels['export'] = 'Exportálás ICS formátumba';
-$labels['category'] = 'Kategória';
+$labels['tabsummary'] = 'Tárgy';
 ?>
diff --git a/plugins/calendar/localization/it_IT.inc b/plugins/calendar/localization/it_IT.inc
index c03b4b90..303fe211 100644
--- a/plugins/calendar/localization/it_IT.inc
+++ b/plugins/calendar/localization/it_IT.inc
@@ -1,27 +1,10 @@
 <?php
-/**
- * RoundCube Calendar
- *
- * Plugin to add a calendar to RoundCube.
- *
- * @version 0.2 BETA 2
- * @author Lazlo Westerhof
- * @url http://rc-calendar.lazlo.me
- * @licence GNU GPL
- * @copyright (c) 2010 Lazlo Westerhof - Netherlands
- *
- **/
-
-$labels = array();
-
-// config
 $labels['default_view'] = 'Visualizzazine di default';
 $labels['time_format'] = 'Formato ora';
 $labels['timeslots'] = 'Timeslots per ora';
 $labels['first_day'] = 'Inizio settimana';
-
-// calendar
 $labels['calendar'] = 'Calendario';
+$labels['category'] = 'Categoria';
 $labels['day'] = 'Giorno';
 $labels['week'] = 'Settimana';
 $labels['month'] = 'Mese';
@@ -34,5 +17,5 @@ $labels['title'] = 'Oggetto';
 $labels['description'] = 'Descrizione';
 $labels['all-day'] = 'Giorno intero';
 $labels['export'] = 'Esporta in ICS';
-$labels['category'] = 'Categoria';
-?>
\ No newline at end of file
+$labels['tabsummary'] = 'Oggetto';
+?>
diff --git a/plugins/calendar/localization/ja_JP.inc b/plugins/calendar/localization/ja_JP.inc
index 6cc76d7a..22928536 100644
--- a/plugins/calendar/localization/ja_JP.inc
+++ b/plugins/calendar/localization/ja_JP.inc
@@ -1,230 +1,206 @@
 <?php
-
-$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';
-
-// calendar
-$labels['calendar'] = 'Calendar';
-$labels['calendars'] = 'Calendars';
-$labels['category'] = 'Category';
-$labels['categories'] = 'Categories';
-$labels['createcalendar'] = 'Create new calendar';
-$labels['editcalendar'] = 'Edit calendar properties';
-$labels['name'] = 'Name';
-$labels['color'] = 'Color';
-$labels['day'] = 'Day';
-$labels['week'] = 'Week';
-$labels['month'] = 'Month';
-$labels['agenda'] = 'Agenda';
-$labels['new'] = 'New';
-$labels['new_event'] = 'New event';
-$labels['edit_event'] = 'Edit event';
-$labels['edit'] = 'Edit';
-$labels['save'] = 'Save';
-$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.';
-
-// 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';
-
-// alarm/reminder settings
-$labels['showalarms'] = 'Show alarms';
-$labels['defaultalarmtype'] = 'Default reminder setting';
-$labels['defaultalarmoffset'] = 'Default reminder time';
-
-// attendees
-$labels['attendee'] = 'Participant';
-$labels['role'] = 'Role';
-$labels['availability'] = 'Avail.';
-$labels['confirmstate'] = 'Status';
-$labels['addattendee'] = 'Add participant';
-$labels['roleorganizer'] = 'Organizer';
-$labels['rolerequired'] = 'Required';
-$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['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';
-$labels['eventupdatesubjectempty'] = 'An event that concerns you has been updated';
-$labels['eventupdatemailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with the updated event details which you can import to your calendar application.";
-$labels['eventcancelsubject'] = '"$title" has been canceled';
-$labels['eventcancelmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nThe event has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated event details.";
-
-// invitation handling
-$labels['itipinvitation'] = 'Invitation to';
-$labels['itipupdate'] = 'Update of';
-$labels['itipcancellation'] = 'Cancelled:';
-$labels['itipreply'] = 'Reply to';
-$labels['itipaccepted'] = 'Accept';
-$labels['itiptentative'] = 'Maybe';
-$labels['itipdeclined'] = 'Decline';
-$labels['itipsubjectaccepted'] = '"$title" has been accepted by $name';
-$labels['itipsubjecttentative'] = '"$title" has been tentatively accepted by $name';
-$labels['itipsubjectdeclined'] = '"$title" has been declined by $name';
-$labels['itipmailbodyaccepted'] = "\$sender has accepted the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
-$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';
-
-// event dialog tabs
-$labels['tabsummary'] = 'Summary';
-$labels['tabrecurrence'] = 'Recurrence';
-$labels['tabattendees'] = 'Participants';
-$labels['tabattachments'] = 'Attachments';
-$labels['tabsharing'] = 'Sharing';
-
-// 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.';
-
-// 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['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['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['default_view'] = 'デフォルトビュー';
+$labels['time_format'] = '時刻表示形式';
+$labels['timeslots'] = '1時間毎';
+$labels['first_day'] = '最初の平日';
+$labels['first_hour'] = '最初の時間を表示';
+$labels['workinghours'] = '労働時間';
+$labels['add_category'] = 'カテゴリ追加';
+$labels['remove_category'] = 'カテゴリ削除';
+$labels['defaultcalendar'] = '新しいイベントの作成';
+$labels['eventcoloring'] = 'イベントカラー';
+$labels['coloringmode0'] = 'カレンダーの説明';
+$labels['coloringmode1'] = 'カテゴリの説明';
+$labels['coloringmode2'] = 'アウトライン用カレンダー、コンテンツ用カテゴリ';
+$labels['coloringmode3'] = 'アウトライン用カレンダー、コンテンツ用カテゴリ';
+$labels['calendar'] = 'カレンダー';
+$labels['calendars'] = 'カレンダー';
+$labels['category'] = 'カテゴリ';
+$labels['categories'] = 'カテゴリ';
+$labels['createcalendar'] = '新しいカレンダーの作成';
+$labels['editcalendar'] = 'カレンダーのプロパティ編集';
+$labels['name'] = '名前';
+$labels['color'] = '色';
+$labels['day'] = '日';
+$labels['week'] = '週';
+$labels['month'] = '月';
+$labels['agenda'] = '予定表';
+$labels['new'] = '新規';
+$labels['new_event'] = '新規イベント';
+$labels['edit_event'] = 'イベント編集';
+$labels['edit'] = '編集';
+$labels['save'] = '保存';
+$labels['remove'] = '削除';
+$labels['cancel'] = 'キャンセル';
+$labels['select'] = '選択';
+$labels['print'] = '印刷';
+$labels['printtitle'] = 'カレンダー印刷';
+$labels['title'] = '要約';
+$labels['description'] = '説明';
+$labels['all-day'] = '全日';
+$labels['export'] = 'エクスポート';
+$labels['exporttitle'] = 'iカレンダーへエクスポート';
+$labels['location'] = '場所';
+$labels['date'] = '期日';
+$labels['start'] = '開始';
+$labels['end'] = '終了';
+$labels['selectdate'] = '日付選択';
+$labels['freebusy'] = '表示する';
+$labels['free'] = '空';
+$labels['busy'] = 'ビジー';
+$labels['outofoffice'] = '外出';
+$labels['tentative'] = '仮';
+$labels['priority'] = '優先度';
+$labels['sensitivity'] = 'プライバシー';
+$labels['public'] = 'パブリック';
+$labels['private'] = 'プライベート';
+$labels['confidential'] = '親展';
+$labels['alarms'] = '通知';
+$labels['generated'] = '生成';
+$labels['printdescriptions'] = '説明印刷';
+$labels['parentcalendar'] = '内に挿入';
+$labels['searchearlierdates'] = '<< 以前のイベントを検索';
+$labels['searchlaterdates'] = '今後のイベントの検索 >>';
+$labels['andnmore'] = '$nr さらに…';
+$labels['togglerole'] = 'クリックでロールをトグル';
+$labels['createfrommail'] = 'イベントとして保存';
+$labels['importevents'] = 'イベントのインポート';
+$labels['importrange'] = 'イベント元';
+$labels['onemonthback'] = '1 ヶ月戻る';
+$labels['nmonthsback'] = '$nr ヶ月戻る';
+$labels['showurl'] = 'カレンダーURL表示';
+$labels['showurldescription'] = '以下のアドレスを使用して他のアプリケーションからカレンダーにアクセス(読込のみ)できます。iCal形式をサポートしたカレンダーソフトウェアへコピーアンドペーストができます。';
+$labels['listrange'] = '表示範囲:';
+$labels['listsections'] = '分割:';
+$labels['smartsections'] = 'スマートセクション';
+$labels['until'] = 'いつまでに';
+$labels['today'] = '今日';
+$labels['tomorrow'] = '明日';
+$labels['thisweek'] = '今週';
+$labels['nextweek'] = '来週';
+$labels['thismonth'] = '今月';
+$labels['nextmonth'] = '来月';
+$labels['weekofyear'] = '週';
+$labels['pastevents'] = '以前';
+$labels['futureevents'] = '以降';
+$labels['showalarms'] = 'アラーム表示';
+$labels['defaultalarmtype'] = 'デフォルト通知設定';
+$labels['defaultalarmoffset'] = 'デフォルト通知時間';
+$labels['attendee'] = '参加者';
+$labels['role'] = 'ロール';
+$labels['availability'] = '利用可';
+$labels['confirmstate'] = '状態';
+$labels['addattendee'] = '参加者追加';
+$labels['roleorganizer'] = '編成者';
+$labels['rolerequired'] = '要件';
+$labels['roleoptional'] = 'オプション';
+$labels['availfree'] = '空';
+$labels['availbusy'] = 'ビジー';
+$labels['availunknown'] = '不明';
+$labels['availtentative'] = '仮';
+$labels['availoutofoffice'] = '外出';
+$labels['scheduletime'] = '利用可検索';
+$labels['sendinvitations'] = '招待を送る';
+$labels['sendnotifications'] = '変更を参加者へ通知する';
+$labels['sendcancellation'] = '中止を参加者へ通知する';
+$labels['onlyworkinghours'] = '労働時間内の利用可検索';
+$labels['reqallattendees'] = '要件/全参加者';
+$labels['prevslot'] = '前のスロット';
+$labels['nextslot'] = '次のスロット';
+$labels['noslotfound'] = '空スロットを見つけられません';
+$labels['invitationsubject'] = '"$title" に招待されました';
+$labels['invitationmailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nあなたのカレンダーアプリケーションにインポートできる全イベントの詳細がインポートできる添付されたiカレンダーファイルを見つけてください。";
+$labels['invitationattendlinks'] = "この場合あなたのメールクライアントはiTip リクエストをサポートしてません、以下のリンクからこの招待を承諾もしくは辞退してください:\n\$url";
+$labels['eventupdatesubject'] = '"$title" はアップデートされました';
+$labels['eventupdatesubjectempty'] = 'あなたに関連するイベントが更新されました';
+$labels['eventupdatemailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nあなたのカレンダーアプリケーションにインポートできるアップデートされた全イベントの詳細が添付されたiカレンダーファイルを見つけてください。";
+$labels['eventcancelsubject'] = '"$title" は変更されました';
+$labels['eventcancelmailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nイベントが \$organizer によってキャンセルされました。\n\n更新されたイベントの詳細とともに添付されたiカレンダーファイルを見つけてください。";
+$labels['itipinvitation'] = '招待する';
+$labels['itipupdate'] = '更新';
+$labels['itipcancellation'] = 'キャンセル';
+$labels['itipreply'] = '返信';
+$labels['itipaccepted'] = '承諾';
+$labels['itiptentative'] = 'たぶん';
+$labels['itipdeclined'] = '辞退';
+$labels['itipsubjectaccepted'] = '$name が "$title" を承諾しました';
+$labels['itipsubjecttentative'] = '$name が "$title" を仮承諾しました';
+$labels['itipsubjectdeclined'] = '$name が "$title" を辞退しました';
+$labels['itipmailbodyaccepted'] = "\$sender は以下のイベントへの招待を承諾しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender は以下のイベントへの招待を仮承諾しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender は以下のイベントへの招待を辞退しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
+$labels['itipdeclineevent'] = 'このイベントへの招待を辞退しますか?';
+$labels['importtocalendar'] = 'カレンダーに保存';
+$labels['removefromcalendar'] = 'カレンダーから削除';
+$labels['updateattendeestatus'] = '参加者の状況更新';
+$labels['acceptinvitation'] = 'この招待を承諾しますか?';
+$labels['youhaveaccepted'] = 'この招待を承諾しました';
+$labels['youhavetentative'] = 'この招待を仮承諾しました。';
+$labels['youhavedeclined'] = 'この招待を辞退しました。';
+$labels['notanattendee'] = 'このイベントの出席者として一覧にありません';
+$labels['eventcancelled'] = 'このイベントはキャンセルされました';
+$labels['saveincalendar'] = '保存';
+$labels['tabsummary'] = '要約';
+$labels['tabrecurrence'] = '繰返し';
+$labels['tabattendees'] = '参加者';
+$labels['tabattachments'] = '添付';
+$labels['tabsharing'] = '共有';
+$labels['deleteventconfirm'] = '本当にこのイベントを削除しますか?';
+$labels['deletecalendarconfirm'] = '本当にこのカレンダーを全イベントとともに削除しますか?';
+$labels['savingdata'] = 'データを保存中…';
+$labels['errorsaving'] = '変更が保存できませんでした。';
+$labels['operationfailed'] = '要求された操作ができませんでした。';
+$labels['invalideventdates'] = '無効な日付が入力されました! 入力を確認してください。';
+$labels['invalidcalendarproperties'] = '無効なカレンダーのプロパティです! 有効な名前を設定してください。';
+$labels['searchnoresults'] = '選択されたカレンダーにイベントは見つかりません。';
+$labels['successremoval'] = 'イベントを削除しました';
+$labels['successrestore'] = 'イベントを復旧しました';
+$labels['errornotifying'] = 'イベント参加者への通知が送信できませんでした';
+$labels['errorimportingevent'] = 'イベントのインポートができませんでした';
+$labels['newerversionexists'] = 'このイベントのより新しいヴァージョンがすでにあります。中断されました。';
+$labels['nowritecalendarfound'] = 'イベントを保存するカレンダーが見つかりません';
+$labels['importedsuccessfully'] = '\'$calendar\' へイベントを追加しました';
+$labels['attendeupdateesuccess'] = '出席者状況を更新しました';
+$labels['itipsendsuccess'] = '出席者へ招待を送信しました。';
+$labels['itipresponseerror'] = 'この招待の返信できませんでした';
+$labels['itipinvalidrequest'] = 'この招待は間もなく無効になります';
+$labels['sentresponseto'] = '$mailto への招待の返信しました';
+$labels['importsuccess'] = '$nr イベントをインポートしました';
+$labels['importnone'] = 'インポートされたイベントはありません';
+$labels['importerror'] = 'インポート中にエラーが発生しました。';
+$labels['aclnorights'] = 'このカレンダーの管理権限がありません。';
+$labels['repeat'] = '繰返し';
+$labels['frequency'] = '繰返し';
+$labels['never'] = '繰返さない';
+$labels['daily'] = '毎日';
+$labels['weekly'] = '毎週';
+$labels['monthly'] = '毎月';
+$labels['yearly'] = '毎年';
+$labels['every'] = 'いつでも';
+$labels['days'] = '日(s)';
+$labels['weeks'] = '週(s)';
+$labels['months'] = '月(s)';
+$labels['years'] = '年(s):';
+$labels['bydays'] = '上';
+$labels['untildate'] = 'その';
+$labels['each'] = 'いずれも';
+$labels['onevery'] = '各';
+$labels['onsamedate'] = 'いつか';
+$labels['forever'] = 'ずっと';
+$labels['recurrencend'] = 'まで';
+$labels['forntimes'] = '$nr まで(s)';
+$labels['first'] = '第1週';
+$labels['second'] = '第2週';
+$labels['third'] = '第3週';
+$labels['fourth'] = '第4週';
+$labels['last'] = '最終週';
+$labels['dayofmonth'] = '日';
+$labels['changeeventconfirm'] = 'イベント変更';
+$labels['removeeventconfirm'] = 'イベント削除';
+$labels['changerecurringeventwarning'] = 'これは繰返しイベントです。現在のイベントのみ、このイベントと今後の全イベント、全イベント、編集したい、もしくは新しいイベントとして保存したい?';
+$labels['removerecurringeventwarning'] = 'これは繰返しイベントです。現在のイベントのみ、このイベントと今後の全イベントト、このイベントの全イベントを削除したい?';
+$labels['currentevent'] = '現在';
+$labels['futurevents'] = '今後';
+$labels['allevents'] = '全て';
+$labels['saveasnew'] = '新規保存';
 ?>
diff --git a/plugins/calendar/localization/nl_NL.inc b/plugins/calendar/localization/nl_NL.inc
index 502ab3c7..b3774086 100644
--- a/plugins/calendar/localization/nl_NL.inc
+++ b/plugins/calendar/localization/nl_NL.inc
@@ -1,39 +1,145 @@
 <?php
-/**
- * RoundCube Calendar
- *
- * Plugin to add a calendar to RoundCube.
- *
- * @version 0.2 BETA 2
- * @author Lazlo Westerhof
- * @url http://rc-calendar.lazlo.me
- * @licence GNU GPL
- * @copyright (c) 2010 Lazlo Westerhof - Netherlands
- *
- **/
-
-$labels = array();
-
-// config
 $labels['default_view'] = 'Standaard agenda';
 $labels['time_format'] = 'Tijdsformaat';
 $labels['timeslots'] = 'Timeslots per uur';
 $labels['first_day'] = 'Eerste weekdag';
-
-// calendar
+$labels['first_hour'] = 'Eerste uur om weer te geven';
+$labels['workinghours'] = 'Werkuren';
+$labels['add_category'] = 'Categorie toevoegen';
+$labels['remove_category'] = 'Categorie verwijderen';
+$labels['eventcoloring'] = 'Evenement kleuren';
+$labels['coloringmode0'] = 'Volgens kalender';
+$labels['coloringmode1'] = 'Volgens categorie';
+$labels['coloringmode2'] = 'Kalender voor omtrek, categorie voor inhoud';
+$labels['coloringmode3'] = 'Categorie voor omtrek, kalender voor inhoud';
 $labels['calendar'] = 'Agenda';
+$labels['calendars'] = 'Kalenders';
+$labels['category'] = 'Categorie';
+$labels['categories'] = 'Categorieen';
+$labels['createcalendar'] = 'Creeer nieuwe kalender';
+$labels['editcalendar'] = 'Wijzig calendar eigenschappen';
+$labels['name'] = 'Naam';
+$labels['color'] = 'Kleur';
 $labels['day'] = 'Dag';
 $labels['week'] = 'Week';
 $labels['month'] = 'Maand';
+$labels['agenda'] = 'Agenda';
+$labels['new'] = 'Nieuw';
 $labels['new_event'] = 'Nieuw evenement';
 $labels['edit_event'] = 'Wijzig evenement';
+$labels['edit'] = 'Wijzig';
 $labels['save'] = 'Bewaar';
 $labels['remove'] = 'Verwijder';
 $labels['cancel'] = 'Terug';
+$labels['select'] = 'Selecteer';
+$labels['print'] = 'Print';
+$labels['printtitle'] = 'Print kalenders';
 $labels['title'] = 'Samenvatting';
 $labels['description'] = 'Beschrijving';
 $labels['all-day'] = 'hele dag';
 $labels['export'] = 'Exporteer naar ICS';
-$labels['category'] = 'Categorie';
+$labels['exporttitle'] = 'Als iCalender exporteren';
 $labels['location'] = 'Locatie';
-?>
\ No newline at end of file
+$labels['date'] = 'Datum';
+$labels['start'] = 'Begin';
+$labels['end'] = 'Eind';
+$labels['selectdate'] = 'Kies datum';
+$labels['freebusy'] = 'Toon mij als';
+$labels['free'] = 'Vrij';
+$labels['busy'] = 'Bezig';
+$labels['outofoffice'] = 'Niet Aanwezig';
+$labels['tentative'] = 'Misschien';
+$labels['priority'] = 'Prioriteit';
+$labels['sensitivity'] = 'Privacy';
+$labels['public'] = 'publiek';
+$labels['private'] = 'prive';
+$labels['confidential'] = 'vertrouwelijk';
+$labels['alarms'] = 'Herinnering';
+$labels['generated'] = 'gegenereerd op';
+$labels['printdescriptions'] = 'Print beschrijvingen';
+$labels['searchearlierdates'] = '« Zoek voor eerdere evenementen';
+$labels['searchlaterdates'] = 'Zoek voor latere evenementen »';
+$labels['andnmore'] = '$nr meer...';
+$labels['createfrommail'] = 'Bewaar als evenement';
+$labels['importevents'] = 'Evenementen importeren';
+$labels['onemonthback'] = '1 maand terug';
+$labels['nmonthsback'] = '$nr maanden terug';
+$labels['showurl'] = 'Toon kalender URL';
+$labels['until'] = 'tot';
+$labels['today'] = 'Vandaag';
+$labels['tomorrow'] = 'Morgen';
+$labels['thisweek'] = 'Deze week';
+$labels['nextweek'] = 'Volgende week';
+$labels['thismonth'] = 'Deze maand';
+$labels['nextmonth'] = 'Volgende maand';
+$labels['weekofyear'] = 'Week';
+$labels['pastevents'] = 'Verleden';
+$labels['futureevents'] = 'Toekomst';
+$labels['showalarms'] = 'Alarmen tonen';
+$labels['attendee'] = 'Deelnemer';
+$labels['role'] = 'Rol';
+$labels['availability'] = 'Beschikb.';
+$labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Deelnemer toevoegen';
+$labels['roleorganizer'] = 'Organisatie';
+$labels['rolerequired'] = 'Verplicht';
+$labels['roleoptional'] = 'Optioneel';
+$labels['availfree'] = 'Vrij';
+$labels['availbusy'] = 'Bezig';
+$labels['availunknown'] = 'Onbekend';
+$labels['availtentative'] = 'Misschien';
+$labels['availoutofoffice'] = 'Niet Aanwezig';
+$labels['scheduletime'] = 'Vind beschikbaarheid';
+$labels['sendinvitations'] = 'Verzend uitnodigingen';
+$labels['itipinvitation'] = 'Uitnodiging voor';
+$labels['itipupdate'] = 'Update van';
+$labels['itipcancellation'] = 'Afgelast:';
+$labels['itipaccepted'] = 'Accepteer';
+$labels['itiptentative'] = 'Misschien';
+$labels['itipdeclined'] = 'Afwijzen';
+$labels['importtocalendar'] = 'Bewaar in mijn kalender';
+$labels['removefromcalendar'] = 'Verwijder van mijn kalender';
+$labels['updateattendeestatus'] = 'Update status van deelnemer';
+$labels['acceptinvitation'] = 'Accepteer je deze uitnodiging?';
+$labels['youhaveaccepted'] = 'Je hebt de uitnodiging geaccepteerd';
+$labels['youhavedeclined'] = 'Je hebt deze uitnodiging afgewezen';
+$labels['eventcancelled'] = 'Dit evenement is afgelast';
+$labels['saveincalendar'] = 'bewaar in';
+$labels['tabsummary'] = 'Samenvatting';
+$labels['tabrecurrence'] = 'Herhaling';
+$labels['tabattendees'] = 'Deelnemers';
+$labels['tabattachments'] = 'Toebehoren';
+$labels['tabsharing'] = 'Delen';
+$labels['savingdata'] = 'Data wordt opgeslagen...';
+$labels['repeat'] = 'Herhaal';
+$labels['frequency'] = 'Herhaal';
+$labels['never'] = 'nooit';
+$labels['daily'] = 'dagelijks';
+$labels['weekly'] = 'weekelijks';
+$labels['monthly'] = 'maandelijks';
+$labels['yearly'] = 'jaarlijks';
+$labels['every'] = 'Elke';
+$labels['days'] = 'dag(en)';
+$labels['weeks'] = 'week / weken';
+$labels['months'] = 'maand(en)';
+$labels['bydays'] = 'Op';
+$labels['untildate'] = 'de';
+$labels['each'] = 'Elke';
+$labels['onevery'] = 'Op elke';
+$labels['onsamedate'] = 'Op dezelfde datum';
+$labels['forever'] = 'oneindig';
+$labels['recurrencend'] = 'tot';
+$labels['forntimes'] = 'voor $nr keer';
+$labels['first'] = 'eerste';
+$labels['second'] = 'tweede';
+$labels['third'] = 'derde';
+$labels['fourth'] = 'vierde';
+$labels['last'] = 'laatste';
+$labels['dayofmonth'] = 'Dag van de maand';
+$labels['changeeventconfirm'] = 'Wijzig evenement';
+$labels['removeeventconfirm'] = 'Verwijder evenement';
+$labels['currentevent'] = 'Huidige';
+$labels['futurevents'] = 'Toekomst';
+$labels['allevents'] = 'Alle';
+$labels['saveasnew'] = 'Bewaar als nieuw';
+?>
diff --git a/plugins/calendar/localization/pl_PL.inc b/plugins/calendar/localization/pl_PL.inc
index 3403ea5a..ac647638 100644
--- a/plugins/calendar/localization/pl_PL.inc
+++ b/plugins/calendar/localization/pl_PL.inc
@@ -1,224 +1,22 @@
 <?php
-
-$labels = array();
-
-// preferences
-$labels['default_view'] = 'Domyślny widok';
-$labels['time_format'] = 'Format czasu';
-$labels['timeslots'] = 'Okienka na godzinę';
-$labels['first_day'] = 'Pierwszy dzień tygodnia';
-$labels['first_hour'] = 'Pierwsza godzina do wyświetlenia';
-$labels['workinghours'] = 'Godziny pracy';
-$labels['add_category'] = 'Dodaj kategorię';
-$labels['remove_category'] = 'Usuń kategorię';
-$labels['defaultcalendar'] = 'Utwórz nowe zdarzenia w';
-$labels['eventcoloring'] = 'Kolorowanie zdarzeń';
-$labels['coloringmode0'] = 'zależnie od kalendarza';
-$labels['coloringmode1'] = 'zależnie od kategorii';
-$labels['coloringmode2'] = 'Kalendarz - obramowanie, kategoria - tło';
-$labels['coloringmode3'] = 'Kategoria - obramowanie, kalendarz - tło';
-
-// calendar
 $labels['calendar'] = 'Kalendarz';
 $labels['calendars'] = 'Kalendarze';
-$labels['category'] = 'Kategoria';
-$labels['categories'] = 'Kategorie';
-$labels['createcalendar'] = 'Utwórz nowy kalendarz';
-$labels['editcalendar'] = 'Edytuj właściwości kalendarza';
 $labels['name'] = 'Nazwa';
-$labels['color'] = 'Kolor';
-$labels['day'] = 'Dzień';
-$labels['week'] = 'Tydzień';
-$labels['month'] = 'Miesiąc';
-$labels['agenda'] = 'Agenda';
-$labels['new_event'] = 'Nowe zdarzenie';
-$labels['edit_event'] = 'Edytuj zdarzenie';
 $labels['edit'] = 'Edytuj';
 $labels['save'] = 'Zapisz';
 $labels['remove'] = 'Usuń';
 $labels['cancel'] = 'Anuluj';
-$labels['select'] = 'Wybierz';
-$labels['print'] = 'Drukuj kalendarze';
 $labels['title'] = 'Podsumowanie';
 $labels['description'] = 'Opis';
-$labels['all-day'] = 'cały dzień';
-$labels['export'] = 'Eksport do iCalendarza';
-$labels['location'] = 'Położenie';
-$labels['date'] = 'Data';
-$labels['start'] = 'Początek';
-$labels['end'] = 'Koniec';
-$labels['selectdate'] = 'Wybierz datę';
-$labels['freebusy'] = 'Pokazuj mnie jako';
-$labels['free'] = 'Wolny';
-$labels['busy'] = 'Zajęty';
-$labels['outofoffice'] = 'Poza buirem';
-$labels['tentative'] = 'Niepewny';
-$labels['priority'] = 'Priorytet';
-$labels['sensitivity'] = 'Dostępność';
-$labels['public'] = 'publiczny';
-$labels['private'] = 'prywatny';
-$labels['confidential'] = 'zastrzeżony';
+$labels['start'] = 'Start';
 $labels['alarms'] = 'Przypomnienie';
-$labels['generated'] = 'wygenerowano';
-$labels['printdescriptions'] = 'Drukuj opisy';
-$labels['parentcalendar'] = 'Nadrzędny kalendarz';
-$labels['searchearlierdates'] = '« Wyszukaj wcześniejsze zdarzenia';
-$labels['searchlaterdates'] = 'Wyszukaj późniejsze zdarzenia »';
-$labels['andnmore'] = '$nr więcej...';
-$labels['showmore'] = 'Pokaż więcej...';
-$labels['togglerole'] = 'Kliknij aby zmienić rolę';
-$labels['createfrommail'] = 'Zapisz jako zdarzenie';
-$labels['importevents'] = 'Import zdarzeń';
-$labels['importrange'] = 'Zdarzenia z';
-$labels['onemonthback'] = '1 miesiąc wstecz';
-$labels['nmonthsback'] = '$nr miesiące wstecz';
-
-// agenda view
-$labels['listrange'] = 'Zakres do wyświetlenia:';
-$labels['listsections'] = 'Podziel na:';
-$labels['smartsections'] = 'Inteligentne sekcje';
-$labels['until'] = 'do';
 $labels['today'] = 'Dzisiaj';
 $labels['tomorrow'] = 'Jutro';
-$labels['thisweek'] = 'Ten tydzień';
-$labels['nextweek'] = 'Następny tydzień';
-$labels['thismonth'] = 'Ten miesiąc';
-$labels['nextmonth'] = 'Następny miesiąc';
-$labels['weekofyear'] = 'Tydzień';
-$labels['pastevents'] = 'Przeszłość';
-$labels['futureevents'] = 'Przyszłość';
-
-// alarm/reminder settings
-$labels['showalarms'] = 'Wyświetlaj alarmy';
-$labels['defaultalarmtype'] = 'Domyślne ustawienia przypomnienia';
-$labels['defaultalarmoffset'] = 'Domyślny czas przypomnienia';
-
-// attendees
-$labels['attendee'] = 'Uczestnik';
+$labels['showalarms'] = 'Pokaż alarmy';
 $labels['role'] = 'Rola';
-$labels['availability'] = 'Dostępn.';
-$labels['confirmstate'] = 'Status';
-$labels['addattendee'] = 'Dodaj uczestnika';
-$labels['roleorganizer'] = 'Organizator';
-$labels['rolerequired'] = 'Wymagany';
 $labels['roleoptional'] = 'Opcjonalny';
-$labels['roleresource'] = 'Żródło';
-$labels['availfree'] = 'Wolny';
-$labels['availbusy'] = 'Zajęty';
-$labels['availunknown'] = 'Nieznany';
-$labels['availtentative'] = 'Niepewny';
-$labels['availoutofoffice'] = 'Poza buirem';
-$labels['scheduletime'] = 'Sprawdź dostępność';
-$labels['sendinvitations'] = 'Wyślij zaproszenia';
-$labels['sendnotifications'] = 'Informuj uczestników o zmianach';
-$labels['sendcancellation'] = 'Informuj uczestników o odwołaniu zdarzenia';
-$labels['onlyworkinghours'] = 'Sprawdź dostępność podczas moich godzin pracy';
-$labels['reqallattendees'] = 'Wymagani/wszyscy uczestnicy';
-$labels['prevslot'] = 'Poprzednie okienko';
-$labels['nextslot'] = 'Następne okienko';
-$labels['noslotfound'] = 'Nie można znaleźć wolnego okienka';
-$labels['invitationsubject'] = 'Zostałeś zaproszony na "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\nW załączeniu plik w formacie iCalendar zawierający szczegóły zdarzenia, który można zaimportować do Pana/Pani kalendarza.";
-$labels['invitationattendlinks'] = "W przypadku gdy Pana/Pani program pocztowy nie obsługuje żądań iTip można użyć następującego łącza w celu akceptacji lub odrzucenia tego zdarzenia:\n\$url";
-$labels['eventupdatesubject'] = '"$title" zostało zaktualizowane';
-$labels['eventupdatesubjectempty'] = 'Zdarzenie, które ciebie dotyczy zostało zaktualizowane';
-$labels['eventupdatemailbody'] = "*\$title*\n\nKiedy: \$date\n\nUczestnicy: \$attendees\n\n.W załączeniu plik w formacie iCalendar zawierający zaktualizowane szczegóły zdarzenia, który można zaimportować do Pana/Pani kalendarza.";
-$labels['eventcancelsubject'] = '"$title" zostało anulowane';
-$labels['eventcancelmailbody'] = "*\$title*\n\nKiedy: \$date\n\nUczestnicy: \$attendees\n\nZdarzenie zostało anulowane przez \$organizer.\n\n.W załączeniu plik w formacie iCalendar zawierający zaktualizowane szczegóły zdarzenia.";
-
-// invitation handling
-$labels['itipinvitation'] = 'Zaproszenie dla';
-$labels['itipupdate'] = 'Aktualizacja do';
-$labels['itipcancellation'] = 'Anulowano:';
-$labels['itipreply'] = 'Odpowiedź do';
-$labels['itipaccepted'] = 'Akceptuj';
-$labels['itiptentative'] = 'Może';
-$labels['itipdeclined'] = 'Odrzuć';
-$labels['itipsubjectaccepted'] = '"$title" zostało zaakceptowane przez $name';
-$labels['itipsubjecttentative'] = '"$title" zostało warunkowo zaakceptowane $name';
-$labels['itipsubjectdeclined'] = '"$title" zostało odrzucone przez $name';
-$labels['itipmailbodyaccepted'] = "\$sender zaakceptował zaproszenie na następującego zdarzenie:\n\n*\$title*\n\nKiedy: \$date\n\nUczestnicy: \$attendees";
-$labels['itipmailbodytentative'] = "\$sender warunkowo zaakceptował zaproszenie na następujące zdarzenie:\n\n*\$title*\n\nKiedy: \$date\n\nUczestnicy: \$attendees";
-$labels['itipmailbodydeclined'] = "\$sender odrzucił zaproszenie na następujące zdarzenie:\n\n*\$title*\n\nKiedy: \$date\n\nUczestnicy: \$attendees";
-$labels['itipdeclineevent'] = 'Czy chcesz odrzucić zaproszenie na to zdarzenie?';
-$labels['importtocalendar'] = 'Zapisz w moim kalendarzu';
-$labels['removefromcalendar'] = 'Usuń z mojego kalendarza';
-$labels['updateattendeestatus'] = 'Aktualizuj status uczestników';
-$labels['acceptinvitation'] = 'Czy akceptujesz to zaproszenie?';
-$labels['youhaveaccepted'] = 'Zaakceptowałeś to zaproszenie';
-$labels['youhavetentative'] = 'Zaakceptowałeś warunkowo to zaproszenie';
-$labels['youhavedeclined'] = 'Odrzuciłeś to zaproszenie';
-$labels['notanattendee'] = 'Nie znajdujesz się na liście uczestników tego zdarzenia';
-$labels['eventcancelled'] = 'Zdarzenie zostało anulowane';
-$labels['saveincalendar'] = 'zapisz w';
-
-// event dialog tabs
 $labels['tabsummary'] = 'Podsumowanie';
-$labels['tabrecurrence'] = 'Powtarzalność';
-$labels['tabattendees'] = 'Uczestnicy';
 $labels['tabattachments'] = 'Załączniki';
-$labels['tabsharing'] = 'Udostępnianie';
-
-// messages
-$labels['deleteventconfirm'] = 'Czy na pewno chcesz usunąć to zdarzenie?';
-$labels['deletecalendarconfirm'] = 'Czy na pewno chcesz usunąć ten kalendarz wraz z wszystkimi zdarzeniami?';
-$labels['savingdata'] = 'Zapisywanie danych...';
-$labels['errorsaving'] = 'Nie udało się zapisanie zmian.';
-$labels['operationfailed'] = 'Żądana operacja nie powiodła się.';
-$labels['invalideventdates'] = 'Wprowadzono błędne daty! Sprawdź dane w formularzu.';
-$labels['invalidcalendarproperties'] = 'Błędne właściwości kalendarza! Proszę podać poprawną datę.';
-$labels['searchnoresults'] = 'Nie znaleziono zdarzeń w wybranym kalendarzu.';
-$labels['successremoval'] = 'Zdarzenie zostało usunięte pomyślnie.';
-$labels['successrestore'] = 'Zdarzenie zostało odtworzone pomyślnie.';
-$labels['errornotifying'] = 'Nie udało się wysłać powiadomień do uczestników';
-$labels['errorimportingevent'] = 'Nie powódł się import zdarzenia';
-$labels['newerversionexists'] = 'Nowsza wersja tego zdarzenia już istnieje! Przerwano.';
-$labels['nowritecalendarfound'] = 'Nie znaleziono kalendarza do zapisu zdarzenia';
-$labels['importedsuccessfully'] = 'Zdarzenie zostało pomyślnie zapisane w \'$calendar\'';
-$labels['attendeupdateesuccess'] = 'Pomyślnie zaktualizowano status uczestnika';
-$labels['itipresponseerror'] = 'Nie udało się wysłać odpowiedzi na to zaproszenie';
-$labels['itipinvalidrequest'] = 'To zaproszenie nie jest już aktualne';
-$labels['sentresponseto'] = 'Pomyślnie wysłano odpowiedź na zaproszenie do $mailto';
-$labels['localchangeswarning'] = 'Próbujesz dokonać zmian, które będą widoczne tylko w twoim prywatnym kalendarzu';
-$labels['importsuccess'] = 'Pomyślnie zaimportowano $nr zdarzeń';
-$labels['importnone'] = 'Nie znaleziono zdarzeń do importu';
-$labels['importerror'] = 'Wystąpił błąd podczas operacji importu.';
-
-// recurrence form
-$labels['repeat'] = 'Powtórz';
-$labels['frequency'] = 'Częstotliwość';
-$labels['never'] = 'nigdy';
-$labels['daily'] = 'codziennie';
-$labels['weekly'] = 'co tydzień';
-$labels['monthly'] = 'co miesiąc';
-$labels['yearly'] = 'co rok';
-$labels['every'] = 'Każdego';
-$labels['days'] = 'dni(a)';
-$labels['weeks'] = 'tygodni(a)';
-$labels['months'] = 'miesięcy';
-$labels['years'] = 'lat w:';
-$labels['bydays'] = 'W';
-$labels['untildate'] = 'Do';
-$labels['each'] = 'Każdy';
-$labels['onevery'] = 'W każdy';
-$labels['onsamedate'] = 'W tej samej dacie';
-$labels['forever'] = 'zawsze';
-$labels['recurrencend'] = 'aż do';
-$labels['forntimes'] = '$nr raz(y)';
-$labels['first'] = 'pierwszy';
-$labels['second'] = 'drugi';
-$labels['third'] = 'trzeci';
-$labels['fourth'] = 'czwarty';
-$labels['last'] = 'ostatni';
-$labels['dayofmonth'] = 'Dzień miesiąca';
-
-$labels['changeeventconfirm'] = 'Zmień zdarzenie';
-$labels['removeeventconfirm'] = 'Usuń zdarzenie';
-$labels['changerecurringeventwarning'] = 'To jest zdarzenie powtarzające się. Czy chesz zmienić tylko bieżące wystąpienie, to i wszystkie przyszłe wystąpienia, czy wszystkie wystąpienia i zapisać je jako nowe zdarzenie?';
-$labels['removerecurringeventwarning'] = 'To jest zdarzenie powtarzające się. Czy chesz usunąć tylko bieżące wystąpienie, to i wszystkie przyszłe wystąpienia, czy wszystkie wystąpienia tego zdarzenie?';
-$labels['currentevent'] = 'Bieżące';
-$labels['futurevents'] = 'Przyszłe';
+$labels['savingdata'] = 'Zapisuję dane...';
 $labels['allevents'] = 'Wszystkie';
-$labels['saveasnew'] = 'Zapisz jako nowy';
-
 ?>
diff --git a/plugins/calendar/localization/pt_BR.inc b/plugins/calendar/localization/pt_BR.inc
index 4d00697f..df82b9eb 100644
--- a/plugins/calendar/localization/pt_BR.inc
+++ b/plugins/calendar/localization/pt_BR.inc
@@ -1,38 +1,206 @@
 <?php
-/**
- * RoundCube Calendar
- *
- * Plugin to add a calendar to RoundCube.
- *
- * @version 0.2 BETA 2
- * @author Lazlo Westerhof
- * @url http://rc-calendar.lazlo.me
- * @licence GNU GPL
- * @copyright (c) 2010 Lazlo Westerhof - Netherlands
- *
- **/
-
-$labels = array();
-
-// config
 $labels['default_view'] = 'Visualização padrão';
 $labels['time_format'] = 'Formato da hora';
-$labels['timeslots'] = 'Caixas de tempo por hora';
+$labels['timeslots'] = 'Alocações de tempo por hora';
 $labels['first_day'] = 'Primeiro dia da semana';
-
-// calendar
+$labels['first_hour'] = 'Primeira hora a mostrar';
+$labels['workinghours'] = 'Horário de trabalho';
+$labels['add_category'] = 'Adicionar categoria';
+$labels['remove_category'] = 'Remover categoria';
+$labels['defaultcalendar'] = 'Criar novos eventos em';
+$labels['eventcoloring'] = 'Coloração de evento';
+$labels['coloringmode0'] = 'De acordo com o calendário';
+$labels['coloringmode1'] = 'De acordo com a categoria';
+$labels['coloringmode2'] = 'Calendário para esboço, categoria para conteúdo';
+$labels['coloringmode3'] = 'Categoria para esboço, calendário para conteúdo';
 $labels['calendar'] = 'Calendário';
+$labels['calendars'] = 'Calendários';
+$labels['category'] = 'Categoria';
+$labels['categories'] = 'Categorias';
+$labels['createcalendar'] = 'Criar novo calendário';
+$labels['editcalendar'] = 'Editar propriedades do calendário';
+$labels['name'] = 'Nome';
+$labels['color'] = 'Cor';
 $labels['day'] = 'Dia';
 $labels['week'] = 'Semana';
 $labels['month'] = 'Mês';
+$labels['agenda'] = 'Agenda';
+$labels['new'] = 'Novo';
 $labels['new_event'] = 'Novo evento';
 $labels['edit_event'] = 'Editar evento';
+$labels['edit'] = 'Editar';
 $labels['save'] = 'Gravar';
 $labels['remove'] = 'Remover';
 $labels['cancel'] = 'Cancelar';
+$labels['select'] = 'Selecionar';
+$labels['print'] = 'Imprimir';
+$labels['printtitle'] = 'Imprimir calendários';
 $labels['title'] = 'Sumário';
 $labels['description'] = 'Descrição';
-$labels['all-day'] = 'dia-a-dia';
-$labels['export'] = 'Exportar para ICS';
-$labels['category'] = 'Categoria';
+$labels['all-day'] = 'dia todo';
+$labels['export'] = 'Exportar';
+$labels['exporttitle'] = 'Exportar para iCalendar';
+$labels['location'] = 'Local';
+$labels['date'] = 'Data';
+$labels['start'] = 'Início';
+$labels['end'] = 'Término';
+$labels['selectdate'] = 'Escolha a data';
+$labels['freebusy'] = 'Mostrar me como';
+$labels['free'] = 'Disponível';
+$labels['busy'] = 'Ocupado';
+$labels['outofoffice'] = 'Fora de escritório';
+$labels['tentative'] = 'Tentativa';
+$labels['priority'] = 'Prioridade';
+$labels['sensitivity'] = 'Privacidade';
+$labels['public'] = 'público';
+$labels['private'] = 'privado';
+$labels['confidential'] = 'confidencial';
+$labels['alarms'] = 'Lembrete';
+$labels['generated'] = 'gerado em';
+$labels['printdescriptions'] = 'Descrições de impressão';
+$labels['parentcalendar'] = 'Inserir dentro';
+$labels['searchearlierdates'] = '« Procurar por eventos anteriores';
+$labels['searchlaterdates'] = 'Procurar por eventos posteriores »';
+$labels['andnmore'] = '$nr mais...';
+$labels['togglerole'] = 'Clique para alternar o papel';
+$labels['createfrommail'] = 'Salvar como evento';
+$labels['importevents'] = 'Importar eventos';
+$labels['importrange'] = 'Eventos de';
+$labels['onemonthback'] = '1 mês atrás';
+$labels['nmonthsback'] = '$nr meses atrás';
+$labels['showurl'] = 'Mostrar URL do calendário';
+$labels['showurldescription'] = 'Use o seguinte endereço para acessar (somente leitura) seu calendário em outras aplicações. Você pode copiar e colar este endereço em qualquer software de calendário que suporte o formato iCal.';
+$labels['listrange'] = 'Intervalo para exibir:';
+$labels['listsections'] = 'Dividir em:';
+$labels['smartsections'] = 'Seções inteligentes';
+$labels['until'] = 'até';
+$labels['today'] = 'Hoje';
+$labels['tomorrow'] = 'Amanhã';
+$labels['thisweek'] = 'Esta semana';
+$labels['nextweek'] = 'Próxima semana';
+$labels['thismonth'] = 'Este mês';
+$labels['nextmonth'] = 'Próximo mês';
+$labels['weekofyear'] = 'Semana';
+$labels['pastevents'] = 'Passado';
+$labels['futureevents'] = 'Futuro';
+$labels['showalarms'] = 'Mostrar alarmes';
+$labels['defaultalarmtype'] = 'Configuração de lembrete padrão';
+$labels['defaultalarmoffset'] = 'Horário padrão de lembrete';
+$labels['attendee'] = 'Participante';
+$labels['role'] = 'Papel';
+$labels['availability'] = 'Disp.';
+$labels['confirmstate'] = 'Situação';
+$labels['addattendee'] = 'Adicionar participante';
+$labels['roleorganizer'] = 'Organizador';
+$labels['rolerequired'] = 'Obrigatório';
+$labels['roleoptional'] = 'Opcional';
+$labels['availfree'] = 'Disponível';
+$labels['availbusy'] = 'Ocupado';
+$labels['availunknown'] = 'Desconhecido';
+$labels['availtentative'] = 'Tentativa';
+$labels['availoutofoffice'] = 'Fora de escritório';
+$labels['scheduletime'] = 'Procurar disponibilidade';
+$labels['sendinvitations'] = 'Enviar convites';
+$labels['sendnotifications'] = 'Avisar os participantes sobre as modificações';
+$labels['sendcancellation'] = 'Avisar os participantes sobre o cancelamento do evento';
+$labels['onlyworkinghours'] = 'Procurar disponibilidade dentro do meu horário de trabalho';
+$labels['reqallattendees'] = 'Obrigatório/todos os participantes';
+$labels['prevslot'] = 'Espaço anterior';
+$labels['nextslot'] = 'Próximo espaço';
+$labels['noslotfound'] = 'Incapaz de encontrar um horário disponível';
+$labels['invitationsubject'] = 'Você foi convidado para "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com todos os detalhes do evento na qual você pode importar para sua aplicação de calendário.";
+$labels['invitationattendlinks'] = "No caso do seu cliente de e-mail não suportar requisições iTIP você pode usar o link a seguir para aceitar ou recusar este convite:\n\$url";
+$labels['eventupdatesubject'] = '"$title" foi atualizado';
+$labels['eventupdatesubjectempty'] = 'Um evento do seu interesse foi atualizado';
+$labels['eventupdatemailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento na qual você pode importar para sua aplicação de calendário.";
+$labels['eventcancelsubject'] = '"$title" foi cancelado';
+$labels['eventcancelmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nO evento foi cancelado por \$organizer.\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento.";
+$labels['itipinvitation'] = 'Convite para';
+$labels['itipupdate'] = 'Atualização de';
+$labels['itipcancellation'] = 'Cancelado:';
+$labels['itipreply'] = 'Responder para';
+$labels['itipaccepted'] = 'Aceitar';
+$labels['itiptentative'] = 'Talvez';
+$labels['itipdeclined'] = 'Rejeitar';
+$labels['itipsubjectaccepted'] = '"$title" foi aceito por $name';
+$labels['itipsubjecttentative'] = '"$title" foi aceito como tentativa por $name';
+$labels['itipsubjectdeclined'] = '"$title" foi recusado por $name';
+$labels['itipmailbodyaccepted'] = "\$sender aceitou o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender aceitou como tentativa o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender recusou o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
+$labels['itipdeclineevent'] = 'Você deseja recusar o convite para este evento?';
+$labels['importtocalendar'] = 'Salvar em meu calendário';
+$labels['removefromcalendar'] = 'Remover do meu calendário';
+$labels['updateattendeestatus'] = 'Atualizar o estado dos participantes';
+$labels['acceptinvitation'] = 'Você aceita este convite?';
+$labels['youhaveaccepted'] = 'Você aceitou este convite';
+$labels['youhavetentative'] = 'Você aceitou como tentativa este convite';
+$labels['youhavedeclined'] = 'Você recusou este convite';
+$labels['notanattendee'] = 'Você não está listado como um participante deste evento';
+$labels['eventcancelled'] = 'O evento foi cancelado';
+$labels['saveincalendar'] = 'salvar em';
+$labels['tabsummary'] = 'Sumário';
+$labels['tabrecurrence'] = 'Repetição';
+$labels['tabattendees'] = 'Participantes';
+$labels['tabattachments'] = 'Anexos';
+$labels['tabsharing'] = 'Compartilhamento';
+$labels['deleteventconfirm'] = 'Você realmente deseja remover este evento?';
+$labels['deletecalendarconfirm'] = 'Você realmente deseja excluir este calendário com todos os seus eventos?';
+$labels['savingdata'] = 'Salvando dados...';
+$labels['errorsaving'] = 'Falha ao salvar as modificações.';
+$labels['operationfailed'] = 'A operação requisitada falhou.';
+$labels['invalideventdates'] = 'Datas inválidas inseridas! Por favor verifique a inserção.';
+$labels['invalidcalendarproperties'] = 'Propriedades de calendário inválidas! Por favor defina um nome válido.';
+$labels['searchnoresults'] = 'Nenhum evento encontrado nos calendários selecionados.';
+$labels['successremoval'] = 'O evento foi excluído com sucesso.';
+$labels['successrestore'] = 'O evento foi restaurado com sucesso.';
+$labels['errornotifying'] = 'Falha ao enviar notificações para os participantes do evento.';
+$labels['errorimportingevent'] = 'Falha ao importar evento';
+$labels['newerversionexists'] = 'Já existe uma nova versão deste evento! Abortado.';
+$labels['nowritecalendarfound'] = 'Nenhum calendário encontrado para salvar o evento';
+$labels['importedsuccessfully'] = 'O evento foi adicionado com sucesso em \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'O status do participante foi atualizado com sucesso.';
+$labels['itipsendsuccess'] = 'Convite enviado aos participantes.';
+$labels['itipresponseerror'] = 'Falha ao enviar a resposta para este convite de evento';
+$labels['itipinvalidrequest'] = 'Este convite não é mais válido';
+$labels['sentresponseto'] = 'Resposta de convite enviada com sucesso para $mailto';
+$labels['importsuccess'] = 'Importado com sucesso $nr eventos';
+$labels['importnone'] = 'Não há eventos a serem importados';
+$labels['importerror'] = 'Ocorreu um erro na importação';
+$labels['aclnorights'] = 'Você não tem permissão de administrador neste calendário.';
+$labels['repeat'] = 'Repetir';
+$labels['frequency'] = 'Repetir';
+$labels['never'] = 'nunca';
+$labels['daily'] = 'diariamente';
+$labels['weekly'] = 'semanalmente';
+$labels['monthly'] = 'mensalmente';
+$labels['yearly'] = 'anualmente';
+$labels['every'] = 'À cada';
+$labels['days'] = 'dia(s)';
+$labels['weeks'] = 'semana(s)';
+$labels['months'] = 'mês(es)';
+$labels['years'] = 'ano(s) em:';
+$labels['bydays'] = 'No';
+$labels['untildate'] = 'em';
+$labels['each'] = 'Cada';
+$labels['onevery'] = 'Em cada';
+$labels['onsamedate'] = 'Na mesma data';
+$labels['forever'] = 'nunca termina';
+$labels['recurrencend'] = 'até';
+$labels['forntimes'] = 'por $nr vez(es)';
+$labels['first'] = 'primeira';
+$labels['second'] = 'segunda';
+$labels['third'] = 'terceira';
+$labels['fourth'] = 'quarta';
+$labels['last'] = 'última';
+$labels['dayofmonth'] = 'Dia do mês';
+$labels['changeeventconfirm'] = 'Trocar evento';
+$labels['removeeventconfirm'] = 'Remover evento';
+$labels['changerecurringeventwarning'] = 'Este é um evento com repetição. Você gostaria de editar o evento atual somente, estas e todas as futuras ocorrências ou salvar este como um novo evento?';
+$labels['removerecurringeventwarning'] = 'Este é um evento com repetição. Você gostaria de remover o evento atual somente, estas e todas as futuras ocorrências ou todas as ocorrências deste evento?';
+$labels['currentevent'] = 'Atual';
+$labels['futurevents'] = 'Futuro';
+$labels['allevents'] = 'Todos';
+$labels['saveasnew'] = 'Salvar como novo';
 ?>
diff --git a/plugins/calendar/localization/ru_RU.inc b/plugins/calendar/localization/ru_RU.inc
index fa7f34ce..7e109d8b 100644
--- a/plugins/calendar/localization/ru_RU.inc
+++ b/plugins/calendar/localization/ru_RU.inc
@@ -1,45 +1,19 @@
 <?php
-/**
- * RoundCube Calendar
- *
- * Plugin to add a calendar to RoundCube.
- *
- * @version 0.2 BETA 2
- * @author Lazlo Westerhof
- * @url http://rc-calendar.lazlo.me
- * @licence GNU GPL
- * @copyright (c) 2010 Lazlo Westerhof - Netherlands
- *
- **/
-
-$labels = array();
-
-// config
-$labels['time_format'] = 'Формат времени';
-$labels['timeslots'] = 'Промежутков в час';
-$labels['first_day'] = 'Первый день недели';
 $labels['default_view'] = 'Вид по умолчанию';
+$labels['time_format'] = 'Формат времени';
+$labels['timeslots'] = 'Промежутков в часу';
+$labels['first_day'] = 'Первый день недели';
+$labels['first_hour'] = 'Показывать начиная с';
 $labels['workinghours'] = 'Рабочие часы';
 $labels['add_category'] = 'Добавить категорию';
 $labels['remove_category'] = 'Удалить категорию';
-$labels['defaultcalendar'] = 'Создать новое событие в';
+$labels['defaultcalendar'] = 'Создавать новое событие в';
 $labels['eventcoloring'] = 'Цвет события';
 $labels['coloringmode0'] = 'Согласно цвета календаря';
 $labels['coloringmode1'] = 'Согласно цвета категории';
-$labels['coloringmode2'] = 'Календарь для внешних, категория для внутренних цветов';
-$labels['coloringmode3'] = 'Категория для внешних, календарь для внутренних цветов';
-
-
-// calendar
+$labels['coloringmode2'] = 'Цвет календаря для рамки, цвет категории для фона';
+$labels['coloringmode3'] = 'Цвет категории для рамки, цвет календаря для фона';
 $labels['calendar'] = 'Календарь';
-$labels['day'] = 'День';
-$labels['week'] = 'Неделя';
-$labels['month'] = 'Месяц';
-$labels['new_event'] = 'Новое событие';
-$labels['edit_event'] = 'Изменить событие';
-$labels['save'] = 'Сохранить';
-$labels['remove'] = 'Удалить';
-$labels['cancel'] = 'Завершить';
 $labels['calendars'] = 'Календари';
 $labels['category'] = 'Категория';
 $labels['categories'] = 'Категории';
@@ -47,15 +21,23 @@ $labels['createcalendar'] = 'Создать новый календарь';
 $labels['editcalendar'] = 'Редактировать свойства календаря';
 $labels['name'] = 'Имя';
 $labels['color'] = 'Цвет';
+$labels['day'] = 'День';
+$labels['week'] = 'Неделя';
+$labels['month'] = 'Месяц';
 $labels['agenda'] = 'Список';
 $labels['new'] = 'Новый';
+$labels['new_event'] = 'Новое событие';
+$labels['edit_event'] = 'Изменить событие';
 $labels['edit'] = 'Редактировать';
+$labels['save'] = 'Сохранить';
+$labels['remove'] = 'Удалить';
+$labels['cancel'] = 'Отмена';
 $labels['select'] = 'Выбрать';
 $labels['print'] = 'Распечатать';
 $labels['printtitle'] = 'Распечатать календарь';
-$labels['title'] = 'Название мероприятия';
+$labels['title'] = 'Сводка';
 $labels['description'] = 'Описание';
-$labels['all-day'] = 'целый день';
+$labels['all-day'] = 'весь день';
 $labels['export'] = 'Экспорт';
 $labels['exporttitle'] = 'Экспорт в iCalendar';
 $labels['location'] = 'Место';
@@ -67,32 +49,29 @@ $labels['freebusy'] = 'Показать как';
 $labels['free'] = 'Свободен';
 $labels['busy'] = 'Занят';
 $labels['outofoffice'] = 'Вне офиса';
-$labels['tentative'] = 'Предварительно';
+$labels['tentative'] = 'Неопределённо';
 $labels['priority'] = 'Приоритет';
 $labels['sensitivity'] = 'Секретность';
-$labels['public'] = 'Общедоступная';
-$labels['private'] = 'Личная';
-$labels['confidential'] = 'Конфиденциальная';
+$labels['public'] = 'общедоступная';
+$labels['private'] = 'личная';
+$labels['confidential'] = 'конфиденциальная';
 $labels['alarms'] = 'Напоминание';
-$labels['generated'] = 'generated at';
-$labels['printdescriptions'] = 'Распечатать описание';
+$labels['generated'] = 'создан';
+$labels['printdescriptions'] = 'Печатать описания';
 $labels['parentcalendar'] = 'Вставить внутри';
-$labels['searchearlierdates'] = 'В« Искать для ранних событий';
-$labels['searchlaterdates'] = 'Искать для поздних событий В»';
+$labels['searchearlierdates'] = '« Искать события раньше';
+$labels['searchlaterdates'] = 'Искать события позже »';
 $labels['andnmore'] = '$nr больше...';
-$labels['showmore'] = 'Показать больше...';
 $labels['togglerole'] = 'Кликните для переключения роли';
 $labels['createfrommail'] = 'Сохранить как событие';
 $labels['importevents'] = 'Импортировать события';
-$labels['importrange'] = 'События с';
+$labels['importrange'] = 'События начиная с';
 $labels['onemonthback'] = '1 месяц назад';
-$labels['nmonthsback'] = '$nr месяцев назад';
+$labels['nmonthsback'] = '$nr месяца(ев) назад';
 $labels['showurl'] = 'Показать URL календаря';
-$labels['showurldescription'] = 'Используйте следующий адрес для доступа к Вашему календарю из других приложений. Вы можете скопировать и вставить это в любое приложение которое поддерживает формат iCal.';
-
-// agenda view
+$labels['showurldescription'] = 'Используйте следующий адрес для просмотра Вашего календаря из других приложений. Вы можете скопировать и вставить это в любое приложение которое поддерживает формат iCal.';
 $labels['listrange'] = 'Диапазон:';
-$labels['listsections'] = 'Разделитесь на:';
+$labels['listsections'] = 'Разделить на:';
 $labels['smartsections'] = 'Умные секции';
 $labels['until'] = 'до';
 $labels['today'] = 'Сегодня';
@@ -102,15 +81,11 @@ $labels['nextweek'] = 'Следующая неделя';
 $labels['thismonth'] = 'Этот месяц';
 $labels['nextmonth'] = 'Следующий месяц';
 $labels['weekofyear'] = 'Неделя';
-$labels['pastevents'] = 'Прошлое';
-$labels['futureevents'] = 'Будующее';
-
-// alarm/reminder settings
-$labels['showalarms'] = 'Показать уведомление';
+$labels['pastevents'] = 'Прошедшее';
+$labels['futureevents'] = 'Будущее';
+$labels['showalarms'] = 'Показывать напоминания';
 $labels['defaultalarmtype'] = 'Настройки напоминания по умолчанию';
 $labels['defaultalarmoffset'] = 'Время напоминания по умолчанию';
-
-// attendees
 $labels['attendee'] = 'Участник';
 $labels['role'] = 'Роль';
 $labels['availability'] = 'Доступность';
@@ -118,35 +93,32 @@ $labels['confirmstate'] = 'Статус';
 $labels['addattendee'] = 'Добавить участника';
 $labels['roleorganizer'] = 'Организатор';
 $labels['rolerequired'] = 'Обязательный';
-$labels['roleoptional'] = 'Опциональный';
-$labels['rolechair'] = 'Наблюдатель';
+$labels['roleoptional'] = 'Необязательный';
 $labels['availfree'] = 'Свободен';
 $labels['availbusy'] = 'Занят';
 $labels['availunknown'] = 'Неизвестно';
 $labels['availtentative'] = 'Предварительно';
 $labels['availoutofoffice'] = 'Вне офиса';
 $labels['scheduletime'] = 'Найти доступность';
-$labels['sendinvitations'] = 'Отправить приглашение';
+$labels['sendinvitations'] = 'Отправить приглашения';
 $labels['sendnotifications'] = 'Уведомить участников об изменениях';
 $labels['sendcancellation'] = 'Уведомить участников об отмене события';
-$labels['onlyworkinghours'] = 'Найти возможность в мои рабочие часы';
+$labels['onlyworkinghours'] = 'Найти доступность в мои рабочие часы';
 $labels['reqallattendees'] = 'Необходимые/все участники';
 $labels['prevslot'] = 'Предыдущее время';
 $labels['nextslot'] = 'Следующее время';
 $labels['noslotfound'] = 'Невозможно найти свободное время';
 $labels['invitationsubject'] = 'Вы приглашены на "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nПожалуйста найдите вложения в iCalendar файл со всеми деталями события которое Вы можете импортировать в вашу программу календаря.";
-$labels['invitationattendlinks'] = "В случае, если Ваш почтовый клиент не поддерживает запросы iTip, Вы можете использовать ссылку, чтобы принять или отклонить это приглашение:\n\$url";
+$labels['invitationmailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nВо вложении вы найдёте файл iCalendar со всеми деталями события, который Вы можете импортировать в Вашу программу-ежедневник.";
+$labels['invitationattendlinks'] = "В случае, если Ваш почтовый клиент не поддерживает запросы iTip, Вы можете использовать ссылку данную ниже, чтобы принять или отклонить это приглашение:\n\$url";
 $labels['eventupdatesubject'] = '"$title" было обновлено';
-$labels['eventupdatesubjectempty'] = 'Событие, которое касается Вас было обновлено';
-$labels['eventupdatemailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nПожалуйста найдите вложения в iCalendar файл со всеми деталями события которое Вы можете импортировать в вашу программу календаря.";
+$labels['eventupdatesubjectempty'] = 'Событие, которое касается Вас, было обновлено';
+$labels['eventupdatemailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nВо вложении вы найдёте файл iCalendar со всеми изменениями в событии, который Вы можете импортировать в Вашу программу-ежедневник.";
 $labels['eventcancelsubject'] = '"$title" было отменено';
-$labels['eventcancelmailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nЭто событие отменено \$organizer.\n\nПожалуйста посмотрите вложение в iCalendar файл которое обновит детали события.";
-
-// invitation handling
+$labels['eventcancelmailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nЭто событие отменено \$organizer.\n\nВо вложении вы найдёте файл iCalendar со всеми изменениями в событии.";
 $labels['itipinvitation'] = 'Приглашение на';
 $labels['itipupdate'] = 'Обновление';
-$labels['itipcancellation'] = 'Отмененный:';
+$labels['itipcancellation'] = 'Отменённый:';
 $labels['itipreply'] = 'Ответить';
 $labels['itipaccepted'] = 'Принять';
 $labels['itiptentative'] = 'Может быть';
@@ -154,9 +126,9 @@ $labels['itipdeclined'] = 'Отклонить';
 $labels['itipsubjectaccepted'] = '"$title" принято $name';
 $labels['itipsubjecttentative'] = '"$title" предварительно принято $name';
 $labels['itipsubjectdeclined'] = '"$title" отклонено $name';
-$labels['itipmailbodyaccepted'] = "\$sender принял приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
-$labels['itipmailbodytentative'] = "\$sender предварительно принял приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
-$labels['itipmailbodydeclined'] = "\$sender отклонил приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
+$labels['itipmailbodyaccepted'] = "\$sender принял(а) приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender предварительно принял(а) приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender отклонил(а) приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
 $labels['itipdeclineevent'] = 'Вы хотите отклонить приглашение на это событие?';
 $labels['importtocalendar'] = 'Сохранить в мой календарь';
 $labels['removefromcalendar'] = 'Удалить из моего календаря';
@@ -165,44 +137,38 @@ $labels['acceptinvitation'] = 'Вы принимаете это приглаше
 $labels['youhaveaccepted'] = 'Вы приняли это приглашение';
 $labels['youhavetentative'] = 'Вы предварительно приняли это приглашение';
 $labels['youhavedeclined'] = 'Вы отклонили это приглашение';
-$labels['notanattendee'] = 'Вы не в списке этого события';
+$labels['notanattendee'] = 'Вы не в списке участников этого события';
 $labels['eventcancelled'] = 'Это событие отменено';
 $labels['saveincalendar'] = 'сохранить в';
-
-// event dialog tabs
 $labels['tabsummary'] = 'Сводка';
 $labels['tabrecurrence'] = 'Повторение';
 $labels['tabattendees'] = 'Участники';
 $labels['tabattachments'] = 'Вложения';
 $labels['tabsharing'] = 'Совместное использование';
-
-// messages
 $labels['deleteventconfirm'] = 'Вы действительно хотите удалить это событие?';
 $labels['deletecalendarconfirm'] = 'Вы действительно хотите удалить этот календарь со всеми его событиями?';
 $labels['savingdata'] = 'Сохранение данных...';
 $labels['errorsaving'] = 'Ошибка сохранения изменений.';
-$labels['operationfailed'] = 'Ошибка запрошенной операции.';
+$labels['operationfailed'] = 'Не удалось выполнить запрошенную операцию.';
 $labels['invalideventdates'] = 'Неверная дата! Пожалуйста проверьте данные.';
 $labels['invalidcalendarproperties'] = 'Неверные свойства календаря! Пожалуйста введите допустимые данные.';
-$labels['searchnoresults'] = 'Событие не найдено в выбранном календаре.';
-$labels['successremoval'] = 'Это событие успешно удалено.';
-$labels['successrestore'] = 'Это событие успешно восстановлено.';
-$labels['errornotifying'] = 'Ошибка в отправке уведомления участникам событий';
-$labels['errorimportingevent'] = 'Ошибка при импорте события';
-$labels['newerversionexists'] = 'Новая версия этого события уже существует! Отменено.';
+$labels['searchnoresults'] = 'Событие не найдено в выбранных календарях.';
+$labels['successremoval'] = 'Событие успешно удалено.';
+$labels['successrestore'] = 'Событие успешно восстановлено.';
+$labels['errornotifying'] = 'Не удалось отправить уведомления участникам событий';
+$labels['errorimportingevent'] = 'Не удалось импортировать событие';
+$labels['newerversionexists'] = 'Обновлённая версия этого события уже существует! Отменено.';
 $labels['nowritecalendarfound'] = 'Не найден календарь для записи этого события';
-$labels['importedsuccessfully'] = 'Это событие успешно добавлено в \'$calendar\'';
-$labels['attendeupdateesuccess'] = 'Успешно обновлен статус участников';
-$labels['itipresponseerror'] = 'Невозможно послать ответ на это приглашение';
+$labels['importedsuccessfully'] = 'Событие успешно добавлено в \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Успешно обновлен статус участника';
+$labels['itipsendsuccess'] = 'Приглашания отправлены участникам.';
+$labels['itipresponseerror'] = 'Не удалось послать ответ на это приглашение';
 $labels['itipinvalidrequest'] = 'Это приглашение больше не действительно';
 $labels['sentresponseto'] = 'Успешно отправлен ответ на приглашение на $mailto';
-$labels['localchangeswarning'] = 'Вы собираетесь внести изменения, которые будут только отражены на Вашем личном календаре';
-$labels['importsuccess'] = 'Успешно импортированы $nr событий';
+$labels['importsuccess'] = 'Успешно импортировано $nr событий';
 $labels['importnone'] = 'Не найдено событий для импорта';
 $labels['importerror'] = 'Ошибка при импорте';
 $labels['aclnorights'] = 'Вы не имеете прав администратора для этого календаря.';
-
-// recurrence form
 $labels['repeat'] = 'Повторить';
 $labels['frequency'] = 'Повторить';
 $labels['never'] = 'никогда';
@@ -210,26 +176,25 @@ $labels['daily'] = 'ежедневно';
 $labels['weekly'] = 'еженедельно';
 $labels['monthly'] = 'ежемесячно';
 $labels['yearly'] = 'ежегодно';
-$labels['every'] = 'Каждый';
-$labels['days'] = 'дней';
-$labels['weeks'] = 'недели';
-$labels['months'] = 'месяцы';
-$labels['years'] = 'годы в:';
-$labels['bydays'] = 'На';
-$labels['untildate'] = 'до числа';
-$labels['each'] = 'Каждый';
-$labels['onevery'] = 'На каждом';
+$labels['every'] = 'Каждый(ую)';
+$labels['days'] = 'день';
+$labels['weeks'] = 'неделю';
+$labels['months'] = 'месяц';
+$labels['years'] = 'год в:';
+$labels['bydays'] = 'В';
+$labels['untildate'] = 'до';
+$labels['each'] = 'Каждого';
+$labels['onevery'] = 'В';
 $labels['onsamedate'] = 'В ту же самую дату';
 $labels['forever'] = 'всегда';
-$labels['recurrencend'] = 'продолжительность';
-$labels['forntimes'] = '$nr дней';
-$labels['first'] = 'первое';
-$labels['second'] = 'второе';
-$labels['third'] = 'третье';
-$labels['fourth'] = 'четвертое';
-$labels['last'] = 'последнее';
+$labels['recurrencend'] = 'Повторять';
+$labels['forntimes'] = '$nr раз(а)';
+$labels['first'] = 'первый(ую)';
+$labels['second'] = 'вторый(ую)';
+$labels['third'] = 'третий(ую)';
+$labels['fourth'] = 'четвертый(ую)';
+$labels['last'] = 'последний(ую)';
 $labels['dayofmonth'] = 'День месяца';
-
 $labels['changeeventconfirm'] = 'Изменить событие';
 $labels['removeeventconfirm'] = 'Удалить событие';
 $labels['changerecurringeventwarning'] = 'Это - повторяющееся событие. Хотели бы Вы редактировать только текущее событие, это и все будущие повторения, все события или сохранять его как новое событие?';
@@ -238,5 +203,4 @@ $labels['currentevent'] = 'Текущее';
 $labels['futurevents'] = 'Будущие';
 $labels['allevents'] = 'Все';
 $labels['saveasnew'] = 'Сохранить как новое';
-
 ?>
diff --git a/plugins/kolab_activesync/localization/bg_BG.inc b/plugins/kolab_activesync/localization/bg_BG.inc
new file mode 100644
index 00000000..fcfbc0d4
--- /dev/null
+++ b/plugins/kolab_activesync/localization/bg_BG.inc
@@ -0,0 +1,26 @@
+<?php
+$labels['tabtitle'] = 'Activesync';
+$labels['devices'] = 'Устройства';
+$labels['devicealias'] = 'Име на устройство';
+$labels['syncmode'] = 'Режим на синхронизация';
+$labels['modeauto'] = 'Автоматично определяне';
+$labels['synchronize'] = 'Синхронизиране';
+$labels['withalarms'] = 'С аларми';
+$labels['syncsettings'] = 'Настройки на синхронизация';
+$labels['deviceconfig'] = 'Конфигуриране на устройството';
+$labels['folderstosync'] = 'Папки за синхронизиране';
+$labels['mail'] = 'Електронна поща';
+$labels['contact'] = 'Адресни книги';
+$labels['event'] = 'Календари';
+$labels['task'] = 'Задачи';
+$labels['note'] = 'Бележки';
+$labels['configuration'] = 'Конфигурация';
+$labels['deletedevice'] = 'Изтриване на устройство';
+$labels['imageformat'] = 'Формат на картинка';
+$labels['laxpiclabel'] = 'Разрешаване на PNG и GIF картинки';
+$labels['savingdata'] = 'Запазване на данни...';
+$labels['savingerror'] = 'Неуспех при запазване на конфигурацията';
+$labels['devicedeleteconfirm'] = 'Наистина ли искате да изтриете конфигурацията за това устройство?';
+$labels['successfullydeleted'] = 'Конфигурацията за устройството беше премахната успешно';
+$labels['devicenotfound'] = 'Невъзможно прочитането на конфигурацията на устройството';
+?>
diff --git a/plugins/kolab_activesync/localization/cs_CZ.inc b/plugins/kolab_activesync/localization/cs_CZ.inc
new file mode 100644
index 00000000..00aa1f55
--- /dev/null
+++ b/plugins/kolab_activesync/localization/cs_CZ.inc
@@ -0,0 +1,5 @@
+<?php
+$labels['mail'] = 'E-mail';
+$labels['event'] = 'Kalendáře';
+$labels['savingdata'] = 'Ukládám data...';
+?>
diff --git a/plugins/kolab_activesync/localization/de_CH.inc b/plugins/kolab_activesync/localization/de_CH.inc
index af49b934..fe0bf04b 100644
--- a/plugins/kolab_activesync/localization/de_CH.inc
+++ b/plugins/kolab_activesync/localization/de_CH.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Geräte';
 $labels['devicealias'] = 'Gerätename';
@@ -18,14 +16,14 @@ $labels['contact'] = 'Kontakte';
 $labels['event'] = 'Kalender';
 $labels['task'] = 'Aufgaben';
 $labels['note'] = 'Notizen';
+$labels['configuration'] = 'Konfiguration';
 $labels['deletedevice'] = 'Gerät löschen';
 $labels['imageformat'] = 'Bildformat';
 $labels['laxpiclabel'] = 'PNG- und GIF-Bilder erlauben';
-$labels['nodevices'] = 'Es sind noch keine Geräte registriert.<br/><br/>Um ein neues Gerät anzumelden, verbinden Sie dieses zuerst mit dem Server. Eine Anleitung dazu finden Sie im <a href="http://wiki.kolab.org/Setup_ActiveSync">Wiki</a>. Anschliessend laden Sie diese Seite neu und das Gerät wird hier aufgelistet.';
 $labels['savingdata'] = 'Daten werden gespeichert...';
 $labels['savingerror'] = 'Fehler beim Speichern';
 $labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
 $labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
 $labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
-
+$labels['devicenotfound'] = 'Es kann nicht auf die Gerätekonfiguration zugegriffen werden';
 ?>
diff --git a/plugins/kolab_activesync/localization/de_DE.inc b/plugins/kolab_activesync/localization/de_DE.inc
index af49b934..3f85b833 100644
--- a/plugins/kolab_activesync/localization/de_DE.inc
+++ b/plugins/kolab_activesync/localization/de_DE.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Geräte';
 $labels['devicealias'] = 'Gerätename';
@@ -18,14 +16,14 @@ $labels['contact'] = 'Kontakte';
 $labels['event'] = 'Kalender';
 $labels['task'] = 'Aufgaben';
 $labels['note'] = 'Notizen';
+$labels['configuration'] = 'Konfiguration';
 $labels['deletedevice'] = 'Gerät löschen';
 $labels['imageformat'] = 'Bildformat';
 $labels['laxpiclabel'] = 'PNG- und GIF-Bilder erlauben';
-$labels['nodevices'] = 'Es sind noch keine Geräte registriert.<br/><br/>Um ein neues Gerät anzumelden, verbinden Sie dieses zuerst mit dem Server. Eine Anleitung dazu finden Sie im <a href="http://wiki.kolab.org/Setup_ActiveSync">Wiki</a>. Anschliessend laden Sie diese Seite neu und das Gerät wird hier aufgelistet.';
 $labels['savingdata'] = 'Daten werden gespeichert...';
 $labels['savingerror'] = 'Fehler beim Speichern';
 $labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
 $labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
 $labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
-
+$labels['devicenotfound'] = 'Es kann nicht auf die Gerätekonfiguration zugegriffen werden.';
 ?>
diff --git a/plugins/kolab_activesync/localization/es_ES.inc b/plugins/kolab_activesync/localization/es_ES.inc
index b7eb3663..ae64b4d2 100644
--- a/plugins/kolab_activesync/localization/es_ES.inc
+++ b/plugins/kolab_activesync/localization/es_ES.inc
@@ -1,33 +1,9 @@
 <?php
-
-$labels = array();
-$labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Devices';
-$labels['devicealias'] = 'Device name';
-$labels['syncmode'] = 'Sync Mode';
-$labels['modeauto'] = 'Determine automatically';
-$labels['modeflat'] = 'Force flat mode';
-$labels['modefolder'] = 'Force folder mode';
-$labels['synchronize'] = 'Synchronize';
-$labels['withalarms'] = 'With alarms';
-$labels['syncsettings'] = 'Synchronization settings';
-$labels['deviceconfig'] = 'Device configration';
-$labels['folderstosync'] = 'Folders to synchronize';
 $labels['mail'] = 'Correo electrónico';
 $labels['contact'] = 'Libreta de direcciones';
 $labels['event'] = 'Calendarios';
 $labels['task'] = 'Tareas';
 $labels['note'] = 'Notas';
 $labels['configuration'] = 'Configuración';
-$labels['deletedevice'] = 'Delete device';
-$labels['imageformat'] = 'Image format';
-$labels['laxpiclabel'] = 'Allow PNG and GIF images';
-$labels['nodevices'] = 'There are currently no devices registered.<br/><br/>In order to register a device, please connect it to the server first, using <a href="http://wiki.kolab.org/Setup_ActiveSync">the instructions in the Wiki</a>. Afterwards the device should become available for configuration here.';
 $labels['savingdata'] = 'Guardando datos...';
-$labels['savingerror'] = 'Failed to save configuration';
-$labels['notsupported'] = 'Your server does not support metadata/annotations';
-$labels['devicedeleteconfirm'] = 'Do you really want to delete the configuration for this device?';
-$labels['successfullydeleted'] = 'The device configuration was successfully removed';
-$labels['devicenotfound'] = 'Unable to read device configuration';
-
 ?>
diff --git a/plugins/kolab_activesync/localization/et_EE.inc b/plugins/kolab_activesync/localization/et_EE.inc
index 6ea633d3..421ee327 100644
--- a/plugins/kolab_activesync/localization/et_EE.inc
+++ b/plugins/kolab_activesync/localization/et_EE.inc
@@ -1,33 +1,3 @@
 <?php
-
-$labels = array();
-$labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Devices';
-$labels['devicealias'] = 'Device name';
-$labels['syncmode'] = 'Sync Mode';
-$labels['modeauto'] = 'Determine automatically';
-$labels['modeflat'] = 'Force flat mode';
-$labels['modefolder'] = 'Force folder mode';
-$labels['synchronize'] = 'Synchronize';
-$labels['withalarms'] = 'With alarms';
-$labels['syncsettings'] = 'Synchronization settings';
-$labels['deviceconfig'] = 'Device configration';
-$labels['folderstosync'] = 'Folders to synchronize';
 $labels['mail'] = 'E-post';
-$labels['contact'] = 'Address Books';
-$labels['event'] = 'Calendars';
-$labels['task'] = 'Tasks';
-$labels['note'] = 'Notes';
-$labels['configuration'] = 'Configuration';
-$labels['deletedevice'] = 'Delete device';
-$labels['imageformat'] = 'Image format';
-$labels['laxpiclabel'] = 'Allow PNG and GIF images';
-$labels['nodevices'] = 'There are currently no devices registered.<br/><br/>In order to register a device, please connect it to the server first, using <a href="http://wiki.kolab.org/Setup_ActiveSync">the instructions in the Wiki</a>. Afterwards the device should become available for configuration here.';
-$labels['savingdata'] = 'Saving data...';
-$labels['savingerror'] = 'Failed to save configuration';
-$labels['notsupported'] = 'Your server does not support metadata/annotations';
-$labels['devicedeleteconfirm'] = 'Do you really want to delete the configuration for this device?';
-$labels['successfullydeleted'] = 'The device configuration was successfully removed';
-$labels['devicenotfound'] = 'Unable to read device configuration';
-
 ?>
diff --git a/plugins/kolab_activesync/localization/fr_FR.inc b/plugins/kolab_activesync/localization/fr_FR.inc
index 01614d9c..934b1bf3 100644
--- a/plugins/kolab_activesync/localization/fr_FR.inc
+++ b/plugins/kolab_activesync/localization/fr_FR.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Périphériques';
 $labels['devicealias'] = 'Nom du Périphérique';
@@ -22,12 +20,10 @@ $labels['configuration'] = 'Configuration';
 $labels['deletedevice'] = 'Supprimer ce périphérique';
 $labels['imageformat'] = 'Format d\'image';
 $labels['laxpiclabel'] = 'Autoriser les images PNG et GIF';
-$labels['nodevices'] = 'Il n\'y a actuellement pas de périphérique enregistrés.<br/><br/>Pour enregistrer un périphérique, merci de d\'abord le connecter au serveur, en suivant <a href="http://wiki.kolab.org/Setup_ActiveSync">les instructions sur le Wiki</a>. Ensuite le périphérique sera accessible ici pour sa configuration.';
 $labels['savingdata'] = 'Enregistrer...';
 $labels['savingerror'] = 'Échec de l\'enregistrement de la configuration';
 $labels['notsupported'] = 'Votre serveur ne supporte pas les métadonnées ou les annotations';
 $labels['devicedeleteconfirm'] = 'Voulez-vous vraiment supprimer la configuration de ce périphérique?';
 $labels['successfullydeleted'] = 'La configuration de ce périphérique a été supprimée';
 $labels['devicenotfound'] = 'Impossible de lire la configuration du périphérique';
-
 ?>
diff --git a/plugins/kolab_activesync/localization/ja_JP.inc b/plugins/kolab_activesync/localization/ja_JP.inc
index 6b1588a9..576844d7 100644
--- a/plugins/kolab_activesync/localization/ja_JP.inc
+++ b/plugins/kolab_activesync/localization/ja_JP.inc
@@ -1,33 +1,29 @@
 <?php
-
-$labels = array();
-$labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Devices';
-$labels['devicealias'] = 'Device name';
-$labels['syncmode'] = 'Sync Mode';
-$labels['modeauto'] = 'Determine automatically';
-$labels['modeflat'] = 'Force flat mode';
-$labels['modefolder'] = 'Force folder mode';
-$labels['synchronize'] = 'Synchronize';
-$labels['withalarms'] = 'With alarms';
-$labels['syncsettings'] = 'Synchronization settings';
-$labels['deviceconfig'] = 'Device configration';
-$labels['folderstosync'] = 'Folders to synchronize';
+$labels['tabtitle'] = 'アクティブシンク';
+$labels['devices'] = '機器';
+$labels['devicealias'] = '機器名';
+$labels['syncmode'] = '同期モード';
+$labels['modeauto'] = '自動決定';
+$labels['modeflat'] = '強制フラットモード';
+$labels['modefolder'] = '強制フォルダモード';
+$labels['synchronize'] = '同期';
+$labels['withalarms'] = 'アラーム付';
+$labels['syncsettings'] = '同期設定';
+$labels['deviceconfig'] = '機器設定';
+$labels['folderstosync'] = '同期するフォルダ';
 $labels['mail'] = 'Email';
-$labels['contact'] = 'Address Books';
-$labels['event'] = 'Calendars';
-$labels['task'] = 'Tasks';
-$labels['note'] = 'Notes';
+$labels['contact'] = 'アドレス帳';
+$labels['event'] = 'カレンダー';
+$labels['task'] = 'タスク';
+$labels['note'] = 'ノート';
 $labels['configuration'] = '設定';
-$labels['deletedevice'] = 'Delete device';
-$labels['imageformat'] = 'Image format';
-$labels['laxpiclabel'] = 'Allow PNG and GIF images';
-$labels['nodevices'] = 'There are currently no devices registered.<br/><br/>In order to register a device, please connect it to the server first, using <a href="http://wiki.kolab.org/Setup_ActiveSync">the instructions in the Wiki</a>. Afterwards the device should become available for configuration here.';
-$labels['savingdata'] = 'Saving data...';
-$labels['savingerror'] = 'Failed to save configuration';
-$labels['notsupported'] = 'Your server does not support metadata/annotations';
-$labels['devicedeleteconfirm'] = 'Do you really want to delete the configuration for this device?';
-$labels['successfullydeleted'] = 'The device configuration was successfully removed';
-$labels['devicenotfound'] = 'Unable to read device configuration';
-
+$labels['deletedevice'] = '機器の削除';
+$labels['imageformat'] = 'イメージの形式';
+$labels['laxpiclabel'] = 'ＰＮＧとGIFのイメージを使用可';
+$labels['savingdata'] = 'データを保存中…';
+$labels['savingerror'] = '設定の保存に失敗しました';
+$labels['notsupported'] = 'サーバはmetadata/annotionsをサポートしていません';
+$labels['devicedeleteconfirm'] = '本当にこのデバイスの設定を削除しますか？';
+$labels['successfullydeleted'] = 'デヴァイスの削除に成功しました';
+$labels['devicenotfound'] = 'デヴァイスの設定を読込めません';
 ?>
diff --git a/plugins/kolab_activesync/localization/nl_NL.inc b/plugins/kolab_activesync/localization/nl_NL.inc
index a78afdcf..26aeea05 100644
--- a/plugins/kolab_activesync/localization/nl_NL.inc
+++ b/plugins/kolab_activesync/localization/nl_NL.inc
@@ -1,9 +1,5 @@
 <?php
-
-$labels = array();
 $labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Devices';
-$labels['devicealias'] = 'Device name';
 $labels['syncmode'] = 'Synchronizatie modus';
 $labels['modeauto'] = 'Stel automatisch vast';
 $labels['modeflat'] = 'Forceer vlakke modus';
@@ -11,23 +7,12 @@ $labels['modefolder'] = 'Forceer mappen modus';
 $labels['synchronize'] = 'Synchronizeren';
 $labels['withalarms'] = 'Met alarmen';
 $labels['syncsettings'] = 'Synchronizatie instellingen';
-$labels['deviceconfig'] = 'Device configration';
-$labels['folderstosync'] = 'Folders to synchronize';
 $labels['mail'] = 'Email';
 $labels['contact'] = 'Adresboeken';
 $labels['event'] = 'Kalenders';
 $labels['task'] = 'Taken';
 $labels['note'] = 'Notities';
 $labels['configuration'] = 'Configuratie';
-$labels['deletedevice'] = 'Delete device';
-$labels['imageformat'] = 'Image format';
 $labels['laxpiclabel'] = 'Sta PNG en GIF plaatjes toe';
-$labels['nodevices'] = 'There are currently no devices registered.<br/><br/>In order to register a device, please connect it to the server first, using <a href="http://wiki.kolab.org/Setup_ActiveSync">the instructions in the Wiki</a>. Afterwards the device should become available for configuration here.';
 $labels['savingdata'] = 'Data wordt opgeslagen...';
-$labels['savingerror'] = 'Failed to save configuration';
-$labels['notsupported'] = 'Your server does not support metadata/annotations';
-$labels['devicedeleteconfirm'] = 'Do you really want to delete the configuration for this device?';
-$labels['successfullydeleted'] = 'The device configuration was successfully removed';
-$labels['devicenotfound'] = 'Unable to read device configuration';
-
 ?>
diff --git a/plugins/kolab_activesync/localization/pl_PL.inc b/plugins/kolab_activesync/localization/pl_PL.inc
index 4d1c413e..dc2a3d6c 100644
--- a/plugins/kolab_activesync/localization/pl_PL.inc
+++ b/plugins/kolab_activesync/localization/pl_PL.inc
@@ -1,13 +1,11 @@
 <?php
-
-$labels = array();
 $labels['tabtitle'] = 'ActiveSync';
 $labels['devices'] = 'Urządzenia';
 $labels['devicealias'] = 'Nazwa urządzenia';
 $labels['syncmode'] = 'Tryb synchronizacji';
 $labels['modeauto'] = 'Ustaw automatycznie';
-$labels['modeflat'] = 'Wymuś tryb płaski';
-$labels['modefolder'] = 'Wymuś tryb folderu';
+$labels['modeflat'] = 'Wymuszaj tryb "płaski"';
+$labels['modefolder'] = 'Wymuszaj tryb folderów';
 $labels['synchronize'] = 'Synchronizuj';
 $labels['withalarms'] = 'Z alarmami';
 $labels['syncsettings'] = 'Ustawienia synchronizacji';
@@ -18,14 +16,13 @@ $labels['contact'] = 'Książki adresowe';
 $labels['event'] = 'Kalendarze';
 $labels['task'] = 'Zadania';
 $labels['note'] = 'Notatki';
+$labels['configuration'] = 'Konfiguracja';
 $labels['deletedevice'] = 'Usuń urządzenie';
-$labels['imageformat'] = 'Format obrazka';
-$labels['laxpiclabel'] = 'Zezwalaj na obrazki PNG i GIF';
-$labels['nodevices'] = 'Obecnie brak zarejestrowanych urządzeń.<br/><br/>Aby zarejestrować urządzenie najpierw podłącz je do serwera według <a href="http://wiki.kolab.org/Setup_ActiveSync">instrukcji z Wiki</a>. Po tym procesie urządzenie powinno dać się skonfigurować tutaj.';
-$labels['savingdata'] = 'Zapisywanie danych...';
+$labels['imageformat'] = 'Format obrazków';
+$labels['savingdata'] = 'Zapisuję dane...';
 $labels['savingerror'] = 'Nie udało się zapisać konfiguracji';
-$labels['notsupported'] = 'Twój serwer nie obsługuje metadanych (metadata/annotations).';
-$labels['devicedeleteconfirm'] = 'Czy na pewno chcesz usunąć konfigurację dla tego urządzenia?';
-$labels['successfullydeleted'] = 'Konfiguracja urządzenia została pomyślnie usunięta.';
-
+$labels['notsupported'] = 'Twój serwer nie obsługuje rozszerzenia metadata/annotations';
+$labels['devicedeleteconfirm'] = 'Czy na pewno chcesz usunąć konfigurację tego urządzenia?';
+$labels['successfullydeleted'] = 'Konfiguracja urządzenie została usunięta';
+$labels['devicenotfound'] = 'Nie można odczytać konfiguracji urządzenia';
 ?>
diff --git a/plugins/kolab_activesync/localization/pt_BR.inc b/plugins/kolab_activesync/localization/pt_BR.inc
new file mode 100644
index 00000000..5fa76588
--- /dev/null
+++ b/plugins/kolab_activesync/localization/pt_BR.inc
@@ -0,0 +1,29 @@
+<?php
+$labels['tabtitle'] = 'Activesync';
+$labels['devices'] = 'Dispositivos';
+$labels['devicealias'] = 'Nome do dispositivo';
+$labels['syncmode'] = 'Modo de Sincronização';
+$labels['modeauto'] = 'Determinar automaticamente';
+$labels['modeflat'] = 'Força modo plano';
+$labels['modefolder'] = 'Forçar modo pasta';
+$labels['synchronize'] = 'Sincronizar';
+$labels['withalarms'] = 'Com alarmes';
+$labels['syncsettings'] = 'Sincronizar configurações';
+$labels['deviceconfig'] = 'Configuração do dispositivo';
+$labels['folderstosync'] = 'Pastas para sincronizar';
+$labels['mail'] = 'Email';
+$labels['contact'] = 'Catálogo de Endereços';
+$labels['event'] = 'Calendários';
+$labels['task'] = 'Tarefas';
+$labels['note'] = 'Notas';
+$labels['configuration'] = 'Configuração';
+$labels['deletedevice'] = 'Remover dispositivo';
+$labels['imageformat'] = 'Formato de imagem';
+$labels['laxpiclabel'] = 'Permitir imagens em formato PNG e GIF';
+$labels['savingdata'] = 'Salvando dados...';
+$labels['savingerror'] = 'Falha ao salvar a configuração';
+$labels['notsupported'] = 'Seu servidor não suporta metadados/anotações';
+$labels['devicedeleteconfirm'] = 'Você deseja realmente remover a configuração deste dispositivo?';
+$labels['successfullydeleted'] = 'A configuração do dispositivo foi removida com sucesso';
+$labels['devicenotfound'] = 'Não foi possível ler a configuração do dispositivo';
+?>
diff --git a/plugins/kolab_activesync/localization/ru_RU.inc b/plugins/kolab_activesync/localization/ru_RU.inc
index 446e6db7..f1b578d7 100644
--- a/plugins/kolab_activesync/localization/ru_RU.inc
+++ b/plugins/kolab_activesync/localization/ru_RU.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Устройства';
 $labels['devicealias'] = 'Имя устройства';
@@ -22,12 +20,10 @@ $labels['configuration'] = 'Конфигурация';
 $labels['deletedevice'] = 'Удалить устройство';
 $labels['imageformat'] = 'Формат изображений';
 $labels['laxpiclabel'] = 'Разрешить PNG и GIF изображения';
-$labels['nodevices'] = 'У вас нет зарегистрированных устройств.<br/><br/>Для того, чтобы зарегистрировать устройство, подключите его к серверу, используя <a href="http://wiki.kolab.org/Setup_ActiveSync">инструкцию в Wiki</a>. После этого устройство должно стать доступным для конфигурации здесь.';
 $labels['savingdata'] = 'Сохранение данных...';
 $labels['savingerror'] = 'Не удалось сохранить конфигурацию';
 $labels['notsupported'] = 'Ваш сервер не поддерживает метаданные/аннотации';
 $labels['devicedeleteconfirm'] = 'Вы действительно хотите удалить конфигурацию для этого устройства?';
 $labels['successfullydeleted'] = 'Конфигурация для устройства была успешно удалена.';
 $labels['devicenotfound'] = 'Не удалось прочитать конфигурацию для устройства';
-
 ?>
diff --git a/plugins/kolab_addressbook/localization/bg_BG.inc b/plugins/kolab_addressbook/localization/bg_BG.inc
new file mode 100644
index 00000000..bae1e113
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/bg_BG.inc
@@ -0,0 +1,13 @@
+<?php
+$labels['initials'] = 'Инциали';
+$labels['profession'] = 'Професия';
+$labels['officelocation'] = 'Офис адрес';
+$labels['children'] = 'Деца';
+$labels['pgppublickey'] = 'PGP публичен ключ';
+$labels['pkcs7publickey'] = 'S/MIME публичен ключ';
+$labels['freebusyurl'] = 'Free-busy URL';
+$labels['typebusiness'] = 'Работен';
+$labels['typebusinessfax'] = 'Работен Факс';
+$labels['typecompany'] = 'Компания';
+$labels['typeprimary'] = 'Основен';
+?>
diff --git a/plugins/kolab_addressbook/localization/de_CH.inc b/plugins/kolab_addressbook/localization/de_CH.inc
index 130564b4..f72b2d1d 100644
--- a/plugins/kolab_addressbook/localization/de_CH.inc
+++ b/plugins/kolab_addressbook/localization/de_CH.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['initials'] = 'Initialen';
 $labels['profession'] = 'Berufsbezeichnung';
 $labels['officelocation'] = 'Büro Adresse';
@@ -18,22 +16,17 @@ $labels['typeisdn'] = 'ISDN';
 $labels['typettytdd'] = 'Telescrit';
 $labels['typecallback'] = 'Rückruf';
 $labels['settings'] = 'Einstellungen';
-
 $labels['bookcreate'] = 'Adressbuch anlegen';
 $labels['bookedit'] = 'Adressbuch bearbeiten';
 $labels['bookdelete'] = 'Adressbuch löschen';
 $labels['bookproperties'] = 'Eigenschaften des Adressbuchs';
 $labels['bookname'] = 'Name des Buches';
 $labels['parentbook'] = 'Übergeordnetes Buch';
-$labels['bookshowurl'] = 'CardDAV-URL anzeigen';
-$labels['carddavurldescription'] = 'Benutzen Sie folgende Addresse in einer <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CalDAV</a>-Anwendung um dieses spezifische Adressbuch mit dem Computer oder Mobiltelefon zu synchronisieren.';
-
 $labels['addressbookprio'] = 'Reihenfolge der Adressbücher';
 $labels['personalfirst'] = 'Private(s) Adressbuch/Adressbücher zuerst';
 $labels['globalfirst'] = 'Globale(s) Adressbuch/Adressbücher zuerst';
 $labels['personalonly'] = 'Nur persönliche(s) Adressbuch/Adressbücher';
 $labels['globalonly'] = 'Nur globale(s) Adressbuch/Adressbücher';
-
 $messages['bookdeleteconfirm']  = 'Soll das gewählte Adressbuch und alle Kontakte darin wirklich gelöscht werden?';
 $messages['bookdeleting'] = 'Adressbuch wird gelöscht...';
 $messages['booksaving'] = 'Adressbuch wird gespeichert...';
@@ -45,5 +38,4 @@ $messages['bookupdateerror'] = 'Fehler beim Aktualisieren des Adressbuchs.';
 $messages['bookcreateerror'] = 'Fehler beim Anlegen des Adressbuchs.';
 $messages['nobooknamewarning'] = 'Bitte den Namen des Adressbuchs angeben.';
 $messages['noemailnamewarning'] = 'Bitte E-Mail-Adresse oder Namen des Kontakts angeben.';
-
 ?>
diff --git a/plugins/kolab_addressbook/localization/de_DE.inc b/plugins/kolab_addressbook/localization/de_DE.inc
index 8f44c8f8..7a073eb9 100644
--- a/plugins/kolab_addressbook/localization/de_DE.inc
+++ b/plugins/kolab_addressbook/localization/de_DE.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['initials'] = 'Initialen';
 $labels['profession'] = 'Berufsbezeichnung';
 $labels['officelocation'] = 'Büro Adresse';
@@ -18,22 +16,17 @@ $labels['typeisdn'] = 'ISDN';
 $labels['typettytdd'] = 'Schreibtelefon';
 $labels['typecallback'] = 'Rückruf';
 $labels['settings'] = 'Einstellungen';
-
 $labels['bookcreate'] = 'Adressbuch anlegen';
 $labels['bookedit'] = 'Adressbuch bearbeiten';
 $labels['bookdelete'] = 'Adressbuch löschen';
 $labels['bookproperties'] = 'Eigenschaften des Adressbuchs';
 $labels['bookname'] = 'Name des Buches';
 $labels['parentbook'] = 'Übergeordnetes Buch';
-$labels['bookshowurl'] = 'CardDAV-URL anzeigen';
-$labels['carddavurldescription'] = 'Benutzen Sie folgende Addresse in einer <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CalDAV</a>-Anwendung um dieses spezifische Adressbuch mit dem Computer oder Mobiltelefon zu synchronisieren.';
-
 $labels['addressbookprio'] = 'Reihenfolge der Adressbücher';
 $labels['personalfirst'] = 'Private(s) Adressbuch/Adressbücher zuerst';
 $labels['globalfirst'] = 'Globale(s) Adressbuch/Adressbücher zuerst';
 $labels['personalonly'] = 'Nur persönliche(s) Adressbuch/Adressbücher';
 $labels['globalonly'] = 'Nur globale(s) Adressbuch/Adressbücher';
-
 $messages['bookdeleteconfirm']  = 'Soll das gewählte Adressbuch und alle Kontakte darin wirklich gelöscht werden?';
 $messages['bookdeleting'] = 'Adressbuch wird gelöscht...';
 $messages['booksaving'] = 'Adressbuch wird gespeichert...';
@@ -45,5 +38,4 @@ $messages['bookupdateerror'] = 'Fehler beim Aktualisieren des Adressbuchs.';
 $messages['bookcreateerror'] = 'Fehler beim Anlegen des Adressbuchs.';
 $messages['nobooknamewarning'] = 'Bitte den Namen des Adressbuchs angeben.';
 $messages['noemailnamewarning'] = 'Bitte E-Mail-Adresse oder Namen des Kontakts angeben.';
-
 ?>
diff --git a/plugins/kolab_addressbook/localization/es_ES.inc b/plugins/kolab_addressbook/localization/es_ES.inc
index 177f33ce..df959195 100644
--- a/plugins/kolab_addressbook/localization/es_ES.inc
+++ b/plugins/kolab_addressbook/localization/es_ES.inc
@@ -1,47 +1,5 @@
 <?php
-
-$labels = array();
 $labels['initials'] = 'Iniciales';
-$labels['profession'] = 'Profession';
-$labels['officelocation'] = 'Office location';
-$labels['children'] = 'Children';
-$labels['pgppublickey'] = 'PGP public key';
-$labels['pkcs7publickey'] = 'S/MIME public key';
-$labels['freebusyurl'] = 'Free-busy URL';
-$labels['typebusiness'] = 'Business';
-$labels['typebusinessfax'] = 'Business Fax';
-$labels['typecompany'] = 'Company';
-$labels['typeprimary'] = 'Primary';
-$labels['typetelex'] = 'Telex';
-$labels['typeradio'] = 'Radio';
-$labels['typeisdn'] = 'ISDN';
-$labels['typettytdd'] = 'TTY/TDD';
-$labels['typecallback'] = 'Callback';
+$labels['typecompany'] = 'Compania';
 $labels['settings'] = 'Servicios';
-
-$labels['bookcreate'] = 'Create address book';
-$labels['bookedit'] = 'Edit address book';
-$labels['bookdelete'] = 'Delete address book';
-$labels['bookproperties'] = 'Address book properties';
-$labels['bookname'] = 'Book name';
-$labels['parentbook'] = 'Superior book';
-
-$labels['addressbookprio'] = 'Address book(s) selection/behaviour';
-$labels['personalfirst'] = 'Personal address book(s) first';
-$labels['globalfirst'] = 'Global address book(s) first';
-$labels['personalonly'] = 'Personal address book(s) only';
-$labels['globalonly'] = 'Global address book(s) only';
-
-$messages['bookdeleteconfirm']  = 'Do you really want to delete the selected address book and all contacts in it?';
-$messages['bookdeleting'] = 'Deleting address book...';
-$messages['booksaving'] = 'Saving address book...';
-$messages['bookdeleted'] = 'Address book deleted successfully.';
-$messages['bookupdated'] = 'Address book updated successfully.';
-$messages['bookcreated'] = 'Address book created successfully.';
-$messages['bookdeleteerror'] = 'An error occured while deleting address book.';
-$messages['bookupdateerror'] = 'An error occured while updating address book.';
-$messages['bookcreateerror'] = 'An error occured while creating address book.';
-$messages['nobooknamewarning'] = 'Please, enter address book name.';
-$messages['noemailnamewarning'] = 'Please, enter email address or contact name.';
-
 ?>
diff --git a/plugins/kolab_addressbook/localization/et_EE.inc b/plugins/kolab_addressbook/localization/et_EE.inc
index a66426f4..acb6c354 100644
--- a/plugins/kolab_addressbook/localization/et_EE.inc
+++ b/plugins/kolab_addressbook/localization/et_EE.inc
@@ -1,47 +1,2 @@
 <?php
-
-$labels = array();
-$labels['initials'] = 'Initials';
-$labels['profession'] = 'Profession';
-$labels['officelocation'] = 'Office location';
-$labels['children'] = 'Children';
-$labels['pgppublickey'] = 'PGP public key';
-$labels['pkcs7publickey'] = 'S/MIME public key';
-$labels['freebusyurl'] = 'Free-busy URL';
-$labels['typebusiness'] = 'Business';
-$labels['typebusinessfax'] = 'Business Fax';
-$labels['typecompany'] = 'Company';
-$labels['typeprimary'] = 'Primary';
-$labels['typetelex'] = 'Telex';
-$labels['typeradio'] = 'Radio';
-$labels['typeisdn'] = 'ISDN';
-$labels['typettytdd'] = 'TTY/TDD';
-$labels['typecallback'] = 'Callback';
-$labels['settings'] = 'Settings';
-
-$labels['bookcreate'] = 'Create address book';
-$labels['bookedit'] = 'Edit address book';
-$labels['bookdelete'] = 'Delete address book';
-$labels['bookproperties'] = 'Address book properties';
-$labels['bookname'] = 'Book name';
-$labels['parentbook'] = 'Superior book';
-
-$labels['addressbookprio'] = 'Address book(s) selection/behaviour';
-$labels['personalfirst'] = 'Personal address book(s) first';
-$labels['globalfirst'] = 'Global address book(s) first';
-$labels['personalonly'] = 'Personal address book(s) only';
-$labels['globalonly'] = 'Global address book(s) only';
-
-$messages['bookdeleteconfirm']  = 'Do you really want to delete the selected address book and all contacts in it?';
-$messages['bookdeleting'] = 'Deleting address book...';
-$messages['booksaving'] = 'Saving address book...';
-$messages['bookdeleted'] = 'Address book deleted successfully.';
-$messages['bookupdated'] = 'Address book updated successfully.';
-$messages['bookcreated'] = 'Address book created successfully.';
-$messages['bookdeleteerror'] = 'An error occured while deleting address book.';
-$messages['bookupdateerror'] = 'An error occured while updating address book.';
-$messages['bookcreateerror'] = 'An error occured while creating address book.';
-$messages['nobooknamewarning'] = 'Please, enter address book name.';
-$messages['noemailnamewarning'] = 'Please, enter email address or contact name.';
-
 ?>
diff --git a/plugins/kolab_addressbook/localization/fr_FR.inc b/plugins/kolab_addressbook/localization/fr_FR.inc
index 4cba245c..8099c99e 100644
--- a/plugins/kolab_addressbook/localization/fr_FR.inc
+++ b/plugins/kolab_addressbook/localization/fr_FR.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['initials'] = 'Initiales';
 $labels['profession'] = 'Profession';
 $labels['officelocation'] = 'Emplacement du bureau';
@@ -18,20 +16,17 @@ $labels['typeisdn'] = 'ISDN';
 $labels['typettytdd'] = 'TTY/TDD';
 $labels['typecallback'] = 'Rappel';
 $labels['settings'] = 'Paramètres';
-
 $labels['bookcreate'] = 'Créer un carnet d\'adresse';
 $labels['bookedit'] = 'Modifier un carnet d\'adresse';
 $labels['bookdelete'] = 'Supprimer un carnet d\'adresse';
 $labels['bookproperties'] = 'Propriétés du carnet d\'adresse';
 $labels['bookname'] = 'Nom du carnet';
 $labels['parentbook'] = 'Carnet parent';
-
 $labels['addressbookprio'] = 'Sélection du(des) carnet(s) d\'adresses/comportement';
 $labels['personalfirst'] = 'Carnet(s) d\'adresse personnel en premier';
 $labels['globalfirst'] = 'Carnet(s) d\'adresse global(aux) en premier';
 $labels['personalonly'] = 'Carnet(s) d\'adresse personnel seulement';
 $labels['globalonly'] = 'Carnet(s) d\'adresse global(aux) seulement';
-
 $messages['bookdeleteconfirm']  = 'Voulez-vous vraiment supprimer le carnet d\'adresse sélectionné et tous ses contacts?';
 $messages['bookdeleting'] = 'Suppression du carnet d\'adresse...';
 $messages['booksaving'] = 'Enregistrement du carnet d\'adresse...';
@@ -43,5 +38,4 @@ $messages['bookupdateerror'] = 'Une erreur est survenue lors de la modification
 $messages['bookcreateerror'] = 'Une erreur est survenue lors de la création du carnet d\'adresse.';
 $messages['nobooknamewarning'] = 'Merci de saisir un nom pour le carnet d\'adresse';
 $messages['noemailnamewarning'] = 'Merci de saisir une adresse de courriel ou un nom de contact.';
-
 ?>
diff --git a/plugins/kolab_addressbook/localization/ja_JP.inc b/plugins/kolab_addressbook/localization/ja_JP.inc
index 7f1a7c5e..47728fc5 100644
--- a/plugins/kolab_addressbook/localization/ja_JP.inc
+++ b/plugins/kolab_addressbook/localization/ja_JP.inc
@@ -1,14 +1,41 @@
 <?php
-
-//  EN-Revision: 4383
-
-$labels = array();
 $labels['initials'] = 'イニシャル';
 $labels['profession'] = '職業';
-$labels['officelocation'] = 'オフィスの所在地';
+$labels['officelocation'] = '会社所在';
 $labels['children'] = '子供';
-$labels['pgppublickey'] = 'PGP 公開鍵';
-$labels['freebusyurl'] = 'Free-busy URL';
+$labels['pgppublickey'] = 'PGP パブリックキー';
+$labels['pkcs7publickey'] = 'S/MIME パブリックキー';
+$labels['freebusyurl'] = '空き状況 URL';
+$labels['typebusiness'] = '仕事';
+$labels['typebusinessfax'] = '仕事 Fax';
+$labels['typecompany'] = '会社名';
+$labels['typeprimary'] = '代表';
+$labels['typetelex'] = 'テレックス';
+$labels['typeradio'] = 'ラジオ';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['typecallback'] = 'コールバック';
 $labels['settings'] = '設定';
-
-?>
\ No newline at end of file
+$labels['bookcreate'] = 'アドレス帳作成';
+$labels['bookedit'] = 'アドレス帳編集';
+$labels['bookdelete'] = 'アドレス帳削除';
+$labels['bookproperties'] = 'アドレス帳設定';
+$labels['bookname'] = 'ブック名';
+$labels['parentbook'] = '上位ブック';
+$labels['addressbookprio'] = 'アドレス帳(s)セレクション/動作';
+$labels['personalfirst'] = '個人アドレス帳(s) を前に';
+$labels['globalfirst'] = 'グローバルアドレス帳(s) を前に';
+$labels['personalonly'] = '個人アドレス帳(s) のみ';
+$labels['globalonly'] = 'グローバルアドレス帳(s) のみ';
+$messages['bookdeleteconfirm']  = '本当に選択したアドレス帳およびそのデータをすべて削除しますか?';
+$messages['bookdeleting'] = 'アドレス帳を削除中...';
+$messages['booksaving'] = 'アドレス帳を保存中…';
+$messages['bookdeleted'] = 'アドレス帳を削除しました。';
+$messages['bookupdated'] = 'アドレス帳を更新しました。';
+$messages['bookcreated'] = 'アドレス帳を作成しました。';
+$messages['bookdeleteerror'] = 'アドレス帳の削除中にエラーが発生しました。';
+$messages['bookupdateerror'] = 'アドレス帳の更新中にエラーが発生しました。';
+$messages['bookcreateerror'] = 'アドレス帳の作成中にエラーが発生しました。';
+$messages['nobooknamewarning'] = 'アドレス帳名を入力してください。';
+$messages['noemailnamewarning'] = 'Emailアドレスまたはコンタクト名を入力してください。';
+?>
diff --git a/plugins/kolab_addressbook/localization/nl_NL.inc b/plugins/kolab_addressbook/localization/nl_NL.inc
index 3c322bec..954a052a 100644
--- a/plugins/kolab_addressbook/localization/nl_NL.inc
+++ b/plugins/kolab_addressbook/localization/nl_NL.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['initials'] = 'Initialen';
 $labels['profession'] = 'Beroep';
 $labels['officelocation'] = 'Kantoorlocatie';
@@ -16,22 +14,18 @@ $labels['typetelex'] = 'Telex';
 $labels['typeradio'] = 'Radio';
 $labels['typeisdn'] = 'ISDN';
 $labels['typettytdd'] = 'TTY/TDD';
-$labels['typecallback'] = 'Callback';
 $labels['settings'] = 'Instellingen';
-
 $labels['bookcreate'] = 'Maak adresboek aan';
 $labels['bookedit'] = 'Wijzig adresboek';
 $labels['bookdelete'] = 'Adresboek verwijderen';
 $labels['bookproperties'] = 'Eigenschappen voor adresboek';
 $labels['bookname'] = 'Adresboek naam';
 $labels['parentbook'] = 'Toevoegen aan bestaand adresboek';
-
 $labels['addressbookprio'] = 'Gedrag voor adresboek(en)-selectie';
 $labels['personalfirst'] = 'Eerst persoonlijke adresboek(en)';
 $labels['globalfirst'] = 'Eerst globale adresboek(en)';
 $labels['personalonly'] = 'Alleen persoonlijke adresboek(en)';
 $labels['globalonly'] = 'Alleen globale adresboek(en)';
-
 $messages['bookdeleteconfirm']  = 'Weet u zeker dat u het geselecteerde adresboek inclusief inhoud wilt verwijderen?';
 $messages['bookdeleting'] = 'Adresboek aan het verwijderen...';
 $messages['booksaving'] = 'Adresboek aan het opslaan...';
@@ -41,7 +35,6 @@ $messages['bookcreated'] = 'Adresboek succesvol aangemaakt.';
 $messages['bookdeleteerror'] = 'Er heeft zich een fout voorgedaan bij het verwijderen van het adresboek.';
 $messages['bookupdateerror'] = 'Er heeft zich een fout voorgedaan bij het wijzigen van het adresboek.';
 $messages['bookcreateerror'] = 'Er heeft zich een fout voorgedaan bij het aanmaken van het adresboek.';
-$messages['nobooknamewarning'] = 'Please, enter address book name.';
-$messages['noemailnamewarning'] = 'Please, enter email address or contact name.';
-
+$messages['nobooknamewarning'] = 'Voer een naam voor het adresboek in, a.u.b.';
+$messages['noemailnamewarning'] = 'Voor een e-mail adres of contactnaam in, a.u.b.';
 ?>
diff --git a/plugins/kolab_addressbook/localization/pl_PL.inc b/plugins/kolab_addressbook/localization/pl_PL.inc
index 95eec2f5..d33b1500 100644
--- a/plugins/kolab_addressbook/localization/pl_PL.inc
+++ b/plugins/kolab_addressbook/localization/pl_PL.inc
@@ -1,47 +1,41 @@
 <?php
-
-$labels = array();
 $labels['initials'] = 'Inicjały';
 $labels['profession'] = 'Zawód';
-$labels['officelocation'] = 'Adres biura';
+$labels['officelocation'] = 'Biuro';
 $labels['children'] = 'Dzieci';
-$labels['pgppublickey'] = 'Klucz publ. PGP';
-$labels['freebusyurl'] = 'URL Free-busy';
-$labels['settings'] = 'Ustawienia';
-
-$labels['typebusiness'] = 'Praca';
+$labels['pgppublickey'] = 'Klucz publiczny PGP';
+$labels['pkcs7publickey'] = 'Klucz publiczny S/MIME';
+$labels['freebusyurl'] = 'URL free-busy';
+$labels['typebusiness'] = 'Firmowy';
 $labels['typebusinessfax'] = 'Fax firmowy';
-$labels['typecallback'] = 'Callback';
 $labels['typecompany'] = 'Firma';
 $labels['typeprimary'] = 'Główny';
 $labels['typetelex'] = 'Teleks';
-$labels['typeradio'] = 'Radio';
+$labels['typeradio'] = 'Radiowy';
 $labels['typeisdn'] = 'ISDN';
 $labels['typettytdd'] = 'TTY/TDD';
-
-$labels['addressbookprio'] = 'Wybór/zachowanie książek adresowych';
-$labels['personalfirst'] = 'Najpierw osobiste książki adresowe';
-$labels['globalfirst'] = 'Najpierw globalne książki adresowe';
-$labels['personalonly'] = 'Tylko osobiste książki adresowe';
-$labels['globalonly'] = 'Tylko globalne książki adresowe';
-
-$labels['bookcreate'] = 'Utwórz książkę';
-$labels['bookedit'] = 'Edytuj książkę';
-$labels['bookdelete'] = 'Usuń książkę';
+$labels['typecallback'] = 'Callback';
+$labels['settings'] = 'Ustawienia';
+$labels['bookcreate'] = 'Utwórz książkę adresową';
+$labels['bookedit'] = 'Edytuj książkę adresową';
+$labels['bookdelete'] = 'Usuń książkę adresową';
 $labels['bookproperties'] = 'Właściwości książki adresowej';
 $labels['bookname'] = 'Nazwa książki';
-$labels['parentbook'] = 'Książka nadrzędna';
-
-$messages['bookdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybraną książkę i wszystkie kontakty w niej zapisane?';
+$labels['parentbook'] = 'Nadrzędna książka';
+$labels['addressbookprio'] = 'Wybór/zachowanie książek adresowych';
+$labels['personalfirst'] = 'najpierw prywatne książki adresowe';
+$labels['globalfirst'] = 'najpierw globalne książki adresowe';
+$labels['personalonly'] = 'tylko prywatne książki adresowe';
+$labels['globalonly'] = 'tylko globalne książki adresowe';
+$messages['bookdeleteconfirm']  = 'Czy na pewno chcesz usunąć wybraną książkę i wszystkie kontakty?';
 $messages['bookdeleting'] = 'Usuwanie książki adresowej...';
 $messages['booksaving'] = 'Zapisywanie książki adresowej...';
 $messages['bookdeleted'] = 'Książka adresowa została usunięta.';
 $messages['bookupdated'] = 'Książka adresowa została zaktualizowana.';
-$messages['bookcreated'] = 'Książka adresowa została utworzona.';
-$messages['bookdeleteerror'] = 'Wystąpił błąd podczas usuwania książki adresowej.';
-$messages['bookupdateerror'] = 'Wystąpił błąd podczas zmiany książki adresowej.';
-$messages['bookcreateerror'] = 'Wystąpił błąd podczas tworzenia książki adresowej.';
+$messages['bookcreated'] = 'Książka adresowa zostałą utworzona.';
+$messages['bookdeleteerror'] = 'Podczas usuwania książki adresowej wystąpił błąd.';
+$messages['bookupdateerror'] = 'Podczas zapisywania książki adresowej wystąpił błąd.';
+$messages['bookcreateerror'] = 'Podczas dodawania książki adresowej wystąpił błąd.';
 $messages['nobooknamewarning'] = 'Proszę podać nazwę książki adresowej.';
 $messages['noemailnamewarning'] = 'Proszę podać adres email lub nazwę kontaktu.';
-
 ?>
diff --git a/plugins/kolab_addressbook/localization/pt_BR.inc b/plugins/kolab_addressbook/localization/pt_BR.inc
new file mode 100644
index 00000000..a8d2c910
--- /dev/null
+++ b/plugins/kolab_addressbook/localization/pt_BR.inc
@@ -0,0 +1,41 @@
+<?php
+$labels['initials'] = 'Iniciais';
+$labels['profession'] = 'Profissão';
+$labels['officelocation'] = 'Local de trabalho';
+$labels['children'] = 'Crianças';
+$labels['pgppublickey'] = 'Chave pública PGP';
+$labels['pkcs7publickey'] = 'Chave pública S/MIME';
+$labels['freebusyurl'] = 'URL livre-ocupado';
+$labels['typebusiness'] = 'Comercial';
+$labels['typebusinessfax'] = 'Fax Comercial';
+$labels['typecompany'] = 'Empresa';
+$labels['typeprimary'] = 'Primário';
+$labels['typetelex'] = 'Telex';
+$labels['typeradio'] = 'Rádio';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['typecallback'] = 'Chamada de retorno';
+$labels['settings'] = 'Configurações';
+$labels['bookcreate'] = 'Criar catálogo de endereços';
+$labels['bookedit'] = 'Editar catálogo de endereços';
+$labels['bookdelete'] = 'Remover catálogo de endereços';
+$labels['bookproperties'] = 'Propriedades do catálogo de endereços';
+$labels['bookname'] = 'Nome do catálogo';
+$labels['parentbook'] = 'Catalogo superior';
+$labels['addressbookprio'] = 'Seleção/comportamento do(s) catálogo de endereços';
+$labels['personalfirst'] = 'Catálogo(s) de endereço primeiro ';
+$labels['globalfirst'] = 'Catálogo de endereço(s) global primeiro';
+$labels['personalonly'] = 'Catálogo de endereço(s) pessoal apenas';
+$labels['globalonly'] = 'Catálogo(s) de endereço global apenas';
+$messages['bookdeleteconfirm']  = 'Você realmente gostaria de remover o catálogo de endereços selecionado e todos os contatos que estão dentro dele?';
+$messages['bookdeleting'] = 'Removendo catálogo de endereço...';
+$messages['booksaving'] = 'Salvando catálogo de endereço...';
+$messages['bookdeleted'] = 'Catálogo de endereço removido com sucesso.';
+$messages['bookupdated'] = 'Catálogo de endereço atualizado com sucesso.';
+$messages['bookcreated'] = 'Catálogo de endereço criado com sucesso.';
+$messages['bookdeleteerror'] = 'Ocorreu um erro ao remover o catálogo de endereço.';
+$messages['bookupdateerror'] = 'Ocorreu um erro ao atualizar o catálogo de endereço.';
+$messages['bookcreateerror'] = 'Ocorreu um erro ao criar o catálogo de endereço.';
+$messages['nobooknamewarning'] = 'Por favor, insira um nome para o catálogo de endereço.';
+$messages['noemailnamewarning'] = 'Por favor, insira um e-mail ou nome para o contato.';
+?>
diff --git a/plugins/kolab_addressbook/localization/ru_RU.inc b/plugins/kolab_addressbook/localization/ru_RU.inc
index 28526319..6bae7b45 100644
--- a/plugins/kolab_addressbook/localization/ru_RU.inc
+++ b/plugins/kolab_addressbook/localization/ru_RU.inc
@@ -1,29 +1,41 @@
 <?php
-/*
-
-+-----------------------------------------------------------------------+
-| plugins/kolab_addressbook/localization/ru_RU.inc                      |
-|                                                                       |
-| Russian translation for roundcube/kolab_addressbook plugin            |
-| Copyright (C) 2008-2011                                               |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Sergey Dukachev <iam@dukess.ru>                               |
-| Updates:                                                              |
-+-----------------------------------------------------------------------+
-
-@version 2011-05-11
-
-*/
-
-$labels = array();
 $labels['initials'] = 'Инициалы';
 $labels['profession'] = 'Профессия';
 $labels['officelocation'] = 'Адрес офиса';
 $labels['children'] = 'Дети';
 $labels['pgppublickey'] = 'Публичный ключ PGP';
+$labels['pkcs7publickey'] = 'Публичный ключ S/MIME';
 $labels['freebusyurl'] = 'URL свободен/занят';
+$labels['typebusiness'] = 'Служебный';
+$labels['typebusinessfax'] = 'Служебный факс';
+$labels['typecompany'] = 'Организация';
+$labels['typeprimary'] = 'Основной(ая)';
+$labels['typetelex'] = 'Telex';
+$labels['typeradio'] = 'Радиотелефон';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['typecallback'] = 'Коллбэк';
 $labels['settings'] = 'Настройки';
-
-?>
\ No newline at end of file
+$labels['bookcreate'] = 'Создать адресную книгу';
+$labels['bookedit'] = 'Редактировать адресную книгу';
+$labels['bookdelete'] = 'Удалить адресную книгу';
+$labels['bookproperties'] = 'Параметры адресной книги';
+$labels['bookname'] = 'Название книги';
+$labels['parentbook'] = 'Родительская книга';
+$labels['addressbookprio'] = 'Поведение/отображение адресных книг';
+$labels['personalfirst'] = 'Персональные адресные книги в начале';
+$labels['globalfirst'] = 'Глобальные адресные книги в начале';
+$labels['personalonly'] = 'Только персональные адресные книги';
+$labels['globalonly'] = 'Только глобальные адресные книги';
+$messages['bookdeleteconfirm']  = 'Вы действительно хотите удалить выбранную адресную книгу и все контакты в ней?';
+$messages['bookdeleting'] = 'Удаление адресной книги...';
+$messages['booksaving'] = 'Сохранение адресной книги...';
+$messages['bookdeleted'] = 'Адресная книга успешно удалена.';
+$messages['bookupdated'] = 'Адресная книга успешно обновлена.';
+$messages['bookcreated'] = 'Адресная книга успешно создана.';
+$messages['bookdeleteerror'] = 'Возникла ошибка при удалении адресной книги.';
+$messages['bookupdateerror'] = 'Возникла ошибка при обновлении адресной книги.';
+$messages['bookcreateerror'] = 'Возникла ошибка при создании адресной книги.';
+$messages['nobooknamewarning'] = 'Пожалуйста, заполните название книги.';
+$messages['noemailnamewarning'] = 'Пожалуйста, заполните почтовый адрес или имя контакта.';
+?>
diff --git a/plugins/kolab_auth/localization/bg_BG.inc b/plugins/kolab_auth/localization/bg_BG.inc
new file mode 100644
index 00000000..1f7a5736
--- /dev/null
+++ b/plugins/kolab_auth/localization/bg_BG.inc
@@ -0,0 +1,3 @@
+<?php
+$labels['loginas'] = 'Влизане като';
+?>
diff --git a/plugins/kolab_auth/localization/de_CH.inc b/plugins/kolab_auth/localization/de_CH.inc
index 9cdad33a..5e85a01d 100644
--- a/plugins/kolab_auth/localization/de_CH.inc
+++ b/plugins/kolab_auth/localization/de_CH.inc
@@ -1,5 +1,3 @@
 <?php
-
 $labels['loginas'] = 'Anmelden als';
-
 ?>
diff --git a/plugins/kolab_auth/localization/de_DE.inc b/plugins/kolab_auth/localization/de_DE.inc
index 9cdad33a..5e85a01d 100644
--- a/plugins/kolab_auth/localization/de_DE.inc
+++ b/plugins/kolab_auth/localization/de_DE.inc
@@ -1,5 +1,3 @@
 <?php
-
 $labels['loginas'] = 'Anmelden als';
-
 ?>
diff --git a/plugins/kolab_auth/localization/es_ES.inc b/plugins/kolab_auth/localization/es_ES.inc
index e1adb3f2..acb6c354 100644
--- a/plugins/kolab_auth/localization/es_ES.inc
+++ b/plugins/kolab_auth/localization/es_ES.inc
@@ -1,5 +1,2 @@
 <?php
-
-$labels['loginas'] = 'Login As';
-
 ?>
diff --git a/plugins/kolab_auth/localization/et_EE.inc b/plugins/kolab_auth/localization/et_EE.inc
index e1adb3f2..acb6c354 100644
--- a/plugins/kolab_auth/localization/et_EE.inc
+++ b/plugins/kolab_auth/localization/et_EE.inc
@@ -1,5 +1,2 @@
 <?php
-
-$labels['loginas'] = 'Login As';
-
 ?>
diff --git a/plugins/kolab_auth/localization/fr_FR.inc b/plugins/kolab_auth/localization/fr_FR.inc
index a25707fb..6f726953 100644
--- a/plugins/kolab_auth/localization/fr_FR.inc
+++ b/plugins/kolab_auth/localization/fr_FR.inc
@@ -1,5 +1,3 @@
 <?php
-
 $labels['loginas'] = 'Se connecter en tant que';
-
 ?>
diff --git a/plugins/kolab_auth/localization/ja_JP.inc b/plugins/kolab_auth/localization/ja_JP.inc
index e1adb3f2..ed0358a5 100644
--- a/plugins/kolab_auth/localization/ja_JP.inc
+++ b/plugins/kolab_auth/localization/ja_JP.inc
@@ -1,5 +1,3 @@
 <?php
-
-$labels['loginas'] = 'Login As';
-
+$labels['loginas'] = 'ログイン';
 ?>
diff --git a/plugins/kolab_auth/localization/nl_NL.inc b/plugins/kolab_auth/localization/nl_NL.inc
index 935b1cf0..a98283f8 100644
--- a/plugins/kolab_auth/localization/nl_NL.inc
+++ b/plugins/kolab_auth/localization/nl_NL.inc
@@ -1,5 +1,3 @@
 <?php
-
 $labels['loginas'] = 'Log in als';
-
 ?>
diff --git a/plugins/kolab_auth/localization/pl_PL.inc b/plugins/kolab_auth/localization/pl_PL.inc
index 785f200e..124c3739 100644
--- a/plugins/kolab_auth/localization/pl_PL.inc
+++ b/plugins/kolab_auth/localization/pl_PL.inc
@@ -1,5 +1,3 @@
 <?php
-
 $labels['loginas'] = 'Zaloguj jako';
-
 ?>
diff --git a/plugins/kolab_auth/localization/pt_BR.inc b/plugins/kolab_auth/localization/pt_BR.inc
new file mode 100644
index 00000000..26e9541c
--- /dev/null
+++ b/plugins/kolab_auth/localization/pt_BR.inc
@@ -0,0 +1,3 @@
+<?php
+$labels['loginas'] = 'Logar como';
+?>
diff --git a/plugins/kolab_auth/localization/ru_RU.inc b/plugins/kolab_auth/localization/ru_RU.inc
index 61ebc597..9e28c126 100644
--- a/plugins/kolab_auth/localization/ru_RU.inc
+++ b/plugins/kolab_auth/localization/ru_RU.inc
@@ -1,5 +1,3 @@
 <?php
-
 $labels['loginas'] = 'Войти как';
-
 ?>
diff --git a/plugins/kolab_delegation/localization/bg_BG.inc b/plugins/kolab_delegation/localization/bg_BG.inc
new file mode 100644
index 00000000..395eac28
--- /dev/null
+++ b/plugins/kolab_delegation/localization/bg_BG.inc
@@ -0,0 +1,8 @@
+<?php
+$labels['mail'] = 'Електронна поща';
+$labels['contact'] = 'Адресни книги';
+$labels['event'] = 'Календари';
+$labels['task'] = 'Задачи';
+$labels['note'] = 'Бележки';
+$labels['savingdata'] = 'Запазване на данни...';
+?>
diff --git a/plugins/kolab_delegation/localization/cs_CZ.inc b/plugins/kolab_delegation/localization/cs_CZ.inc
new file mode 100644
index 00000000..00aa1f55
--- /dev/null
+++ b/plugins/kolab_delegation/localization/cs_CZ.inc
@@ -0,0 +1,5 @@
+<?php
+$labels['mail'] = 'E-mail';
+$labels['event'] = 'Kalendáře';
+$labels['savingdata'] = 'Ukládám data...';
+?>
diff --git a/plugins/kolab_delegation/localization/de_CH.inc b/plugins/kolab_delegation/localization/de_CH.inc
index c4fb40fc..7b6d866c 100644
--- a/plugins/kolab_delegation/localization/de_CH.inc
+++ b/plugins/kolab_delegation/localization/de_CH.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['tabtitle'] = 'Vertretung';
 $labels['delegates'] = 'Vertreter';
 $labels['delegate'] = 'Vertreter';
@@ -12,10 +9,8 @@ $labels['task'] = 'Aufgaben';
 $labels['note'] = 'Notizen';
 $labels['yes'] = 'Ja';
 $labels['no'] = 'Nein';
-
 $labels['adddelegate'] = 'Vertreter hinzufügen';
 $labels['deletedelegate'] = 'Vertreter löschen';
-
 $labels['savingdata'] = 'Speichere Daten...';
 $labels['delegatedeleteconfirm'] = 'Wollen Sie diesen Vertreter wirklich löschen?';
 $labels['delegateremoveacl'] = 'Zugriffsrechte von diesem Benutzer zugeordneten Ordnern entfernen';
@@ -26,5 +21,4 @@ $labels['updatesuccess'] = 'Der Vertreter wurde erfolgreich aktualisiert.';
 $labels['updateerror'] = 'Vertreter konnte nicht aktualisiert werden.';
 $labels['createsuccess'] = 'Der Vertreter wurde erfolgreich hinzugefügt.';
 $labels['createerror'] = 'Vertreter konnte nicht hinzugefügt werden.';
-
 ?>
diff --git a/plugins/kolab_delegation/localization/de_DE.inc b/plugins/kolab_delegation/localization/de_DE.inc
index eb15a821..99aced56 100644
--- a/plugins/kolab_delegation/localization/de_DE.inc
+++ b/plugins/kolab_delegation/localization/de_DE.inc
@@ -1,30 +1,9 @@
 <?php
-
-$labels = array();
-
-$labels['tabtitle'] = 'Delegation';
-$labels['delegates'] = 'Vertreter';
-$labels['delegate'] = 'Delegate';
+$labels['delegates'] = 'Delegierte';
 $labels['mail'] = 'E-Mail';
-$labels['contact'] = 'Adressbücher';
+$labels['contact'] = 'Kontakte';
 $labels['event'] = 'Kalender';
 $labels['task'] = 'Aufgaben';
 $labels['note'] = 'Notizen';
-$labels['yes'] = 'Ja';
-$labels['no'] = 'No';
-
-$labels['adddelegate'] = 'Add delegate';
-$labels['deletedelegate'] = 'Delete delegate';
-
-$labels['savingdata'] = 'Daten werden gespeichert...';
-$labels['delegatedeleteconfirm'] = 'Do you really want to delete this delegate?';
-$labels['delegateremoveacl'] = 'remove access rights on folders assigned to this user';
-$labels['deleteconfirm'] = 'Confirmation';
-$labels['deletesuccess'] = 'The delegate was successfully removed.';
-$labels['deleteerror'] = 'Could not remove delegate.';
-$labels['updatesuccess'] = 'The delegate was successfully updated.';
-$labels['updateerror'] = 'Could not update delegate.';
-$labels['createsuccess'] = 'The delegate was successfully added.';
-$labels['createerror'] = 'Could not add delegate.';
-
+$labels['savingdata'] = 'Speichere Daten...';
 ?>
diff --git a/plugins/kolab_delegation/localization/es_ES.inc b/plugins/kolab_delegation/localization/es_ES.inc
index 032cafcb..b932bed5 100644
--- a/plugins/kolab_delegation/localization/es_ES.inc
+++ b/plugins/kolab_delegation/localization/es_ES.inc
@@ -1,30 +1,10 @@
 <?php
-
-$labels = array();
-
-$labels['tabtitle'] = 'Delegation';
 $labels['delegates'] = 'Delegados';
-$labels['delegate'] = 'Delegate';
 $labels['mail'] = 'Correo electrónico';
 $labels['contact'] = 'Libreta de direcciones';
 $labels['event'] = 'Calendarios';
 $labels['task'] = 'Tareas';
 $labels['note'] = 'Notas';
 $labels['yes'] = 'Sí';
-$labels['no'] = 'No';
-
-$labels['adddelegate'] = 'Add delegate';
-$labels['deletedelegate'] = 'Delete delegate';
-
 $labels['savingdata'] = 'Guardando datos...';
-$labels['delegatedeleteconfirm'] = 'Do you really want to delete this delegate?';
-$labels['delegateremoveacl'] = 'remove access rights on folders assigned to this user';
-$labels['deleteconfirm'] = 'Confirmation';
-$labels['deletesuccess'] = 'The delegate was successfully removed.';
-$labels['deleteerror'] = 'Could not remove delegate.';
-$labels['updatesuccess'] = 'The delegate was successfully updated.';
-$labels['updateerror'] = 'Could not update delegate.';
-$labels['createsuccess'] = 'The delegate was successfully added.';
-$labels['createerror'] = 'Could not add delegate.';
-
 ?>
diff --git a/plugins/kolab_delegation/localization/et_EE.inc b/plugins/kolab_delegation/localization/et_EE.inc
index dec09a31..421ee327 100644
--- a/plugins/kolab_delegation/localization/et_EE.inc
+++ b/plugins/kolab_delegation/localization/et_EE.inc
@@ -1,30 +1,3 @@
 <?php
-
-$labels = array();
-
-$labels['tabtitle'] = 'Delegation';
-$labels['delegates'] = 'Delegates';
-$labels['delegate'] = 'Delegate';
 $labels['mail'] = 'E-post';
-$labels['contact'] = 'Address Books';
-$labels['event'] = 'Calendars';
-$labels['task'] = 'Tasks';
-$labels['note'] = 'Notes';
-$labels['yes'] = 'Yes';
-$labels['no'] = 'No';
-
-$labels['adddelegate'] = 'Add delegate';
-$labels['deletedelegate'] = 'Delete delegate';
-
-$labels['savingdata'] = 'Saving data...';
-$labels['delegatedeleteconfirm'] = 'Do you really want to delete this delegate?';
-$labels['delegateremoveacl'] = 'remove access rights on folders assigned to this user';
-$labels['deleteconfirm'] = 'Confirmation';
-$labels['deletesuccess'] = 'The delegate was successfully removed.';
-$labels['deleteerror'] = 'Could not remove delegate.';
-$labels['updatesuccess'] = 'The delegate was successfully updated.';
-$labels['updateerror'] = 'Could not update delegate.';
-$labels['createsuccess'] = 'The delegate was successfully added.';
-$labels['createerror'] = 'Could not add delegate.';
-
 ?>
diff --git a/plugins/kolab_delegation/localization/fr_FR.inc b/plugins/kolab_delegation/localization/fr_FR.inc
index 4c371e5a..c92619d2 100644
--- a/plugins/kolab_delegation/localization/fr_FR.inc
+++ b/plugins/kolab_delegation/localization/fr_FR.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['tabtitle'] = 'Délégation';
 $labels['delegates'] = 'Délégation';
 $labels['delegate'] = 'Déléguer';
@@ -12,10 +9,8 @@ $labels['task'] = 'Tâches';
 $labels['note'] = 'Notes';
 $labels['yes'] = 'Oui';
 $labels['no'] = 'Non';
-
 $labels['adddelegate'] = 'Ajouter une délégation';
 $labels['deletedelegate'] = 'Supprimer une délégation';
-
 $labels['savingdata'] = 'Enregistrer...';
 $labels['delegatedeleteconfirm'] = 'Voulez-vous vraiment supprimer cette délégation?';
 $labels['delegateremoveacl'] = 'Supprimer les droits d\'accès aux dossiers affectés à cet utilisateur';
@@ -26,5 +21,4 @@ $labels['updatesuccess'] = 'La délégation a été mise à jour';
 $labels['updateerror'] = 'La délégation n\'a pas pu être mise à jour';
 $labels['createsuccess'] = 'La délégation a été ajoutée';
 $labels['createerror'] = 'La délégation n\'a pas pu être ajoutée';
-
 ?>
diff --git a/plugins/kolab_delegation/localization/ja_JP.inc b/plugins/kolab_delegation/localization/ja_JP.inc
index c445f7f9..2a224286 100644
--- a/plugins/kolab_delegation/localization/ja_JP.inc
+++ b/plugins/kolab_delegation/localization/ja_JP.inc
@@ -1,30 +1,24 @@
 <?php
-
-$labels = array();
-
-$labels['tabtitle'] = 'Delegation';
-$labels['delegates'] = 'Delegates';
-$labels['delegate'] = 'Delegate';
+$labels['tabtitle'] = '委任';
+$labels['delegates'] = '委任者';
+$labels['delegate'] = '委任者';
 $labels['mail'] = 'Email';
-$labels['contact'] = 'Address Books';
-$labels['event'] = 'Calendars';
-$labels['task'] = 'Tasks';
-$labels['note'] = 'Notes';
-$labels['yes'] = 'Yes';
-$labels['no'] = 'No';
-
-$labels['adddelegate'] = 'Add delegate';
-$labels['deletedelegate'] = 'Delete delegate';
-
-$labels['savingdata'] = 'Saving data...';
-$labels['delegatedeleteconfirm'] = 'Do you really want to delete this delegate?';
-$labels['delegateremoveacl'] = 'remove access rights on folders assigned to this user';
-$labels['deleteconfirm'] = 'Confirmation';
-$labels['deletesuccess'] = 'The delegate was successfully removed.';
-$labels['deleteerror'] = 'Could not remove delegate.';
-$labels['updatesuccess'] = 'The delegate was successfully updated.';
-$labels['updateerror'] = 'Could not update delegate.';
-$labels['createsuccess'] = 'The delegate was successfully added.';
-$labels['createerror'] = 'Could not add delegate.';
-
+$labels['contact'] = 'アドレス帳';
+$labels['event'] = 'カレンダー';
+$labels['task'] = 'タスク';
+$labels['note'] = 'ノート';
+$labels['yes'] = 'はい';
+$labels['no'] = 'いいえ';
+$labels['adddelegate'] = '委任者を追加';
+$labels['deletedelegate'] = '委任者を削除';
+$labels['savingdata'] = 'データを保存中…';
+$labels['delegatedeleteconfirm'] = 'この委任者を本当に削除しますか？';
+$labels['delegateremoveacl'] = 'このユーザにアサインされたフォルダのアクセス権を削除しました';
+$labels['deleteconfirm'] = '確認';
+$labels['deletesuccess'] = '委任者の削除に成功しました';
+$labels['deleteerror'] = '委任者の削除ができません。';
+$labels['updatesuccess'] = '委任者の更新に成功しました。';
+$labels['updateerror'] = '委任者の更新ができません。';
+$labels['createsuccess'] = '委任者の追加に成功しました。';
+$labels['createerror'] = '委任者の追加ができません。';
 ?>
diff --git a/plugins/kolab_delegation/localization/nl_NL.inc b/plugins/kolab_delegation/localization/nl_NL.inc
index 2d95f529..6b57c673 100644
--- a/plugins/kolab_delegation/localization/nl_NL.inc
+++ b/plugins/kolab_delegation/localization/nl_NL.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['tabtitle'] = 'Delegatie';
 $labels['delegates'] = 'Gedelegeerden';
 $labels['delegate'] = 'Gedelegeerde';
@@ -12,10 +9,8 @@ $labels['task'] = 'Taken';
 $labels['note'] = 'Notities';
 $labels['yes'] = 'Ja';
 $labels['no'] = 'Nee';
-
 $labels['adddelegate'] = 'Gedelegeerde toevoegen';
 $labels['deletedelegate'] = 'Gedelegeerde verwijderen';
-
 $labels['savingdata'] = 'Data wordt opgeslagen...';
 $labels['delegatedeleteconfirm'] = 'Wilt u deze gedelegeerde echt verwijderen?';
 $labels['delegateremoveacl'] = 'verwijder toegangsrechten op mappen toegewezen aan deze gebruiker';
@@ -26,5 +21,4 @@ $labels['updatesuccess'] = 'De gedelegeerde is succesvol gewijzigd.';
 $labels['updateerror'] = 'De gedelegeerde kon niet worden gewijzigd.';
 $labels['createsuccess'] = 'De gedelegeerde is succesvol toegevoegd.';
 $labels['createerror'] = 'De gedelegeerde kon niet worden toegevoegd.';
-
 ?>
diff --git a/plugins/kolab_delegation/localization/pl_PL.inc b/plugins/kolab_delegation/localization/pl_PL.inc
index 2512d5ec..84ececdc 100644
--- a/plugins/kolab_delegation/localization/pl_PL.inc
+++ b/plugins/kolab_delegation/localization/pl_PL.inc
@@ -1,30 +1,9 @@
 <?php
-
-$labels = array();
-
-$labels['tabtitle'] = 'Delegation';
 $labels['delegates'] = 'Wydelegowani';
-$labels['delegate'] = 'Delegate';
-$labels['mail'] = 'Email';
-$labels['contact'] = 'Address Books';
-$labels['event'] = 'Calendars';
-$labels['task'] = 'Tasks';
-$labels['note'] = 'Notes';
-$labels['yes'] = 'Yes';
-$labels['no'] = 'No';
-
-$labels['adddelegate'] = 'Add delegate';
-$labels['deletedelegate'] = 'Delete delegate';
-
+$labels['mail'] = 'Poczta';
+$labels['contact'] = 'Książki adresowe';
+$labels['event'] = 'Kalendarze';
+$labels['task'] = 'Zadania';
+$labels['note'] = 'Notatki';
 $labels['savingdata'] = 'Zapisuję dane...';
-$labels['delegatedeleteconfirm'] = 'Do you really want to delete this delegate?';
-$labels['delegateremoveacl'] = 'remove access rights on folders assigned to this user';
-$labels['deleteconfirm'] = 'Confirmation';
-$labels['deletesuccess'] = 'The delegate was successfully removed.';
-$labels['deleteerror'] = 'Could not remove delegate.';
-$labels['updatesuccess'] = 'The delegate was successfully updated.';
-$labels['updateerror'] = 'Could not update delegate.';
-$labels['createsuccess'] = 'The delegate was successfully added.';
-$labels['createerror'] = 'Could not add delegate.';
-
 ?>
diff --git a/plugins/kolab_delegation/localization/pt_BR.inc b/plugins/kolab_delegation/localization/pt_BR.inc
new file mode 100644
index 00000000..3536dc04
--- /dev/null
+++ b/plugins/kolab_delegation/localization/pt_BR.inc
@@ -0,0 +1,24 @@
+<?php
+$labels['tabtitle'] = 'Delegação';
+$labels['delegates'] = 'Delegados';
+$labels['delegate'] = 'Delegado';
+$labels['mail'] = 'E-mail';
+$labels['contact'] = 'Catálogo de endereços';
+$labels['event'] = 'Calendários';
+$labels['task'] = 'Tarefas';
+$labels['note'] = 'Notas';
+$labels['yes'] = 'SIm';
+$labels['no'] = 'Não';
+$labels['adddelegate'] = 'Adicionar delegado';
+$labels['deletedelegate'] = 'Remover delegado';
+$labels['savingdata'] = 'Salvando dados...';
+$labels['delegatedeleteconfirm'] = 'Você realmente gostaria de remover este delegado?';
+$labels['delegateremoveacl'] = 'remover permissões de acesso sobre pastas assinadas por este usuário ';
+$labels['deleteconfirm'] = 'Confirmação';
+$labels['deletesuccess'] = 'O delegado foi removido com sucesso.';
+$labels['deleteerror'] = 'Não foi possível remover o delegado.';
+$labels['updatesuccess'] = 'O delegado foi atualizado com sucesso.';
+$labels['updateerror'] = 'Não foi possível atualizar o delegado';
+$labels['createsuccess'] = 'O delegado foi adicionado com sucesso.';
+$labels['createerror'] = 'Não foi possível adicionar o delegado';
+?>
diff --git a/plugins/kolab_delegation/localization/ru_RU.inc b/plugins/kolab_delegation/localization/ru_RU.inc
index b3b33057..ce6d0e41 100644
--- a/plugins/kolab_delegation/localization/ru_RU.inc
+++ b/plugins/kolab_delegation/localization/ru_RU.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['tabtitle'] = 'Делегирование';
 $labels['delegates'] = 'Представители';
 $labels['delegate'] = 'Представитель';
@@ -12,10 +9,8 @@ $labels['task'] = 'Задачи';
 $labels['note'] = 'Заметки';
 $labels['yes'] = 'Да';
 $labels['no'] = 'Нет';
-
 $labels['adddelegate'] = 'Добавить представителя';
 $labels['deletedelegate'] = 'Исключить из представителей';
-
 $labels['savingdata'] = 'Сохранение данных...';
 $labels['delegatedeleteconfirm'] = 'Вы действительно хотите исключить этого пользователя из представителей?';
 $labels['delegateremoveacl'] = 'удалить права на доступ к каталогам назначенные этому пользователю';
@@ -26,5 +21,4 @@ $labels['updatesuccess'] = 'Представитель был успешно о
 $labels['updateerror'] = 'Не удалось обновить представителя.';
 $labels['createsuccess'] = 'Представитель успешно добавлен.';
 $labels['createerror'] = 'Не удалось добавить представителя.';
-
 ?>
diff --git a/plugins/kolab_files/localization/bg_BG.inc b/plugins/kolab_files/localization/bg_BG.inc
new file mode 100644
index 00000000..7b7e2a4c
--- /dev/null
+++ b/plugins/kolab_files/localization/bg_BG.inc
@@ -0,0 +1,9 @@
+<?php
+$labels['files'] = 'Файлове';
+$labels['save'] = 'Запис';
+$labels['cancel'] = 'Отказ';
+$labels['folderinside'] = 'Внасяне вътре';
+$labels['name'] = 'Име';
+$labels['edit'] = 'Промяна';
+$labels['save'] = 'Запис';
+?>
diff --git a/plugins/kolab_files/localization/cs_CZ.inc b/plugins/kolab_files/localization/cs_CZ.inc
new file mode 100644
index 00000000..0e56d354
--- /dev/null
+++ b/plugins/kolab_files/localization/cs_CZ.inc
@@ -0,0 +1,8 @@
+<?php
+$labels['save'] = 'Uložit';
+$labels['cancel'] = 'Storno';
+$labels['folderinside'] = 'Vložit dovnitř';
+$labels['name'] = 'Název';
+$labels['edit'] = 'Upravit';
+$labels['save'] = 'Uložit';
+?>
diff --git a/plugins/kolab_files/localization/de_CH.inc b/plugins/kolab_files/localization/de_CH.inc
new file mode 100644
index 00000000..e78e76f6
--- /dev/null
+++ b/plugins/kolab_files/localization/de_CH.inc
@@ -0,0 +1,9 @@
+<?php
+$labels['files'] = 'Dateien';
+$labels['save'] = 'Speichern';
+$labels['cancel'] = 'Abbrechen';
+$labels['folderinside'] = 'Erstellen in';
+$labels['name'] = 'Name';
+$labels['edit'] = 'Bearbeiten';
+$labels['save'] = 'Speichern';
+?>
diff --git a/plugins/kolab_files/localization/de_DE.inc b/plugins/kolab_files/localization/de_DE.inc
new file mode 100644
index 00000000..e78e76f6
--- /dev/null
+++ b/plugins/kolab_files/localization/de_DE.inc
@@ -0,0 +1,9 @@
+<?php
+$labels['files'] = 'Dateien';
+$labels['save'] = 'Speichern';
+$labels['cancel'] = 'Abbrechen';
+$labels['folderinside'] = 'Erstellen in';
+$labels['name'] = 'Name';
+$labels['edit'] = 'Bearbeiten';
+$labels['save'] = 'Speichern';
+?>
diff --git a/plugins/kolab_files/localization/es_ES.inc b/plugins/kolab_files/localization/es_ES.inc
new file mode 100644
index 00000000..13ace68f
--- /dev/null
+++ b/plugins/kolab_files/localization/es_ES.inc
@@ -0,0 +1,8 @@
+<?php
+$labels['save'] = 'Guardar';
+$labels['cancel'] = 'Cancelar';
+$labels['name'] = 'Nombre';
+$labels['type'] = 'Tipo';
+$labels['edit'] = 'Editar';
+$labels['save'] = 'Guardar';
+?>
diff --git a/plugins/kolab_files/localization/et_EE.inc b/plugins/kolab_files/localization/et_EE.inc
new file mode 100644
index 00000000..5063751b
--- /dev/null
+++ b/plugins/kolab_files/localization/et_EE.inc
@@ -0,0 +1,5 @@
+<?php
+$labels['save'] = 'Salvesta';
+$labels['name'] = 'Nimi';
+$labels['save'] = 'Salvesta';
+?>
diff --git a/plugins/kolab_files/localization/fr_FR.inc b/plugins/kolab_files/localization/fr_FR.inc
new file mode 100644
index 00000000..82125281
--- /dev/null
+++ b/plugins/kolab_files/localization/fr_FR.inc
@@ -0,0 +1,10 @@
+<?php
+$labels['files'] = 'Fichiers';
+$labels['save'] = 'Enregistrer';
+$labels['cancel'] = 'Annuler';
+$labels['folderinside'] = 'Ajouter à l\'intérieur';
+$labels['name'] = 'Nom';
+$labels['type'] = 'Type';
+$labels['edit'] = 'Modifier';
+$labels['save'] = 'Enregistrer';
+?>
diff --git a/plugins/kolab_files/localization/hu_HU.inc b/plugins/kolab_files/localization/hu_HU.inc
new file mode 100644
index 00000000..7870ca92
--- /dev/null
+++ b/plugins/kolab_files/localization/hu_HU.inc
@@ -0,0 +1,5 @@
+<?php
+$labels['save'] = 'Mentés';
+$labels['cancel'] = 'Mégse';
+$labels['save'] = 'Mentés';
+?>
diff --git a/plugins/kolab_files/localization/it_IT.inc b/plugins/kolab_files/localization/it_IT.inc
new file mode 100644
index 00000000..df257d61
--- /dev/null
+++ b/plugins/kolab_files/localization/it_IT.inc
@@ -0,0 +1,5 @@
+<?php
+$labels['save'] = 'Salva';
+$labels['cancel'] = 'Annulla';
+$labels['save'] = 'Salva';
+?>
diff --git a/plugins/kolab_files/localization/ja_JP.inc b/plugins/kolab_files/localization/ja_JP.inc
new file mode 100644
index 00000000..e5ce909b
--- /dev/null
+++ b/plugins/kolab_files/localization/ja_JP.inc
@@ -0,0 +1,10 @@
+<?php
+$labels['files'] = 'ファイル';
+$labels['save'] = '保存';
+$labels['cancel'] = 'キャンセル';
+$labels['folderinside'] = '内に挿入';
+$labels['foldername'] = 'フォルダネーム';
+$labels['name'] = '名前';
+$labels['edit'] = '編集';
+$labels['save'] = '保存';
+?>
diff --git a/plugins/kolab_files/localization/nl_NL.inc b/plugins/kolab_files/localization/nl_NL.inc
new file mode 100644
index 00000000..5d82d11d
--- /dev/null
+++ b/plugins/kolab_files/localization/nl_NL.inc
@@ -0,0 +1,9 @@
+<?php
+$labels['files'] = 'Bestanden';
+$labels['save'] = 'Opslaan';
+$labels['cancel'] = 'Annuleren';
+$labels['foldername'] = 'Folder naam';
+$labels['name'] = 'Naam';
+$labels['edit'] = 'Wijzigen';
+$labels['save'] = 'Opslaan';
+?>
diff --git a/plugins/kolab_files/localization/pl_PL.inc b/plugins/kolab_files/localization/pl_PL.inc
new file mode 100644
index 00000000..3d8d7708
--- /dev/null
+++ b/plugins/kolab_files/localization/pl_PL.inc
@@ -0,0 +1,8 @@
+<?php
+$labels['files'] = 'Pliki';
+$labels['save'] = 'Zapisz';
+$labels['cancel'] = 'Anuluj';
+$labels['name'] = 'Nazwa';
+$labels['edit'] = 'Edytuj';
+$labels['save'] = 'Zapisz';
+?>
diff --git a/plugins/kolab_files/localization/pt_BR.inc b/plugins/kolab_files/localization/pt_BR.inc
new file mode 100644
index 00000000..5a3aa791
--- /dev/null
+++ b/plugins/kolab_files/localization/pt_BR.inc
@@ -0,0 +1,10 @@
+<?php
+$labels['files'] = 'Arquivos';
+$labels['save'] = 'Salvar';
+$labels['cancel'] = 'Cancelar';
+$labels['folderinside'] = 'Inserir dentro';
+$labels['foldername'] = 'Nome da pasta';
+$labels['name'] = 'Nome';
+$labels['edit'] = 'Editar';
+$labels['save'] = 'Salvar';
+?>
diff --git a/plugins/kolab_files/localization/ru_RU.inc b/plugins/kolab_files/localization/ru_RU.inc
new file mode 100644
index 00000000..3ead0c32
--- /dev/null
+++ b/plugins/kolab_files/localization/ru_RU.inc
@@ -0,0 +1,9 @@
+<?php
+$labels['files'] = 'Файлы';
+$labels['save'] = 'Сохранить';
+$labels['cancel'] = 'Отмена';
+$labels['folderinside'] = 'Вставить внутри';
+$labels['name'] = 'Имя';
+$labels['edit'] = 'Редактировать';
+$labels['save'] = 'Сохранить';
+?>
diff --git a/plugins/kolab_folders/localization/bg_BG.inc b/plugins/kolab_folders/localization/bg_BG.inc
new file mode 100644
index 00000000..04f9298b
--- /dev/null
+++ b/plugins/kolab_folders/localization/bg_BG.inc
@@ -0,0 +1,19 @@
+<?php
+$labels['folderctype'] = 'Тип на съдържанието';
+$labels['foldertypemail'] = 'Поща';
+$labels['foldertypeevent'] = 'Календар'; // Events?
+$labels['foldertypejournal'] = 'Дневник';
+$labels['foldertypetask'] = 'Задачи';
+$labels['foldertypenote'] = 'Бележки';
+$labels['foldertypecontact'] = 'Контакти';
+$labels['foldertypeconfiguration'] = 'Конфигурация';
+$labels['foldertypefile'] = 'Файлове';
+$labels['default'] = 'По подразбиране';
+$labels['inbox'] = 'Вх. поща';
+$labels['drafts'] = 'Чернови';
+$labels['sentitems'] = 'Изпратени';
+$labels['outbox'] = 'Изходящи';
+$labels['wastebasket'] = 'Кошче';
+$labels['junkemail'] = 'Нежелани';
+$messages['defaultfolderexists'] = 'Вече има папка по подразбиране за въпросният тип';
+?>
diff --git a/plugins/kolab_folders/localization/cs_CZ.inc b/plugins/kolab_folders/localization/cs_CZ.inc
new file mode 100644
index 00000000..541aa48e
--- /dev/null
+++ b/plugins/kolab_folders/localization/cs_CZ.inc
@@ -0,0 +1,3 @@
+<?php
+$labels['foldertypeevent'] = 'Kalendář'; // Events?
+?>
diff --git a/plugins/kolab_folders/localization/de_CH.inc b/plugins/kolab_folders/localization/de_CH.inc
index f9f6e169..b53eea0b 100644
--- a/plugins/kolab_folders/localization/de_CH.inc
+++ b/plugins/kolab_folders/localization/de_CH.inc
@@ -1,16 +1,14 @@
 <?php
-
-$labels = array();
-
 $labels['folderctype'] = 'Ordnerinhalt';
 $labels['foldertypemail'] = 'E-Mail';
-$labels['foldertypeevent'] = 'Kalender'; // Termine?
+$labels['foldertypeevent'] = 'Kalender'; // Events?
 $labels['foldertypejournal'] = 'Journal';
 $labels['foldertypetask'] = 'Aufgaben';
 $labels['foldertypenote'] = 'Notizen';
 $labels['foldertypecontact'] = 'Kontakte';
 $labels['foldertypeconfiguration'] = 'Konfiguration';
-
+$labels['foldertypefile'] = 'Dateien';
+$labels['foldertypefreebusy'] = 'Frei-Besetzt';
 $labels['default'] = 'Standard';
 $labels['inbox'] = 'Posteingang';
 $labels['drafts'] = 'Entwürfe';
@@ -18,7 +16,5 @@ $labels['sentitems'] = 'Gesendet';
 $labels['outbox'] = 'Postausgang';
 $labels['wastebasket'] = 'Gelöscht';
 $labels['junkemail'] = 'Spam';
-
 $messages['defaultfolderexists'] = 'Es existiert bereits ein Standardordner für den angegebenen Typ';
-
 ?>
diff --git a/plugins/kolab_folders/localization/de_DE.inc b/plugins/kolab_folders/localization/de_DE.inc
index f9f6e169..60c67411 100644
--- a/plugins/kolab_folders/localization/de_DE.inc
+++ b/plugins/kolab_folders/localization/de_DE.inc
@@ -1,24 +1,20 @@
 <?php
-
-$labels = array();
-
 $labels['folderctype'] = 'Ordnerinhalt';
 $labels['foldertypemail'] = 'E-Mail';
-$labels['foldertypeevent'] = 'Kalender'; // Termine?
+$labels['foldertypeevent'] = 'Kalender'; // Events?
 $labels['foldertypejournal'] = 'Journal';
 $labels['foldertypetask'] = 'Aufgaben';
 $labels['foldertypenote'] = 'Notizen';
 $labels['foldertypecontact'] = 'Kontakte';
 $labels['foldertypeconfiguration'] = 'Konfiguration';
-
+$labels['foldertypefile'] = 'Dateien';
+$labels['foldertypefreebusy'] = 'Frei/Belegt';
 $labels['default'] = 'Standard';
 $labels['inbox'] = 'Posteingang';
 $labels['drafts'] = 'Entwürfe';
 $labels['sentitems'] = 'Gesendet';
 $labels['outbox'] = 'Postausgang';
-$labels['wastebasket'] = 'Gelöscht';
+$labels['wastebasket'] = 'Mülleimer';
 $labels['junkemail'] = 'Spam';
-
-$messages['defaultfolderexists'] = 'Es existiert bereits ein Standardordner für den angegebenen Typ';
-
+$messages['defaultfolderexists'] = 'Es gibt bereits einen Standardordner dieses Typs';
 ?>
diff --git a/plugins/kolab_folders/localization/es_ES.inc b/plugins/kolab_folders/localization/es_ES.inc
index 0481d093..91fe5b48 100644
--- a/plugins/kolab_folders/localization/es_ES.inc
+++ b/plugins/kolab_folders/localization/es_ES.inc
@@ -1,26 +1,7 @@
 <?php
-
-$labels = array();
-
-$labels['folderctype'] = 'Content type';
-$labels['foldertypemail'] = 'Mail';
-$labels['foldertypeevent'] = 'Calendar'; // Events?
-$labels['foldertypejournal'] = 'Journal';
+$labels['foldertypeevent'] = ''; // Events?
 $labels['foldertypetask'] = 'Tareas';
 $labels['foldertypenote'] = 'Notas';
 $labels['foldertypecontact'] = 'Contactos';
 $labels['foldertypeconfiguration'] = 'Configuración';
-$labels['foldertypefile'] = 'Files';
-$labels['foldertypefreebusy'] = 'Free-Busy';
-
-$labels['default'] = 'Default';
-$labels['inbox'] = 'Inbox';
-$labels['drafts'] = 'Drafts';
-$labels['sentitems'] = 'Sent';
-$labels['outbox'] = 'Outbox';
-$labels['wastebasket'] = 'Trash';
-$labels['junkemail'] = 'Junk';
-
-$messages['defaultfolderexists'] = 'There is already default folder of specified type';
-
 ?>
diff --git a/plugins/kolab_folders/localization/et_EE.inc b/plugins/kolab_folders/localization/et_EE.inc
index 856f59d5..e39fe4a8 100644
--- a/plugins/kolab_folders/localization/et_EE.inc
+++ b/plugins/kolab_folders/localization/et_EE.inc
@@ -1,26 +1,3 @@
 <?php
-
-$labels = array();
-
-$labels['folderctype'] = 'Content type';
-$labels['foldertypemail'] = 'Mail';
-$labels['foldertypeevent'] = 'Calendar'; // Events?
-$labels['foldertypejournal'] = 'Journal';
-$labels['foldertypetask'] = 'Tasks';
-$labels['foldertypenote'] = 'Notes';
-$labels['foldertypecontact'] = 'Contacts';
-$labels['foldertypeconfiguration'] = 'Configuration';
-$labels['foldertypefile'] = 'Files';
-$labels['foldertypefreebusy'] = 'Free-Busy';
-
-$labels['default'] = 'Default';
-$labels['inbox'] = 'Inbox';
-$labels['drafts'] = 'Drafts';
-$labels['sentitems'] = 'Sent';
-$labels['outbox'] = 'Outbox';
-$labels['wastebasket'] = 'Trash';
-$labels['junkemail'] = 'Junk';
-
-$messages['defaultfolderexists'] = 'There is already default folder of specified type';
-
+$labels['foldertypeevent'] = ''; // Events?
 ?>
diff --git a/plugins/kolab_folders/localization/fr_FR.inc b/plugins/kolab_folders/localization/fr_FR.inc
index 19e03e75..9ddece14 100644
--- a/plugins/kolab_folders/localization/fr_FR.inc
+++ b/plugins/kolab_folders/localization/fr_FR.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['folderctype'] = 'Type de contenu';
 $labels['foldertypemail'] = 'Courriel';
 $labels['foldertypeevent'] = 'Calendrier'; // Events?
@@ -12,7 +9,6 @@ $labels['foldertypecontact'] = 'Contacts';
 $labels['foldertypeconfiguration'] = 'Configuration';
 $labels['foldertypefile'] = 'Fichiers';
 $labels['foldertypefreebusy'] = 'Disponible/Occupé';
-
 $labels['default'] = 'Par Défaut';
 $labels['inbox'] = 'Courrier entrant';
 $labels['drafts'] = 'Brouillons';
@@ -20,7 +16,5 @@ $labels['sentitems'] = 'Envoyés';
 $labels['outbox'] = 'Courrier sortant';
 $labels['wastebasket'] = 'Corbeille';
 $labels['junkemail'] = 'Indésirables';
-
 $messages['defaultfolderexists'] = 'Il existe déjà un répertoire par défaut pour le type spécifié';
-
 ?>
diff --git a/plugins/kolab_folders/localization/ja_JP.inc b/plugins/kolab_folders/localization/ja_JP.inc
index 3bba3ed2..14f3692d 100644
--- a/plugins/kolab_folders/localization/ja_JP.inc
+++ b/plugins/kolab_folders/localization/ja_JP.inc
@@ -1,26 +1,20 @@
 <?php
-
-$labels = array();
-
-$labels['folderctype'] = 'Content type';
-$labels['foldertypemail'] = 'Mail';
-$labels['foldertypeevent'] = 'Calendar'; // Events?
-$labels['foldertypejournal'] = 'Journal';
-$labels['foldertypetask'] = 'Tasks';
-$labels['foldertypenote'] = 'Notes';
-$labels['foldertypecontact'] = 'Contacts';
+$labels['folderctype'] = 'コンテンツタイプ';
+$labels['foldertypemail'] = 'メール';
+$labels['foldertypeevent'] = 'カレンダー'; // Events?
+$labels['foldertypejournal'] = 'ジャーナル';
+$labels['foldertypetask'] = 'タスク';
+$labels['foldertypenote'] = 'ノート';
+$labels['foldertypecontact'] = 'コンタクト';
 $labels['foldertypeconfiguration'] = '設定';
-$labels['foldertypefile'] = 'Files';
-$labels['foldertypefreebusy'] = 'Free-Busy';
-
-$labels['default'] = 'Default';
-$labels['inbox'] = 'Inbox';
-$labels['drafts'] = 'Drafts';
-$labels['sentitems'] = 'Sent';
-$labels['outbox'] = 'Outbox';
-$labels['wastebasket'] = 'Trash';
-$labels['junkemail'] = 'Junk';
-
-$messages['defaultfolderexists'] = 'There is already default folder of specified type';
-
+$labels['foldertypefile'] = 'ファイル';
+$labels['foldertypefreebusy'] = '空状況';
+$labels['default'] = 'デフォルト';
+$labels['inbox'] = '受信箱';
+$labels['drafts'] = '下書き';
+$labels['sentitems'] = '送信済';
+$labels['outbox'] = '送信箱';
+$labels['wastebasket'] = 'ごみ箱';
+$labels['junkemail'] = '迷惑メール';
+$messages['defaultfolderexists'] = '指定したタイプの初期フォルダは既にあります。';
 ?>
diff --git a/plugins/kolab_folders/localization/nl_NL.inc b/plugins/kolab_folders/localization/nl_NL.inc
index 30112793..e0dffcd1 100644
--- a/plugins/kolab_folders/localization/nl_NL.inc
+++ b/plugins/kolab_folders/localization/nl_NL.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['folderctype'] = 'Inhoudstype';
 $labels['foldertypemail'] = 'Mail';
 $labels['foldertypeevent'] = 'Agenda'; // Events?
@@ -12,7 +9,6 @@ $labels['foldertypecontact'] = 'Adresboek';
 $labels['foldertypeconfiguration'] = 'Configuratie';
 $labels['foldertypefile'] = 'Bestanden';
 $labels['foldertypefreebusy'] = 'Free/Busy';
-
 $labels['default'] = 'Standaard';
 $labels['inbox'] = 'Inbox';
 $labels['drafts'] = 'Concepten';
@@ -20,7 +16,5 @@ $labels['sentitems'] = 'Verzonden';
 $labels['outbox'] = 'Te versturen';
 $labels['wastebasket'] = 'Prullenbak';
 $labels['junkemail'] = 'Ongewenst';
-
 $messages['defaultfolderexists'] = 'Er is reeds een standaard map voor dit type inhoud';
-
 ?>
diff --git a/plugins/kolab_folders/localization/pl_PL.inc b/plugins/kolab_folders/localization/pl_PL.inc
index 4520dacf..f6d98a5a 100644
--- a/plugins/kolab_folders/localization/pl_PL.inc
+++ b/plugins/kolab_folders/localization/pl_PL.inc
@@ -1,23 +1,20 @@
 <?php
-
-$labels = array();
-$labels['folderctype'] = 'Zawartość';
+$labels['folderctype'] = 'Typ treści';
 $labels['foldertypemail'] = 'Poczta';
-$labels['foldertypeevent'] = 'Kalendarz';
+$labels['foldertypeevent'] = 'Kalendarz'; // Events?
 $labels['foldertypejournal'] = 'Dziennik';
 $labels['foldertypetask'] = 'Zadania';
 $labels['foldertypenote'] = 'Notatki';
 $labels['foldertypecontact'] = 'Kontakty';
 $labels['foldertypeconfiguration'] = 'Konfiguracja';
 $labels['foldertypefile'] = 'Pliki';
-$labels['foldertypefreebusy'] = 'Free-Busy';
+$labels['foldertypefreebusy'] = 'Wolny-Zajęty';
 $labels['default'] = 'Domyślny';
 $labels['inbox'] = 'Odebrane';
-$labels['drafts'] = 'Szkice';
+$labels['drafts'] = 'Kopie robocze';
 $labels['sentitems'] = 'Wysłane';
-$labels['outbox'] = 'Wychodzące';
+$labels['outbox'] = 'Poczta wychodząca';
 $labels['wastebasket'] = 'Kosz';
 $labels['junkemail'] = 'Spam';
-$messages['defaultfolderexists'] = 'Folder domyślny dla podanego typu już istnieje';
-
+$messages['defaultfolderexists'] = 'Folder domyślny wybranego typu już istnieje';
 ?>
diff --git a/plugins/kolab_folders/localization/pt_BR.inc b/plugins/kolab_folders/localization/pt_BR.inc
new file mode 100644
index 00000000..7027dc1d
--- /dev/null
+++ b/plugins/kolab_folders/localization/pt_BR.inc
@@ -0,0 +1,20 @@
+<?php
+$labels['folderctype'] = 'Tipo de conteúdo';
+$labels['foldertypemail'] = 'Correio';
+$labels['foldertypeevent'] = 'Calendário'; // Events?
+$labels['foldertypejournal'] = 'Journal';
+$labels['foldertypetask'] = 'Tarefas';
+$labels['foldertypenote'] = 'Notas';
+$labels['foldertypecontact'] = 'Contatos';
+$labels['foldertypeconfiguration'] = 'Configuração';
+$labels['foldertypefile'] = 'Arquivos';
+$labels['foldertypefreebusy'] = 'Livre-ocupado';
+$labels['default'] = 'Padrão';
+$labels['inbox'] = 'Caixa de entrada';
+$labels['drafts'] = 'Rascunhos';
+$labels['sentitems'] = 'Enviados';
+$labels['outbox'] = 'Caixa de saída';
+$labels['wastebasket'] = 'Lixeira';
+$labels['junkemail'] = 'Spam';
+$messages['defaultfolderexists'] = 'Já existe um diretório padrão do tipo especificado';
+?>
diff --git a/plugins/kolab_folders/localization/ru_RU.inc b/plugins/kolab_folders/localization/ru_RU.inc
index e9878baf..3e554805 100644
--- a/plugins/kolab_folders/localization/ru_RU.inc
+++ b/plugins/kolab_folders/localization/ru_RU.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['folderctype'] = 'Тип ящика';
 $labels['foldertypemail'] = 'Почта';
 $labels['foldertypeevent'] = 'Календарь'; // Events?
@@ -12,7 +9,6 @@ $labels['foldertypecontact'] = 'Контакты';
 $labels['foldertypeconfiguration'] = 'Настройки';
 $labels['foldertypefile'] = 'Файлы';
 $labels['foldertypefreebusy'] = 'Занят/Свободен';
-
 $labels['default'] = 'По умолчанию';
 $labels['inbox'] = 'Входящие';
 $labels['drafts'] = 'Черновики';
@@ -20,7 +16,5 @@ $labels['sentitems'] = 'Отправленные';
 $labels['outbox'] = 'Исходящие';
 $labels['wastebasket'] = 'Корзина';
 $labels['junkemail'] = 'Спам';
-
 $messages['defaultfolderexists'] = 'Уже назначен ящик по умолчанию для указанного типа';
-
 ?>
diff --git a/plugins/kolab_folders/localization/vi.inc b/plugins/kolab_folders/localization/vi.inc
new file mode 100644
index 00000000..e39fe4a8
--- /dev/null
+++ b/plugins/kolab_folders/localization/vi.inc
@@ -0,0 +1,3 @@
+<?php
+$labels['foldertypeevent'] = ''; // Events?
+?>
diff --git a/plugins/kolab_zpush/localization/de_CH.inc b/plugins/kolab_zpush/localization/de_CH.inc
index f0abdbf5..74445a49 100644
--- a/plugins/kolab_zpush/localization/de_CH.inc
+++ b/plugins/kolab_zpush/localization/de_CH.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Geräte';
 $labels['devicealias'] = 'Gerätename';
@@ -28,5 +26,4 @@ $labels['savingerror'] = 'Fehler beim Speichern';
 $labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
 $labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
 $labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
-
 ?>
diff --git a/plugins/kolab_zpush/localization/de_DE.inc b/plugins/kolab_zpush/localization/de_DE.inc
index f0abdbf5..74445a49 100644
--- a/plugins/kolab_zpush/localization/de_DE.inc
+++ b/plugins/kolab_zpush/localization/de_DE.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Geräte';
 $labels['devicealias'] = 'Gerätename';
@@ -28,5 +26,4 @@ $labels['savingerror'] = 'Fehler beim Speichern';
 $labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
 $labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
 $labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
-
 ?>
diff --git a/plugins/kolab_zpush/localization/pl_PL.inc b/plugins/kolab_zpush/localization/pl_PL.inc
index 53b5faf2..64d63854 100644
--- a/plugins/kolab_zpush/localization/pl_PL.inc
+++ b/plugins/kolab_zpush/localization/pl_PL.inc
@@ -1,6 +1,4 @@
 <?php
-
-$labels = array();
 $labels['tabtitle'] = 'ActiveSync';
 $labels['devices'] = 'Urządzenia';
 $labels['devicealias'] = 'Nazwa urządzenia';
@@ -28,5 +26,4 @@ $labels['savingerror'] = 'Nie udało się zapisać konfiguracji';
 $labels['notsupported'] = 'Twój serwer nie obsługuje metadanych (metadata/annotations).';
 $labels['devicedeleteconfirm'] = 'Czy na pewno chcesz usunąć konfigurację dla tego urządzenia?';
 $labels['successfullydeleted'] = 'Konfiguracja urządzenia została pomyślnie usunięta.';
-
 ?>
diff --git a/plugins/libcalendaring/localization/bg_BG.inc b/plugins/libcalendaring/localization/bg_BG.inc
new file mode 100644
index 00000000..2c46ab7a
--- /dev/null
+++ b/plugins/libcalendaring/localization/bg_BG.inc
@@ -0,0 +1,2 @@
+<?php
+$labels['alarmemailoption'] = 'Електронна поща';
diff --git a/plugins/libcalendaring/localization/cs_CZ.inc b/plugins/libcalendaring/localization/cs_CZ.inc
old mode 100755
new mode 100644
index 0515e193..aa6a04c2
--- a/plugins/libcalendaring/localization/cs_CZ.inc
+++ b/plugins/libcalendaring/localization/cs_CZ.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'Poslat e-mail';
 $labels['alarmdisplay'] = 'Zobrazit zprávu';
 $labels['alarmdisplayoption'] = 'Zpráva';
@@ -15,7 +12,6 @@ $labels['trigger+M'] = 'minut po';
 $labels['trigger+H'] = 'hodin po';
 $labels['trigger+D'] = 'dnů po';
 $labels['addalarm'] = 'přidat upozornění';
-
 $labels['alarmtitle'] = 'Blížící se události';
 $labels['dismissall'] = 'Zrušit vše';
 $labels['dismiss'] = 'Zrušit';
@@ -25,6 +21,4 @@ $labels['repeatinhr'] = 'Zopakovat za 1 hodinu';
 $labels['repeatinhrs'] = 'Zopakovat za $hrs hodin';
 $labels['repeattomorrow'] = 'Zopakovat zítra';
 $labels['repeatinweek'] = 'Zopakovat za týden';
-
 $labels['showmore'] = 'Ukázat víc...';
-
diff --git a/plugins/libcalendaring/localization/de_CH.inc b/plugins/libcalendaring/localization/de_CH.inc
index 37609317..565cf8b7 100644
--- a/plugins/libcalendaring/localization/de_CH.inc
+++ b/plugins/libcalendaring/localization/de_CH.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'E-Mail senden';
 $labels['alarmdisplay'] = 'Nachricht anzeigen';
 $labels['alarmdisplayoption'] = 'Nachricht';
@@ -15,7 +12,6 @@ $labels['trigger+M'] = 'Minuten danach';
 $labels['trigger+H'] = 'Stunden danach';
 $labels['trigger+D'] = 'Tage danach';
 $labels['addalarm'] = 'Erinnerung hinzufügen';
-
 $labels['alarmtitle'] = 'Anstehende Termine';
 $labels['dismissall'] = 'Alle ignorieren';
 $labels['dismiss'] = 'Ignorieren';
@@ -25,5 +21,4 @@ $labels['repeatinhr'] = 'Wiederholung in 1 Stunde';
 $labels['repeatinhrs'] = 'Wiederholung in $hrs Stunden';
 $labels['repeattomorrow'] = 'Wiederholung morgen';
 $labels['repeatinweek'] = 'Wiederholung in einer Woche';
-
 $labels['showmore'] = 'Mehr anzeigen...';
diff --git a/plugins/libcalendaring/localization/de_DE.inc b/plugins/libcalendaring/localization/de_DE.inc
index 37609317..565cf8b7 100644
--- a/plugins/libcalendaring/localization/de_DE.inc
+++ b/plugins/libcalendaring/localization/de_DE.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'E-Mail senden';
 $labels['alarmdisplay'] = 'Nachricht anzeigen';
 $labels['alarmdisplayoption'] = 'Nachricht';
@@ -15,7 +12,6 @@ $labels['trigger+M'] = 'Minuten danach';
 $labels['trigger+H'] = 'Stunden danach';
 $labels['trigger+D'] = 'Tage danach';
 $labels['addalarm'] = 'Erinnerung hinzufügen';
-
 $labels['alarmtitle'] = 'Anstehende Termine';
 $labels['dismissall'] = 'Alle ignorieren';
 $labels['dismiss'] = 'Ignorieren';
@@ -25,5 +21,4 @@ $labels['repeatinhr'] = 'Wiederholung in 1 Stunde';
 $labels['repeatinhrs'] = 'Wiederholung in $hrs Stunden';
 $labels['repeattomorrow'] = 'Wiederholung morgen';
 $labels['repeatinweek'] = 'Wiederholung in einer Woche';
-
 $labels['showmore'] = 'Mehr anzeigen...';
diff --git a/plugins/libcalendaring/localization/fr_FR.inc b/plugins/libcalendaring/localization/fr_FR.inc
index c33f29eb..e1409012 100644
--- a/plugins/libcalendaring/localization/fr_FR.inc
+++ b/plugins/libcalendaring/localization/fr_FR.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'Envoyer un email';
 $labels['alarmdisplay'] = 'Voir le message';
 $labels['alarmdisplayoption'] = 'Message';
@@ -15,7 +12,6 @@ $labels['trigger+M'] = 'minutes après';
 $labels['trigger+H'] = 'heures après';
 $labels['trigger+D'] = 'jours après';
 $labels['addalarm'] = 'ajouter alarme';
-
 $labels['alarmtitle'] = 'Evénements à venir';
 $labels['dismissall'] = 'Tout supprimer';
 $labels['dismiss'] = 'Abandonner';
@@ -25,6 +21,4 @@ $labels['repeatinhr'] = 'Répéter dans 1 heure';
 $labels['repeatinhrs'] = 'Répéter dans $hrs heures';
 $labels['repeattomorrow'] = 'Répéter demain';
 $labels['repeatinweek'] = 'Répéter dans une semaine';
-
 $labels['showmore'] = 'Afficher plus...';
-
diff --git a/plugins/libcalendaring/localization/ja_JP.inc b/plugins/libcalendaring/localization/ja_JP.inc
new file mode 100644
index 00000000..60f9eaa7
--- /dev/null
+++ b/plugins/libcalendaring/localization/ja_JP.inc
@@ -0,0 +1,24 @@
+<?php
+$labels['alarmemail'] = 'メール送信';
+$labels['alarmdisplay'] = 'メッセージ表示';
+$labels['alarmdisplayoption'] = 'メッセージ';
+$labels['alarmemailoption'] = 'Eメール';
+$labels['alarmat'] = '$datetime に';
+$labels['trigger@'] = '日付に';
+$labels['trigger-M'] = '分前';
+$labels['trigger-H'] = '時間前';
+$labels['trigger-D'] = '分後';
+$labels['trigger+M'] = '分後';
+$labels['trigger+H'] = '時間後';
+$labels['trigger+D'] = '日後';
+$labels['addalarm'] = 'アラーム追加';
+$labels['alarmtitle'] = '今後のイベント';
+$labels['dismissall'] = '全て削除';
+$labels['dismiss'] = '削除';
+$labels['snooze'] = 'スノーズ';
+$labels['repeatinmin'] = '$min 以内で繰返し';
+$labels['repeatinhr'] = '1時間で繰返し';
+$labels['repeatinhrs'] = '$hrs で繰返し';
+$labels['repeattomorrow'] = '明日繰返し';
+$labels['repeatinweek'] = '1週間で繰返し';
+$labels['showmore'] = 'さらに表示…';
diff --git a/plugins/libcalendaring/localization/nl_NL.inc b/plugins/libcalendaring/localization/nl_NL.inc
new file mode 100644
index 00000000..41eb2643
--- /dev/null
+++ b/plugins/libcalendaring/localization/nl_NL.inc
@@ -0,0 +1,22 @@
+<?php
+$labels['alarmemail'] = 'Verzend E-mail';
+$labels['alarmdisplay'] = 'Bericht weergeven';
+$labels['alarmdisplayoption'] = 'Bericht';
+$labels['alarmemailoption'] = 'E-mail';
+$labels['alarmat'] = 'op $datetime';
+$labels['trigger@'] = 'op datum';
+$labels['trigger-M'] = 'minuten voor';
+$labels['trigger-H'] = 'uren voor';
+$labels['trigger-D'] = 'dagen voor';
+$labels['trigger+M'] = 'minuten na';
+$labels['trigger+H'] = 'uren na';
+$labels['trigger+D'] = 'dagen na';
+$labels['addalarm'] = 'alarm toevoegen';
+$labels['alarmtitle'] = 'Aankomende evenementen';
+$labels['snooze'] = 'Snooze';
+$labels['repeatinmin'] = 'Herhaal over $min minuten';
+$labels['repeatinhr'] = 'Herhaal over 1 uur';
+$labels['repeatinhrs'] = 'Herhaal over $hrs uur';
+$labels['repeattomorrow'] = 'Herhaal morgen';
+$labels['repeatinweek'] = 'Herhaal over een week';
+$labels['showmore'] = 'Toon meer...';
diff --git a/plugins/libcalendaring/localization/pl_PL.inc b/plugins/libcalendaring/localization/pl_PL.inc
index 69a0ed54..73fe126d 100644
--- a/plugins/libcalendaring/localization/pl_PL.inc
+++ b/plugins/libcalendaring/localization/pl_PL.inc
@@ -1,21 +1,17 @@
 <?php
-
-$labels = array();
-
-$labels['alarmemail'] = 'Wyślij pocztę';
+$labels['alarmemail'] = 'Wyślij e-mail';
 $labels['alarmdisplay'] = 'Pokaż wiadomość';
 $labels['alarmdisplayoption'] = 'Wiadomość';
-$labels['alarmemailoption'] = 'Poczta';
+$labels['alarmemailoption'] = 'E-mail';
 $labels['alarmat'] = 'o $datetime';
 $labels['trigger@'] = 'w dniu';
-$labels['trigger-M'] = 'minuty przed';
+$labels['trigger-M'] = 'minut(y) przed';
 $labels['trigger-H'] = 'godziny przed';
 $labels['trigger-D'] = 'dni przed';
 $labels['trigger+M'] = 'minut po';
-$labels['trigger+H'] = 'godziny po';
+$labels['trigger+H'] = 'godzin(y) po';
 $labels['trigger+D'] = 'dni po';
 $labels['addalarm'] = 'dodaj alarm';
-
 $labels['alarmtitle'] = 'Nadchodzące zdarzenia';
 $labels['dismissall'] = 'Odrzuć wszystkie';
 $labels['dismiss'] = 'Odrzuć';
@@ -25,6 +21,4 @@ $labels['repeatinhr'] = 'Powtórz po godzinie';
 $labels['repeatinhrs'] = 'Powtórz po $hrs godzinach';
 $labels['repeattomorrow'] = 'Powtórz jutro';
 $labels['repeatinweek'] = 'Powtórz za tydzień';
-
 $labels['showmore'] = 'Pokaż więcej...';
-
diff --git a/plugins/libcalendaring/localization/pt_BR.inc b/plugins/libcalendaring/localization/pt_BR.inc
new file mode 100644
index 00000000..481ebdae
--- /dev/null
+++ b/plugins/libcalendaring/localization/pt_BR.inc
@@ -0,0 +1,24 @@
+<?php
+$labels['alarmemail'] = 'Enviar Email';
+$labels['alarmdisplay'] = 'Mostrar mensagem';
+$labels['alarmdisplayoption'] = 'Mensagem';
+$labels['alarmemailoption'] = 'Email';
+$labels['alarmat'] = 'como $datetime';
+$labels['trigger@'] = 'na data';
+$labels['trigger-M'] = 'minutos antes';
+$labels['trigger-H'] = 'horas antes';
+$labels['trigger-D'] = 'dias antes';
+$labels['trigger+M'] = 'minutos depois';
+$labels['trigger+H'] = 'horas depois';
+$labels['trigger+D'] = 'dias depois';
+$labels['addalarm'] = 'adicionar alarme';
+$labels['alarmtitle'] = 'Próximos eventos';
+$labels['dismissall'] = 'Dispensar tudo';
+$labels['dismiss'] = 'Dispensar';
+$labels['snooze'] = 'Tirar uma soneca';
+$labels['repeatinmin'] = 'Repetir em $min minutos';
+$labels['repeatinhr'] = 'Repetir em 1 hora';
+$labels['repeatinhrs'] = 'Repetir em $hrs horas';
+$labels['repeattomorrow'] = 'Repetir amanhã';
+$labels['repeatinweek'] = 'Repetir em uma semana';
+$labels['showmore'] = 'Mostrar mais...';
diff --git a/plugins/libcalendaring/localization/ru_RU.inc b/plugins/libcalendaring/localization/ru_RU.inc
index 0057ebba..a37e761a 100644
--- a/plugins/libcalendaring/localization/ru_RU.inc
+++ b/plugins/libcalendaring/localization/ru_RU.inc
@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'Послать e-mail';
 $labels['alarmdisplay'] = 'Показать сообщение';
 $labels['alarmdisplayoption'] = 'Сообщение';
@@ -15,7 +12,6 @@ $labels['trigger+M'] = 'минут после';
 $labels['trigger+H'] = 'часов после';
 $labels['trigger+D'] = 'дней после';
 $labels['addalarm'] = 'добавить уведомление';
-
 $labels['alarmtitle'] = 'Предстоящие события';
 $labels['dismissall'] = 'Отменить все';
 $labels['dismiss'] = 'Отменить';
@@ -25,5 +21,4 @@ $labels['repeatinhr'] = 'Повторить через 1 час';
 $labels['repeatinhrs'] = 'Повторить через $hrs часов';
 $labels['repeattomorrow'] = 'Повторить завтра';
 $labels['repeatinweek'] = 'Повторить через неделю';
-
 $labels['showmore'] = 'Показать больше...';
diff --git a/plugins/owncloud/localization/bg_BG.inc b/plugins/owncloud/localization/bg_BG.inc
new file mode 100644
index 00000000..a42b9738
--- /dev/null
+++ b/plugins/owncloud/localization/bg_BG.inc
@@ -0,0 +1,3 @@
+<?php
+$labels['owncloud'] = 'Файлове';
+?>
diff --git a/plugins/owncloud/localization/de_CH.inc b/plugins/owncloud/localization/de_CH.inc
index b3482da4..33dc4439 100644
--- a/plugins/owncloud/localization/de_CH.inc
+++ b/plugins/owncloud/localization/de_CH.inc
@@ -1,6 +1,3 @@
 <?php
-
-$labels = array();
 $labels['owncloud'] = 'Dateien';
-
 ?>
diff --git a/plugins/owncloud/localization/de_DE.inc b/plugins/owncloud/localization/de_DE.inc
index b3482da4..33dc4439 100644
--- a/plugins/owncloud/localization/de_DE.inc
+++ b/plugins/owncloud/localization/de_DE.inc
@@ -1,6 +1,3 @@
 <?php
-
-$labels = array();
 $labels['owncloud'] = 'Dateien';
-
 ?>
diff --git a/plugins/owncloud/localization/es_ES.inc b/plugins/owncloud/localization/es_ES.inc
index f5cb8fb8..acb6c354 100644
--- a/plugins/owncloud/localization/es_ES.inc
+++ b/plugins/owncloud/localization/es_ES.inc
@@ -1,6 +1,2 @@
 <?php
-
-$labels = array();
-$labels['owncloud'] = 'Files';
-
 ?>
diff --git a/plugins/owncloud/localization/et_EE.inc b/plugins/owncloud/localization/et_EE.inc
index f5cb8fb8..acb6c354 100644
--- a/plugins/owncloud/localization/et_EE.inc
+++ b/plugins/owncloud/localization/et_EE.inc
@@ -1,6 +1,2 @@
 <?php
-
-$labels = array();
-$labels['owncloud'] = 'Files';
-
 ?>
diff --git a/plugins/owncloud/localization/fr_FR.inc b/plugins/owncloud/localization/fr_FR.inc
index 08226658..81b61700 100644
--- a/plugins/owncloud/localization/fr_FR.inc
+++ b/plugins/owncloud/localization/fr_FR.inc
@@ -1,6 +1,3 @@
 <?php
-
-$labels = array();
 $labels['owncloud'] = 'Fichiers';
-
 ?>
diff --git a/plugins/owncloud/localization/ja_JP.inc b/plugins/owncloud/localization/ja_JP.inc
index f5cb8fb8..f4dc46e5 100644
--- a/plugins/owncloud/localization/ja_JP.inc
+++ b/plugins/owncloud/localization/ja_JP.inc
@@ -1,6 +1,3 @@
 <?php
-
-$labels = array();
-$labels['owncloud'] = 'Files';
-
+$labels['owncloud'] = 'ファイル';
 ?>
diff --git a/plugins/owncloud/localization/nl_NL.inc b/plugins/owncloud/localization/nl_NL.inc
index 11ffcc85..4e631c5e 100644
--- a/plugins/owncloud/localization/nl_NL.inc
+++ b/plugins/owncloud/localization/nl_NL.inc
@@ -1,6 +1,3 @@
 <?php
-
-$labels = array();
 $labels['owncloud'] = 'Bestanden';
-
 ?>
diff --git a/plugins/owncloud/localization/pl_PL.inc b/plugins/owncloud/localization/pl_PL.inc
index 4b84bd46..40090ac7 100644
--- a/plugins/owncloud/localization/pl_PL.inc
+++ b/plugins/owncloud/localization/pl_PL.inc
@@ -1,6 +1,3 @@
 <?php
-
-$labels = array();
 $labels['owncloud'] = 'Pliki';
-
 ?>
diff --git a/plugins/owncloud/localization/pt_BR.inc b/plugins/owncloud/localization/pt_BR.inc
new file mode 100644
index 00000000..cae8c161
--- /dev/null
+++ b/plugins/owncloud/localization/pt_BR.inc
@@ -0,0 +1,3 @@
+<?php
+$labels['owncloud'] = 'Arquivos';
+?>
diff --git a/plugins/owncloud/localization/ru_RU.inc b/plugins/owncloud/localization/ru_RU.inc
index 7eb018cc..87b3e3df 100644
--- a/plugins/owncloud/localization/ru_RU.inc
+++ b/plugins/owncloud/localization/ru_RU.inc
@@ -1,6 +1,3 @@
 <?php
-
-$labels = array();
 $labels['owncloud'] = 'Файлы';
-
 ?>
diff --git a/plugins/tasklist/localization/bg_BG.inc b/plugins/tasklist/localization/bg_BG.inc
new file mode 100644
index 00000000..2f9b52e6
--- /dev/null
+++ b/plugins/tasklist/localization/bg_BG.inc
@@ -0,0 +1,15 @@
+<?php
+$labels['navtitle'] = 'Задачи';
+$labels['edit'] = 'Промяна';
+$labels['description'] = 'Описание';
+$labels['start'] = 'Начало';
+$labels['alarms'] = 'Напомняне';
+$labels['today'] = 'Днес';
+$labels['tomorrow'] = 'Утре';
+$labels['removetag'] = 'Изтриване';
+$labels['save'] = 'Запис';
+$labels['cancel'] = 'Отказ';
+$labels['tabsummary'] = 'Заглавие';
+$labels['listname'] = 'Име';
+$labels['showalarms'] = 'Показване на аларми';
+$labels['savingdata'] = 'Запазване на данни...';
diff --git a/plugins/tasklist/localization/cs_CZ.inc b/plugins/tasklist/localization/cs_CZ.inc
index 1ad5b0ba..032d0a7e 100644
--- a/plugins/tasklist/localization/cs_CZ.inc
+++ b/plugins/tasklist/localization/cs_CZ.inc
@@ -1,68 +1,18 @@
 <?php
-
-$labels = array();
-$labels['navtitle'] = 'Úkoly';
-$labels['lists'] = 'Seznamy úkolů';
-$labels['list'] = 'Seznam úkolů';
-$labels['tags'] = 'Štítky';
-
-$labels['newtask'] = 'Nový úkol';
-$labels['createnewtask'] = 'Vytvořit nový úkol (např. sobota, posekat trávník)';
-$labels['createfrommail'] = 'Uložit úkol';
-$labels['mark'] = 'Označit';
-$labels['unmark'] = 'Odznačit';
 $labels['edit'] = 'Upravit';
-$labels['delete'] = 'Smazat';
-$labels['title'] = 'Titulek';
 $labels['description'] = 'Popis';
-$labels['datetime'] = 'Konec';
 $labels['start'] = 'Začátek';
 $labels['alarms'] = 'Připomenutí';
-
 $labels['all'] = 'Všechny';
-$labels['flagged'] = 'Označkované';
-$labels['complete'] = 'Dokončené';
-$labels['overdue'] = 'Zpožděné';
 $labels['today'] = 'Dnes';
 $labels['tomorrow'] = 'Zítra';
-$labels['next7days'] = 'Příštích 7 dnů';
-$labels['later'] = 'Později';
-$labels['nodate'] = 'Žádné datum';
 $labels['removetag'] = 'Odstranit';
-
-$labels['taskdetails'] = 'Podrobnosti';
-$labels['newtask'] = 'Nový úkol';
-$labels['edittask'] = 'Upravit úkol';
 $labels['save'] = 'Uložit';
 $labels['cancel'] = 'Storno';
-$labels['addsubtask'] = 'Přidat podúkol';
-$labels['deletetask'] = 'Smazat úkol';
-$labels['deletethisonly'] = 'Smazat pouze tento úkol';
-$labels['deletewithchilds'] = 'Smazat se všemi podúkoly';
-
 $labels['tabsummary'] = 'Souhrn';
 $labels['tabrecurrence'] = 'Opakování';
 $labels['tabattachments'] = 'Přílohy';
 $labels['tabsharing'] = 'Sdílení';
-
-$labels['editlist'] = 'Upravit seznam';
-$labels['createlist'] = 'Přidat seznam';
-$labels['listactions'] = 'Možnosti seznamu...';
 $labels['listname'] = 'Název';
-$labels['showalarms'] = 'Ukázat upozornění';
-$labels['import'] = 'Import';
-
-// date words
-$labels['on'] = ' ';
-$labels['at'] = ' ';
-$labels['this'] = 'tento';
-$labels['next'] = 'příští';
-
-// messages
+$labels['showalarms'] = 'Zobrazit upozornění';
 $labels['savingdata'] = 'Ukládám data...';
-$labels['errorsaving'] = 'Nelze uložit data.';
-$labels['notasksfound'] = 'Nebyly nalezeny žádné úkoly vyhovující daným kritériím';
-$labels['invalidstartduedates'] = 'Počáteční datum nesmí být pozdější než koncové datum.';
-$labels['deletetasktconfirm'] = 'Opravdu chcete smazat tento úkol?';
-$labels['deleteparenttasktconfirm'] = 'Opravdu chcete smazat tento úkol a všechny jeho podúkoly?';
-$labels['deletelistconfirm'] = 'Opravdu chcete smazat tento seznam včetně všech úkolů?';
diff --git a/plugins/tasklist/localization/de_CH.inc b/plugins/tasklist/localization/de_CH.inc
index ab9a999e..c35bc5d1 100644
--- a/plugins/tasklist/localization/de_CH.inc
+++ b/plugins/tasklist/localization/de_CH.inc
@@ -1,11 +1,8 @@
 <?php
-
-$labels = array();
 $labels['navtitle'] = 'Aufgaben';
 $labels['lists'] = 'Aufgabenlisten';
 $labels['list'] = 'Liste';
 $labels['tags'] = 'Tags';
-
 $labels['newtask'] = 'Neue Aufgabe';
 $labels['createnewtask'] = 'Neue Aufgabe eingeben (z.B. Samstag, Rasenmähen)';
 $labels['createfrommail'] = 'Als Aufgabe speichern';
@@ -15,10 +12,8 @@ $labels['edit'] = 'Bearbeiten';
 $labels['delete'] = 'Löschen';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beschreibung';
-$labels['datetime'] = 'Fällig';
 $labels['start'] = 'Beginn';
 $labels['alarms'] = 'Erinnerung';
-
 $labels['all'] = 'Alle';
 $labels['flagged'] = 'Markiert';
 $labels['complete'] = 'Erledigt';
@@ -29,7 +24,6 @@ $labels['next7days'] = 'Nächste 7 Tage';
 $labels['later'] = 'Später';
 $labels['nodate'] = 'kein Datum';
 $labels['removetag'] = 'Löschen';
-
 $labels['taskdetails'] = 'Details';
 $labels['newtask'] = 'Neue Aufgabe';
 $labels['edittask'] = 'Aufgabe bearbeiten';
@@ -39,27 +33,20 @@ $labels['addsubtask'] = 'Neue Teilaufgabe';
 $labels['deletetask'] = 'Aufgabe löschen';
 $labels['deletethisonly'] = 'Nur diese Aufgabe löschen';
 $labels['deletewithchilds'] = 'Mit allen Teilaufhaben löschen';
-
-
 $labels['tabsummary'] = 'Übersicht';
 $labels['tabrecurrence'] = 'Wiederholung';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
-
 $labels['editlist'] = 'Liste bearbeiten';
 $labels['createlist'] = 'Neue Liste';
 $labels['listactions'] = 'Listenoptionen...';
 $labels['listname'] = 'Name';
 $labels['showalarms'] = 'Erinnerungen anzeigen';
 $labels['import'] = 'Importieren';
-
-// date words
 $labels['on'] = 'am';
 $labels['at'] = 'um';
 $labels['this'] = 'diesen';
 $labels['next'] = 'nächsten';
-
-// mesages
 $labels['savingdata'] = 'Daten werden gespeichert...';
 $labels['errorsaving'] = 'Fehler beim Speichern.';
 $labels['notasksfound'] = 'Für die aktuellen Kriterien wurden keine Aufgaben gefunden.';
@@ -67,4 +54,3 @@ $labels['invalidstartduedates'] = 'Beginn der Aufgabe darf nicht grösser als da
 $labels['deletetasktconfirm'] = 'Möchten Sie diese Aufgabe wirklich löschen?';
 $labels['deleteparenttasktconfirm'] = 'Möchten Sie diese Aufgabe inklusive aller Teilaufgaben wirklich löschen?';
 $labels['deletelistconfirm'] = 'Möchten Sie diese Liste mit allen Aufgaben wirklich löschen?';
-$labels['deletelistconfirmrecursive'] = 'Möchten Sie diese Liste mit allen Aufgaben und Unter-Listen wirklich löschen?';
diff --git a/plugins/tasklist/localization/de_DE.inc b/plugins/tasklist/localization/de_DE.inc
index b6d1cc3f..11a92d35 100644
--- a/plugins/tasklist/localization/de_DE.inc
+++ b/plugins/tasklist/localization/de_DE.inc
@@ -1,70 +1,55 @@
 <?php
-
-$labels = array();
 $labels['navtitle'] = 'Aufgaben';
 $labels['lists'] = 'Aufgabenlisten';
-$labels['list'] = 'Liste';
-$labels['tags'] = 'Tags';
-
+$labels['list'] = 'Aufgabenliste';
 $labels['newtask'] = 'Neue Aufgabe';
-$labels['createnewtask'] = 'Neue Aufgabe eingeben (z.B. Samstag, Rasenmähen)';
-$labels['createfrommail'] = 'Als Aufgabe speichern';
+$labels['createnewtask'] = 'Neue Aufgabe erstellen (z.B. Samstag, Rasen mähen)';
+$labels['createfrommail'] = 'Aufgabe speichern';
 $labels['mark'] = 'Markieren';
-$labels['unmark'] = 'Markierung aufheben';
+$labels['unmark'] = 'Markierung entfernen';
 $labels['edit'] = 'Bearbeiten';
 $labels['delete'] = 'Löschen';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beschreibung';
-$labels['datetime'] = 'Fällig';
 $labels['start'] = 'Beginn';
 $labels['alarms'] = 'Erinnerung';
-
 $labels['all'] = 'Alle';
 $labels['flagged'] = 'Markiert';
-$labels['complete'] = 'Erledigt';
+$labels['complete'] = 'Abgeschlossen';
 $labels['overdue'] = 'Überfällig';
 $labels['today'] = 'Heute';
 $labels['tomorrow'] = 'Morgen';
-$labels['next7days'] = 'Nächste 7 Tage';
+$labels['next7days'] = 'Innerhalb von 7 Tagen';
 $labels['later'] = 'Später';
-$labels['nodate'] = 'kein Datum';
-$labels['removetag'] = 'Löschen';
-
+$labels['nodate'] = 'Ohne Datum';
+$labels['removetag'] = 'Entfernen';
 $labels['taskdetails'] = 'Details';
 $labels['newtask'] = 'Neue Aufgabe';
-$labels['edittask'] = 'Aufgabe bearbeiten';
+$labels['edittask'] = 'Aufgabe ändern';
 $labels['save'] = 'Speichern';
 $labels['cancel'] = 'Abbrechen';
-$labels['addsubtask'] = 'Neue Teilaufgabe';
+$labels['addsubtask'] = 'Teilaufgabe hinzufügen';
 $labels['deletetask'] = 'Aufgabe löschen';
 $labels['deletethisonly'] = 'Nur diese Aufgabe löschen';
-$labels['deletewithchilds'] = 'Mit allen Teilaufhaben löschen';
-
-
-$labels['tabsummary'] = 'Übersicht';
+$labels['deletewithchilds'] = 'Mit allen Teilaufgaben löschen';
+$labels['tabsummary'] = 'Titel';
 $labels['tabrecurrence'] = 'Wiederholung';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
-
 $labels['editlist'] = 'Liste bearbeiten';
-$labels['createlist'] = 'Neue Liste';
-$labels['listactions'] = 'Listenoptionen...';
+$labels['createlist'] = 'Liste hinzufügen';
+$labels['listactions'] = 'Listeneinstellungen…';
 $labels['listname'] = 'Name';
 $labels['showalarms'] = 'Erinnerungen anzeigen';
 $labels['import'] = 'Importieren';
-
-// date words
 $labels['on'] = 'am';
 $labels['at'] = 'um';
-$labels['this'] = 'diesen';
-$labels['next'] = 'nächsten';
-
-// mesages
-$labels['savingdata'] = 'Daten werden gespeichert...';
-$labels['errorsaving'] = 'Fehler beim Speichern.';
-$labels['notasksfound'] = 'Für die aktuellen Kriterien wurden keine Aufgaben gefunden.';
-$labels['invalidstartduedates'] = 'Beginn der Aufgabe darf nicht größer als das Enddatum sein.';
-$labels['deletetasktconfirm'] = 'Möchten Sie diese Aufgabe wirklich löschen?';
-$labels['deleteparenttasktconfirm'] = 'Möchten Sie diese Aufgabe inklusive aller Teilaufgaben wirklich löschen?';
-$labels['deletelistconfirm'] = 'Möchten Sie diese Liste mit allen Aufgaben wirklich löschen?';
-$labels['deletelistconfirmrecursive'] = 'Möchten Sie diese Liste mit allen Aufgaben und Unter-Listen wirklich löschen?';
\ No newline at end of file
+$labels['this'] = 'dies';
+$labels['next'] = 'weiter';
+$labels['savingdata'] = 'Daten werden gespeichert…';
+$labels['errorsaving'] = 'Daten konnten nicht gespeichert werden.';
+$labels['notasksfound'] = 'Keine Aufgabe erfüllt die angelegten Kriterien';
+$labels['invalidstartduedates'] = 'Das Anfangsdatum muss vor dem Fälligkeitsdatum liegen.';
+$labels['deletetasktconfirm'] = 'Diese Aufgabe wirklich löschen?';
+$labels['deleteparenttasktconfirm'] = 'Diese Aufgabe wirklich mit allen Teilaufgaben löschen?';
+$labels['deletelistconfirm'] = 'Diese Aufgabenliste wirklich mit allen Aufgaben löschen?';
diff --git a/plugins/tasklist/localization/es_ES.inc b/plugins/tasklist/localization/es_ES.inc
index b956d40d..381f5e56 100644
--- a/plugins/tasklist/localization/es_ES.inc
+++ b/plugins/tasklist/localization/es_ES.inc
@@ -1,68 +1,11 @@
 <?php
-
-$labels = array();
 $labels['navtitle'] = 'Tareas';
-$labels['lists'] = 'Tasklists';
-$labels['list'] = 'Tasklist';
-$labels['tags'] = 'Tags';
-
-$labels['newtask'] = 'New Task';
-$labels['createnewtask'] = 'Create new Task (e.g. Saturday, Mow the lawn)';
-$labels['createfrommail'] = 'Save as task';
-$labels['mark'] = 'Mark';
-$labels['unmark'] = 'Unmark';
-$labels['edit'] = 'Edit';
+$labels['edit'] = 'Editar';
 $labels['delete'] = 'Borrar';
 $labels['title'] = 'Título';
-$labels['description'] = 'Description';
-$labels['datetime'] = 'Date/Time';
-$labels['start'] = 'Start';
-$labels['alarms'] = 'Reminder';
-
-$labels['all'] = 'All';
-$labels['flagged'] = 'Flagged';
-$labels['complete'] = 'Complete';
-$labels['overdue'] = 'Overdue';
-$labels['today'] = 'Today';
-$labels['tomorrow'] = 'Tomorrow';
-$labels['next7days'] = 'Next 7 days';
-$labels['later'] = 'Later';
-$labels['nodate'] = 'no date';
-$labels['removetag'] = 'Remove';
-
-$labels['taskdetails'] = 'Details';
-$labels['newtask'] = 'New Task';
-$labels['edittask'] = 'Edit Task';
+$labels['description'] = 'Descripción';
+$labels['taskdetails'] = 'Detalles';
 $labels['save'] = 'Guardar';
-$labels['cancel'] = 'Cancel';
-$labels['addsubtask'] = 'Add subtask';
-$labels['deletetask'] = 'Delete task';
-$labels['deletethisonly'] = 'Delete this task only';
-$labels['deletewithchilds'] = 'Delete with all subtasks';
-
-$labels['tabsummary'] = 'Summary';
-$labels['tabrecurrence'] = 'Recurrence';
-$labels['tabattachments'] = 'Attachments';
-$labels['tabsharing'] = 'Sharing';
-
-$labels['editlist'] = 'Edit list';
-$labels['createlist'] = 'Add list';
-$labels['listactions'] = 'List options...';
+$labels['cancel'] = 'Cancelar';
 $labels['listname'] = 'Nombre';
-$labels['showalarms'] = 'Show alarms';
-$labels['import'] = 'Import';
-
-// date words
-$labels['on'] = 'on';
-$labels['at'] = 'at';
-$labels['this'] = 'this';
-$labels['next'] = 'next';
-
-// mesages
 $labels['savingdata'] = 'Guardando datos...';
-$labels['errorsaving'] = 'Failed to save data.';
-$labels['notasksfound'] = 'No tasks found for the given criteria';
-$labels['invalidstartduedates'] = 'Start date must not be greater than due date.';
-$labels['deletetasktconfirm'] = 'Do you really want to delete this task?';
-$labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
-$labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';
diff --git a/plugins/tasklist/localization/et_EE.inc b/plugins/tasklist/localization/et_EE.inc
index 2a1ce477..b3b65640 100644
--- a/plugins/tasklist/localization/et_EE.inc
+++ b/plugins/tasklist/localization/et_EE.inc
@@ -1,68 +1,5 @@
 <?php
-
-$labels = array();
-$labels['navtitle'] = 'Tasks';
-$labels['lists'] = 'Tasklists';
-$labels['list'] = 'Tasklist';
-$labels['tags'] = 'Tags';
-
-$labels['newtask'] = 'New Task';
-$labels['createnewtask'] = 'Create new Task (e.g. Saturday, Mow the lawn)';
-$labels['createfrommail'] = 'Save as task';
-$labels['mark'] = 'Mark';
-$labels['unmark'] = 'Unmark';
-$labels['edit'] = 'Edit';
 $labels['delete'] = 'Kustuta';
 $labels['title'] = 'Pealkiri';
-$labels['description'] = 'Description';
-$labels['datetime'] = 'Date/Time';
-$labels['start'] = 'Start';
-$labels['alarms'] = 'Reminder';
-
-$labels['all'] = 'All';
-$labels['flagged'] = 'Flagged';
-$labels['complete'] = 'Complete';
-$labels['overdue'] = 'Overdue';
-$labels['today'] = 'Today';
-$labels['tomorrow'] = 'Tomorrow';
-$labels['next7days'] = 'Next 7 days';
-$labels['later'] = 'Later';
-$labels['nodate'] = 'no date';
-$labels['removetag'] = 'Remove';
-
-$labels['taskdetails'] = 'Details';
-$labels['newtask'] = 'New Task';
-$labels['edittask'] = 'Edit Task';
 $labels['save'] = 'Salvesta';
-$labels['cancel'] = 'Cancel';
-$labels['addsubtask'] = 'Add subtask';
-$labels['deletetask'] = 'Delete task';
-$labels['deletethisonly'] = 'Delete this task only';
-$labels['deletewithchilds'] = 'Delete with all subtasks';
-
-$labels['tabsummary'] = 'Summary';
-$labels['tabrecurrence'] = 'Recurrence';
-$labels['tabattachments'] = 'Attachments';
-$labels['tabsharing'] = 'Sharing';
-
-$labels['editlist'] = 'Edit list';
-$labels['createlist'] = 'Add list';
-$labels['listactions'] = 'List options...';
 $labels['listname'] = 'Nimi';
-$labels['showalarms'] = 'Show alarms';
-$labels['import'] = 'Import';
-
-// date words
-$labels['on'] = 'on';
-$labels['at'] = 'at';
-$labels['this'] = 'this';
-$labels['next'] = 'next';
-
-// mesages
-$labels['savingdata'] = 'Saving data...';
-$labels['errorsaving'] = 'Failed to save data.';
-$labels['notasksfound'] = 'No tasks found for the given criteria';
-$labels['invalidstartduedates'] = 'Start date must not be greater than due date.';
-$labels['deletetasktconfirm'] = 'Do you really want to delete this task?';
-$labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
-$labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';
diff --git a/plugins/tasklist/localization/fr_FR.inc b/plugins/tasklist/localization/fr_FR.inc
index ebd9c33a..7b393738 100644
--- a/plugins/tasklist/localization/fr_FR.inc
+++ b/plugins/tasklist/localization/fr_FR.inc
@@ -1,11 +1,8 @@
 <?php
-
-$labels = array();
 $labels['navtitle'] = 'Tâches';
 $labels['lists'] = 'Liste des tâches';
 $labels['list'] = 'Liste de tâche';
 $labels['tags'] = 'Étiquettes';
-
 $labels['newtask'] = 'Nouvelle tâche';
 $labels['createnewtask'] = 'Créer une nouvelle tâche (ex : Samedi, tondre la pelouse)';
 $labels['createfrommail'] = 'Enregistrer la tâche';
@@ -15,10 +12,8 @@ $labels['edit'] = 'Modifier';
 $labels['delete'] = 'Supprimet';
 $labels['title'] = 'Titre';
 $labels['description'] = 'Description';
-$labels['datetime'] = 'Date/heure';
 $labels['start'] = 'Début';
 $labels['alarms'] = 'Rappel';
-
 $labels['all'] = 'Tous';
 $labels['flagged'] = 'Marqué';
 $labels['complete'] = 'Terminé';
@@ -29,7 +24,6 @@ $labels['next7days'] = '7 prochains jours';
 $labels['later'] = 'Plus tard';
 $labels['nodate'] = 'Pas de date';
 $labels['removetag'] = 'Supprimer';
-
 $labels['taskdetails'] = 'Détails';
 $labels['newtask'] = 'Nouvelle tâche';
 $labels['edittask'] = 'Modifier la tâche';
@@ -39,26 +33,20 @@ $labels['addsubtask'] = 'Ajouter une sous-tâche';
 $labels['deletetask'] = 'Supprimer la tâche';
 $labels['deletethisonly'] = 'Supprimer seulement cette tâche';
 $labels['deletewithchilds'] = 'Supprimer avec toutes les sous-tâches';
-
 $labels['tabsummary'] = 'Résumé';
 $labels['tabrecurrence'] = 'Récurrence';
 $labels['tabattachments'] = 'Pièces jointes';
 $labels['tabsharing'] = 'Partage';
-
 $labels['editlist'] = 'Modifier une liste';
 $labels['createlist'] = 'Ajouter une liste';
 $labels['listactions'] = 'Liste des options';
 $labels['listname'] = 'Nom';
 $labels['showalarms'] = 'Montrer les alarmes';
 $labels['import'] = 'Importer';
-
-// date words
 $labels['on'] = 'sur';
 $labels['at'] = 'à';
 $labels['this'] = 'ce';
 $labels['next'] = 'suivant';
-
-// mesages
 $labels['savingdata'] = 'Enregistrer...';
 $labels['errorsaving'] = 'Échec de l\'enregistrement';
 $labels['notasksfound'] = 'Pas de tâche trouvé avec les critères sélectionnés';
diff --git a/plugins/tasklist/localization/hu_HU.inc b/plugins/tasklist/localization/hu_HU.inc
new file mode 100644
index 00000000..30332c66
--- /dev/null
+++ b/plugins/tasklist/localization/hu_HU.inc
@@ -0,0 +1,6 @@
+<?php
+$labels['description'] = 'Leírás';
+$labels['removetag'] = 'Törlés';
+$labels['save'] = 'Mentés';
+$labels['cancel'] = 'Mégse';
+$labels['tabsummary'] = 'Tárgy';
diff --git a/plugins/tasklist/localization/it_IT.inc b/plugins/tasklist/localization/it_IT.inc
new file mode 100644
index 00000000..fc2dfd43
--- /dev/null
+++ b/plugins/tasklist/localization/it_IT.inc
@@ -0,0 +1,6 @@
+<?php
+$labels['description'] = 'Descrizione';
+$labels['removetag'] = 'Elimina';
+$labels['save'] = 'Salva';
+$labels['cancel'] = 'Annulla';
+$labels['tabsummary'] = 'Oggetto';
diff --git a/plugins/tasklist/localization/ja_JP.inc b/plugins/tasklist/localization/ja_JP.inc
index 7d5415ab..ff08a531 100644
--- a/plugins/tasklist/localization/ja_JP.inc
+++ b/plugins/tasklist/localization/ja_JP.inc
@@ -1,68 +1,56 @@
 <?php
-
-$labels = array();
-$labels['navtitle'] = 'Tasks';
-$labels['lists'] = 'Tasklists';
-$labels['list'] = 'Tasklist';
-$labels['tags'] = 'Tags';
-
-$labels['newtask'] = 'New Task';
-$labels['createnewtask'] = 'Create new Task (e.g. Saturday, Mow the lawn)';
-$labels['createfrommail'] = 'Save as task';
-$labels['mark'] = 'Mark';
-$labels['unmark'] = 'Unmark';
-$labels['edit'] = 'Edit';
-$labels['delete'] = 'Delete';
-$labels['title'] = 'Title';
-$labels['description'] = 'Description';
-$labels['datetime'] = 'Date/Time';
-$labels['start'] = 'Start';
-$labels['alarms'] = 'Reminder';
-
-$labels['all'] = 'All';
-$labels['flagged'] = 'Flagged';
-$labels['complete'] = 'Complete';
-$labels['overdue'] = 'Overdue';
-$labels['today'] = 'Today';
-$labels['tomorrow'] = 'Tomorrow';
-$labels['next7days'] = 'Next 7 days';
-$labels['later'] = 'Later';
-$labels['nodate'] = 'no date';
-$labels['removetag'] = 'Remove';
-
-$labels['taskdetails'] = 'Details';
-$labels['newtask'] = 'New Task';
-$labels['edittask'] = 'Edit Task';
-$labels['save'] = 'Save';
-$labels['cancel'] = 'Cancel';
-$labels['addsubtask'] = 'Add subtask';
-$labels['deletetask'] = 'Delete task';
-$labels['deletethisonly'] = 'Delete this task only';
-$labels['deletewithchilds'] = 'Delete with all subtasks';
-
-$labels['tabsummary'] = 'Summary';
-$labels['tabrecurrence'] = 'Recurrence';
-$labels['tabattachments'] = 'Attachments';
-$labels['tabsharing'] = 'Sharing';
-
-$labels['editlist'] = 'Edit list';
-$labels['createlist'] = 'Add list';
-$labels['listactions'] = 'List options...';
-$labels['listname'] = 'Name';
-$labels['showalarms'] = 'Show alarms';
-$labels['import'] = 'Import';
-
-// date words
-$labels['on'] = 'on';
-$labels['at'] = 'at';
-$labels['this'] = 'this';
-$labels['next'] = 'next';
-
-// mesages
-$labels['savingdata'] = 'Saving data...';
-$labels['errorsaving'] = 'Failed to save data.';
-$labels['notasksfound'] = 'No tasks found for the given criteria';
-$labels['invalidstartduedates'] = 'Start date must not be greater than due date.';
-$labels['deletetasktconfirm'] = 'Do you really want to delete this task?';
-$labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
-$labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';
+$labels['navtitle'] = 'タスク';
+$labels['lists'] = 'タスク一覧';
+$labels['list'] = 'タスク一覧';
+$labels['tags'] = 'タグ';
+$labels['newtask'] = '新しいタスク';
+$labels['createnewtask'] = '新しいタスクの生成(例:土曜日、芝生を刈る)';
+$labels['createfrommail'] = 'タスクとして保存';
+$labels['mark'] = 'マーク';
+$labels['unmark'] = 'マーク解除';
+$labels['edit'] = '編集';
+$labels['delete'] = '削除';
+$labels['title'] = 'タイトル';
+$labels['description'] = '説明';
+$labels['start'] = '開始';
+$labels['alarms'] = '通知';
+$labels['all'] = '全て';
+$labels['flagged'] = 'フラグ';
+$labels['complete'] = '完了';
+$labels['overdue'] = '期限切れ';
+$labels['today'] = '今日';
+$labels['tomorrow'] = '明日';
+$labels['next7days'] = '翌 7 日';
+$labels['later'] = '後で';
+$labels['nodate'] = '期日なし';
+$labels['removetag'] = '削除';
+$labels['taskdetails'] = '詳細';
+$labels['newtask'] = '新しいタスク';
+$labels['edittask'] = 'タスク編集';
+$labels['save'] = '保存';
+$labels['cancel'] = 'キャンセル';
+$labels['addsubtask'] = 'サブタスク追加';
+$labels['deletetask'] = 'タスク削除';
+$labels['deletethisonly'] = 'このタスクのみ削除';
+$labels['deletewithchilds'] = '全てのサブタスクも削除';
+$labels['tabsummary'] = '要約';
+$labels['tabrecurrence'] = '繰返し';
+$labels['tabattachments'] = '添付';
+$labels['tabsharing'] = '共有';
+$labels['editlist'] = '一覧編集';
+$labels['createlist'] = '一覧追加';
+$labels['listactions'] = '一覧オプション';
+$labels['listname'] = '名前';
+$labels['showalarms'] = 'アラーム表示';
+$labels['import'] = 'インポート';
+$labels['on'] = '上';
+$labels['at'] = 'の';
+$labels['this'] = 'この';
+$labels['next'] = '次';
+$labels['savingdata'] = 'データを保存中…';
+$labels['errorsaving'] = 'データが保存できませんでした。';
+$labels['notasksfound'] = '条件に該当するタスクは見つかりません';
+$labels['invalidstartduedates'] = '開始日は終了日の前でなければいけません。';
+$labels['deletetasktconfirm'] = 'このタスクを本当に削除しますか?';
+$labels['deleteparenttasktconfirm'] = 'このタスクとすべてのサブタスクを本当に削除しますか?';
+$labels['deletelistconfirm'] = '本当に、この一覧とすべてのタスクを一緒に削除しますか?';
diff --git a/plugins/tasklist/localization/nl_NL.inc b/plugins/tasklist/localization/nl_NL.inc
index 91684d81..b027fc4a 100644
--- a/plugins/tasklist/localization/nl_NL.inc
+++ b/plugins/tasklist/localization/nl_NL.inc
@@ -1,11 +1,8 @@
 <?php
-
-$labels = array();
 $labels['navtitle'] = 'Taken';
 $labels['lists'] = 'Takenlijsten';
 $labels['list'] = 'Takenlijst';
 $labels['tags'] = 'Tags';
-
 $labels['newtask'] = 'Nieuwe Taak';
 $labels['createnewtask'] = 'Creer een nieuwe Taak (bijv. Zaterdag, gras maaien)';
 $labels['createfrommail'] = 'Als taak opslaan';
@@ -15,10 +12,8 @@ $labels['edit'] = 'Wijzigen';
 $labels['delete'] = 'Verwijderen';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beschrijving';
-$labels['datetime'] = 'Datum/Tijd';
 $labels['start'] = 'Begin';
 $labels['alarms'] = 'Herinnering';
-
 $labels['all'] = 'Alle';
 $labels['flagged'] = 'Gemarkeerd';
 $labels['complete'] = 'Compleet';
@@ -29,7 +24,6 @@ $labels['next7days'] = 'Deze week';
 $labels['later'] = 'Later';
 $labels['nodate'] = 'geen datum';
 $labels['removetag'] = 'Verwijder';
-
 $labels['taskdetails'] = 'Details';
 $labels['newtask'] = 'Nieuwe Taak';
 $labels['edittask'] = 'Taak Wijzigen';
@@ -39,26 +33,20 @@ $labels['addsubtask'] = 'Voeg subtaak toe';
 $labels['deletetask'] = 'Verwijder taak';
 $labels['deletethisonly'] = 'Verwijder alleen deze taak';
 $labels['deletewithchilds'] = 'Verwijder inclusief subtaken';
-
 $labels['tabsummary'] = 'Samenvatting';
 $labels['tabrecurrence'] = 'Herhaling';
 $labels['tabattachments'] = 'Toebehoren';
 $labels['tabsharing'] = 'Delen';
-
 $labels['editlist'] = 'Lijst wijzigen';
 $labels['createlist'] = 'Lijst toevoegen';
 $labels['listactions'] = 'Lijst opties...';
 $labels['listname'] = 'Naam';
 $labels['showalarms'] = 'Alarmen tonen';
 $labels['import'] = 'Importeren';
-
-// date words
 $labels['on'] = 'op';
 $labels['at'] = 'om';
 $labels['this'] = 'deze';
 $labels['next'] = 'volgende';
-
-// mesages
 $labels['savingdata'] = 'Data wordt opgeslagen...';
 $labels['errorsaving'] = 'Fout in opslaan van data.';
 $labels['notasksfound'] = 'Geen taken gevonden voor de gegeven criteria';
diff --git a/plugins/tasklist/localization/pl_PL.inc b/plugins/tasklist/localization/pl_PL.inc
index 9f0a6273..06607330 100644
--- a/plugins/tasklist/localization/pl_PL.inc
+++ b/plugins/tasklist/localization/pl_PL.inc
@@ -1,68 +1,53 @@
 <?php
-
-$labels = array();
-$labels['navtitle'] = 'Tasks';
-$labels['lists'] = 'Tasklists';
-$labels['list'] = 'Tasklist';
-$labels['tags'] = 'Tags';
-
-$labels['newtask'] = 'New Task';
-$labels['createnewtask'] = 'Create new Task (e.g. Saturday, Mow the lawn)';
-$labels['createfrommail'] = 'Save as task';
-$labels['mark'] = 'Mark';
-$labels['unmark'] = 'Unmark';
-$labels['edit'] = 'Edit';
+$labels['navtitle'] = 'Zadania';
+$labels['lists'] = 'Listy zadań';
+$labels['list'] = 'Lista zadań';
+$labels['tags'] = 'Tagi';
+$labels['newtask'] = 'Nowe zadanie';
+$labels['createnewtask'] = 'Utwórz nowe zadanie (n.p. sobota, skosić trawnik)';
+$labels['createfrommail'] = 'Zapisz jako zadanie';
+$labels['mark'] = 'Zaznacz';
+$labels['unmark'] = 'Odznacz';
+$labels['edit'] = 'Edytuj';
 $labels['delete'] = 'Usuń';
-$labels['title'] = 'Title';
-$labels['description'] = 'Description';
-$labels['datetime'] = 'Date/Time';
+$labels['title'] = 'Tytuł';
+$labels['description'] = 'Opis';
 $labels['start'] = 'Start';
-$labels['alarms'] = 'Reminder';
-
-$labels['all'] = 'All';
-$labels['flagged'] = 'Flagged';
-$labels['complete'] = 'Complete';
-$labels['overdue'] = 'Overdue';
-$labels['today'] = 'Today';
-$labels['tomorrow'] = 'Tomorrow';
-$labels['next7days'] = 'Next 7 days';
-$labels['later'] = 'Later';
-$labels['nodate'] = 'no date';
-$labels['removetag'] = 'Remove';
-
-$labels['taskdetails'] = 'Details';
-$labels['newtask'] = 'New Task';
-$labels['edittask'] = 'Edit Task';
-$labels['save'] = 'Save';
-$labels['cancel'] = 'Cancel';
-$labels['addsubtask'] = 'Add subtask';
-$labels['deletetask'] = 'Delete task';
-$labels['deletethisonly'] = 'Delete this task only';
-$labels['deletewithchilds'] = 'Delete with all subtasks';
-
-$labels['tabsummary'] = 'Summary';
-$labels['tabrecurrence'] = 'Recurrence';
-$labels['tabattachments'] = 'Attachments';
-$labels['tabsharing'] = 'Sharing';
-
-$labels['editlist'] = 'Edit list';
-$labels['createlist'] = 'Add list';
-$labels['listactions'] = 'List options...';
+$labels['alarms'] = 'Przypomnienie';
+$labels['all'] = 'Wszystkie';
+$labels['flagged'] = 'Oflagowane';
+$labels['complete'] = 'Ukończone';
+$labels['overdue'] = 'Po terminie';
+$labels['today'] = 'Dzisiaj';
+$labels['tomorrow'] = 'Jutro';
+$labels['next7days'] = 'Kolejne 7 dni';
+$labels['later'] = 'Późniejsze';
+$labels['nodate'] = 'Bez daty';
+$labels['removetag'] = 'Usuń';
+$labels['taskdetails'] = 'Szczegóły';
+$labels['newtask'] = 'Nowe zadanie';
+$labels['edittask'] = 'Edytuj zadanie';
+$labels['save'] = 'Zapisz';
+$labels['cancel'] = 'Anuluj';
+$labels['addsubtask'] = 'Dodaj podzadanie';
+$labels['deletetask'] = 'Usuń zadanie';
+$labels['deletethisonly'] = 'Usuń tylko to zadanie';
+$labels['deletewithchilds'] = 'Usuń z wszystkimi podzadaniami';
+$labels['tabsummary'] = 'Podsumowanie';
+$labels['tabattachments'] = 'Załączniki';
+$labels['editlist'] = 'Edytuj listę';
+$labels['createlist'] = 'Dodaj listę';
 $labels['listname'] = 'Nazwa';
-$labels['showalarms'] = 'Show alarms';
-$labels['import'] = 'Import';
-
-// date words
-$labels['on'] = 'on';
-$labels['at'] = 'at';
-$labels['this'] = 'this';
-$labels['next'] = 'next';
-
-// mesages
+$labels['showalarms'] = 'Pokaż alarmy';
+$labels['import'] = 'Importuj';
+$labels['on'] = 'na';
+$labels['at'] = 'w';
+$labels['this'] = 'ten';
+$labels['next'] = 'następny';
 $labels['savingdata'] = 'Zapisuję dane...';
-$labels['errorsaving'] = 'Failed to save data.';
-$labels['notasksfound'] = 'No tasks found for the given criteria';
-$labels['invalidstartduedates'] = 'Start date must not be greater than due date.';
-$labels['deletetasktconfirm'] = 'Do you really want to delete this task?';
-$labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
-$labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';
+$labels['errorsaving'] = 'Błąd podczas zapisu danych.';
+$labels['notasksfound'] = 'Nie znaleziono zadań spełniających kryteria';
+$labels['invalidstartduedates'] = 'Data rozpoczęcia nie może być wcześniejsza od ukończenia. ';
+$labels['deletetasktconfirm'] = 'Na pewno chcesz usunąć to zadanie ?';
+$labels['deleteparenttasktconfirm'] = 'Na pewno chcesz usunąć to zadanie z wszystkimi podzadaniami ?';
+$labels['deletelistconfirm'] = 'Na pewno chcesz usunąć tą listę z wszystkimi zadaniami ?';
diff --git a/plugins/tasklist/localization/pt_BR.inc b/plugins/tasklist/localization/pt_BR.inc
new file mode 100644
index 00000000..498d114a
--- /dev/null
+++ b/plugins/tasklist/localization/pt_BR.inc
@@ -0,0 +1,56 @@
+<?php
+$labels['navtitle'] = 'Tarefas';
+$labels['lists'] = 'Listas de tarefas';
+$labels['list'] = 'Lista de tarefas';
+$labels['tags'] = 'Etiquetas';
+$labels['newtask'] = 'Nova Tarefa';
+$labels['createnewtask'] = 'Criar nova Tarefa (ex.: Sábado, Cortar a grama)';
+$labels['createfrommail'] = 'Salvar como tarefa';
+$labels['mark'] = 'Marcar';
+$labels['unmark'] = 'Desmarcar';
+$labels['edit'] = 'Editar';
+$labels['delete'] = 'Deletar';
+$labels['title'] = 'Título';
+$labels['description'] = 'Descrição';
+$labels['start'] = 'Início';
+$labels['alarms'] = 'Lembrete';
+$labels['all'] = 'Todos';
+$labels['flagged'] = 'Marcado';
+$labels['complete'] = 'Completado';
+$labels['overdue'] = 'Atrasado';
+$labels['today'] = 'Hoje';
+$labels['tomorrow'] = 'Amanhã';
+$labels['next7days'] = 'Próximos 7 dias';
+$labels['later'] = 'Mais tarde';
+$labels['nodate'] = 'sem data';
+$labels['removetag'] = 'Remover';
+$labels['taskdetails'] = 'Detalhes';
+$labels['newtask'] = 'Nova Tarefa';
+$labels['edittask'] = 'Editar Tarefa';
+$labels['save'] = 'Gravar';
+$labels['cancel'] = 'Cancelar';
+$labels['addsubtask'] = 'Adicionar subtarefa';
+$labels['deletetask'] = 'Remover tarefa';
+$labels['deletethisonly'] = 'Remover esta tarefa somente';
+$labels['deletewithchilds'] = 'Remover com todas as subtarefas';
+$labels['tabsummary'] = 'Sumário';
+$labels['tabrecurrence'] = 'Repetição';
+$labels['tabattachments'] = 'Anexos';
+$labels['tabsharing'] = 'Compartilhamento';
+$labels['editlist'] = 'Editar lista';
+$labels['createlist'] = 'Adicionar lista';
+$labels['listactions'] = 'Opções da lista...';
+$labels['listname'] = 'Nome';
+$labels['showalarms'] = 'Mostrar alarmes';
+$labels['import'] = 'Importar';
+$labels['on'] = 'em';
+$labels['at'] = 'no';
+$labels['this'] = 'este';
+$labels['next'] = 'próximo';
+$labels['savingdata'] = 'Salvando dados...';
+$labels['errorsaving'] = 'Falha ao salvar dados.';
+$labels['notasksfound'] = 'Nenhuma tarefa encontrada com estes critérios';
+$labels['invalidstartduedates'] = 'Data de início não deve ser maior que data de término.';
+$labels['deletetasktconfirm'] = 'Você realmente quer remover esta tarefa?';
+$labels['deleteparenttasktconfirm'] = 'Você realmente quer remover esta tarefa e todas suas subtarefas?';
+$labels['deletelistconfirm'] = 'Você realmente quer remover esta lista com todas as suas tarefas?';
diff --git a/plugins/tasklist/localization/ru_RU.inc b/plugins/tasklist/localization/ru_RU.inc
index e2aaa299..c5ed8e81 100644
--- a/plugins/tasklist/localization/ru_RU.inc
+++ b/plugins/tasklist/localization/ru_RU.inc
@@ -1,11 +1,8 @@
 <?php
-
-$labels = array();
 $labels['navtitle'] = 'Задачи';
 $labels['lists'] = 'Списки задач';
 $labels['list'] = 'Список задач';
 $labels['tags'] = 'Теги';
-
 $labels['newtask'] = 'Новая задача';
 $labels['createnewtask'] = 'Создать новую задачу (пример: Суббота, покосить газон)';
 $labels['createfrommail'] = 'Сохранить как задачу';
@@ -15,10 +12,8 @@ $labels['edit'] = 'Редактировать';
 $labels['delete'] = 'Удалить';
 $labels['title'] = 'Заголовок';
 $labels['description'] = 'Описание';
-$labels['datetime'] = 'Дата/Время';
 $labels['start'] = 'Начало';
 $labels['alarms'] = 'Напоминание';
-
 $labels['all'] = 'Все';
 $labels['flagged'] = 'Отмеченные';
 $labels['complete'] = 'Завершенные';
@@ -29,7 +24,6 @@ $labels['next7days'] = 'Ближайшая неделя';
 $labels['later'] = 'Позднее';
 $labels['nodate'] = 'без даты';
 $labels['removetag'] = 'Убрать';
-
 $labels['taskdetails'] = 'Подробнее';
 $labels['newtask'] = 'Новая задача';
 $labels['edittask'] = 'Редактировать задачу';
@@ -39,26 +33,20 @@ $labels['addsubtask'] = 'Добавить подзадачу';
 $labels['deletetask'] = 'Удалить задачу';
 $labels['deletethisonly'] = 'Удалить только эту задачу';
 $labels['deletewithchilds'] = 'Удалить задачу и все ее подзадачи';
-
 $labels['tabsummary'] = 'Сводка';
 $labels['tabrecurrence'] = 'Повтор';
 $labels['tabattachments'] = 'Вложения';
 $labels['tabsharing'] = 'Поделиться';
-
 $labels['editlist'] = 'Изменить список';
 $labels['createlist'] = 'Добавить список';
 $labels['listactions'] = 'Действия со списком...';
 $labels['listname'] = 'Название';
 $labels['showalarms'] = 'Показывать уведомления';
 $labels['import'] = 'Импорт';
-
-// date words
 $labels['on'] = 'в';
 $labels['at'] = 'в';
 $labels['this'] = 'этот';
 $labels['next'] = 'следующий';
-
-// mesages
 $labels['savingdata'] = 'Сохранение данных...';
 $labels['errorsaving'] = 'Не удалось сохранить.';
 $labels['notasksfound'] = 'По заданному условию не найдено задач';