Backported translation updates

46 files changed, 2599 insertions, 1380 deletions

diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc
index 90f34bf8e..785ac7b6e 100644
--- a/plugins/managesieve/localization/bg_BG.inc
+++ b/plugins/managesieve/localization/bg_BG.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/bg_BG/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Филтри';
 $labels['managefilters'] = 'Управление на филтри за входяща поща';
@@ -33,18 +47,15 @@ $labels['add'] = 'Добавяне';
 $labels['del'] = 'Изтриване';
 $labels['sender'] = 'Подател';
 $labels['recipient'] = 'Получател';
+$labels['filterunknownerror'] = 'Неизвестна грешка на сървъра';
+$labels['filterconnerror'] = 'Невъзможност за свързване с managesieve сървъра';
+$labels['filterdeleteerror'] = 'Невъзможност за изтриване на филтър. Сървър грешка';
+$labels['filterdeleted'] = 'Филтърът е изтрит успешно';
+$labels['filtersaved'] = 'Филтърът е записан успешно';
+$labels['filtersaveerror'] = 'Филтърът не може да бъде записан. Сървър грешка.';
+$labels['filterdeleteconfirm'] = 'Наистина ли искате да изтриете избрания филтър?';
+$labels['ruledeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното правило?';
+$labels['actiondeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното действие?';
+$labels['forbiddenchars'] = 'Забранени символи в полето';
+$labels['cannotbeempty'] = 'Полето не може да бъде празно';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Неизвестна грешка на сървъра';
-$messages['filterconnerror'] = 'Невъзможност за свързване с managesieve сървъра ';
-$messages['filterdeleteerror'] = 'Невъзможност за изтриване на филтър. Сървър грешка';
-$messages['filterdeleted'] = 'Филтърът е изтрит успешно';
-$messages['filterdeleteconfirm'] = 'Наистина ли искате да изтриете избрания филтър?';
-$messages['filtersaved'] = 'Филтърът е записан успешно';
-$messages['filtersaveerror'] = 'Филтърът не може да бъде записан. Сървър грешка.';
-$messages['ruledeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното правило?';
-$messages['actiondeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното действие?';
-$messages['forbiddenchars'] = 'Забранени символи в полето';
-$messages['cannotbeempty'] = 'Полето не може да бъде празно';
-
-?>
diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc
index 033a1a0e3..b2f96b636 100644
--- a/plugins/managesieve/localization/cs_CZ.inc
+++ b/plugins/managesieve/localization/cs_CZ.inc
@@ -1,13 +1,20 @@
 <?php
 
-/**
- * Czech translation for Roundcube managesieve plugin
- *
- * @version 1.0 (2009-09-29)
- * @author Daniel Kolar <kolar@g2n.cz>
- *
- */
+/*
+ +-----------------------------------------------------------------------+
+ | localization/cs_CZ/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
 
+$labels = array();
 $labels['filters'] = 'Filtry';
 $labels['managefilters'] = 'Nastavení filtrů';
 $labels['filtername'] = 'Název filtru';
@@ -44,18 +51,15 @@ $labels['vacationaddresses'] = 'Seznam příjemců, kterým nebude zpráva odesl
 $labels['vacationdays'] = 'Počet dnů mezi automatickými odpověďmi:';
 $labels['vacationreason'] = 'Zpráva (Důvod nepřítomnosti):';
 $labels['rulestop'] = 'Zastavit pravidla';
+$labels['filterunknownerror'] = 'Neznámá chyba serveru';
+$labels['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
+$labels['filterdeleteerror'] = 'Nebylo možné smazat filtr. Server nahlásil chybu';
+$labels['filterdeleted'] = 'Filtr byl smazán';
+$labels['filtersaved'] = 'Filtr byl uložen';
+$labels['filtersaveerror'] = 'Nebylo možné uložit filtr. Server nahlásil chybu.';
+$labels['filterdeleteconfirm'] = 'Opravdu chcete smazat vybraný filtr?';
+$labels['ruledeleteconfirm'] = 'Jste si jisti, že chcete smazat vybrané pravidlo?';
+$labels['actiondeleteconfirm'] = 'Jste si jisti, že chcete smazat vybranou akci?';
+$labels['forbiddenchars'] = 'Zakázané znaky v poli';
+$labels['cannotbeempty'] = 'Pole nemůže být prázdné';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Neznámá chyba serveru';
-$messages['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
-$messages['filterdeleteerror'] = 'Nebylo možné smazat filtr. Server nahlásil chybu';
-$messages['filterdeleted'] = 'Filtr byl smazán';
-$messages['filterdeleteconfirm'] = 'Opravdu chcete smazat vybraný filtr?';
-$messages['filtersaved'] = 'Filtr byl uložen';
-$messages['filtersaveerror'] = 'Nebylo možné uložit filtr. Server nahlásil chybu.';
-$messages['ruledeleteconfirm'] = 'Jste si jisti, že chcete smazat vybrané pravidlo?';
-$messages['actiondeleteconfirm'] = 'Jste si jisti, že chcete smazat vybranou akci?';
-$messages['forbiddenchars'] = 'Zakázané znaky v poli';
-$messages['cannotbeempty'] = 'Pole nemůže být prázdné';
-
-?>
diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc
index cabb950be..963d1a6a2 100644
--- a/plugins/managesieve/localization/de_CH.inc
+++ b/plugins/managesieve/localization/de_CH.inc
@@ -5,13 +5,13 @@
  | localization/de_CH/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2011, The Roundcube Dev Team                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Christoph Wickert <Unknown>                                   |
  +-----------------------------------------------------------------------+
- @version : importgettext.sh 5558 2011-12-07 08:51:01Z thomasb $
+ @version $Id$
 */
 
 $labels = array();
@@ -96,7 +96,7 @@ $labels['flagdraft'] = 'Entwurf';
 $labels['filtercreate'] = 'Filter erstellen';
 $labels['usedata'] = 'Die folgenden Daten im Filter benutzen:';
 $labels['nextstep'] = 'Nächster Schritt';
-$labels['...'] = '';
+$labels['...'] = '...';
 $labels['advancedopts'] = 'Erweiterte Optionen';
 $labels['body'] = 'Inhalt';
 $labels['address'] = 'Adresse';
@@ -120,11 +120,31 @@ $labels['filterunknownerror'] = 'Unbekannter Serverfehler';
 $labels['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden';
 $labels['filterdeleteerror'] = 'Fehler beim des löschen  Filters. Serverfehler';
 $labels['filterdeleted'] = 'Filter erfolgreich gelöscht';
-$labels['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen ?';
 $labels['filtersaved'] = 'Filter gespeichert';
 $labels['filtersaveerror'] = 'Serverfehler, konnte den Filter nicht speichern.';
+$labels['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen ?';
 $labels['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?';
 $labels['actiondeleteconfirm'] = 'Sicher, dass Sie die ausgewaehlte Aktion löschen wollen?';
 $labels['forbiddenchars'] = 'Unerlaubte Zeichen im Feld';
 $labels['cannotbeempty'] = 'Feld darf nicht leer sein';
+$labels['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
+$labels['setactivateerror'] = 'Filtersatz kann nicht aktiviert werden. Serverfehler.';
+$labels['setdeactivateerror'] = 'Filtersatz kann nicht deaktiviert werden. Serverfehler.';
+$labels['setdeleteerror'] = 'Filtersatz kann nicht gelöscht werden. Serverfehler.';
+$labels['setactivated'] = 'Filtersatz erfolgreich aktiviert.';
+$labels['setdeactivated'] = 'Filtersatz erfolgreich deaktiviert.';
+$labels['setdeleted'] = 'Filtersatz erfolgreich gelöscht.';
+$labels['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
+$labels['setcreateerror'] = 'Filtersatz kann nicht erstellt werden. Serverfehler.';
+$labels['setcreated'] = 'Filter erfolgreich erstellt.';
+$labels['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
+$labels['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
+$labels['activated'] = 'Filter erfolgreich deaktiviert.';
+$labels['deactivated'] = 'Filter erfolgreich aktiviert.';
+$labels['moved'] = 'Filter erfolgreich verschoben.';
+$labels['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
+$labels['nametoolong'] = 'Filtersatz kann nicht erstellt werden. Name zu lang.';
+$labels['namereserved'] = 'Reservierter Name.';
+$labels['setexist'] = 'Filtersatz existiert bereits.';
+$labels['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
 
diff --git a/plugins/managesieve/localization/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
index 1eaffe80b..592020b95 100644
--- a/plugins/managesieve/localization/de_DE.inc
+++ b/plugins/managesieve/localization/de_DE.inc
@@ -5,13 +5,13 @@
  | localization/de_DE/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2011, The Roundcube Dev Team                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Christoph Wickert <Unknown>                                   |
  +-----------------------------------------------------------------------+
- @version : importgettext.sh 5558 2011-12-07 08:51:01Z thomasb $
+ @version $Id$
 */
 
 $labels = array();
@@ -127,6 +127,7 @@ $labels['ruledeleteconfirm'] = 'Sind Sie sicher, dass Sie die ausgewählte Regel
 $labels['actiondeleteconfirm'] = 'Sind Sie sicher, dass Sie die ausgewählte Aktion löschen möchten?';
 $labels['forbiddenchars'] = 'Unzulässige Zeichen im Eingabefeld';
 $labels['cannotbeempty'] = 'Eingabefeld darf nicht leer sein';
+$labels['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
 $labels['setactivateerror'] = 'Kann ausgewählten Filtersatz nicht aktivieren. Serverfehler';
 $labels['setdeactivateerror'] = 'Kann ausgewählten Filtersatz nicht deaktivieren. Serverfehler';
 $labels['setdeleteerror'] = 'Kann ausgewählten Filtersatz nicht löschen. Serverfehler';
@@ -136,6 +137,14 @@ $labels['setdeleted'] = 'Filtersatz wurde erfolgreich gelöscht';
 $labels['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
 $labels['setcreateerror'] = 'Kann Filtersatz nicht erstellen. Serverfehler';
 $labels['setcreated'] = 'Filtersatz wurde erfolgreich erstellt';
-$labels['emptyname'] = 'Kann Filtersatz nicht erstellen. Kein Name vergeben';
+$labels['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
+$labels['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
+$labels['activated'] = 'Filter erfolgreich deaktiviert.';
+$labels['deactivated'] = 'Filter erfolgreich aktiviert.';
+$labels['moved'] = 'Filter erfolgreich verschoben.';
+$labels['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
 $labels['nametoolong'] = 'Kann Filtersatz nicht erstellen. Name zu lang';
+$labels['namereserved'] = 'Reservierter Name.';
+$labels['setexist'] = 'Filtersatz existiert bereits.';
+$labels['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
 
diff --git a/plugins/managesieve/localization/el_GR.inc b/plugins/managesieve/localization/el_GR.inc
index a1a5eeca3..dada982d6 100644
--- a/plugins/managesieve/localization/el_GR.inc
+++ b/plugins/managesieve/localization/el_GR.inc
@@ -1,6 +1,18 @@
 <?php
 
-// Antonis Kanouras (2009-10-22)
+/*
+ +-----------------------------------------------------------------------+
+ | localization/el_GR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
 
 $labels = array();
 $labels['filters'] = 'Φίλτρα';
@@ -39,18 +51,14 @@ $labels['vacationaddresses'] = 'Πρόσθετη λίστα email παραληπ
 $labels['vacationdays'] = 'Συχνότητα αποστολής μηνυμάτων (σε ημέρες):';
 $labels['vacationreason'] = 'Σώμα μηνύματος (λόγος απουσίας):';
 $labels['rulestop'] = 'Παύση επαλήθευσης κανόνων';
+$labels['filterunknownerror'] = 'Άγνωστο σφάλμα διακομιστή';
+$labels['filterconnerror'] = 'Αδυναμία σύνδεσης στον διακομιστή managesieve';
+$labels['filterdeleteerror'] = 'Αδυναμία διαγραφής φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
+$labels['filterdeleted'] = 'Το φίλτρο διαγράφηκε επιτυχώς';
+$labels['filtersaved'] = 'Το φίλτρο αποθηκεύτηκε επιτυχώς';
+$labels['filtersaveerror'] = 'Αδυναμία αποθήκευσης φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
+$labels['ruledeleteconfirm'] = 'Θέλετε όντως να διαγράψετε τον επιλεγμένο κανόνα;';
+$labels['actiondeleteconfirm'] = 'Θέλετε όντως να διαγράψετε την επιλεγμένη ενέργεια;';
+$labels['forbiddenchars'] = 'Μη επιτρεπτοί χαρακτήρες στο πεδίο';
+$labels['cannotbeempty'] = 'Το πεδίο δεν μπορεί να είναι κενό';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Άγνωστο σφάλμα διακομιστή';
-$messages['filterconnerror'] = 'Αδυναμία σύνδεσης στον διακομιστή managesieve';
-$messages['filterdeleteerror'] = 'Αδυναμία διαγραφής φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
-$messages['filterdeleted'] = 'Το φίλτρο διαγράφηκε επιτυχώς';
-$messages['filterconfirmdelete'] = 'Θέλετε όντως να διαγράψετε το επιλεγμένο φίλτρο;';
-$messages['filtersaved'] = 'Το φίλτρο αποθηκεύτηκε επιτυχώς';
-$messages['filtersaveerror'] = 'Αδυναμία αποθήκευσης φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
-$messages['ruledeleteconfirm'] = 'Θέλετε όντως να διαγράψετε τον επιλεγμένο κανόνα;';
-$messages['actiondeleteconfirm'] = 'Θέλετε όντως να διαγράψετε την επιλεγμένη ενέργεια;';
-$messages['forbiddenchars'] = 'Μη επιτρεπτοί χαρακτήρες στο πεδίο';
-$messages['cannotbeempty'] = 'Το πεδίο δεν μπορεί να είναι κενό';
-
-?>
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
index c62979cc5..5e1c83a9c 100644
--- a/plugins/managesieve/localization/en_GB.inc
+++ b/plugins/managesieve/localization/en_GB.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/en_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Vibhav Pant <vibhavp@gmail.com>                               |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['filters'] = 'Filters';
 $labels['managefilters'] = 'Manage incoming mail filters';
 $labels['filtername'] = 'Filter name';
@@ -17,12 +32,18 @@ $labels['filteris'] = 'is equal to';
 $labels['filterisnot'] = 'is not equal to';
 $labels['filterexists'] = 'exists';
 $labels['filternotexists'] = 'not exists';
+$labels['filtermatches'] = 'matches expression';
+$labels['filternotmatches'] = 'not matches expression';
+$labels['filterregex'] = 'matches regular expression';
+$labels['filternotregex'] = 'not matches regular expression';
 $labels['filterunder'] = 'under';
 $labels['filterover'] = 'over';
 $labels['addrule'] = 'Add rule';
 $labels['delrule'] = 'Delete rule';
 $labels['messagemoveto'] = 'Move message to';
 $labels['messageredirect'] = 'Redirect message to';
+$labels['messagecopyto'] = 'Copy message to';
+$labels['messagesendcopy'] = 'Send message copy to';
 $labels['messagereply'] = 'Reply with message';
 $labels['messagedelete'] = 'Delete message';
 $labels['messagediscard'] = 'Discard with message';
@@ -35,19 +56,95 @@ $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'Additional list of recipient e-mails (comma separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
 $labels['vacationreason'] = 'Message body (vacation reason):';
+$labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
+$labels['enable'] = 'Enable/Disable';
+$labels['filterset'] = 'Filters set';
+$labels['filtersets'] = 'Filter sets';
+$labels['filtersetadd'] = 'Add filters set';
+$labels['filtersetdel'] = 'Delete current filters set';
+$labels['filtersetact'] = 'Activate current filters set';
+$labels['filtersetdeact'] = 'Deactivate current filters set';
+$labels['filterdef'] = 'Filter definition';
+$labels['filtersetname'] = 'Filters set name';
+$labels['newfilterset'] = 'New filters set';
+$labels['active'] = 'active';
+$labels['none'] = 'none';
+$labels['fromset'] = 'from set';
+$labels['fromfile'] = 'from file';
+$labels['filterdisabled'] = 'Filter disabled';
+$labels['countisgreaterthan'] = 'count is greater than';
+$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
+$labels['countislessthan'] = 'count is less than';
+$labels['countislessthanequal'] = 'count is less than or equal to';
+$labels['countequals'] = 'count is equal to';
+$labels['countnotequals'] = 'count does not equal';
+$labels['valueisgreaterthan'] = 'value is greater than';
+$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
+$labels['valueislessthan'] = 'value is less than';
+$labels['valueislessthanequal'] = 'value is less than or equal to';
+$labels['valueequals'] = 'value is equal to';
+$labels['valuenotequals'] = 'value does not equal';
+$labels['setflags'] = 'Set flags to the message';
+$labels['addflags'] = 'Add flags to the message';
+$labels['removeflags'] = 'Remove flags from the message';
+$labels['flagread'] = 'Read';
+$labels['flagdeleted'] = 'Deleted';
+$labels['flaganswered'] = 'Answered';
+$labels['flagflagged'] = 'Flagged';
+$labels['flagdraft'] = 'Draft';
+$labels['filtercreate'] = 'Create filter';
+$labels['usedata'] = 'Use following data in the filter:';
+$labels['nextstep'] = 'Next Step';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Advanced options';
+$labels['body'] = 'Body';
+$labels['address'] = 'address';
+$labels['envelope'] = 'envelope';
+$labels['modifier'] = 'modifier:';
+$labels['text'] = 'text';
+$labels['undecoded'] = 'undecoded (raw)';
+$labels['contenttype'] = 'content type';
+$labels['modtype'] = 'type:';
+$labels['allparts'] = 'all';
+$labels['domain'] = 'domain';
+$labels['localpart'] = 'local part';
+$labels['user'] = 'user';
+$labels['detail'] = 'detail';
+$labels['comparator'] = 'comparator:';
+$labels['default'] = 'default';
+$labels['octet'] = 'strict (octet)';
+$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
+$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['filterunknownerror'] = 'Unknown server error';
+$labels['filterconnerror'] = 'Unable to connect to managesieve server';
+$labels['filterdeleteerror'] = 'Unable to delete filter. Server error occured';
+$labels['filterdeleted'] = 'Filter deleted successfully';
+$labels['filtersaved'] = 'Filter saved successfully';
+$labels['filtersaveerror'] = 'Unable to save filter. Server error occured.';
+$labels['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$labels['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
+$labels['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
+$labels['forbiddenchars'] = 'Forbidden characters in field';
+$labels['cannotbeempty'] = 'Field cannot be empty';
+$labels['ruleexist'] = 'Filter with specified name already exists.';
+$labels['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
+$labels['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
+$labels['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
+$labels['setactivated'] = 'Filters set activated successfully.';
+$labels['setdeactivated'] = 'Filters set deactivated successfully.';
+$labels['setdeleted'] = 'Filters set deleted successfully.';
+$labels['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
+$labels['setcreateerror'] = 'Unable to create filters set. Server error occured.';
+$labels['setcreated'] = 'Filters set created successfully.';
+$labels['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
+$labels['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
+$labels['activated'] = 'Filter(s) disabled successfully.';
+$labels['deactivated'] = 'Filter(s) enabled successfully.';
+$labels['moved'] = 'Filter moved successfully.';
+$labels['moveerror'] = 'Unable to move selected filter. Server error occured.';
+$labels['nametoolong'] = 'Name too long.';
+$labels['namereserved'] = 'Reserved name.';
+$labels['setexist'] = 'Set already exists.';
+$labels['nodata'] = 'At least one position must be selected!';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Unknown server error';
-$messages['filterconnerror'] = 'Unable to connect to managesieve server';
-$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured';
-$messages['filterdeleted'] = 'Filter deleted successfully';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$messages['filtersaved'] = 'Filter saved successfully';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
-$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$messages['forbiddenchars'] = 'Forbidden characters in field';
-$messages['cannotbeempty'] = 'Field cannot be empty';
-
-?>
diff --git a/plugins/managesieve/localization/es_AR.inc b/plugins/managesieve/localization/es_AR.inc
index 93fd1e9f4..b8e857d76 100644
--- a/plugins/managesieve/localization/es_AR.inc
+++ b/plugins/managesieve/localization/es_AR.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_AR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Administrar filtros de correo entrante';
@@ -44,7 +58,6 @@ $labels['filtersetadd'] = 'Agregar conjunto de filtros';
 $labels['filtersetdel'] = 'Eliminar conjunto de filtros';
 $labels['filtersetact'] = 'Activar conjunto de filtros';
 $labels['filtersetdeact'] = 'Deactivar conjunto de filtros';
-$labels['filtersetget'] = 'Descargar conjunto de filtros en archivo de texto';
 $labels['filterdef'] = 'Definicion del conjunto de filtros';
 $labels['filtersetname'] = 'Nombre del conjunto de filtros';
 $labels['newfilterset'] = 'Nuevo conjunto de filtros';
@@ -53,29 +66,25 @@ $labels['none'] = 'none';
 $labels['fromset'] = 'desde conjunto';
 $labels['fromfile'] = 'desde archivo';
 $labels['filterdisabled'] = 'Filtro deshabilitado';
+$labels['filterunknownerror'] = 'Error desconocido de servidor';
+$labels['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
+$labels['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
+$labels['filterdeleted'] = 'Filtro borrado satisfactoriamente';
+$labels['filtersaved'] = 'Filtro guardado satisfactoriamente';
+$labels['filtersaveerror'] = 'Imposible guardar ell filtro. Ha ocurrido un error en el servidor';
+$labels['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
+$labels['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
+$labels['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
+$labels['forbiddenchars'] = 'Caracteres prohibidos en el campo';
+$labels['cannotbeempty'] = 'El campo no puede estar vacío';
+$labels['setactivateerror'] = 'Imposible activar el conjunto de filtros. Error en el servidor.';
+$labels['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros. Error en el servidor.';
+$labels['setdeleteerror'] = 'Imposible eliminar el conjunto de filtros. Error en el servidor.';
+$labels['setactivated'] = 'Conjunto de filtros activados correctamente';
+$labels['setdeactivated'] = 'Conjunto de filtros desactivados correctamente';
+$labels['setdeleted'] = 'Conjunto de filtros eliminados correctamente';
+$labels['setdeleteconfirm'] = '¿Esta seguro, que quiere eliminar el conjunto de filtros seleccionado?';
+$labels['setcreateerror'] = 'Imposible crear el conjunto de filtros. Error en el servidor.';
+$labels['setcreated'] = 'Conjunto de filtros creados correctamente';
+$labels['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre del conjunto de filtros muy largo';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Error desconocido de servidor';
-$messages['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
-$messages['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
-$messages['filterdeleted'] = 'Filtro borrado satisfactoriamente';
-$messages['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
-$messages['filtersaved'] = 'Filtro guardado satisfactoriamente';
-$messages['filtersaveerror'] = 'Imposible guardar ell filtro. Ha ocurrido un error en el servidor';
-$messages['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
-$messages['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
-$messages['forbiddenchars'] = 'Caracteres prohibidos en el campo';
-$messages['cannotbeempty'] = 'El campo no puede estar vacío';
-$messages['setactivateerror'] = 'Imposible activar el conjunto de filtros. Error en el servidor.';
-$messages['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros. Error en el servidor.';
-$messages['setdeleteerror'] = 'Imposible eliminar el conjunto de filtros. Error en el servidor.';
-$messages['setactivated'] = 'Conjunto de filtros activados correctamente';
-$messages['setdeactivated'] = 'Conjunto de filtros desactivados correctamente';
-$messages['setdeleted'] = 'Conjunto de filtros eliminados correctamente';
-$messages['setdeleteconfirm'] = '¿Esta seguro, que quiere eliminar el conjunto de filtros seleccionado?';
-$messages['setcreateerror'] = 'Imposible crear el conjunto de filtros. Error en el servidor.';
-$messages['setcreated'] = 'Conjunto de filtros creados correctamente';
-$messages['emptyname'] = 'Imposible crear el conjunto de filtros. Nombre del conjunto de filtros vacio';
-$messages['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre del conjunto de filtros muy largo';
-
-?>
diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc
index b6dbf166b..5c6b9c32a 100644
--- a/plugins/managesieve/localization/es_ES.inc
+++ b/plugins/managesieve/localization/es_ES.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/es_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: JorSol <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Administrar filtros de correo entrante';
@@ -18,6 +32,10 @@ $labels['filteris'] = 'es igual a';
 $labels['filterisnot'] = 'no es igual a';
 $labels['filterexists'] = 'existe';
 $labels['filternotexists'] = 'no existe';
+$labels['filtermatches'] = 'coincide con la expresión';
+$labels['filternotmatches'] = 'no coincide con la expresión';
+$labels['filterregex'] = 'coincide con la expresión regular';
+$labels['filternotregex'] = 'no coincide con la expresión regular';
 $labels['filterunder'] = 'bajo';
 $labels['filterover'] = 'sobre';
 $labels['addrule'] = 'Agregar regla';
@@ -38,26 +56,23 @@ $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de direcciones de correo de destinatarios adicionales (separados por comas):';
 $labels['vacationdays'] = 'Cada cuanto enviar mensajes (en días):';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razón de vacaciones):';
+$labels['vacationsubject'] = 'Asunto del Mensaje:';
 $labels['rulestop'] = 'Parar de evaluar reglas';
+$labels['enable'] = 'Habilitar/Deshabilitar';
 $labels['filterset'] = 'Conjunto de filtros';
+$labels['filtersets'] = 'Conjunto de filtros';
 $labels['filtersetadd'] = 'Agregar conjunto de filtros';
 $labels['filtersetdel'] = 'Eliminar conjunto de filtros actual';
 $labels['filtersetact'] = 'Activar conjunto de filtros actual';
 $labels['filtersetdeact'] = 'Desactivar conjunto de filtros actual';
-$labels['filtersetget'] = 'Descargar conjunto de filtros en formato de texto';
 $labels['filterdef'] = 'Definición de filtros';
 $labels['filtersetname'] = 'Nombre del conjunto de filtros';
 $labels['newfilterset'] = 'Nuevo conjunto de filtros';
 $labels['active'] = 'activo';
 $labels['none'] = 'ninguno';
-$labels['fromset'] = 'de conjunto ';
+$labels['fromset'] = 'de conjunto';
 $labels['fromfile'] = 'de archivo';
 $labels['filterdisabled'] = 'Filtro desactivado';
-$labels['filtermatches'] = 'coincide con la expresión';
-$labels['filternotmatches'] = 'no coincide con la expresión';
-$labels['filterregex'] = 'coincide con la expresión regular';
-$labels['filternotregex'] = 'no coincide con la expresión regular';
-$labels['vacationsubject'] = 'Asunto del Mensaje:';
 $labels['countisgreaterthan'] = 'contiene más que';
 $labels['countisgreaterthanequal'] = 'contiene más o igual que';
 $labels['countislessthan'] = 'contiene menos que';
@@ -78,30 +93,32 @@ $labels['flagdeleted'] = 'Eliminado';
 $labels['flaganswered'] = 'Respondido';
 $labels['flagflagged'] = 'Marcado';
 $labels['flagdraft'] = 'Borrador';
+$labels['filtercreate'] = 'Crear Filtro';
+$labels['usedata'] = 'User los siguientes datos en el filtro:';
+$labels['nextstep'] = 'Siguiente paso';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Opciones avanzadas';
+$labels['body'] = 'Cuerpo del mensaje';
+$labels['address'] = 'dirección';
+$labels['filterunknownerror'] = 'Error desconocido de servidor';
+$labels['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
+$labels['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
+$labels['filterdeleted'] = 'Filtro borrado satisfactoriamente';
+$labels['filtersaved'] = 'Filtro guardado satisfactoriamente';
+$labels['filtersaveerror'] = 'Imposible guardar el filtro. Ha ocurrido un error en el servidor';
+$labels['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
+$labels['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
+$labels['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
+$labels['forbiddenchars'] = 'Caracteres prohibidos en el campo';
+$labels['cannotbeempty'] = 'El campo no puede estar vacío';
+$labels['setactivateerror'] = 'Imposible activar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
+$labels['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
+$labels['setdeleteerror'] = 'Imposible borrar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
+$labels['setactivated'] = 'Conjunto de filtros activado satisfactoriamente';
+$labels['setdeactivated'] = 'Conjunto de filtros desactivado satisfactoriamente';
+$labels['setdeleted'] = 'Conjunto de filtros borrado satisfactoriamente';
+$labels['setdeleteconfirm'] = '¿Está seguro de que desea borrar el conjunto de filtros seleccionado?';
+$labels['setcreateerror'] = 'Imposible crear el conjunto de filtros. Ha ocurrido un error en el servidor';
+$labels['setcreated'] = 'Conjunto de filtros creado satisfactoriamente';
+$labels['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre demasiado largo';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Error desconocido de servidor';
-$messages['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
-$messages['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
-$messages['filterdeleted'] = 'Filtro borrado satisfactoriamente';
-$messages['filtersaved'] = 'Filtro guardado satisfactoriamente';
-$messages['filtersaveerror'] = 'Imposible guardar el filtro. Ha ocurrido un error en el servidor';
-$messages['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
-$messages['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
-$messages['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
-$messages['forbiddenchars'] = 'Caracteres prohibidos en el campo';
-$messages['cannotbeempty'] = 'El campo no puede estar vacío';
-$messages['setactivateerror'] = 'Imposible activar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
-$messages['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
-$messages['setdeleteerror'] = 'Imposible borrar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
-$messages['setactivated'] = 'Conjunto de filtros activado satisfactoriamente';
-$messages['setdeactivated'] = 'Conjunto de filtros desactivado satisfactoriamente';
-$messages['setdeleted'] = 'Conjunto de filtros borrado satisfactoriamente';
-$messages['setdeleteconfirm'] = '¿Está seguro de que desea borrar el conjunto de filtros seleccionado?';
-$messages['setcreateerror'] = 'Imposible crear el conjunto de filtros. Ha ocurrido un error en el servidor';
-$messages['setcreated'] = 'Conjunto de filtros creado satisfactoriamente';
-$messages['emptyname'] = 'Imposible crear el conjunto de filtros. Sin nombre';
-$messages['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre demasiado largo';
-$messages['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
-
-?>
diff --git a/plugins/managesieve/localization/et_EE.inc b/plugins/managesieve/localization/et_EE.inc
index 7f891883b..fab96639c 100644
--- a/plugins/managesieve/localization/et_EE.inc
+++ b/plugins/managesieve/localization/et_EE.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/et_EE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: yllar <Unknown>                                               |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['filters'] = 'Filtrid';
 $labels['managefilters'] = 'Halda sisenevate kirjade filtreid';
 $labels['filtername'] = 'Filtri nimi';
@@ -17,12 +32,18 @@ $labels['filteris'] = 'on võrdne kui';
 $labels['filterisnot'] = 'ei ole võrdne kui';
 $labels['filterexists'] = 'on olemas';
 $labels['filternotexists'] = 'pole olemas';
+$labels['filtermatches'] = 'vastab avaldisele';
+$labels['filternotmatches'] = 'ei vasta avaldisele';
+$labels['filterregex'] = 'vastab regulaaravaldisele';
+$labels['filternotregex'] = 'ei vasta regulaaravaldisele';
 $labels['filterunder'] = 'alt';
 $labels['filterover'] = 'üle';
 $labels['addrule'] = 'Lisa reegel';
 $labels['delrule'] = 'Kustuta reegel';
 $labels['messagemoveto'] = 'Liiguta kiri';
 $labels['messageredirect'] = 'Suuna kiri ümber';
+$labels['messagecopyto'] = 'Kopeeri kiri';
+$labels['messagesendcopy'] = 'Saada kirja koopia';
 $labels['messagereply'] = 'Vasta kirjaga';
 $labels['messagedelete'] = 'Kustuta kiri';
 $labels['messagediscard'] = 'Viska ära teatega';
@@ -35,19 +56,85 @@ $labels['recipient'] = 'Saaja';
 $labels['vacationaddresses'] = 'Lisanimekiri saaja e-posti aadressidest (komadega eraldatud):';
 $labels['vacationdays'] = 'Kui tihti kirju saata (päevades):';
 $labels['vacationreason'] = 'Kirja sisu (puhkuse põhjus):';
+$labels['vacationsubject'] = 'Kirja teema:';
 $labels['rulestop'] = 'Peata reeglite otsimine';
+$labels['enable'] = 'Luba/keela';
+$labels['filterset'] = 'Filtrite kogum';
+$labels['filtersets'] = 'Filtri kogum';
+$labels['filtersetadd'] = 'Lisa filtrite kogum';
+$labels['filtersetdel'] = 'Kustuta praegune filtrite kogum';
+$labels['filtersetact'] = 'Aktiveeri praegune filtrite kogum';
+$labels['filtersetdeact'] = 'De-aktiveeri praegune filtrite kogum';
+$labels['filterdef'] = 'Filtri definitsioon';
+$labels['filtersetname'] = 'Filtrite kogumi nimi';
+$labels['newfilterset'] = 'Uus filtrite kogum';
+$labels['active'] = 'aktiivne';
+$labels['none'] = 'puudub';
+$labels['fromset'] = 'kogumist';
+$labels['fromfile'] = 'failist';
+$labels['filterdisabled'] = 'Filter keelatud';
+$labels['countisgreaterthan'] = 'koguarv on suurem kui';
+$labels['countisgreaterthanequal'] = 'koguarv on suurem kui või võrdne';
+$labels['countislessthan'] = 'koguarv on väiksem';
+$labels['countislessthanequal'] = 'koguarv on väiksem kui või võrdne';
+$labels['countequals'] = 'koguarv on võrdne';
+$labels['countnotequals'] = 'koguarv ei ole võrdne';
+$labels['valueisgreaterthan'] = 'väärtus on suurem kui';
+$labels['valueisgreaterthanequal'] = 'väärtus on suurem kui või võrdne';
+$labels['valueislessthan'] = 'väärtus on väiksem kui';
+$labels['valueislessthanequal'] = 'väärtus on väiksem kui või võrdne';
+$labels['valueequals'] = 'väärtus on võrdne';
+$labels['valuenotequals'] = 'väärtus ei ole võrdne';
+$labels['setflags'] = 'Sea kirjale lipik';
+$labels['addflags'] = 'Lisa kirjale lipikuid';
+$labels['removeflags'] = 'Eemalda kirjalt lipikud';
+$labels['flagread'] = 'Loetud';
+$labels['flagdeleted'] = 'Kustutatud';
+$labels['flaganswered'] = 'Vastatud';
+$labels['flagflagged'] = 'Märgistatud';
+$labels['flagdraft'] = 'Mustand';
+$labels['filtercreate'] = 'Loo filter';
+$labels['usedata'] = 'Kasuta filtris järgmisi andmeid:';
+$labels['nextstep'] = 'Järgmine samm';
+$labels['...'] = '…';
+$labels['advancedopts'] = 'Lisaseadistused';
+$labels['body'] = 'Põhitekst';
+$labels['address'] = 'aadress';
+$labels['envelope'] = 'ümbrik';
+$labels['modifier'] = 'muutja:';
+$labels['text'] = 'tekst';
+$labels['undecoded'] = 'kodeerimata (toor)';
+$labels['contenttype'] = 'sisu tüüp';
+$labels['modtype'] = 'tüüp:';
+$labels['allparts'] = 'kõik';
+$labels['domain'] = 'domeen';
+$labels['localpart'] = 'kohalik osa';
+$labels['user'] = 'kasutaja';
+$labels['detail'] = 'detail';
+$labels['comparator'] = 'võrdleja:';
+$labels['default'] = 'vaikimisi';
+$labels['octet'] = 'range (octet)';
+$labels['asciicasemap'] = 'tõstutundetu (ascii-casemap)';
+$labels['asciinumeric'] = 'numbriline (ascii-numeric)';
+$labels['filterunknownerror'] = 'Tundmatu serveri tõrge';
+$labels['filterconnerror'] = 'Managesieve serveriga ühendumine nurjus';
+$labels['filterdeleteerror'] = 'Filtri kustutamine nurjus. Ilmnes serveri tõrge.';
+$labels['filterdeleted'] = 'Filter edukalt kustutatud';
+$labels['filtersaved'] = 'Filter edukalt salvestatud';
+$labels['filtersaveerror'] = 'Filtri salvestamine nurjus. Ilmnes serveri tõrge.';
+$labels['filterdeleteconfirm'] = 'Soovid valitud filtri kustutada?';
+$labels['ruledeleteconfirm'] = 'Soovid valitud reegli kustutada?';
+$labels['actiondeleteconfirm'] = 'Soovid valitud tegevuse kustutada?';
+$labels['forbiddenchars'] = 'Väljal on lubamatu märk';
+$labels['cannotbeempty'] = 'Väli ei või tühi olla';
+$labels['ruleexist'] = 'Määratud nimega filter on juba olemas';
+$labels['activateerror'] = 'Valitud filtrite lubamine nurjus. Ilmnes serveri tõrge.';
+$labels['deactivateerror'] = 'Valitud filtrite keelamine nurjus. Ilmnes serveri tõrge.';
+$labels['activated'] = 'Filter edukalt keelatud.';
+$labels['deactivated'] = 'Filter edukalt lubatud.';
+$labels['moved'] = 'Filter edukalt liigutatud.';
+$labels['moveerror'] = 'Valitud filtri liigutamine nurjus. Ilmnes serveri tõrge.';
+$labels['nametoolong'] = 'Nimi on liiga pikk.';
+$labels['namereserved'] = 'Nimi on reserveeritud.';
+$labels['nodata'] = 'Valitud peab olema vähemalt üks asukoht!';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Tundmatu serveri tõrge';
-$messages['filterconnerror'] = 'Managesieve serveriga ühendumine nurjus';
-$messages['filterdeleteerror'] = 'Filtri kustutamine nurjus. Ilmnes serveri tõrge.';
-$messages['filterdeleted'] = 'Filter edukalt kustutatud';
-$messages['filterdeleteconfirm'] = 'Soovid valitud filtri kustutada?';
-$messages['filtersaved'] = 'Filter edukalt salvestatud';
-$messages['filtersaveerror'] = 'Filtri salvestamine nurjus. Ilmnes serveri tõrge.';
-$messages['ruledeleteconfirm'] = 'Soovid valitud reegli kustutada?';
-$messages['actiondeleteconfirm'] = 'Soovid valitud tegevuse kustutada?';
-$messages['forbiddenchars'] = 'Väljal on lubamatu märk';
-$messages['cannotbeempty'] = 'Väli ei või tühi olla';
-
-?>
diff --git a/plugins/managesieve/localization/fi_FI.inc b/plugins/managesieve/localization/fi_FI.inc
index 70d3ccebb..09d97b2fe 100644
--- a/plugins/managesieve/localization/fi_FI.inc
+++ b/plugins/managesieve/localization/fi_FI.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fi_FI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jiri Grönroos <Unknown>                                      |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Suodattimet';
 $labels['managefilters'] = 'Muokkaa saapuvan sähköpostin suodattimia';
@@ -13,7 +27,7 @@ $labels['filterallof'] = 'Täsmää kaikkien sääntöjen mukaan';
 $labels['filteranyof'] = 'Täsmää minkä tahansa sääntöjen mukaan';
 $labels['filterany'] = 'Kaikki viestit';
 $labels['filtercontains'] = 'Sisältää';
-$labels['filternotcontains'] = 'Ei Sisällä';
+$labels['filternotcontains'] = 'Ei sisällä';
 $labels['filteris'] = 'on samanlainen kuin';
 $labels['filterisnot'] = 'ei ole samanlainen kuin';
 $labels['filterexists'] = 'on olemassa';
@@ -36,12 +50,12 @@ $labels['recipient'] = 'Vastaanottaja';
 $labels['vacationaddresses'] = 'Lähetä viesti myös seuraaviin osotteisiin (erottele pilkulla):';
 $labels['vacationdays'] = 'Kuinka monen päivän välein lähetetään uusi vastaus:';
 $labels['vacationreason'] = 'Viesti:';
+$labels['vacationsubject'] = 'Viestin aihe:';
 $labels['rulestop'] = 'Viimeinen sääntö';
 $labels['filterset'] = 'Suodatinlista';
 $labels['filtersetadd'] = 'Lisää suodatinlista';
 $labels['filtersetdel'] = 'Poista valittu suodatinlista';
 $labels['filtersetact'] = 'Aktivoi valittu suodatinlista';
-$labels['filtersetget'] = 'Lataa valittu suodatinlista tekstimuodossa';
 $labels['filterdef'] = 'Suodatinmääritykset';
 $labels['filtersetname'] = 'Suodatinlistan nimi';
 $labels['newfilterset'] = 'Uusi suodatinlista';
@@ -50,19 +64,27 @@ $labels['none'] = 'ei mitään';
 $labels['fromset'] = 'listasta';
 $labels['fromfile'] = 'tiedostosta';
 $labels['filterdisabled'] = 'Suodatin on poistettu käytöstä';
+$labels['flagread'] = 'Luettu';
+$labels['flagdeleted'] = 'Poistettu';
+$labels['flaganswered'] = 'Vastattu';
+$labels['flagdraft'] = 'Luonnos';
+$labels['filtercreate'] = 'Luo suodatin';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Lisäasetukset';
+$labels['address'] = 'osoite';
+$labels['modtype'] = 'tyyppi:';
+$labels['allparts'] = 'kaikki';
+$labels['user'] = 'käyttäjä';
+$labels['default'] = 'oletus';
+$labels['filterunknownerror'] = 'Tuntematon palvelin virhe';
+$labels['filterconnerror'] = 'Yhdistäminen palvelimeen epäonnistui';
+$labels['filterdeleteerror'] = 'Suodattimen poistaminen epäonnistui. Palvelin virhe';
+$labels['filterdeleted'] = 'Suodatin poistettu';
+$labels['filtersaved'] = 'Suodatin tallennettu';
+$labels['filtersaveerror'] = 'Suodattimen tallennus epäonnistui. Palvelin virhe';
+$labels['filterdeleteconfirm'] = 'Haluatko varmasti poistaa valitut suodattimet?';
+$labels['ruledeleteconfirm'] = 'Haluatko poistaa valitut säännöt?';
+$labels['actiondeleteconfirm'] = 'Haluatko poistaa valitut tapahtumat?';
+$labels['forbiddenchars'] = 'Sisältää kiellettyjä kirjaimia';
+$labels['cannotbeempty'] = 'Kenttä ei voi olla tyhjä';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Tuntematon palvelin virhe';
-$messages['filterconnerror'] = 'Yhdistäminen palvelimeen epäonnistui';
-$messages['filterdeleteerror'] = 'Suodattimen poistaminen epäonnistui. Palvelin virhe';
-$messages['filterdeleted'] = 'Suodatin poistettu';
-$messages['filterdeleteconfirm'] = 'Haluatko varmasti poistaa valitut suodattimet?';
-$messages['filtersaved'] = 'Suodatin tallennettu';
-$messages['filtersaveerror'] = 'Suodattimen tallennus epäonnistui. Palvelin virhe';
-$messages['ruledeleteconfirm'] = 'Haluatko poistaa valitut säännöt?';
-$messages['actiondeleteconfirm'] = 'Haluatko poistaa valitut tapahtumat?';
-$messages['forbiddenchars'] = 'Sisältää kiellettyjä kirjaimia';
-$messages['cannotbeempty'] = 'Kenttä ei voi olla tyhjä';
-
-
-?>
diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
index a2a83c21c..527f071f0 100644
--- a/plugins/managesieve/localization/fr_FR.inc
+++ b/plugins/managesieve/localization/fr_FR.inc
@@ -1,11 +1,26 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fr_FR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Nicolas Delvaux <Unknown>                                     |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['filters'] = 'Filtres';
 $labels['managefilters'] = 'Gestion des filtres sur les mails entrants';
 $labels['filtername'] = 'Nom du filtre';
 $labels['newfilter'] = 'Nouveau filtre';
 $labels['filteradd'] = 'Ajouter un filtre';
-$labels['filterdel'] = 'Supprimer un filtre';
+$labels['filterdel'] = 'Supprimer le filtre';
 $labels['moveup'] = 'Monter';
 $labels['movedown'] = 'Descendre';
 $labels['filterallof'] = 'valident toutes les conditions suivantes';
@@ -13,21 +28,25 @@ $labels['filteranyof'] = 'valident au moins une des conditions suivantes';
 $labels['filterany'] = 'tous les messages';
 $labels['filtercontains'] = 'contient';
 $labels['filternotcontains'] = 'ne contient pas';
-$labels['filteris'] = 'est ';
-$labels['filterisnot'] = 'n\'est pas';
+$labels['filteris'] = 'est égal à';
+$labels['filterisnot'] = 'est différent de';
 $labels['filterexists'] = 'existe';
 $labels['filternotexists'] = 'n\'existe pas';
+$labels['filtermatches'] = 'concorde avec l\'expression';
+$labels['filternotmatches'] = 'ne concorde pas avec l\'expression';
+$labels['filterregex'] = 'concorde avec l\'expression régulière';
+$labels['filternotregex'] = 'ne concorde pas avec l\'expression régulière';
 $labels['filterunder'] = 'est plus petit que';
 $labels['filterover'] = 'est plus grand que';
 $labels['addrule'] = 'Ajouter une règle';
 $labels['delrule'] = 'Supprimer une règle';
 $labels['messagemoveto'] = 'Déplacer le message vers';
 $labels['messageredirect'] = 'Transférer le message à';
+$labels['messagecopyto'] = 'Copier le message vers';
+$labels['messagesendcopy'] = 'Envoyer une copie du message à';
 $labels['messagereply'] = 'Répondre avec le message';
 $labels['messagedelete'] = 'Supprimer le message';
 $labels['messagediscard'] = 'Rejeter avec le message';
-$labels['messagecopyto'] = 'Copier le message vers';
-$labels['messagesendcopy'] = 'Envoyer une copie du message à';
 $labels['messagesrules'] = 'Pour les mails entrants:';
 $labels['messagesactions'] = '...exécuter les actions suivantes:';
 $labels['add'] = 'Ajouter';
@@ -37,27 +56,84 @@ $labels['recipient'] = 'Destinataire';
 $labels['vacationaddresses'] = 'Liste des destinataires (séparés par une virgule) :';
 $labels['vacationdays'] = 'Ne pas renvoyer un message avant (jours) :';
 $labels['vacationreason'] = 'Corps du message (raison de l\'absence) :';
+$labels['vacationsubject'] = 'Sujet du message:';
 $labels['rulestop'] = 'Arrêter d\'évaluer les prochaines règles';
-$labels['setflags'] = 'Mettre les flags au message';
-$labels['addflags'] = 'Ajouter les flags au message';
-$labels['removeflags'] = 'Supprimer les flags du message';
+$labels['enable'] = 'Activer/Désactiver';
+$labels['filterset'] = 'Groupe de filtres';
+$labels['filtersets'] = 'Groupes de filtres';
+$labels['filtersetadd'] = 'Ajouter un groupe de filtres';
+$labels['filtersetdel'] = 'Supprimer le groupe de filtres actuel';
+$labels['filtersetact'] = 'Activer le groupe de filtres actuel';
+$labels['filtersetdeact'] = 'Désactiver le groupe de filtres actuel';
+$labels['filterdef'] = 'Définition du filtre';
+$labels['filtersetname'] = 'Nom du groupe de filtres';
+$labels['newfilterset'] = 'Nouveau groupe de filtres';
+$labels['active'] = 'actif';
+$labels['none'] = 'aucun';
+$labels['fromset'] = 'à partir du filtre';
+$labels['fromfile'] = 'à partir du fichier';
+$labels['filterdisabled'] = 'Filtre désactivé';
+$labels['countisgreaterthan'] = 'total supérieur à';
+$labels['countisgreaterthanequal'] = 'total supérieur ou égal à';
+$labels['countislessthan'] = 'total inférieur à';
+$labels['countislessthanequal'] = 'total inférieur à';
+$labels['countequals'] = 'total égal à';
+$labels['countnotequals'] = 'total différent de';
+$labels['valueisgreaterthan'] = 'valeur supérieure à';
+$labels['valueisgreaterthanequal'] = 'valeur supérieure ou égale à';
+$labels['valueislessthan'] = 'valeur inférieure à';
+$labels['valueislessthanequal'] = 'valeur inférieure ou égale à';
+$labels['valueequals'] = 'valeur égale à';
+$labels['valuenotequals'] = 'valeur différente de';
+$labels['setflags'] = 'Mettre les marqueurs au message';
+$labels['addflags'] = 'Ajouter les marqueurs au message';
+$labels['removeflags'] = 'Supprimer les marqueurs du message';
 $labels['flagread'] = 'Lu';
-$labels['flagdeleted'] = 'Suprimé';
-$labels['flaganswered'] = 'répondu';
-$labels['flagflagged'] = 'Favori';
+$labels['flagdeleted'] = 'Supprimé';
+$labels['flaganswered'] = 'Répondu';
+$labels['flagflagged'] = 'Marqué';
 $labels['flagdraft'] = 'Brouillon';
+$labels['filtercreate'] = 'Créer un filtre';
+$labels['usedata'] = 'Utiliser les informations suivantes dans le filtre';
+$labels['nextstep'] = 'Étape suivante';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Options avancées';
+$labels['body'] = 'Corps du message';
+$labels['address'] = 'adresse';
+$labels['envelope'] = 'enveloppe';
+$labels['modifier'] = 'modificateur:';
+$labels['text'] = 'texte';
+$labels['undecoded'] = 'non décodé (brut)';
+$labels['contenttype'] = 'type de contenu';
+$labels['modtype'] = 'type:';
+$labels['allparts'] = 'tout';
+$labels['domain'] = 'domaine';
+$labels['localpart'] = 'partie locale';
+$labels['user'] = 'utilisateur';
+$labels['detail'] = 'détail';
+$labels['comparator'] = 'comparateur';
+$labels['default'] = 'par défaut';
+$labels['octet'] = 'strict (octet)';
+$labels['asciicasemap'] = 'insensible à la casse (ascii-casemap)';
+$labels['asciinumeric'] = 'numérique (ascii-numeric)';
+$labels['filterunknownerror'] = 'Erreur du serveur inconnue';
+$labels['filterconnerror'] = 'Connexion au serveur Managesieve impossible';
+$labels['filterdeleteerror'] = 'Suppression du filtre impossible. Le serveur à produit une erreur';
+$labels['filterdeleted'] = 'Le filtre a bien été supprimé';
+$labels['filtersaved'] = 'Le filtre a bien été enregistré';
+$labels['filtersaveerror'] = 'Enregistrement du filtre impossibe. Le serveur à produit une erreur';
+$labels['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
+$labels['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée?';
+$labels['actiondeleteconfirm'] = 'Voulez-vous vraiment supprimer l\'action sélectionnée?';
+$labels['forbiddenchars'] = 'Caractères interdits dans le champ';
+$labels['cannotbeempty'] = 'Le champ ne peut pas être vide';
+$labels['setactivateerror'] = 'Impossible d\'aactiver le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
+$labels['setdeactivateerror'] = 'Impossible de désactiver le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
+$labels['setdeleteerror'] = 'Impossible de supprimer le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
+$labels['setactivated'] = 'Le groupe de filtres a bien été activé.';
+$labels['setdeactivated'] = 'Le groupe de filtres a bien été désactivé.';
+$labels['setdeleted'] = 'Le groupe de filtres a bien été supprimé.';
+$labels['setdeleteconfirm'] = 'Voulez vous vraiment supprimer le groupe de filtres sélectionné ?';
+$labels['setcreateerror'] = 'Impossible de créer le groupe de filtres. Le serveur a rencontré une erreur.';
+$labels['setcreated'] = 'Le groupe de filtres a bien été créé.';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Erreur du serveur inconnue';
-$messages['filterconnerror'] = 'Connexion au serveur Managesieve impossible';
-$messages['filterdeleteerror'] = 'Suppression du filtre impossible. Le serveur à produit une erreur';
-$messages['filterdeleted'] = 'Le filtre a bien été supprimé';
-$messages['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
-$messages['filtersaved'] = 'Le filtre a bien été enregistré';
-$messages['filtersaveerror'] = 'Enregistrement du filtre impossibe. Le serveur à produit une erreur';
-$messages['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée?';
-$messages['actiondeleteconfirm'] = 'Voulez-vous vraiment supprimer l\'action sélectionnée?';
-$messages['forbiddenchars'] = 'Caractères interdits dans le champ';
-$messages['cannotbeempty'] = 'Le champ ne peut pas être vide';
-
-?>
diff --git a/plugins/managesieve/localization/gl_ES.inc b/plugins/managesieve/localization/gl_ES.inc
index a03d9dec4..715f358cf 100644
--- a/plugins/managesieve/localization/gl_ES.inc
+++ b/plugins/managesieve/localization/gl_ES.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/gl_ES/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Xestionar os filtros de correo entrante';
@@ -44,38 +58,33 @@ $labels['filtersetadd'] = 'Engadir un conxunto de filtros';
 $labels['filtersetdel'] = 'Eliminar o conxunto de filtros actual';
 $labels['filtersetact'] = 'Activar o conxunto de filtros actual';
 $labels['filtersetdeact'] = 'Desactivar o conxunto de filtros actual';
-$labels['filtersetget'] = 'Descargar o conxunto de filtros en formato de texto';
 $labels['filterdef'] = 'Definición de filtros';
 $labels['filtersetname'] = 'Nome do conxunto de filtros';
 $labels['newfilterset'] = 'Novo conxunto de filtros';
 $labels['active'] = 'activo';
 $labels['none'] = 'ningún';
-$labels['fromset'] = 'de conxunto ';
+$labels['fromset'] = 'de conxunto';
 $labels['fromfile'] = 'de arquivo';
 $labels['filterdisabled'] = 'Filtro desactivado';
+$labels['filterunknownerror'] = 'Erro descoñecido servidor';
+$labels['filterconnerror'] = 'Imposible conectar co servidor managesieve';
+$labels['filterdeleteerror'] = 'Imposible eliminar filtro. Ocurriu un erro no servidor';
+$labels['filterdeleted'] = 'Filtro borrado con éxito';
+$labels['filtersaved'] = 'Filtro gardado con éxito';
+$labels['filtersaveerror'] = 'Imposible gardar o filtro. Ocurriu un erro no servidor';
+$labels['filterdeleteconfirm'] = 'Realmente desexa eliminar o filtro seleccionado?';
+$labels['ruledeleteconfirm'] = 'Está seguro de que desexa eliminar a regra seleccionada?';
+$labels['actiondeleteconfirm'] = 'Está seguro de que desexa eliminar a acción seleccionada?';
+$labels['forbiddenchars'] = 'Caracteres non permitidos no campo';
+$labels['cannotbeempty'] = 'O campo non pode estar baleiro';
+$labels['setactivateerror'] = 'Imposible activar o conxunto de filtros seleccionado. Ocurriu un erro no servidor';
+$labels['setdeactivateerror'] = 'Imposible desactivar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
+$labels['setdeleteerror'] = 'Imposible eliminar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
+$labels['setactivated'] = 'O conxunto de filtros activouse con éxito';
+$labels['setdeactivated'] = 'O conxunto de filtros desactivouse con éxito';
+$labels['setdeleted'] = 'O Conxunto de filtros borrouse con éxito';
+$labels['setdeleteconfirm'] = 'Está seguro de que desexa eliminar o conxunto de filtros seleccionado?';
+$labels['setcreateerror'] = 'Imposible crear o conxunto de filtros. Ocurriu un error no servidor';
+$labels['setcreated'] = 'Conxunto de filtros creado con éxito';
+$labels['nametoolong'] = 'Imposible crear o conxunto de filtros. O nome é longo de máis';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Erro descoñecido servidor';
-$messages['filterconnerror'] = 'Imposible conectar co servidor managesieve';
-$messages['filterdeleteerror'] = 'Imposible eliminar filtro. Ocurriu un erro no servidor';
-$messages['filterdeleted'] = 'Filtro borrado con éxito';
-$messages['filtersaved'] = 'Filtro gardado con éxito';
-$messages['filtersaveerror'] = 'Imposible gardar o filtro. Ocurriu un erro no servidor';
-$messages['filterdeleteconfirm'] = 'Realmente desexa eliminar o filtro seleccionado?';
-$messages['ruledeleteconfirm'] = 'Está seguro de que desexa eliminar a regra seleccionada?';
-$messages['actiondeleteconfirm'] = 'Está seguro de que desexa eliminar a acción seleccionada?';
-$messages['forbiddenchars'] = 'Caracteres non permitidos no campo';
-$messages['cannotbeempty'] = 'O campo non pode estar baleiro';
-$messages['setactivateerror'] = 'Imposible activar o conxunto de filtros seleccionado. Ocurriu un erro no servidor';
-$messages['setdeactivateerror'] = 'Imposible desactivar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
-$messages['setdeleteerror'] = 'Imposible eliminar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
-$messages['setactivated'] = 'O conxunto de filtros activouse con éxito';
-$messages['setdeactivated'] = 'O conxunto de filtros desactivouse con éxito';
-$messages['setdeleted'] = 'O Conxunto de filtros borrouse con éxito';
-$messages['setdeleteconfirm'] = 'Está seguro de que desexa eliminar o conxunto de filtros seleccionado?';
-$messages['setcreateerror'] = 'Imposible crear o conxunto de filtros. Ocurriu un error no servidor';
-$messages['setcreated'] = 'Conxunto de filtros creado con éxito';
-$messages['emptyname'] = 'Imposible crear o conxunto de filtros. Sen nome';
-$messages['nametoolong'] = 'Imposible crear o conxunto de filtros. O nome é longo de máis'
-
-?>
diff --git a/plugins/managesieve/localization/hr_HR.inc b/plugins/managesieve/localization/hr_HR.inc
index 3b8eb50b4..369180e3b 100644
--- a/plugins/managesieve/localization/hr_HR.inc
+++ b/plugins/managesieve/localization/hr_HR.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hr_HR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['filters'] = 'Filteri';
 $labels['managefilters'] = 'Uredi filtere za pristiglu poštu';
 $labels['filtername'] = 'Naziv filtera';
@@ -48,7 +63,6 @@ $labels['filtersetadd'] = 'Dodaj grupu filtera';
 $labels['filtersetdel'] = 'Obriši odabranu grupu filtera';
 $labels['filtersetact'] = 'Aktiviraj odabranu grupu filtera';
 $labels['filtersetdeact'] = 'Deaktiviraj odabranu grupu filtera';
-$labels['filtersetget'] = 'Preuzmi grupu filtera u tekstualnom formatu';
 $labels['filterdef'] = 'Definicije filtera';
 $labels['filtersetname'] = 'Naziv grupe filtera';
 $labels['newfilterset'] = 'Nova grupa filtera';
@@ -77,29 +91,25 @@ $labels['flagdeleted'] = 'Obrisana';
 $labels['flaganswered'] = 'Odgovorena';
 $labels['flagflagged'] = 'Označena';
 $labels['flagdraft'] = 'Predložak';
+$labels['filterunknownerror'] = 'Nepoznata greška na poslužitelju';
+$labels['filterconnerror'] = 'Nemoguće spajanje na poslužitelj (managesieve)';
+$labels['filterdeleteerror'] = 'Nemoguće brisanje filtera. Greška na poslužitelju';
+$labels['filterdeleted'] = 'Filter je uspješno obrisan';
+$labels['filtersaved'] = 'Filter je uspješno spremljen';
+$labels['filtersaveerror'] = 'Nemoguće spremiti filter. Greška na poslužitelju';
+$labels['filterdeleteconfirm'] = 'Sigurno želite obrisati odabrani filter?';
+$labels['ruledeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabrana pravila?';
+$labels['actiondeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabrane akcije?';
+$labels['forbiddenchars'] = 'Nedozvoljeni znakovi u polju';
+$labels['cannotbeempty'] = 'Polje nesmije biti prazno';
+$labels['setactivateerror'] = 'Nemoguće aktivirati odabranu grupu filtera. Greška na poslužitelju';
+$labels['setdeactivateerror'] = 'Nemoguće deaktivirati odabranu grupu filtera. Greška na poslužitelju';
+$labels['setdeleteerror'] = 'Nemoguće obrisati odabranu grupu filtera. Greška na poslužitelju';
+$labels['setactivated'] = 'Grupa filtera je uspješno aktivirana';
+$labels['setdeactivated'] = 'Grupa filtera je uspješno deaktivirana';
+$labels['setdeleted'] = 'Grupa filtera je uspješno obrisana';
+$labels['setdeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabranu grupu filtera?';
+$labels['setcreateerror'] = 'Nemoguće stvoriti grupu filtera. Greška na poslužitelju';
+$labels['setcreated'] = 'Grupa filtera je uspješno stvorena';
+$labels['nametoolong'] = 'Nemoguće napraviti grupu filtera. Naziv je predugačak';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Nepoznata greška na poslužitelju';
-$messages['filterconnerror'] = 'Nemoguće spajanje na poslužitelj (managesieve)';
-$messages['filterdeleteerror'] = 'Nemoguće brisanje filtera. Greška na poslužitelju';
-$messages['filterdeleted'] = 'Filter je uspješno obrisan';
-$messages['filtersaved'] = 'Filter je uspješno spremljen';
-$messages['filtersaveerror'] = 'Nemoguće spremiti filter. Greška na poslužitelju';
-$messages['filterdeleteconfirm'] = 'Sigurno želite obrisati odabrani filter?';
-$messages['ruledeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabrana pravila?';
-$messages['actiondeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabrane akcije?';
-$messages['forbiddenchars'] = 'Nedozvoljeni znakovi u polju';
-$messages['cannotbeempty'] = 'Polje nesmije biti prazno';
-$messages['setactivateerror'] = 'Nemoguće aktivirati odabranu grupu filtera. Greška na poslužitelju';
-$messages['setdeactivateerror'] = 'Nemoguće deaktivirati odabranu grupu filtera. Greška na poslužitelju';
-$messages['setdeleteerror'] = 'Nemoguće obrisati odabranu grupu filtera. Greška na poslužitelju';
-$messages['setactivated'] = 'Grupa filtera je uspješno aktivirana';
-$messages['setdeactivated'] = 'Grupa filtera je uspješno deaktivirana';
-$messages['setdeleted'] = 'Grupa filtera je uspješno obrisana';
-$messages['setdeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabranu grupu filtera?';
-$messages['setcreateerror'] = 'Nemoguće stvoriti grupu filtera. Greška na poslužitelju';
-$messages['setcreated'] = 'Grupa filtera je uspješno stvorena';
-$messages['emptyname'] = 'Nemoguće napraviti grupu filtera. Naziv je prazan';
-$messages['nametoolong'] = 'Nemoguće napraviti grupu filtera. Naziv je predugačak'
-
-?>
diff --git a/plugins/managesieve/localization/hu_HU.inc b/plugins/managesieve/localization/hu_HU.inc
index 47a84f1a6..dcd017552 100644
--- a/plugins/managesieve/localization/hu_HU.inc
+++ b/plugins/managesieve/localization/hu_HU.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/hu_HU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Üzenetszűrők';
 $labels['managefilters'] = 'Bejövő üzenetek szűrői';
@@ -24,6 +38,7 @@ $labels['addrule'] = 'Szabály hozzáadása';
 $labels['delrule'] = 'Szabály törlése';
 $labels['messagemoveto'] = 'Üzenet áthelyezése ide:';
 $labels['messageredirect'] = 'Üzenet továbbítása ide:';
+$labels['messagecopyto'] = 'Üzenet másolása';
 $labels['messagereply'] = 'Válaszüzenet küldése (autoreply)';
 $labels['messagedelete'] = 'Üzenet törlése';
 $labels['messagediscard'] = 'Válaszüzenet küldése, a levél törlése';
@@ -36,19 +51,21 @@ $labels['recipient'] = 'Címzett';
 $labels['vacationaddresses'] = 'További címzettek (vesszővel elválasztva):';
 $labels['vacationdays'] = 'Válaszüzenet küldése ennyi naponként:';
 $labels['vacationreason'] = 'Levél szövege (automatikus válasz):';
+$labels['vacationsubject'] = 'Üzenet tárgya:';
 $labels['rulestop'] = 'Műveletek végrehajtásának befejezése';
+$labels['enable'] = 'Bekapcsol/Kikapcsol';
+$labels['filterdef'] = 'Szűrő definíció';
+$labels['active'] = 'aktív';
+$labels['none'] = 'nincs';
+$labels['filterunknownerror'] = 'Ismeretlen szerverhiba';
+$labels['filterconnerror'] = 'Nem tudok a szűrőszerverhez kapcsolódni';
+$labels['filterdeleteerror'] = 'A szűrőt nem lehet törölni, szerverhiba történt';
+$labels['filterdeleted'] = 'A szűrő törlése sikeres';
+$labels['filtersaved'] = 'A szűrő mentése sikeres';
+$labels['filtersaveerror'] = 'A szűrő mentése sikertelen, szerverhiba történt';
+$labels['filterdeleteconfirm'] = 'Biztosan törli ezt a szűrőt?';
+$labels['ruledeleteconfirm'] = 'Biztosan törli ezt a szabályt?';
+$labels['actiondeleteconfirm'] = 'Biztosan törli ezt a műveletet?';
+$labels['forbiddenchars'] = 'Érvénytelen karakter a mezőben';
+$labels['cannotbeempty'] = 'A mező nem lehet üres';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Ismeretlen szerverhiba';
-$messages['filterconnerror'] = 'Nem tudok a szűrőszerverhez kapcsolódni';
-$messages['filterdeleteerror'] = 'A szűrőt nem lehet törölni, szerverhiba történt';
-$messages['filterdeleted'] = 'A szűrő törlése sikeres';
-$messages['filterdeleteconfirm'] = 'Biztosan törli ezt a szűrőt?';
-$messages['filtersaved'] = 'A szűrő mentése sikeres';
-$messages['filtersaveerror'] = 'A szűrő mentése sikertelen, szerverhiba történt';
-$messages['ruledeleteconfirm'] = 'Biztosan törli ezt a szabályt?';
-$messages['actiondeleteconfirm'] = 'Biztosan törli ezt a műveletet?';
-$messages['forbiddenchars'] = 'Érvénytelen karakter a mezőben';
-$messages['cannotbeempty'] = 'A mező nem lehet üres';
-
-?>
diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc
index 2debf3033..53e7d0998 100644
--- a/plugins/managesieve/localization/it_IT.inc
+++ b/plugins/managesieve/localization/it_IT.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/it_IT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: emilio brambilla <Unknown>                                    |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Filtri';
 $labels['managefilters'] = 'Gestione dei filtri per la posta in arrivo';
@@ -18,12 +32,18 @@ $labels['filteris'] = 'è uguale a';
 $labels['filterisnot'] = 'è diverso da';
 $labels['filterexists'] = 'esiste';
 $labels['filternotexists'] = 'non esiste';
+$labels['filtermatches'] = 'matcha l\'espressione';
+$labels['filternotmatches'] = 'non matcha l\'espressione';
+$labels['filterregex'] = 'matcha l\'espressione regolare';
+$labels['filternotregex'] = 'non matcha l\'espressione regolare';
 $labels['filterunder'] = 'sotto';
 $labels['filterover'] = 'sopra';
 $labels['addrule'] = 'Aggiungi regola';
 $labels['delrule'] = 'Elimina regola';
 $labels['messagemoveto'] = 'Sposta il messaggio in';
 $labels['messageredirect'] = 'Inoltra il messaggio a';
+$labels['messagecopyto'] = 'copia a';
+$labels['messagesendcopy'] = 'Invia copia a';
 $labels['messagereply'] = 'Rispondi con il messaggio';
 $labels['messagedelete'] = 'Elimina il messaggio';
 $labels['messagediscard'] = 'Rifiuta con messaggio';
@@ -36,13 +56,15 @@ $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista di indirizzi e-mail di destinatari addizionali (separati da virgola):';
 $labels['vacationdays'] = 'Ogni quanti giorni ribadire il messaggio allo stesso mittente';
 $labels['vacationreason'] = 'Corpo del messaggio (dettagli relativi all\'assenza):';
+$labels['vacationsubject'] = 'Oggetto del messaggio';
 $labels['rulestop'] = 'Non valutare le regole successive';
+$labels['enable'] = 'Abilita/disabilita';
 $labels['filterset'] = 'Gruppi di filtri';
+$labels['filtersets'] = 'gruppo di filtri';
 $labels['filtersetadd'] = 'Aggiungi gruppo';
 $labels['filtersetdel'] = 'Cancella gruppo selezionato';
 $labels['filtersetact'] = 'Attiva gruppo selezionato';
 $labels['filtersetdeact'] = 'Disattiva gruppo selezionato';
-$labels['filtersetget'] = 'Scarica filtri come testo';
 $labels['filterdef'] = 'Definizione del filtro';
 $labels['filtersetname'] = 'Nome del Gruppo di filtri';
 $labels['newfilterset'] = 'Nuovo gruppo di filri';
@@ -51,29 +73,78 @@ $labels['none'] = 'nessuno';
 $labels['fromset'] = 'dal set';
 $labels['fromfile'] = 'dal file';
 $labels['filterdisabled'] = 'Filtro disabilitato';
+$labels['countisgreaterthan'] = 'somma maggiore di';
+$labels['countisgreaterthanequal'] = 'somma maggiore uguale  a';
+$labels['countislessthan'] = 'somma minore di';
+$labels['countislessthanequal'] = 'somma minore o uguale a';
+$labels['countequals'] = 'somma uguale a';
+$labels['countnotequals'] = 'somma diversa da';
+$labels['valueisgreaterthan'] = 'valore maggiore di';
+$labels['valueisgreaterthanequal'] = 'valore maggiore uguale a';
+$labels['valueislessthan'] = 'valore minore di';
+$labels['valueislessthanequal'] = 'valore minore uguale di';
+$labels['valueequals'] = 'valore uguale a';
+$labels['valuenotequals'] = 'valore diverso da';
+$labels['setflags'] = 'Contrassegna il messaggio';
+$labels['addflags'] = 'aggiungi flag al messaggio';
+$labels['removeflags'] = 'togli flag dal messaggio';
+$labels['flagread'] = 'Letto';
+$labels['flagdeleted'] = 'Cancellato';
+$labels['flaganswered'] = 'Risposto';
+$labels['flagflagged'] = 'Contrassegna';
+$labels['flagdraft'] = 'Bozza';
+$labels['filtercreate'] = 'Crea filtro';
+$labels['usedata'] = 'utilizza i seguenti dati nel filtro';
+$labels['nextstep'] = 'passo successivo';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Opzioni avanzate';
+$labels['body'] = 'Corpo';
+$labels['address'] = 'indirizzo';
+$labels['envelope'] = 'busta';
+$labels['modifier'] = 'modificatore:';
+$labels['text'] = 'testo';
+$labels['undecoded'] = 'non decodificato (raw)';
+$labels['contenttype'] = 'content type';
+$labels['modtype'] = 'tipo:';
+$labels['allparts'] = 'tutto';
+$labels['domain'] = 'dominio';
+$labels['localpart'] = 'parte locale';
+$labels['user'] = 'user';
+$labels['detail'] = 'dettaglio';
+$labels['comparator'] = 'comparatore';
+$labels['default'] = 'predefinito';
+$labels['octet'] = 'strict (octet)';
+$labels['asciicasemap'] = 'non differenziare maiuscole/minuscole (ascii-casemap)';
+$labels['asciinumeric'] = 'numerico';
+$labels['filterunknownerror'] = 'Errore sconosciuto del server';
+$labels['filterconnerror'] = 'Collegamento al server managesieve fallito';
+$labels['filterdeleteerror'] = 'Eliminazione del filtro fallita. Si è verificato un errore nel server';
+$labels['filterdeleted'] = 'Filtro eliminato con successo';
+$labels['filtersaved'] = 'Filtro salvato con successo';
+$labels['filtersaveerror'] = 'Salvataggio del filtro fallito. Si è verificato un errore nel server';
+$labels['filterdeleteconfirm'] = 'Vuoi veramente eliminare il filtro selezionato?';
+$labels['ruledeleteconfirm'] = 'Sei sicuro di voler eliminare la regola selezionata?';
+$labels['actiondeleteconfirm'] = 'Sei sicuro di voler eliminare l\'azione selezionata?';
+$labels['forbiddenchars'] = 'Caratteri non consentiti nel campo';
+$labels['cannotbeempty'] = 'Il campo non può essere vuoto';
+$labels['ruleexist'] = 'Esiste già un filtro con questo nome';
+$labels['setactivateerror'] = 'Impossibile attivare il filtro. Errore del server';
+$labels['setdeactivateerror'] = 'Impossibile disattivare il filtro. Errore del server';
+$labels['setdeleteerror'] = 'Impossibile cancellare il filtro. Errore del server';
+$labels['setactivated'] = 'Filtro attivato';
+$labels['setdeactivated'] = 'Filtro disattivato';
+$labels['setdeleted'] = 'Filtro cancellato';
+$labels['setdeleteconfirm'] = 'Sei sicuro di voler cancellare il gruppo di filtri';
+$labels['setcreateerror'] = 'Impossibile creare il gruppo. Errore del server';
+$labels['setcreated'] = 'Gruppo di filtri creato';
+$labels['activateerror'] = 'impossibile selezionare il filtro (server error)';
+$labels['deactivateerror'] = 'impossibile disabilitare il filtro (server error)';
+$labels['activated'] = 'filtro disabilitato';
+$labels['deactivated'] = 'filtro abilitato';
+$labels['moved'] = 'filtro spostato';
+$labels['moveerror'] = 'impossibile spostare il filtro (server error)';
+$labels['nametoolong'] = 'Impossibile creare il gruppo: Nome troppo lungo';
+$labels['namereserved'] = 'nome riservato';
+$labels['setexist'] = 'Il gruppo esiste già';
+$labels['nodata'] = 'selezionare almeno una posizione';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Errore sconosciuto del server';
-$messages['filterconnerror'] = 'Collegamento al server managesieve fallito';
-$messages['filterdeleteerror'] = 'Eliminazione del filtro fallita. Si è verificato un errore nel server';
-$messages['filterdeleted'] = 'Filtro eliminato con successo';
-$messages['filterdeleteconfirm'] = 'Vuoi veramente eliminare il filtro selezionato?';
-$messages['filtersaved'] = 'Filtro salvato con successo';
-$messages['filtersaveerror'] = 'Salvataggio del filtro fallito. Si è verificato un errore nel server';
-$messages['ruledeleteconfirm'] = 'Sei sicuro di voler eliminare la regola selezionata?';
-$messages['actiondeleteconfirm'] = 'Sei sicuro di voler eliminare l\'azione selezionata?';
-$messages['forbiddenchars'] = 'Caratteri non consentiti nel campo';
-$messages['cannotbeempty'] = 'Il campo non può essere vuoto';
-$messages['setactivateerror'] = 'Impossibile attivare il filtro. Errore del server';
-$messages['setdeactivateerror'] = 'Impossibile disattivare il filtro. Errore del server';
-$messages['setdeleteerror'] = 'Impossibile cancellare il filtro. Errore del server';
-$messages['setactivated'] = 'Filtro attivato';
-$messages['setdeactivated'] = 'Filtro disattivato';
-$messages['setdeleted'] = 'Filtro cancellato';
-$messages['setdeleteconfirm'] = 'Sei sicuro di voler cancellare il gruppo di filtri';
-$messages['setcreateerror'] = 'Impossibile creare il gruppo. Errore del server';
-$messages['setcreated'] = 'Gruppo di filtri creato';
-$messages['emptyname'] = 'Impossibile creare il gruppo: Inserire un nome';
-$messages['nametoolong'] = 'Impossibile creare il gruppo: Nome troppo lungo';
-
-?>
diff --git a/plugins/managesieve/localization/ja_JP.inc b/plugins/managesieve/localization/ja_JP.inc
index a489054ad..9642f1471 100644
--- a/plugins/managesieve/localization/ja_JP.inc
+++ b/plugins/managesieve/localization/ja_JP.inc
@@ -1,7 +1,20 @@
 <?php
 
-//  EN-Revision: 3891
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ja_JP/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
 
+$labels = array();
 $labels['filters'] = 'フィルター';
 $labels['managefilters'] = '受信メールのフィルターの管理';
 $labels['filtername'] = 'フィルターの名前';
@@ -19,6 +32,10 @@ $labels['filteris'] = '次と一致する';
 $labels['filterisnot'] = '次と一致しない';
 $labels['filterexists'] = '存在する';
 $labels['filternotexists'] = '存在しない';
+$labels['filtermatches'] = '一致する表記';
+$labels['filternotmatches'] = '一致しない表記';
+$labels['filterregex'] = '一致する正規表現';
+$labels['filternotregex'] = '一致しない正規表現';
 $labels['filterunder'] = 'より上';
 $labels['filterover'] = 'より下';
 $labels['addrule'] = 'ルールの追加';
@@ -39,13 +56,15 @@ $labels['recipient'] = '受信者';
 $labels['vacationaddresses'] = '電子メール受信者の一覧を追加する (カンマ区切り):';
 $labels['vacationdays'] = 'どれ位頻繁にメッセージの送信をするか (1 日あたり):';
 $labels['vacationreason'] = 'メッセージ本文 (vacation reason):';
+$labels['vacationsubject'] = 'メッセージの件名';
 $labels['rulestop'] = 'ルール評価の停止';
+$labels['enable'] = '有効/無効';
 $labels['filterset'] = 'フィルター セット';
+$labels['filtersets'] = 'フィルターセット';
 $labels['filtersetadd'] = 'フィルター セットの追加';
 $labels['filtersetdel'] = '現在のルールセット の削除';
 $labels['filtersetact'] = '現在のフィルター セットを有効にする';
 $labels['filtersetdeact'] = '現在のフィルター セットを無効にする';
-$labels['filtersetget'] = 'テキスト形式でフィルター セットをダウンロードする';
 $labels['filterdef'] = 'フィルターの定義';
 $labels['filtersetname'] = 'フィルター セットの名前';
 $labels['newfilterset'] = '新規フィルター セット';
@@ -54,29 +73,65 @@ $labels['none'] = 'なし';
 $labels['fromset'] = 'セットから';
 $labels['fromfile'] = 'ファイルから';
 $labels['filterdisabled'] = 'フィルターを無効にしました。';
+$labels['countisgreaterthan'] = 'より大きい回数';
+$labels['countisgreaterthanequal'] = '以上の回数';
+$labels['countislessthan'] = '未満の回数';
+$labels['countislessthanequal'] = '以下の回数';
+$labels['countequals'] = '一致する回数';
+$labels['countnotequals'] = '一致しない回数';
+$labels['valueisgreaterthan'] = 'より大きい値';
+$labels['valueisgreaterthanequal'] = '以上の値';
+$labels['valueislessthan'] = '未満の値';
+$labels['valueislessthanequal'] = '以下の値';
+$labels['valueequals'] = '一致する値';
+$labels['valuenotequals'] = '一致しない値';
+$labels['setflags'] = 'メッセージにフラグを設定する';
+$labels['addflags'] = 'メッセージにフラグの追加';
+$labels['removeflags'] = 'メッセージからフラグの削除';
+$labels['flagread'] = '既読';
+$labels['flagdeleted'] = '削除済み';
+$labels['flaganswered'] = '返信済み';
+$labels['flagflagged'] = 'フラグあり';
+$labels['flagdraft'] = '下書き';
+$labels['filtercreate'] = 'フィルターの作成';
+$labels['usedata'] = 'フィルターで次のデータを使う';
+$labels['nextstep'] = '次のステップ';
+$labels['...'] = '...';
+$labels['advancedopts'] = '高度なオプション';
+$labels['body'] = '本文';
+$labels['address'] = 'メールアドレス';
+$labels['envelope'] = 'エンベロープ';
+$labels['modifier'] = '修正:';
+$labels['text'] = 'テキスト';
+$labels['undecoded'] = '未デコード (生の状態)';
+$labels['modtype'] = '種類:';
+$labels['allparts'] = 'すべて';
+$labels['domain'] = 'ドメイン';
+$labels['localpart'] = 'ローカル パート(メールアドレスで@の左)';
+$labels['user'] = 'ユーザー';
+$labels['detail'] = '詳細';
+$labels['default'] = '初期値';
+$labels['asciicasemap'] = '英大小文字の同一視(Aとaが同じ)';
+$labels['asciinumeric'] = '数値 (半角数値)';
+$labels['filterunknownerror'] = '不明なサーバーのエラーです';
+$labels['filterconnerror'] = 'managesieve サーバーに接続できません。';
+$labels['filterdeleteerror'] = 'フィルターを削除できませんでした。サーバーでエラーが発生しました。';
+$labels['filterdeleted'] = 'フィルターの削除に成功しました。';
+$labels['filtersaved'] = 'フィルターの保存に成功しました。';
+$labels['filtersaveerror'] = 'フィルターの保存に失敗しました。サーバーでエラーが発生しました。';
+$labels['filterdeleteconfirm'] = '本当に選択したフィルターを削除しますか?';
+$labels['ruledeleteconfirm'] = '本当に選択したルールを削除しますか?';
+$labels['actiondeleteconfirm'] = '本当に選択した操作を削除しますか?';
+$labels['forbiddenchars'] = '項目に禁止文字があります。';
+$labels['cannotbeempty'] = '空にできませんでした';
+$labels['setactivateerror'] = '選択したフィルター セットの有効化に失敗しました。サーバーでエラーが発生しました。';
+$labels['setdeactivateerror'] = '選択したフィルター セットの無効化に失敗しました。サーバーでエラーが発生しました。';
+$labels['setdeleteerror'] = '選択したフィルター セットの削除に失敗しました。サーバーでエラーが発生しました。';
+$labels['setactivated'] = 'フィルターセットの有効化に成功しました。';
+$labels['setdeactivated'] = 'フィルターセットの無効化に成功しました。';
+$labels['setdeleted'] = 'フィルターセットの削除に成功しました。';
+$labels['setdeleteconfirm'] = '本当に選択したフィルター セットを削除しますか?';
+$labels['setcreateerror'] = 'フィルター セットの作成に失敗しました。サーバーでエラーが発生しました。';
+$labels['setcreated'] = 'フィルター セットの作成に成功しました。';
+$labels['nametoolong'] = 'フィルター セットの作成に失敗しました。名前が長すぎます。';
 
-$messages = array();
-$messages['filterunknownerror'] = '不明なサーバーのエラーです';
-$messages['filterconnerror'] = 'managesieve サーバーに接続できません。';
-$messages['filterdeleteerror'] = 'フィルターを削除できませんでした。サーバーでエラーが発生しました。';
-$messages['filterdeleted'] = 'フィルターの削除に成功しました。';
-$messages['filtersaved'] = 'フィルターの保存に成功しました。';
-$messages['filtersaveerror'] = 'フィルターの保存に失敗しました。サーバーでエラーが発生しました。';
-$messages['filterdeleteconfirm'] = '本当に選択したフィルターを削除しますか?';
-$messages['ruledeleteconfirm'] = '本当に選択したルールを削除しますか?';
-$messages['actiondeleteconfirm'] = '本当に選択した操作を削除しますか?';
-$messages['forbiddenchars'] = '項目に禁止文字があります。';
-$messages['cannotbeempty'] = '空にできませんでした';
-$messages['setactivateerror'] = '選択したフィルター セットの有効化に失敗しました。サーバーでエラーが発生しました。';
-$messages['setdeactivateerror'] = '選択したフィルター セットの無効化に失敗しました。サーバーでエラーが発生しました。';
-$messages['setdeleteerror'] = '選択したフィルター セットの削除に失敗しました。サーバーでエラーが発生しました。';
-$messages['setactivated'] = 'フィルターセットの有効化に成功しました。';
-$messages['setdeactivated'] = 'フィルターセットの無効化に成功しました。';
-$messages['setdeleted'] = 'フィルターセットの削除に成功しました。';
-$messages['setdeleteconfirm'] = '本当に選択したフィルター セットを削除しますか?';
-$messages['setcreateerror'] = 'フィルター セットの作成に失敗しました。サーバーでエラーが発生しました。';
-$messages['setcreated'] = 'フィルター セットの作成に成功しました。';
-$messages['emptyname'] = 'フィルター セットの作成に失敗しました。名前が空です。';
-$messages['nametoolong'] = 'フィルター セットの作成に失敗しました。名前が長すぎます。';
-
-?>
diff --git a/plugins/managesieve/localization/lv_LV.inc b/plugins/managesieve/localization/lv_LV.inc
index b394588e9..98804d08e 100644
--- a/plugins/managesieve/localization/lv_LV.inc
+++ b/plugins/managesieve/localization/lv_LV.inc
@@ -1,49 +1,70 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/lv_LV/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Ivars Strazdiņš <Unknown>                                   |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['filters'] = 'Vēstuļu filtri';
-$labels['managefilters'] = 'Rediģēt ienākošo vēstuļu filtrus';
+$labels['managefilters'] = 'Pārvaldīt ienākošo vēstuļu filtrus';
 $labels['filtername'] = 'Filtra nosaukums';
 $labels['newfilter'] = 'Jauns filtrs';
 $labels['filteradd'] = 'Pievienot filtru';
-$labels['filterdel'] = 'Izdzēst filtru';
+$labels['filterdel'] = 'Dzēst filtru';
 $labels['moveup'] = 'Pārvietot augšup';
 $labels['movedown'] = 'Pārvietot lejup';
-$labels['filterallof'] = 'jāatbilst visiem no sekojošiem nosacījumiem';
-$labels['filteranyof'] = 'jāatbilst jebkuram no sekojošiem nosacījumiem';
+$labels['filterallof'] = 'jāatbilst visiem sekojošajiem nosacījumiem';
+$labels['filteranyof'] = 'jāatbilst jebkuram no sekojošajiem nosacījumiem';
 $labels['filterany'] = 'visām vēstulēm';
 $labels['filtercontains'] = 'satur';
 $labels['filternotcontains'] = 'nesatur';
-$labels['filteris'] = 'ir vienāds ar';
+$labels['filteris'] = 'vienāds ar';
 $labels['filterisnot'] = 'nav vienāds ar';
 $labels['filterexists'] = 'eksistē';
 $labels['filternotexists'] = 'neeksistē';
+$labels['filtermatches'] = 'jāatbilst izteiksmei';
+$labels['filternotmatches'] = 'neatbilst izteiksmei';
+$labels['filterregex'] = 'jāatbilst regulārai izteiksmei';
+$labels['filternotregex'] = 'neatbilst regulārai izteiksmei';
 $labels['filterunder'] = 'zem';
 $labels['filterover'] = 'virs';
 $labels['addrule'] = 'Pievienot nosacījumu';
-$labels['delrule'] = 'Izdzēst nosacījumu';
+$labels['delrule'] = 'Dzēst nosacījumu';
 $labels['messagemoveto'] = 'Pārvietot vēstuli uz';
 $labels['messageredirect'] = 'Pāradresēt vēstuli uz';
-$labels['messagecopyto'] = 'Pārkopēt vēstuli uz';
+$labels['messagecopyto'] = 'Kopēt vēstuli uz';
 $labels['messagesendcopy'] = 'Pārsūtīt vēstules kopiju uz';
-$labels['messagereply'] = 'Automātiski atbildēt';
-$labels['messagedelete'] = 'Izdzēst vēstuli';
-$labels['messagediscard'] = 'Izdzēst vēstuli un atbildēt';
+$labels['messagereply'] = 'Atbildēt ar';
+$labels['messagedelete'] = 'Dzēst vēstuli';
+$labels['messagediscard'] = 'Dzēst vēstuli un atbildēt';
 $labels['messagesrules'] = 'Ienākošajām vēstulēm:';
 $labels['messagesactions'] = 'Izpildīt sekojošās darbības:';
 $labels['add'] = 'Pievienot';
 $labels['del'] = 'Dzēst';
 $labels['sender'] = 'Sūtītājs';
 $labels['recipient'] = 'Saņēmējs';
-$labels['vacationaddresses'] = 'Ievadiet savu(s) e-pastu(s) caur komatu:';
+$labels['vacationaddresses'] = 'Ievadiet vienu vai vairākus e-pastu(s), atdalot tos komatu:';
 $labels['vacationdays'] = 'Cik dienu laikā vienam un tam pašam sūtītājam neatbildēt atkārtoti (piem., 7):';
-$labels['vacationreason'] = 'Atvaļinājuma vēstules teksts:';
+$labels['vacationreason'] = 'Atvaļinājuma paziņojuma teksts:';
+$labels['vacationsubject'] = 'Vēstules tēma:';
 $labels['rulestop'] = 'Apturēt nosacījumu pārbaudi';
+$labels['enable'] = 'Ieslēgt/Izslēgt';
 $labels['filterset'] = 'Filtru kopa';
+$labels['filtersets'] = 'Filtru kopas';
 $labels['filtersetadd'] = 'Pievienot filtru kopu';
-$labels['filtersetdel'] = 'Izdzēst pašreizējo filtru kopu';
+$labels['filtersetdel'] = 'Dzēst pašreizējo filtru kopu';
 $labels['filtersetact'] = 'Aktivizēt pašreizējo filtru kopu';
 $labels['filtersetdeact'] = 'Deaktivizēt pašreizējo filtru kopu';
-$labels['filtersetget'] = 'Lejupielādēt filtru kopu teksta formātā';
 $labels['filterdef'] = 'Filtra apraksts';
 $labels['filtersetname'] = 'Filtru kopas nosaukums';
 $labels['newfilterset'] = 'Jauna filtru kopa';
@@ -64,29 +85,56 @@ $labels['valueislessthan'] = 'vērtība ir mazāka nekā';
 $labels['valueislessthanequal'] = 'vērtība ir vienāda vai mazāka nekā';
 $labels['valueequals'] = 'vērtība ir vienāda ar';
 $labels['valuenotequals'] = 'vērtība nav vienāda ar';
+$labels['setflags'] = 'Marķēt vēstuli';
+$labels['addflags'] = 'Pievienot vēstulei marķierus';
+$labels['removeflags'] = 'Noņemt vēstulei marķierus';
+$labels['flagread'] = 'Lasītas';
+$labels['flagdeleted'] = 'Dzēstas';
+$labels['flaganswered'] = 'Atbildētas';
+$labels['flagflagged'] = 'Iezīmētās';
+$labels['flagdraft'] = 'Melnraksts';
+$labels['filtercreate'] = 'Izveidot filtru';
+$labels['usedata'] = 'Filtrā izmantot sekojošus datus';
+$labels['nextstep'] = 'Nākamais solis';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Paplašināti iestatījumi';
+$labels['body'] = 'Pamatteksts';
+$labels['address'] = 'adresāts';
+$labels['envelope'] = 'aploksne';
+$labels['modifier'] = 'modifikators:';
+$labels['text'] = 'teksts';
+$labels['undecoded'] = 'neatkodēts (jēldati)';
+$labels['contenttype'] = 'satura tips';
+$labels['modtype'] = 'tips:';
+$labels['allparts'] = 'viss';
+$labels['domain'] = 'domēns';
+$labels['localpart'] = 'vietējā daļa';
+$labels['user'] = 'lietotājs';
+$labels['detail'] = 'detaļas';
+$labels['comparator'] = 'komparators';
+$labels['default'] = 'noklusējums';
+$labels['octet'] = 'strikti (oktets)';
+$labels['asciicasemap'] = 'reģistrnejutīgs (ascii tabula)';
+$labels['asciinumeric'] = 'skaitļu (ascii skaitļu)';
+$labels['filterunknownerror'] = 'Nezināma servera kļūda';
+$labels['filterconnerror'] = 'Neizdevās pieslēgties ManageSieve serverim';
+$labels['filterdeleteerror'] = 'Neizdevās dzēst filtru. Servera iekšējā kļūda';
+$labels['filterdeleted'] = 'Filtrs veiksmīgi izdzēsts';
+$labels['filtersaved'] = 'Filtrs veiksmīgi saglabāts';
+$labels['filtersaveerror'] = 'Neizdevās saglabāt filtru. Servera iekšējā kļūda';
+$labels['filterdeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto filtru?';
+$labels['ruledeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto nosacījumu?';
+$labels['actiondeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto darbību?';
+$labels['forbiddenchars'] = 'Lauks satur aizliegtus simbolus';
+$labels['cannotbeempty'] = 'Lauks nedrīkst būt tukšs';
+$labels['setactivateerror'] = 'Neizdevās aktivizēt atzīmēto filtru kopu. Servera iekšējā kļūda';
+$labels['setdeactivateerror'] = 'Neizdevās deaktivizēt atzīmēto filtru kopu. Servera iekšējā kļūda';
+$labels['setdeleteerror'] = 'Neizdevās izdzēst atzīmēto filtru kopu. Servera iekšējā kļūda';
+$labels['setactivated'] = 'Filtru kopa veiksmīgi aktivizēta';
+$labels['setdeactivated'] = 'Filtru kopa veiksmīgi deaktivizēta';
+$labels['setdeleted'] = 'Filtru kopa veiksmīgi izdzēsta';
+$labels['setdeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto filtru kopu?';
+$labels['setcreateerror'] = 'Neizdevās izveidot filtru kopu. Servera iekšējā kļūda';
+$labels['setcreated'] = 'Filtru kopa veiksmīgi izveidota';
+$labels['nametoolong'] = 'Neizdevās izveidot filtru kopu. Pārāk garš kopas nosaukums';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Nezināma servera kļūda';
-$messages['filterconnerror'] = 'Neizdevās pieslēgties ManageSieve serverim';
-$messages['filterdeleteerror'] = 'Neizdevās dzēst filtru. Servera iekšējā kļūda';
-$messages['filterdeleted'] = 'Filtrs veiksmīgi izdzēsts';
-$messages['filtersaved'] = 'Filtrs veiksmīgi saglabāts';
-$messages['filtersaveerror'] = 'Neizdevās saglabāt filtru. Servera iekšējā kļūda';
-$messages['filterdeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto filtru?';
-$messages['ruledeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto nosacījumu?';
-$messages['actiondeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto darbību?';
-$messages['forbiddenchars'] = 'Lauks satur aizliegtus simbolus';
-$messages['cannotbeempty'] = 'Lauks nedrīkst būt tukšs';
-$messages['setactivateerror'] = 'Neizdevās aktivizēt atzīmēto filtru kopu. Servera iekšējā kļūda';
-$messages['setdeactivateerror'] = 'Neizdevās deaktivizēt atzīmēto filtru kopu. Servera iekšējā kļūda';
-$messages['setdeleteerror'] = 'Neizdevās izdzēst atzīmēto filtru kopu. Servera iekšējā kļūda';
-$messages['setactivated'] = 'Filtru kopa veiksmīgi aktivizēta';
-$messages['setdeactivated'] = 'Filtru kopa veiksmīgi deaktivizēta';
-$messages['setdeleted'] = 'Filtru kopa veiksmīgi izdzēsta';
-$messages['setdeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto filtru kopu?';
-$messages['setcreateerror'] = 'Neizdevās izveidot filtru kopu. Servera iekšējā kļūda';
-$messages['setcreated'] = 'Filtru kopa veiksmīgi izveidota';
-$messages['emptyname'] = 'Neizdevās izveidot filtru kopu. Nav ievadīts kopas nosaukums';
-$messages['nametoolong'] = 'Neizdevās izveidot filtru kopu. Pārāk garš kopas nosaukums'
-
-?>
diff --git a/plugins/managesieve/localization/nb_NO.inc b/plugins/managesieve/localization/nb_NO.inc
index a0ed1f3d7..17df730de 100644
--- a/plugins/managesieve/localization/nb_NO.inc
+++ b/plugins/managesieve/localization/nb_NO.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nb_NO/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Rediger filter for innkommende e-post';
@@ -24,6 +38,8 @@ $labels['addrule'] = 'Legg til regel';
 $labels['delrule'] = 'Slett regel';
 $labels['messagemoveto'] = 'Flytt meldingen til';
 $labels['messageredirect'] = 'Videresend meldingen til';
+$labels['messagecopyto'] = 'Kopier meldingen til';
+$labels['messagesendcopy'] = 'Send en kopi av meldingen til';
 $labels['messagereply'] = 'Svar med melding';
 $labels['messagedelete'] = 'Slett melding';
 $labels['messagediscard'] = 'Avvis med melding';
@@ -37,18 +53,33 @@ $labels['vacationaddresses'] = 'Liste med mottakeradresser (adskilt med komma):'
 $labels['vacationdays'] = 'Periode mellom meldinger (i dager):';
 $labels['vacationreason'] = 'Innhold (begrunnelse for fravær)';
 $labels['rulestop'] = 'Stopp evaluering av regler';
+$labels['enable'] = 'Aktiver / deaktiver';
+$labels['active'] = 'aktiv';
+$labels['none'] = 'ingen';
+$labels['fromfile'] = 'fra fil';
+$labels['filterdisabled'] = 'Filter deaktiver';
+$labels['valueisgreaterthan'] = 'verdien er høyrere enn';
+$labels['valueisgreaterthanequal'] = 'verdien er høyere eller lik';
+$labels['valueislessthan'] = 'verdien er lavere enn';
+$labels['valueislessthanequal'] = 'verdien er lavere eller lik';
+$labels['valueequals'] = 'verdien er';
+$labels['valuenotequals'] = 'verdien er ikke';
+$labels['flagread'] = 'Lese';
+$labels['flaganswered'] = 'Besvart';
+$labels['flagflagged'] = 'Flagget';
+$labels['flagdraft'] = 'Utkast';
+$labels['filtercreate'] = 'Opprett filter';
+$labels['address'] = 'adresse';
+$labels['text'] = 'tekst';
+$labels['domain'] = 'domene';
+$labels['filterunknownerror'] = 'Ukjent problem med tjener';
+$labels['filterconnerror'] = 'Kunne ikke koble til MANAGESIEVE-tjener';
+$labels['filterdeleteerror'] = 'Kunne ikke slette filter. Det dukket opp en feil på tjeneren.';
+$labels['filterdeleted'] = 'Filteret er blitt slettet';
+$labels['filtersaved'] = 'Filter er blitt lagret';
+$labels['filtersaveerror'] = 'Kunne ikke lagre filteret. Det dukket opp en feil på tjeneren.';
+$labels['ruledeleteconfirm'] = 'Er du sikker på at du vil slette valgte regel?';
+$labels['actiondeleteconfirm'] = 'Er du sikker på at du vil slette valgte hendelse?';
+$labels['forbiddenchars'] = 'Ugyldige tegn i felt';
+$labels['cannotbeempty'] = 'Feltet kan ikke stå tomt';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Ukjent problem med tjener';
-$messages['filterconnerror'] = 'Kunne ikke koble til MANAGESIEVE-tjener';
-$messages['filterdeleteerror'] = 'Kunne ikke slette filter. Det dukket opp en feil på tjeneren.';
-$messages['filterdeleted'] = 'Filteret er blitt slettet';
-$messages['filterconfirmdelete'] = 'Er du sikker på at du vil slette følgende filter?';
-$messages['filtersaved'] = 'Filter er blitt lagret';
-$messages['filtersaveerror'] = 'Kunne ikke lagre filteret. Det dukket opp en feil på tjeneren.';
-$messages['ruledeleteconfirm'] = 'Er du sikker på at du vil slette valgte regel?';
-$messages['actiondeleteconfirm'] = 'Er du sikker på at du vil slette valgte hendelse?';
-$messages['forbiddenchars'] = 'Ugyldige tegn i felt';
-$messages['cannotbeempty'] = 'Feltet kan ikke stå tomt';
-
-?>
diff --git a/plugins/managesieve/localization/nl_NL.inc b/plugins/managesieve/localization/nl_NL.inc
index 8ee317216..032cde2fc 100644
--- a/plugins/managesieve/localization/nl_NL.inc
+++ b/plugins/managesieve/localization/nl_NL.inc
@@ -1,13 +1,28 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nl_NL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Justin van Beusekom <Unknown>                                 |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['filters'] = 'Filters';
 $labels['managefilters'] = 'Beheer inkomende mail filters';
 $labels['filtername'] = 'Filternaam';
 $labels['newfilter'] = 'Nieuw filter';
 $labels['filteradd'] = 'Filter toevoegen';
-$labels['filterdel'] = 'Filter verwijderen';
-$labels['moveup'] = 'Omhoog';
-$labels['movedown'] = 'Omlaag';
+$labels['filterdel'] = 'Verwijder filter';
+$labels['moveup'] = 'Verplaats omhoog';
+$labels['movedown'] = 'Verplaats omlaag';
 $labels['filterallof'] = 'die voldoen aan alle volgende regels';
 $labels['filteranyof'] = 'die voldoen aan een van de volgende regels';
 $labels['filterany'] = 'alle berichten';
@@ -17,33 +32,119 @@ $labels['filteris'] = 'is gelijk aan';
 $labels['filterisnot'] = 'is niet gelijk aan';
 $labels['filterexists'] = 'bestaat';
 $labels['filternotexists'] = 'bestaat niet';
+$labels['filtermatches'] = 'komt overeen met expressie';
+$labels['filternotmatches'] = 'komt niet overeen met expressie';
+$labels['filterregex'] = 'komt overeen met de reguliere expressie';
+$labels['filternotregex'] = 'komt niet overeen met de reguliere expressie';
 $labels['filterunder'] = 'onder';
 $labels['filterover'] = 'over';
 $labels['addrule'] = 'Regel toevoegen';
 $labels['delrule'] = 'Regel verwijderen';
 $labels['messagemoveto'] = 'Verplaats bericht naar';
 $labels['messageredirect'] = 'Redirect bericht naar';
+$labels['messagecopyto'] = 'Kopieer bericht naar';
+$labels['messagesendcopy'] = 'Verstuur een kopie naar';
 $labels['messagereply'] = 'Beantwoord met bericht';
 $labels['messagedelete'] = 'Verwijder bericht';
-$labels['messagediscard'] = 'Wijs af met bericht';
-$labels['messagesrules'] = 'Voor binnenkomende e-mail';
+$labels['messagediscard'] = 'Met bericht negeren';
+$labels['messagesrules'] = 'Voor binnenkomende e-mail:';
 $labels['messagesactions'] = '...voer de volgende acties uit';
 $labels['add'] = 'Toevoegen';
 $labels['del'] = 'Verwijderen';
 $labels['sender'] = 'Afzender';
 $labels['recipient'] = 'Ontvanger';
+$labels['vacationaddresses'] = 'Aanvullende lijst van geadresseerden (gescheiden met komma\'s):';
+$labels['vacationdays'] = 'Hoe vaak moet een bericht verstuurd worden (in dagen):';
+$labels['vacationreason'] = 'Bericht (vakantiereden):';
+$labels['vacationsubject'] = 'Onderwerp:';
+$labels['rulestop'] = 'Stop met regels uitvoeren';
+$labels['enable'] = 'In-/uitschakelen';
+$labels['filterset'] = 'Filterverzameling';
+$labels['filtersets'] = 'Filterverzamelingen';
+$labels['filtersetadd'] = 'Nieuwe filterverzameling';
+$labels['filtersetdel'] = 'Verwijder filterverzameling';
+$labels['filtersetact'] = 'Huidige filterverzameling activeren';
+$labels['filtersetdeact'] = 'Huidige filterverzameling uitschakelen';
+$labels['filterdef'] = 'Filterdefinitie';
+$labels['filtersetname'] = 'Filterverzamelingnaam';
+$labels['newfilterset'] = 'Nieuwe filterverzameling';
+$labels['active'] = 'actief';
+$labels['none'] = 'geen';
+$labels['fromset'] = 'van verzameling';
+$labels['fromfile'] = 'van bestand';
+$labels['filterdisabled'] = 'Filter uitgeschakeld';
+$labels['countisgreaterthan'] = 'aantal is groter dan';
+$labels['countisgreaterthanequal'] = 'aantal is groter dan of gelijk aan';
+$labels['countislessthan'] = 'aantal is kleiner dan';
+$labels['countislessthanequal'] = 'aantal is kleiner dan of gelijk aan';
+$labels['countequals'] = 'aantal is gelijk aan';
+$labels['countnotequals'] = 'aantal is niet gelijk aan';
+$labels['valueisgreaterthan'] = 'waarde is groter dan';
+$labels['valueisgreaterthanequal'] = 'waarde is groter dan of gelijk aan';
+$labels['valueislessthan'] = 'waarde is minder dan';
+$labels['valueislessthanequal'] = 'waarde is minder dan of gelijk aan';
+$labels['valueequals'] = 'waarde is gelijk aan';
+$labels['valuenotequals'] = 'waarde is niet gelijk aan';
+$labels['setflags'] = 'Stel markeringen in op bericht';
+$labels['addflags'] = 'Voeg markeringen toe aan bericht';
+$labels['removeflags'] = 'Verwijder markeringen van bericht';
+$labels['flagread'] = 'Lezen';
+$labels['flagdeleted'] = 'Verwijderd';
+$labels['flaganswered'] = 'Beantwoord';
+$labels['flagflagged'] = 'Gemarkeerd';
+$labels['flagdraft'] = 'Concept';
+$labels['filtercreate'] = 'Filter aanmaken';
+$labels['usedata'] = 'Gebruik de volgende gegevens in het filter:';
+$labels['nextstep'] = 'Volgende stap';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Geavanceerde opties';
+$labels['body'] = 'Inhoud';
+$labels['address'] = 'adres';
+$labels['envelope'] = 'envelope';
+$labels['modifier'] = 'wijziger';
+$labels['text'] = 'tekst';
+$labels['undecoded'] = 'undecoded (raw)';
+$labels['contenttype'] = 'content type';
+$labels['modtype'] = 'type:';
+$labels['allparts'] = 'Alle';
+$labels['domain'] = 'domein';
+$labels['localpart'] = 'lokaal gedeelte';
+$labels['user'] = 'gebruiker';
+$labels['detail'] = 'detail';
+$labels['comparator'] = 'vergelijker:';
+$labels['default'] = 'standaard';
+$labels['octet'] = 'strikt (octet)';
+$labels['asciicasemap'] = 'hoofdletterongevoelig (ascii-casemap)';
+$labels['asciinumeric'] = 'numeriek (ascii-numeriek)';
+$labels['filterunknownerror'] = 'Onbekende fout';
+$labels['filterconnerror'] = 'Kan geen verbinding maken met de managesieve server';
+$labels['filterdeleteerror'] = 'Kan filter niet verwijderen. Er is een fout opgetreden';
+$labels['filterdeleted'] = 'Filter succesvol verwijderd';
+$labels['filtersaved'] = 'Filter succesvol opgeslagen';
+$labels['filtersaveerror'] = 'Kan filter niet opslaan. Er is een fout opgetreden.';
+$labels['filterdeleteconfirm'] = 'Weet je zeker dat je het geselecteerde filter wilt verwijderen?';
+$labels['ruledeleteconfirm'] = 'Weet je zeker dat je de geselecteerde regel wilt verwijderen?';
+$labels['actiondeleteconfirm'] = 'Weet je zeker dat je de geselecteerde actie wilt verwijderen?';
+$labels['forbiddenchars'] = 'Verboden karakters in het veld';
+$labels['cannotbeempty'] = 'Veld mag niet leeg zijn';
+$labels['ruleexist'] = 'Er bestaat al een filter met deze naam.';
+$labels['setactivateerror'] = 'Filterverzameling kon niet geactiveerd worden. Er trad een serverfout op.';
+$labels['setdeactivateerror'] = 'Filterverzameling kon niet gedeactiveerd worden. Er trad een serverfout op.';
+$labels['setdeleteerror'] = 'Filterverzameling kon niet verwijderd worden. Er trad een serverfout op.';
+$labels['setactivated'] = 'Filterset succesvol geactiveerd.';
+$labels['setdeactivated'] = 'Filterverzameling succesvol gedeactiveerd.';
+$labels['setdeleted'] = 'Filterverzameling succesvol verwijderd.';
+$labels['setdeleteconfirm'] = 'Weet u zeker dat u de geselecteerde filterset wilt verwijderen?';
+$labels['setcreateerror'] = 'Filterverzameling kon niet aangemaakt worden. Er trad een serverfout op.';
+$labels['setcreated'] = 'Filterverzameling succesvol aangemaakt.';
+$labels['activateerror'] = 'Geselecteerde filter(s) konden niet ingeschakeld worden. Er trad een serverfout op.';
+$labels['deactivateerror'] = 'Geselecteerde filter(s) konden niet uitgeschakeld worden. Er trad een serverfout op.';
+$labels['activated'] = 'Filter(s) succesvol uitgeschakeld.';
+$labels['deactivated'] = 'Filter(s) succesvol ingeschakeld.';
+$labels['moved'] = 'Filter succesvol verplaatst.';
+$labels['moveerror'] = 'Geselecteerde filter(s) konden niet verplaatst worden. Er trad een serverfout op.';
+$labels['nametoolong'] = 'Naam is te lang.';
+$labels['namereserved'] = 'Gereserveerde naam.';
+$labels['setexist'] = 'Set bestaat al.';
+$labels['nodata'] = 'Tenminste één positie moet geselecteerd worden!';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Onbekende fout';
-$messages['filterconnerror'] = 'Kan geen verbinding maken met de managesieve server';
-$messages['filterdeleteerror'] = 'Kan filter niet verwijderen. Er is een fout opgetreden';
-$messages['filterdeleted'] = 'Filter succesvol verwijderd';
-$messages['filterdeleteconfirm'] = 'Weet je zeker dat je het geselecteerde filter wilt verwijderen?';
-$messages['filtersaved'] = 'Filter succesvol opgeslagen';
-$messages['filtersaveerror'] = 'Kan filter niet opslaan. Er is een fout opgetreden.';
-$messages['ruledeleteconfirm'] = 'Weet je zeker dat je de geselecteerde regel wilt verwijderen?';
-$messages['actiondeleteconfirm'] = 'Weet je zeker dat je de geselecteerde actie wilt verwijderen?';
-$messages['forbiddenchars'] = 'Verboden karakters in het veld';
-$messages['cannotbeempty'] = 'Veld mag niet leeg zijn';
-
-?>
diff --git a/plugins/managesieve/localization/pl_PL.inc b/plugins/managesieve/localization/pl_PL.inc
index c0ec2ede2..b6227347d 100644
--- a/plugins/managesieve/localization/pl_PL.inc
+++ b/plugins/managesieve/localization/pl_PL.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pl_PL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Filtry';
 $labels['managefilters'] = 'Zarządzaj filtrami wiadomości przychodzących';
@@ -7,8 +21,8 @@ $labels['filtername'] = 'Nazwa filtru';
 $labels['newfilter'] = 'Nowy filtr';
 $labels['filteradd'] = 'Dodaj filtr';
 $labels['filterdel'] = 'Usuń filtr';
-$labels['enable'] = 'Włącz/Wyłącz';
-$labels['filtersets'] = 'Zbiory fitrów';
+$labels['moveup'] = 'W górę';
+$labels['movedown'] = 'W dół';
 $labels['filterallof'] = 'spełniających wszystkie poniższe kryteria';
 $labels['filteranyof'] = 'spełniających dowolne z poniższych kryteriów';
 $labels['filterany'] = 'wszystkich';
@@ -28,9 +42,9 @@ $labels['addrule'] = 'Dodaj regułę';
 $labels['delrule'] = 'Usuń regułę';
 $labels['messagemoveto'] = 'Przenieś wiadomość do';
 $labels['messageredirect'] = 'Przekaż wiadomość na konto';
-$labels['messagereply'] = 'Odpowiedz wiadomością o treści';
 $labels['messagecopyto'] = 'Skopiuj wiadomość do';
 $labels['messagesendcopy'] = 'Wyślij kopię do';
+$labels['messagereply'] = 'Odpowiedz wiadomością o treści';
 $labels['messagedelete'] = 'Usuń wiadomość';
 $labels['messagediscard'] = 'Odrzuć z komunikatem';
 $labels['messagesrules'] = 'W stosunku do przychodzących wiadomości:';
@@ -39,12 +53,14 @@ $labels['add'] = 'Dodaj';
 $labels['del'] = 'Usuń';
 $labels['sender'] = 'Nadawca';
 $labels['recipient'] = 'Odbiorca';
-$labels['rulestop'] = 'Przerwij przetwarzanie reguł';
-$labels['vacationdays'] = 'Częstotliwość wysyłania wiadomości (w dniach):';
 $labels['vacationaddresses'] = 'Lista dodatkowych adresów odbiorców (oddzielonych przecinkami):';
+$labels['vacationdays'] = 'Częstotliwość wysyłania wiadomości (w dniach):';
 $labels['vacationreason'] = 'Treść (przyczyna nieobecności):';
 $labels['vacationsubject'] = 'Temat wiadomości:';
+$labels['rulestop'] = 'Przerwij przetwarzanie reguł';
+$labels['enable'] = 'Włącz/Wyłącz';
 $labels['filterset'] = 'Zbiór filtrów';
+$labels['filtersets'] = 'Zbiory fitrów';
 $labels['filtersetadd'] = 'Dodaj zbiór filtrów';
 $labels['filtersetdel'] = 'Usuń bieżący zbiór filtrów';
 $labels['filtersetact'] = 'Aktywuj bieżący zbiór filtrów';
@@ -100,38 +116,35 @@ $labels['default'] = 'domyślny';
 $labels['octet'] = 'dokładny (octet)';
 $labels['asciicasemap'] = 'nierozróżniający wielkości liter (ascii-casemap)';
 $labels['asciinumeric'] = 'numeryczny (ascii-numeric)';
+$labels['filterunknownerror'] = 'Nieznany błąd serwera.';
+$labels['filterconnerror'] = 'Nie można nawiązać połączenia z serwerem.';
+$labels['filterdeleteerror'] = 'Nie można usunąć filtra. Błąd serwera.';
+$labels['filterdeleted'] = 'Filtr został usunięty pomyślnie.';
+$labels['filtersaved'] = 'Filtr został zapisany pomyślnie.';
+$labels['filtersaveerror'] = 'Nie można zapisać filtra. Wystąpił błąd serwera.';
+$labels['filterdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany filtr?';
+$labels['ruledeleteconfirm'] = 'Czy na pewno chcesz usunąć wybraną regułę?';
+$labels['actiondeleteconfirm'] = 'Czy na pewno usunąć wybraną akcję?';
+$labels['forbiddenchars'] = 'Pole zawiera niedozwolone znaki.';
+$labels['cannotbeempty'] = 'Pole nie może być puste.';
+$labels['ruleexist'] = 'Filtr o podanej nazwie już istnieje.';
+$labels['setactivateerror'] = 'Nie można aktywować wybranego zbioru filtrów. Błąd serwera.';
+$labels['setdeactivateerror'] = 'Nie można deaktywować wybranego zbioru filtrów. Błąd serwera.';
+$labels['setdeleteerror'] = 'Nie można usunąć wybranego zbioru filtrów. Błąd serwera.';
+$labels['setactivated'] = 'Zbiór filtrów został aktywowany pomyślnie.';
+$labels['setdeactivated'] = 'Zbiór filtrów został deaktywowany pomyślnie.';
+$labels['setdeleted'] = 'Zbiór filtrów został usunięty pomyślnie.';
+$labels['setdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany zbiór filtrów?';
+$labels['setcreateerror'] = 'Nie można utworzyć zbioru filtrów. Błąd serwera.';
+$labels['setcreated'] = 'Zbiór filtrów został utworzony pomyślnie.';
+$labels['activateerror'] = 'Nie można włączyć wybranych filtrów. Błąd serwera.';
+$labels['deactivateerror'] = 'Nie można wyłączyć wybranych filtrów. Błąd serwera.';
+$labels['activated'] = 'Filtr(y) wyłączono pomyślnie.';
+$labels['deactivated'] = 'Filtr(y) włączono pomyślnie.';
+$labels['moved'] = 'Filter został przeniesiony pomyślnie.';
+$labels['moveerror'] = 'Nie można przenieść wybranego filtra. Błąd serwera.';
+$labels['nametoolong'] = 'Zbyt długa nazwa.';
+$labels['namereserved'] = 'Nazwa zarezerwowana.';
+$labels['setexist'] = 'Zbiór już istnieje.';
+$labels['nodata'] = 'Należy wybrać co najmniej jedną pozycję!';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Nieznany błąd serwera.';
-$messages['filterconnerror'] = 'Nie można nawiązać połączenia z serwerem.';
-$messages['filterdeleteerror'] = 'Nie można usunąć filtra. Błąd serwera.';
-$messages['filterdeleted'] = 'Filtr został usunięty pomyślnie.';
-$messages['filterdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany filtr?';
-$messages['filtersaved'] = 'Filtr został zapisany pomyślnie.';
-$messages['filtersaveerror'] = 'Nie można zapisać filtra. Wystąpił błąd serwera.';
-$messages['ruledeleteconfirm'] = 'Czy na pewno chcesz usunąć wybraną regułę?';
-$messages['actiondeleteconfirm'] = 'Czy na pewno usunąć wybraną akcję?';
-$messages['forbiddenchars'] = 'Pole zawiera niedozwolone znaki.';
-$messages['cannotbeempty'] = 'Pole nie może być puste.';
-$messages['setactivateerror'] = 'Nie można aktywować wybranego zbioru filtrów. Błąd serwera.';
-$messages['setdeactivateerror'] = 'Nie można deaktywować wybranego zbioru filtrów. Błąd serwera.';
-$messages['setdeleteerror'] = 'Nie można usunąć wybranego zbioru filtrów. Błąd serwera.';
-$messages['setactivated'] = 'Zbiór filtrów został aktywowany pomyślnie.';
-$messages['setdeactivated'] = 'Zbiór filtrów został deaktywowany pomyślnie.';
-$messages['setdeleted'] = 'Zbiór filtrów został usunięty pomyślnie.';
-$messages['setdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany zbiór filtrów?';
-$messages['setcreateerror'] = 'Nie można utworzyć zbioru filtrów. Błąd serwera.';
-$messages['setcreated'] = 'Zbiór filtrów został utworzony pomyślnie.';
-$messages['nodata'] = 'Należy wybrać co najmniej jedną pozycję!';
-$messages['ruleexist'] = 'Filtr o podanej nazwie już istnieje.';
-$messages['activateerror'] = 'Nie można włączyć wybranych filtrów. Błąd serwera.';
-$messages['deactivateerror'] = 'Nie można wyłączyć wybranych filtrów. Błąd serwera.';
-$messages['activated'] = 'Filtr(y) wyłączono pomyślnie.';
-$messages['deactivated'] = 'Filtr(y) włączono pomyślnie.';
-$messages['moved'] = 'Filter został przeniesiony pomyślnie.';
-$messages['moveerror'] = 'Nie można przenieść wybranego filtra. Błąd serwera.';
-$messages['nametoolong'] = 'Zbyt długa nazwa.';
-$messages['namereserved'] = 'Nazwa zarezerwowana.';
-$messages['setexist'] = 'Zbiór już istnieje.';
-
-?>
diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc
index af3f05add..f0e890d86 100644
--- a/plugins/managesieve/localization/pt_BR.inc
+++ b/plugins/managesieve/localization/pt_BR.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_BR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Gerenciar filtros de entrada de e-mail';
 $labels['filtername'] = 'Nome do filtro';
@@ -17,12 +32,18 @@ $labels['filteris'] = 'é igual a';
 $labels['filterisnot'] = 'não é igual a';
 $labels['filterexists'] = 'existe';
 $labels['filternotexists'] = 'não existe';
+$labels['filtermatches'] = 'expressão combina';
+$labels['filternotmatches'] = 'expressão não combina';
+$labels['filterregex'] = 'combina com expressão regular';
+$labels['filternotregex'] = 'não combina com a expressão regular';
 $labels['filterunder'] = 'inferior a';
 $labels['filterover'] = 'superior a';
 $labels['addrule'] = 'Adicionar regra';
 $labels['delrule'] = 'Excluir regra';
 $labels['messagemoveto'] = 'Mover mensagem para';
 $labels['messageredirect'] = 'Redirecionar mensagem para';
+$labels['messagecopyto'] = 'Copiar mensagem para';
+$labels['messagesendcopy'] = 'Enviar cópia da mensagem para';
 $labels['messagereply'] = 'Responder com mensagem';
 $labels['messagedelete'] = 'Excluir mensagem';
 $labels['messagediscard'] = 'Descartar com mensagem';
@@ -35,19 +56,95 @@ $labels['recipient'] = 'Destinatário';
 $labels['vacationaddresses'] = 'Lista adicional de e-mails destinatários (separado por vírgula):';
 $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
 $labels['vacationreason'] = 'Corpo da mensagem (motivo de férias):';
+$labels['vacationsubject'] = 'Título da mensagem:';
 $labels['rulestop'] = 'Parar de avaliar regras';
+$labels['enable'] = 'Habilitar/Desabilitar';
+$labels['filterset'] = 'Conjunto de filtros';
+$labels['filtersets'] = 'Conjuntos de filtro';
+$labels['filtersetadd'] = 'Adicionar conjunto de filtros';
+$labels['filtersetdel'] = 'Excluir conjunto de filtros atual';
+$labels['filtersetact'] = 'Ativar conjunto de filtros atual';
+$labels['filtersetdeact'] = 'Desativar conjunto de filtros atual';
+$labels['filterdef'] = 'Definição de filtro';
+$labels['filtersetname'] = 'Nome do conjunto de filtros';
+$labels['newfilterset'] = 'Novo conjunto de filtros';
+$labels['active'] = 'ativo';
+$labels['none'] = 'nenhum';
+$labels['fromset'] = 'Do conjunto';
+$labels['fromfile'] = 'Do arquivo';
+$labels['filterdisabled'] = 'Filtro desativado';
+$labels['countisgreaterthan'] = 'contagem é maior que';
+$labels['countisgreaterthanequal'] = 'contagem é maior ou igual a';
+$labels['countislessthan'] = 'contagem é menor que';
+$labels['countislessthanequal'] = 'contagem é menor ou igual a';
+$labels['countequals'] = 'contagem é igual a';
+$labels['countnotequals'] = 'contagem não é igual a';
+$labels['valueisgreaterthan'] = 'valor é maior que';
+$labels['valueisgreaterthanequal'] = 'valor é maior ou igual a';
+$labels['valueislessthan'] = 'valor é menor que';
+$labels['valueislessthanequal'] = 'valor é menor ou igual a';
+$labels['valueequals'] = 'valor é igual a';
+$labels['valuenotequals'] = 'valor não é igual a';
+$labels['setflags'] = 'Definir marcadores à mensagem';
+$labels['addflags'] = 'Adicionar marcadores à mensagem';
+$labels['removeflags'] = 'Remover marcadores da mensagem';
+$labels['flagread'] = 'Lida';
+$labels['flagdeleted'] = 'Excluída';
+$labels['flaganswered'] = 'Respondida';
+$labels['flagflagged'] = 'Marcada';
+$labels['flagdraft'] = 'Rascunho';
+$labels['filtercreate'] = 'Criar filtro';
+$labels['usedata'] = 'Usar os seguintes dados no filtro:';
+$labels['nextstep'] = 'Próximo Passo';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Opções avançadas';
+$labels['body'] = 'Corpo';
+$labels['address'] = 'endereço';
+$labels['envelope'] = 'envelope';
+$labels['modifier'] = 'modificador:';
+$labels['text'] = 'texto';
+$labels['undecoded'] = 'decodificado (bruto)';
+$labels['contenttype'] = 'tipo de conteúdo';
+$labels['modtype'] = 'tipo:';
+$labels['allparts'] = 'todas';
+$labels['domain'] = 'domínio';
+$labels['localpart'] = 'parte local';
+$labels['user'] = 'usuário';
+$labels['detail'] = 'detalhes';
+$labels['comparator'] = 'comparador:';
+$labels['default'] = 'padrão';
+$labels['octet'] = 'estrito (octeto)';
+$labels['asciicasemap'] = 'caso insensível (mapa de caracteres ascii)';
+$labels['asciinumeric'] = 'numérico (ascii-numeric)';
+$labels['filterunknownerror'] = 'Erro desconhecido de servidor';
+$labels['filterconnerror'] = 'Não foi possível conectar ao servidor managesieve';
+$labels['filterdeleteerror'] = 'Não foi possível excluir filtro. Occorreu um erro de servidor';
+$labels['filterdeleted'] = 'Filtro excluído com sucesso';
+$labels['filtersaved'] = 'Filtro gravado com sucesso';
+$labels['filtersaveerror'] = 'Não foi possível gravar filtro. Occoreu um erro de servidor.';
+$labels['filterdeleteconfirm'] = 'Deseja realmente excluir o filtro selecionado?';
+$labels['ruledeleteconfirm'] = 'Deseja realmente excluir a regra selecionada?';
+$labels['actiondeleteconfirm'] = 'Deseja realmente excluir a ação selecionada?';
+$labels['forbiddenchars'] = 'Caracteres não permitidos no campo';
+$labels['cannotbeempty'] = 'Campo não pode ficar em branco';
+$labels['ruleexist'] = 'O filtro com o nome especificado já existe.';
+$labels['setactivateerror'] = 'Não foi possível ativar o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
+$labels['setdeactivateerror'] = 'Não foi possível desativar o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
+$labels['setdeleteerror'] = 'Não foi possível excluir o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
+$labels['setactivated'] = 'Conjunto de filtros ativados com sucesso.';
+$labels['setdeactivated'] = 'Conjunto de filtros desativados com sucesso.';
+$labels['setdeleted'] = 'Conjunto de filtros excluídos com sucesso.';
+$labels['setdeleteconfirm'] = 'Você está certo que deseja excluir o conjunto de filtros selecionados?';
+$labels['setcreateerror'] = 'Não foi possível criar o conjunto de filtros. Ocorreu um erro no servidor.';
+$labels['setcreated'] = 'Conjunto de filtros criado com sucesso.';
+$labels['activateerror'] = 'Não foi possível habilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.';
+$labels['deactivateerror'] = 'Não foi possível desabilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.';
+$labels['activated'] = 'Filtro(s) desabilitado(s) com sucesso.';
+$labels['deactivated'] = 'Filtro(s) habilitado(s) com sucesso.';
+$labels['moved'] = 'Filtro movido com sucesso.';
+$labels['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.';
+$labels['nametoolong'] = 'Nome muito longo.';
+$labels['namereserved'] = 'Nome reservado.';
+$labels['setexist'] = 'Conjunto já existe.';
+$labels['nodata'] = 'Pelo menos uma posição precisa ser selecionada!';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Erro desconhecido de servidor';
-$messages['filterconnerror'] = 'Não foi possível conectar ao servidor managesieve';
-$messages['filterdeleteerror'] = 'Não foi possível excluir filtro. Occorreu um erro de servidor';
-$messages['filterdeleted'] = 'Filtro excluído com sucesso';
-$messages['filterdeleteconfirm'] = 'Deseja realmente excluir o filtro selecionado?';
-$messages['filtersaved'] = 'Filtro gravado com sucesso';
-$messages['filtersaveerror'] = 'Não foi possível gravar filtro. Occoreu um erro de servidor.';
-$messages['ruledeleteconfirm'] = 'Deseja realmente excluir a regra selecionada?';
-$messages['actiondeleteconfirm'] = 'Deseja realmente excluir a ação selecionada?';
-$messages['forbiddenchars'] = 'Caracteres não permitidos no campo';
-$messages['cannotbeempty'] = 'Campo não pode ficar em branco';
-
-?>
diff --git a/plugins/managesieve/localization/pt_PT.inc b/plugins/managesieve/localization/pt_PT.inc
index 592916fc0..bb0c781a1 100644
--- a/plugins/managesieve/localization/pt_PT.inc
+++ b/plugins/managesieve/localization/pt_PT.inc
@@ -1,13 +1,26 @@
 <?php
-/* Author: Ling Fude */
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_PT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: David <Unknown>                                               |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
 
 $labels = array();
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Gerir filtros';
 $labels['filtername'] = 'Nome do filtro';
-$labels['disablerule'] = 'Desactivar regra';
-$labels['disabled'] = 'Desactivado';
 $labels['newfilter'] = 'Novo filtro';
+$labels['filteradd'] = 'Adicionar filtro';
+$labels['filterdel'] = 'Eliminar filtro';
 $labels['moveup'] = 'Mover para cima';
 $labels['movedown'] = 'Mover para baixo';
 $labels['filterallof'] = 'corresponde a todas as seguintes regras';
@@ -19,22 +32,47 @@ $labels['filteris'] = 'é igual a';
 $labels['filterisnot'] = 'é diferente de';
 $labels['filterexists'] = 'existe';
 $labels['filternotexists'] = 'não existe';
+$labels['filtermatches'] = 'expressão corresponde';
+$labels['filternotmatches'] = 'expressão não corresponde';
 $labels['filterregex'] = 'corresponde à expressão';
 $labels['filternotregex'] = 'não corresponde à expressão';
 $labels['filterunder'] = 'é inferior a';
 $labels['filterover'] = 'é superior a';
-$labels['filterbefore'] = 'é antes';
-$labels['filterafter'] = 'é depois';
-$labels['filteradvoptions'] = 'mais opções...';
-$labels['spamtest'] = 'Probabilidade de Spam';
-$labels['operator'] = 'Operador';
-$labels['comparator'] = 'Comparador';
-$labels['isgreaterthan'] = 'é maior que';
-$labels['isgreaterthanequal'] = 'é maior ou igual a';
-$labels['islessthan'] = 'é menor que';
-$labels['islessthanequal'] = 'é menor ou igual a';
-$labels['equals'] = 'é igual a';
-$labels['notequals'] = 'é diferente de';
+$labels['addrule'] = 'Adicionar regra';
+$labels['delrule'] = 'Eliminar regra';
+$labels['messagemoveto'] = 'Mover mensagem para';
+$labels['messageredirect'] = 'Redirecionar mensagem para';
+$labels['messagecopyto'] = 'Copiar mensagem para';
+$labels['messagesendcopy'] = 'Enviar cópia da mensagem para';
+$labels['messagereply'] = 'Responder com a mensagem';
+$labels['messagedelete'] = 'Eliminar mensagem';
+$labels['messagediscard'] = 'Rejeitar mensagem';
+$labels['messagesrules'] = 'Regras para Filtros';
+$labels['messagesactions'] = 'Acções para Filtros';
+$labels['add'] = 'Adicionar';
+$labels['del'] = 'Eliminar';
+$labels['sender'] = 'Remetente';
+$labels['recipient'] = 'Destinatário';
+$labels['vacationaddresses'] = 'Lista adicional de destinatários de e-mails (separados por vírgula):';
+$labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
+$labels['vacationreason'] = 'Conteúdo da mensagem (motivo da ausência):';
+$labels['vacationsubject'] = 'Assunto da mensagem:';
+$labels['rulestop'] = 'Parar de avaliar regras';
+$labels['enable'] = 'Activar/Desactivar';
+$labels['filterset'] = 'Filtros definidos';
+$labels['filtersets'] = 'Filtros definidos';
+$labels['filtersetadd'] = 'Adicionar definição de filtros';
+$labels['filtersetdel'] = 'Eliminar definição de filtros actuais';
+$labels['filtersetact'] = 'Activar definição de filtros actuais';
+$labels['filtersetdeact'] = 'Desactivar definição de filtros actuais';
+$labels['filterdef'] = 'Definição de filtros';
+$labels['filtersetname'] = 'Nome da definição de filtros';
+$labels['newfilterset'] = 'Nova definição de filtros';
+$labels['active'] = 'activo';
+$labels['none'] = 'nehnum';
+$labels['fromset'] = 'definição de';
+$labels['fromfile'] = 'a partir do ficheiro';
+$labels['filterdisabled'] = 'Filtro desactivado';
 $labels['countisgreaterthan'] = 'contagem é maior que';
 $labels['countisgreaterthanequal'] = 'contagem é maior ou igual a';
 $labels['countislessthan'] = 'contagem é menor que';
@@ -47,139 +85,66 @@ $labels['valueislessthan'] = 'valor é menor que';
 $labels['valueislessthanequal'] = 'valor é menor ou igual a';
 $labels['valueequals'] = 'valor é igual a';
 $labels['valuenotequals'] = 'valor diferente de';
-$labels['userpart'] = 'parte do utilizador igual a';
-$labels['notuserpart'] = 'parte do utilizador diferente de';
-$labels['detailpart'] = 'parte do detalhe igual a';
-$labels['notdetailpart'] = 'parte do detalhe diferente de';
-$labels['domainpart'] = 'parte do domínio igual a';
-$labels['notdomainpart'] = 'parte do domínio diferente de';
-$labels['teststring'] = 'Texto de teste';
-$labels['messagemoveto'] = 'Mover mensagem para';
-$labels['messageredirect'] = 'Redirecionar mensagem para';
-$labels['messageimapflags'] = 'Marcar mensagem como';
-$labels['messagereject'] = 'Rejeitar com a mensagem';
-$labels['messagevacation'] = 'Mensagem Fora do Escritório';
-$labels['messagekeep'] = 'Manter mensagem';
-$labels['messagediscard'] = 'Rejeitar mensagem';
-$labels['messagenotify'] = 'Enviar notificação';
-$labels['messagestop'] = 'Parar o processamento de filtros';
-$labels['messagehelp'] = 'O que é isto?';
-$labels['sieveorigsubj'] = 'Acrescentar assunto original à resposta';
-$labels['sievevachandle'] = 'Manusear';
-$labels['method'] = 'Método';
-$labels['options'] = 'Opções';
-$labels['messagesrules'] = 'Regras para Filtros';
-$labels['messagesactions'] = 'Acções para Filtros';
-$labels['sieveto'] = 'Alias';
-$labels['sievefrom'] = 'De';
-$labels['flag'] = 'Importância';
-$labels['importancen'] = 'Nenhum';
-$labels['importance1'] = 'Alta';
-$labels['importance2'] = 'Normal';
-$labels['importance3'] = 'Baixa';
+$labels['setflags'] = 'Definir indicadores para a mensagem';
+$labels['addflags'] = 'Adicionar indicadores para a mensagem';
+$labels['removeflags'] = 'Eliminar indicadores da mensagem';
 $labels['flagread'] = 'Lida';
 $labels['flagdeleted'] = 'Eliminada';
 $labels['flaganswered'] = 'Respondida';
-$labels['flagdraft'] = 'Rascunho';
 $labels['flagflagged'] = 'Marcada';
-$labels['addsieverule'] = 'Adicionar outra regra, depois desta';
-$labels['addsieveact'] = 'Adicionar outra acção, depois desta';
-$labels['deletesieverule'] = 'Eliminar esta regra';
-$labels['deletesieveact'] = 'Eliminar esta acção';
-$labels['envelopefrom'] = 'Envelope De';
-$labels['envelopeto'] = 'Envelope Para';
-$labels['otherheader'] = 'Outro cabeçalho';
-$labels['days'] = 'Periodo';
-$labels['message'] = 'Mensagem';
-$labels['sieveruleheaders'] = 'Ver exemplos de outros cabecalhos';
-$labels['examplefilters'] = 'Exemplo de Filtros';
-$labels['importfilters'] = 'Importar Filtros';
-$labels['usedefaultfilter'] = 'Usar filtros predefinidos';
-$labels['importfilter'] = 'Importar filtros';
-$labels['moreactions'] = 'Mais opções...';
-$labels['adveditor'] = 'Editor avançado';
-$labels['stdeditor'] = 'Editor padrão';
-$labels['messageredirectcopy'] = 'Enviar cópia para';
-$labels['messagecopyto'] = 'Copiar mensagem para';
+$labels['flagdraft'] = 'Rascunho';
+$labels['filtercreate'] = 'Criar filtro';
+$labels['usedata'] = 'Usar os seguintes dados no filtro:';
+$labels['nextstep'] = 'Próximo passo';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Opções avançadas';
 $labels['body'] = 'Corpo';
-$labels['auto'] = 'Auto';
-$labels['raw'] = 'Raw';
+$labels['address'] = 'endereço';
+$labels['envelope'] = 'envelope';
+$labels['modifier'] = 'modificador:';
 $labels['text'] = 'Texto';
-$labels['other'] = 'Outro';
-$labels['bodycontentpart'] = 'Parte Conteúdo';
-$labels['spamnotchecked'] = 'não verificado';
-$labels['spamlevelisgreaterthanequal'] = 'é maior ou igual a';
-$labels['spamlevelislessthanequal'] = 'é menor ou igual a';
-$labels['spamlevelequals'] = 'é igual a';
-$labels['i;ascii-casemap'] = 'correspondência de texto indeferente a maiúsculas e minúsculas';
-$labels['i;octet'] = 'correspondência exacta do texto';
-$labels['i;ascii-numeric'] = 'correspondência numérica';
-$labels['selectruleset'] = 'Seleccionar conjunto de regras';
-$labels['activeruleset'] = '%s (activo)';
-$labels['activateruleset'] = 'Activar este conjunto de regras';
-$labels['newruleset'] = 'Criar um no grupo de regras';
-$labels['delruleset'] = 'Eliminar este conjunto de regras';
-$labels['renameruleset'] = 'Renomear este conjunto de regras';
-$labels['copy'] = 'Copiar';
-$labels['copyexistingfilter'] = 'Copiar filtros existentes';
-$labels['copytoruleset'] = 'Copiar o filtro para outro conjunto de regras';
-$labels['copyfromruleset'] = 'Copiar filtros de um conjunto regras existente';
-$labels['time'] = 'Tempo';
-$labels['weekday'] = 'dia da semana';
-
-$messages = array();
-$messages['nosieverules'] = 'Nenhum filtro encontrado.';
-$messages['filterdeleteconfirm'] = 'Tem a certeza que pretende eliminar este filtro?';
-$messages['ruledeleteconfirm'] = 'Tem a certeza que pretende eliminar esta regra?';
-$messages['actiondeleteconfirm'] = 'Tem a certeza que pretende eliminar esta acção?';
-$messages['filterunknownerror'] = 'Erro de servidor desconhecido';
-$messages['filterconnerror'] = 'Não é possível ligar ao servidor Sieve';
-$messages['filterdeleteerror'] = 'Não foi possível eliminar o filtro. Erro no servidor';
-$messages['filterdeleted'] = 'Filtro eliminado com sucesso';
-$messages['filtersaved'] = 'Filtro guardado com sucesso';
-$messages['filtersaveerror'] = 'Não foi possível guardar o filtro. Erro no servidor';
-$messages['vacdaysexp'] = 'O período é o número de dias durante o qual a mensagem não será reenviado para o mesmo remetente, não importa quantas vezes ele entre contacto consigo.<br/><br/>Por exemplo: Se o João lhe enviar e-mails na segunda-feira e o período está definido para 7 dias, o João irá receber uma mensagem de Fora do Escritório na segunda-feira, mas não irá receber mais nenhuma até à segunda-feira seguinte, não importa quantos e-mails ele lhe envie durante a semana.';
-$messages['vachandleexp'] = 'Um identificador pode ser usado para ligar as diferentes mensagens de Fora do Escritório em conjunto, uma vez que uma mensagem foi enviada outra mensagem com o mesmo identificador será reenviado no mesmo período.';
-$messages['vactoexp'] = 'Lista de endereços de destinatários adicionais que estão incluídos na resposta automática. Se um destinatário de e-mail não é o seu endereço principal e não está nesta lista, nenhuma mensagem será enviada.';
-$messages['vactoexp_adv'] = 'Separar múltiplos endereços com virgula (,). Exemplo: test1@example.com,test2@example.com,test3@example.com';
-$messages['vactoexp_err'] = 'Erro: Múltiplos endereços devem ser separados por virgula (,).';
-$messages['norulename'] = 'Por favor, indique um nome para este filtro';
-$messages['ruleexists'] = 'Já existe um filtro com este nome. Por favor, indique outro';
-$messages['noheader'] = 'Por favor, indique o nome do cabeçalho para testar';
-$messages['headerbadchars'] = 'Erro: O cabeçalho contém caracteres proibidos';
-$messages['noheadervalue'] = 'Por favor indique um valor para testar o cabeçalho contra';
-$messages['sizewrongformat'] = 'Erro: O tamanho da mensagem deve ser numérico';
-$messages['noredirect'] = 'Indique um endereço de e-mail para redirecionar as mensagens';
-$messages['redirectaddresserror'] = 'Erro: O endereço de e-mail parece ser inválido';
-$messages['noreject'] = 'Indique uma mensagem para enviar juntamente com o e-mail rejeitado';
-$messages['vacnodays'] = 'Por favor insira um número de dias para o período em que a mensagem não será reenviado para a mesma pessoa';
-$messages['vacdayswrongformat'] = 'Erro: O período deve ser um número maior ou igual a 1';
-$messages['vacnomsg'] = 'Insira o texto para a sua mensagem';
-$messages['notifynomethod'] = 'Por favor, indique um método pelo qual a notificação deve ser enviada';
-$messages['notifynomsg'] = 'Insira o texto para a sua mensagem';
-$messages['sieveruleexp'] = 'Por favor, defina uma ou mais regras sobre as quais cada mensagem será testada. Os filtros são executados na ordem em que aparecem à esquerda do ecrã, se for encontrada uma correspondência mais nenhum filtro será testado.';
-$messages['sieveruleexp_stop'] = 'Por favor, defina uma ou mais regras sobre as quais cada mensagem será testada. Os filtros são executados na ordem em que aparecem à esquerda do ecrã até uma acção de \'Stop\' ser encontrada.';
-$messages['sieveactexp'] = 'Por favor, seleccione uma das opções abaixo. Essas acções serão realizadas para qualquer mensagem correspondente à(s) regra(s) acima.';
-$messages['sieveheadershlp'] = 'Abaixo estão alguns exemplos de outros cabeçalhos que podem ser testados pelos filtros. Selecione um cabeçalho para adicioná-lo à regra, ou introduza um personalizado na caixa acima.';
-$messages['movingfilter'] = 'A mover filtro...';
-$messages['noexistingfilters'] = 'Não foi detectado nenhum filtro existente!';
-$messages['importdefault'] = '<b>Usar filtros predefinidos:</b> Há um conjunto de filtros predefinidos disponíveis. Gostaria de usar esses filtros?';
-$messages['importother'] = '<b>Importação de filtros:</b>Foi encontrado outro conjunto de filtros de %s. Gostaria de importar esses filtros para o seu conjunto actual?';
-$messages['switchtoadveditor'] = 'Mudando para o editor avançado permite editar o ficheiro Sieve directamente. Quaisquer alterações aqui efectuadas podem ser ilegíveis no editor normal e podem ser perdidas quando os filtros são guardados usando o editor normal. Deseja continuar?';
-$messages['filterimported'] = 'Filtro importado com sucesso';
-$messages['filterimporterror'] = 'Não foi possível importar o filtro. Ocorreu um erro no servidor.';
-$messages['notifyinvalidmethod'] = 'O método parece não estar escrito num formato válido, ele deve ser um URL. Por exemplo: "mailto: alert@example.com».';
-$messages['nobodycontentpart'] = 'Por favor, indique uma parte de conteúdo para testar';
-$messages['badoperator'] = 'O operador seleccionado não pode ser usado nesta regra';
-$messages['filteractionerror'] = 'A acção solicitada não é suportada pelo servidor';
-$messages['filtermissingerror'] = 'Não foi possível encontrar a regra solicitada';
-$messages['contentpartexp'] = 'O tipo de MIME ou parte específica da mensagem que deve ser testado. Por exemplo: `text/html`, `audio/mp3` or `image`.';
-$messages['delrulesetconf'] = 'Tem certeza que quer eliminar este conjunto de regras?';
-$messages['rulesetexists'] = 'Um conjunto de regras com este nome já existe. Por favor, indique outro nome';
-$messages['copyexisting'] = '<b>Copiar conjunto de regras existente:</b>Gostaria de copiar os filtros de um conjunto de de regras existente para o seu conjunto actual?';
-$messages['filtercopied'] = 'Filtro copiado com sucesso';
-$messages['nosieverulesets'] = 'Nenhum conjunto de regras encontrado.';
-$messages['baddateformat'] = 'Erro: Indique a data no formato AAAA-MM-DD';
-$messages['badtimeformat'] = 'Erro: Indique a hora no formato HH:MM:SS';
+$labels['undecoded'] = 'não descodificado (raw)';
+$labels['contenttype'] = 'tipo de conteúdo';
+$labels['modtype'] = 'tipo:';
+$labels['allparts'] = 'todos';
+$labels['domain'] = 'domínio';
+$labels['localpart'] = 'parte local';
+$labels['user'] = 'utilizador';
+$labels['detail'] = 'detalhe';
+$labels['comparator'] = 'Comparador';
+$labels['default'] = 'predefinido';
+$labels['octet'] = 'estrito (octeto)';
+$labels['asciicasemap'] = 'não sensível a maiúsculas/minúsculas (caracteres ascii)';
+$labels['asciinumeric'] = 'numérico (numérico ascii)';
+$labels['filterunknownerror'] = 'Erro de servidor desconhecido';
+$labels['filterconnerror'] = 'Não é possível ligar ao servidor Sieve';
+$labels['filterdeleteerror'] = 'Não foi possível eliminar o filtro. Erro no servidor';
+$labels['filterdeleted'] = 'Filtro eliminado com sucesso';
+$labels['filtersaved'] = 'Filtro guardado com sucesso';
+$labels['filtersaveerror'] = 'Não foi possível guardar o filtro. Erro no servidor';
+$labels['filterdeleteconfirm'] = 'Tem a certeza que pretende eliminar este filtro?';
+$labels['ruledeleteconfirm'] = 'Tem a certeza que pretende eliminar esta regra?';
+$labels['actiondeleteconfirm'] = 'Tem a certeza que pretende eliminar esta acção?';
+$labels['forbiddenchars'] = 'Caracteres inválidos no campo.';
+$labels['cannotbeempty'] = 'Este campo não pode estar vazio.';
+$labels['ruleexist'] = 'Já existe um Filtro com o nome especificado.';
+$labels['setactivateerror'] = 'Não foi possível ativar os filtros selecionados.  Ocorreu um erro no servidor.';
+$labels['setdeactivateerror'] = 'Não foi possível desativar os filtros selecionados.  Ocorreu um erro no servidor.';
+$labels['setdeleteerror'] = 'Não foi possível eliminar os filtros selecionados.  Ocorreu um erro no servidor.';
+$labels['setactivated'] = 'Filtros ativados com sucesso.';
+$labels['setdeactivated'] = 'Filtros desativados com sucesso.';
+$labels['setdeleted'] = 'Filtros eliminados com sucesso.';
+$labels['setdeleteconfirm'] = 'Tem a certeza que pretende eliminar os filtros selecionados?';
+$labels['setcreateerror'] = 'Não foi possível criar o conjunto de filtros. Ocorreu um erro no servidor.';
+$labels['setcreated'] = 'Conjunto de filtros criado com sucesso.';
+$labels['activateerror'] = 'Não foi possível ativar os filtros selecionados. Ocorreu um erro no servidor.';
+$labels['deactivateerror'] = 'Não foi possível desativar os filtros selecionados. Ocorreu um erro no servidor.';
+$labels['activated'] = 'Filtro(s) desativado(s) com sucesso.';
+$labels['deactivated'] = 'Filtro(s) ativado(s) com sucesso.';
+$labels['moved'] = 'Filtro movido com sucesso.';
+$labels['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.';
+$labels['nametoolong'] = 'Nome demasiado longo.';
+$labels['namereserved'] = 'Nome invertido.';
+$labels['setexist'] = 'O conjunto já existe.';
+$labels['nodata'] = 'Deve selecionar pelo menos uma posição.';
 
-?>
\ No newline at end of file
diff --git a/plugins/managesieve/localization/ru_RU.inc b/plugins/managesieve/localization/ru_RU.inc
index 68aa411a8..aaadc4f32 100644
--- a/plugins/managesieve/localization/ru_RU.inc
+++ b/plugins/managesieve/localization/ru_RU.inc
@@ -1,22 +1,20 @@
 <?php
-/*
-
-+-----------------------------------------------------------------------+
-| plugins/managesieve/localization/ru_RU.inc                            |
-|                                                                       |
-| Russian translation for roundcube/managesieve plugin                  |
-| Copyright (C) 2008-2011                                               |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Sergey Dukachev <iam@dukess.ru>                               |
-| Updates: Sergey Dukachev <iam@dukess.ru>                              |
-+-----------------------------------------------------------------------+
-
-@version 2011-05-11
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ru_RU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Nkolay Parukhin <parukhin@gmail.com>                          |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
+$labels = array();
 $labels['filters'] = 'Фильтры';
 $labels['managefilters'] = 'Управление фильтрами для входящей почты';
 $labels['filtername'] = 'Название фильтра';
@@ -54,13 +52,15 @@ $labels['recipient'] = 'Получатель';
 $labels['vacationaddresses'] = 'Список дополнительных адресов получателя (разделённых запятыми):';
 $labels['vacationdays'] = 'Как часто отправлять сообщения (в днях):';
 $labels['vacationreason'] = 'Текст сообщения (причина отсутствия):';
+$labels['vacationsubject'] = 'Тема сообщения:';
 $labels['rulestop'] = 'Закончить выполнение';
+$labels['enable'] = 'Включить/Выключить';
 $labels['filterset'] = 'Набор фильтров';
+$labels['filtersets'] = 'Наборы фильтров';
 $labels['filtersetadd'] = 'Добавить набор фильтров';
 $labels['filtersetdel'] = 'Удалить текущий набор фильтров';
 $labels['filtersetact'] = 'Включить текущий набор фильтров';
 $labels['filtersetdeact'] = 'Отключить текущий набор фильтров';
-$labels['filtersetget'] = 'Скачать набор фильтров в виде текста';
 $labels['filterdef'] = 'Описание фильтра';
 $labels['filtersetname'] = 'Название набора фильтров';
 $labels['newfilterset'] = 'Новый набор фильтров';
@@ -89,29 +89,40 @@ $labels['flagdeleted'] = 'Удалено';
 $labels['flaganswered'] = 'Отвечено';
 $labels['flagflagged'] = 'Помечено';
 $labels['flagdraft'] = 'Черновик';
+$labels['filtercreate'] = 'Создать фильтр';
+$labels['usedata'] = 'Использовать следующие данные в фильтре:';
+$labels['nextstep'] = 'Далее';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Дополнительные параметры';
+$labels['body'] = 'Тело письма';
+$labels['address'] = 'адрес';
+$labels['envelope'] = 'конверт';
+$labels['text'] = 'текст';
+$labels['contenttype'] = 'тип содержимого';
+$labels['modtype'] = 'тип:';
+$labels['allparts'] = 'все';
+$labels['domain'] = 'домен';
+$labels['user'] = 'пользователь';
+$labels['default'] = 'по умолчанию';
+$labels['filterunknownerror'] = 'Неизвестная ошибка сервера';
+$labels['filterconnerror'] = 'Невозможно подсоединится к серверу фильтров';
+$labels['filterdeleteerror'] = 'Невозможно удалить фильтр. Ошибка сервера';
+$labels['filterdeleted'] = 'Фильтр успешно удалён';
+$labels['filtersaved'] = 'Фильтр успешно сохранён';
+$labels['filtersaveerror'] = 'Невозможно сохранить фильтр. Ошибка сервера';
+$labels['filterdeleteconfirm'] = 'Вы действительно хотите удалить фильтр?';
+$labels['ruledeleteconfirm'] = 'Вы уверенны, что хотите удалить это правило?';
+$labels['actiondeleteconfirm'] = 'Вы уверенны, что хотите удалить это действие?';
+$labels['forbiddenchars'] = 'Недопустимые символы в поле';
+$labels['cannotbeempty'] = 'Поле не может быть пустым';
+$labels['setactivateerror'] = 'Невозможно включить выбранный набор фильтров. Ошибка сервера';
+$labels['setdeactivateerror'] = 'Невозможно отключить выбранный набор фильтров. Ошибка сервера';
+$labels['setdeleteerror'] = 'Невозможно удалить выбранный набор фильтров. Ошибка сервера';
+$labels['setactivated'] = 'Набор фильтров успешно включён';
+$labels['setdeactivated'] = 'Набор фильтров успешно отключён';
+$labels['setdeleted'] = 'Набор фильтров успешно удалён';
+$labels['setdeleteconfirm'] = 'Вы уверены в том, что хотите удалить выбранный набор фильтров?';
+$labels['setcreateerror'] = 'Невозможно создать набор фильтров. Ошибка сервера';
+$labels['setcreated'] = 'Набор фильтров успешно создан';
+$labels['nametoolong'] = 'Невозможно создать набор фильтров. Название слишком длинное';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Неизвестная ошибка сервера';
-$messages['filterconnerror'] = 'Невозможно подсоединится к серверу фильтров';
-$messages['filterdeleteerror'] = 'Невозможно удалить фильтр. Ошибка сервера';
-$messages['filterdeleted'] = 'Фильтр успешно удалён';
-$messages['filterdeleteconfirm'] = 'Вы действительно хотите удалить фильтр?';
-$messages['filtersaved'] = 'Фильтр успешно сохранён';
-$messages['filtersaveerror'] = 'Невозможно сохранить фильтр. Ошибка сервера';
-$messages['ruledeleteconfirm'] = 'Вы уверенны, что хотите удалить это правило?';
-$messages['actiondeleteconfirm'] = 'Вы уверенны, что хотите удалить это действие?';
-$messages['forbiddenchars'] = 'Недопустимые символы в поле';
-$messages['cannotbeempty'] = 'Поле не может быть пустым';
-$messages['setactivateerror'] = 'Невозможно включить выбранный набор фильтров. Ошибка сервера';
-$messages['setdeactivateerror'] = 'Невозможно отключить выбранный набор фильтров. Ошибка сервера';
-$messages['setdeleteerror'] = 'Невозможно удалить выбранный набор фильтров. Ошибка сервера';
-$messages['setactivated'] = 'Набор фильтров успешно включён';
-$messages['setdeactivated'] = 'Набор фильтров успешно отключён';
-$messages['setdeleted'] = 'Набор фильтров успешно удалён';
-$messages['setdeleteconfirm'] = 'Вы уверены в том, что хотите удалить выбранный набор фильтров?';
-$messages['setcreateerror'] = 'Невозможно создать набор фильтров. Ошибка сервера';
-$messages['setcreated'] = 'Набор фильтров успешно создан';
-$messages['emptyname'] = 'Невозможно создать набор фильтров. Название не задано';
-$messages['nametoolong'] = 'Невозможно создать набор фильтров. Название слишком длинное'
-
-?>
diff --git a/plugins/managesieve/localization/sk_SK.inc b/plugins/managesieve/localization/sk_SK.inc
index 89c6a2b49..d08611e3a 100644
--- a/plugins/managesieve/localization/sk_SK.inc
+++ b/plugins/managesieve/localization/sk_SK.inc
@@ -1,12 +1,20 @@
 <?php
 
 /*
- * Slovak translation for roundcube/managesieve plugin
- *
- * @version 1.0
- * (c) 27.06.2010 by Juraj LUTTER <juraj@lutter.sk>
- */
+ +-----------------------------------------------------------------------+
+ | localization/sk_SK/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
 
+$labels = array();
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Správa filtrov príchádzajúcej pošty';
 $labels['filtername'] = 'Názov filtra';
@@ -24,12 +32,18 @@ $labels['filteris'] = 'je';
 $labels['filterisnot'] = 'nie je';
 $labels['filterexists'] = 'existuje';
 $labels['filternotexists'] = 'neexistuje';
+$labels['filtermatches'] = 'vyhovuje výrazu';
+$labels['filternotmatches'] = 'nevyhovuje výrazu';
+$labels['filterregex'] = 'vyhovuje regulárnemu výrazu';
+$labels['filternotregex'] = 'nevyhovuje regulárnemu výrazu';
 $labels['filterunder'] = 'pod';
 $labels['filterover'] = 'nad';
 $labels['addrule'] = 'Pridaj pravidlo';
 $labels['delrule'] = 'Zmaž pravidlo';
 $labels['messagemoveto'] = 'Presuň správu do';
 $labels['messageredirect'] = 'Presmeruj správu na';
+$labels['messagecopyto'] = 'Kopírovať správu do';
+$labels['messagesendcopy'] = 'Poslať kópiu správy';
 $labels['messagereply'] = 'Pošli automatickú odpoveď';
 $labels['messagedelete'] = 'Zmaž správu';
 $labels['messagediscard'] = 'Zmaž a pošli správu na';
@@ -42,13 +56,15 @@ $labels['recipient'] = 'Adresát';
 $labels['vacationaddresses'] = 'Dodatoční príjemcovia správy (oddelení čiarkami):';
 $labels['vacationdays'] = 'Počet dní medzi odoslaním správy:';
 $labels['vacationreason'] = 'Dôvod neprítomnosti:';
+$labels['vacationsubject'] = 'Predmet správy:';
 $labels['rulestop'] = 'Koniec pravidiel';
+$labels['enable'] = 'Povoliť/Zakázať';
 $labels['filterset'] = 'Sada filtrov';
+$labels['filtersets'] = 'Množiny filtrov';
 $labels['filtersetadd'] = 'Pridaj sadu filtrov';
 $labels['filtersetdel'] = 'Zmaž túto sadu filtrov';
 $labels['filtersetact'] = 'Aktivuj túto sadu filtrov';
 $labels['filtersetdeact'] = 'Deaktivuj túto sadu filtrov';
-$labels['filtersetget'] = 'Stiahni definíciu filtrov v textovom súbore';
 $labels['filterdef'] = 'Definícia filtra';
 $labels['filtersetname'] = 'Názov sady filtrov';
 $labels['newfilterset'] = 'Nová sada filtrov';
@@ -57,29 +73,62 @@ $labels['none'] = 'žiadne';
 $labels['fromset'] = 'zo sady';
 $labels['fromfile'] = 'zo súboru';
 $labels['filterdisabled'] = 'Filter zakázaný';
+$labels['countisgreaterthan'] = 'počet je väčší ako';
+$labels['countisgreaterthanequal'] = 'počet je väčší alebo rovný ako';
+$labels['countislessthan'] = 'počet je menší ako';
+$labels['countislessthanequal'] = 'počet je menší alebo rovný ako';
+$labels['countequals'] = 'počet je rovný';
+$labels['countnotequals'] = 'počet sa nerovná';
+$labels['valueisgreaterthan'] = 'hodnota je väčšia ako';
+$labels['valueisgreaterthanequal'] = 'hodnota je väčšia alebo rovná ako';
+$labels['valueislessthan'] = 'hodnota je menšia ako';
+$labels['valueislessthanequal'] = 'hodnota je menšia alebo rovná';
+$labels['valueequals'] = 'hodnota je rovná';
+$labels['valuenotequals'] = 'hodnota je rôzna od';
+$labels['setflags'] = 'Nastaviť príznaky správy';
+$labels['addflags'] = 'Pridať príznak správy';
+$labels['removeflags'] = 'odstrániť príznaky zo správy';
+$labels['flagread'] = 'Prečítaný';
+$labels['flagdeleted'] = 'Zmazané';
+$labels['flaganswered'] = 'Odpovedané';
+$labels['flagflagged'] = 'Označené';
+$labels['flagdraft'] = 'Koncept';
+$labels['filtercreate'] = 'Vytvoriť filter';
+$labels['usedata'] = 'Použiť tieto údaje vo filtri:';
+$labels['nextstep'] = 'Ďalší krok';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Rozšírené nastavenia';
+$labels['body'] = 'Telo';
+$labels['address'] = 'adresa';
+$labels['envelope'] = 'obálka';
+$labels['text'] = 'text';
+$labels['contenttype'] = 'typ obsahu';
+$labels['modtype'] = 'typ:';
+$labels['allparts'] = 'všetko';
+$labels['domain'] = 'doména';
+$labels['localpart'] = 'lokálna časť';
+$labels['user'] = 'užívateľ';
+$labels['detail'] = 'detail';
+$labels['default'] = 'predvolené';
+$labels['filterunknownerror'] = 'Neznáma chyba serveru';
+$labels['filterconnerror'] = 'Nepodarilo sa pripojiť k managesieve serveru';
+$labels['filterdeleteerror'] = 'Nepodarilo sa zmazať filter, server ohlásil chybu';
+$labels['filterdeleted'] = 'Filter bol zmazaný';
+$labels['filtersaved'] = 'Filter bol uložený';
+$labels['filtersaveerror'] = 'Nepodarilo sa uložiť filter, server ohlásil chybu';
+$labels['filterdeleteconfirm'] = 'Naozaj si prajete zmazať tento filter?';
+$labels['ruledeleteconfirm'] = 'Naozaj si prajete zamzať toto pravidlo?';
+$labels['actiondeleteconfirm'] = 'Naozaj si prajete zmazať túto akciu?';
+$labels['forbiddenchars'] = 'Pole obsahuje nepovolené znaky';
+$labels['cannotbeempty'] = 'Pole nemôže byť prázdne';
+$labels['setactivateerror'] = 'Nepodarilo sa aktivovať zvolenú sadu filtrov, server ohlásil chybu';
+$labels['setdeactivateerror'] = 'Nepodarilo sa deaktivovať zvolenú sadu filtrov, server ohlásil chybu';
+$labels['setdeleteerror'] = 'Nepodarilo sa zmazať zvolenú sadu filtrov, server ohlásil chybu';
+$labels['setactivated'] = 'Sada filtrov bola aktivovaná';
+$labels['setdeactivated'] = 'Sada filtrov bola deaktivovaná';
+$labels['setdeleted'] = 'Sada filtrov bola zmazaná';
+$labels['setdeleteconfirm'] = 'Naozaj si prajete zmazať túto sadu filtrov?';
+$labels['setcreateerror'] = 'Nepodarilo sa vytvoriť sadu filtrov, server ohlásil chybu';
+$labels['setcreated'] = 'Sada filtrov bola vytvorená';
+$labels['nametoolong'] = 'Názov sady filtrov je príliš dlhý';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Neznáma chyba serveru';
-$messages['filterconnerror'] = 'Nepodarilo sa pripojiť k managesieve serveru';
-$messages['filterdeleteerror'] = 'Nepodarilo sa zmazať filter, server ohlásil chybu';
-$messages['filterdeleted'] = 'Filter bol zmazaný';
-$messages['filtersaved'] = 'Filter bol uložený';
-$messages['filtersaveerror'] = 'Nepodarilo sa uložiť filter, server ohlásil chybu';
-$messages['filterdeleteconfirm'] = 'Naozaj si prajete zmazať tento filter?';
-$messages['ruledeleteconfirm'] = 'Naozaj si prajete zamzať toto pravidlo?';
-$messages['actiondeleteconfirm'] = 'Naozaj si prajete zmazať túto akciu?';
-$messages['forbiddenchars'] = 'Pole obsahuje nepovolené znaky';
-$messages['cannotbeempty'] = 'Pole nemôže byť prázdne';
-$messages['setactivateerror'] = 'Nepodarilo sa aktivovať zvolenú sadu filtrov, server ohlásil chybu';
-$messages['setdeactivateerror'] = 'Nepodarilo sa deaktivovať zvolenú sadu filtrov, server ohlásil chybu';
-$messages['setdeleteerror'] = 'Nepodarilo sa zmazať zvolenú sadu filtrov, server ohlásil chybu';
-$messages['setactivated'] = 'Sada filtrov bola aktivovaná';
-$messages['setdeactivated'] = 'Sada filtrov bola deaktivovaná';
-$messages['setdeleted'] = 'Sada filtrov bola zmazaná';
-$messages['setdeleteconfirm'] = 'Naozaj si prajete zmazať túto sadu filtrov?';
-$messages['setcreateerror'] = 'Nepodarilo sa vytvoriť sadu filtrov, server ohlásil chybu';
-$messages['setcreated'] = 'Sada filtrov bola vytvorená';
-$messages['emptyname'] = 'Názov sady filtrov nemôže byť prázdny';
-$messages['nametoolong'] = 'Názov sady filtrov je príliš dlhý'
-
-?>
diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc
index ab9ccad66..010332e5f 100644
--- a/plugins/managesieve/localization/sl_SI.inc
+++ b/plugins/managesieve/localization/sl_SI.inc
@@ -1,5 +1,20 @@
 <?php
-	
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sl_SI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['filters'] = 'Pravila';
 $labels['managefilters'] = 'Uredi sporočilna pravila';
 $labels['filtername'] = 'Ime pravila';
@@ -36,18 +51,15 @@ $labels['vacationaddresses'] = 'Dodaten seznam naslovov prejemnikov (ločenih z
 $labels['vacationdays'] = 'Kako pogosto naj bodo sporočila poslana (v dnevih):';
 $labels['vacationreason'] = 'Vsebina sporočila (vzrok za odsotnost):';
 $labels['rulestop'] = 'Prekini z izvajanjem pravil';
+$labels['filterunknownerror'] = 'Prišlo je do neznane napake.';
+$labels['filterconnerror'] = 'Povezave s strežnikom (managesieve) ni bilo mogoče vzpostaviti';
+$labels['filterdeleteerror'] = 'Pravila ni bilo mogoče izbrisati. Prišlo je do napake.';
+$labels['filterdeleted'] = 'Pravilo je bilo uspešno izbrisano.';
+$labels['filtersaved'] = 'Pravilo je bilo uspešno shranjeno';
+$labels['filtersaveerror'] = 'Pravilo ni bilo shranjeno. Prišlo je do napake.';
+$labels['filterdeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
+$labels['ruledeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
+$labels['actiondeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano dejanje?';
+$labels['forbiddenchars'] = 'V polju so neveljavni znaki';
+$labels['cannotbeempty'] = 'Polje ne sme biti prazno';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Prišlo je do neznane napake.';
-$messages['filterconnerror'] = 'Povezave s strežnikom (managesieve) ni bilo mogoče vzpostaviti';
-$messages['filterdeleteerror'] = 'Pravila ni bilo mogoče izbrisati. Prišlo je do napake.';
-$messages['filterdeleted'] = 'Pravilo je bilo uspešno izbrisano.';
-$messages['filterdeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
-$messages['filtersaved'] = 'Pravilo je bilo uspešno shranjeno';
-$messages['filtersaveerror'] = 'Pravilo ni bilo shranjeno. Prišlo je do napake.';
-$messages['ruledeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
-$messages['actiondeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano dejanje?';
-$messages['forbiddenchars'] = 'V polju so neveljavni znaki';
-$messages['cannotbeempty'] = 'Polje ne sme biti prazno';
-
-?>
diff --git a/plugins/managesieve/localization/sv_SE.inc b/plugins/managesieve/localization/sv_SE.inc
index 883525b71..104690c21 100644
--- a/plugins/managesieve/localization/sv_SE.inc
+++ b/plugins/managesieve/localization/sv_SE.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/sv_SE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Administrera filter';
@@ -18,6 +32,10 @@ $labels['filteris'] = 'är lika med';
 $labels['filterisnot'] = 'är inte lika med';
 $labels['filterexists'] = 'finns';
 $labels['filternotexists'] = 'inte finns';
+$labels['filtermatches'] = 'matchar uttryck';
+$labels['filternotmatches'] = 'inte matchar uttryck';
+$labels['filterregex'] = 'matchar reguljärt uttryck';
+$labels['filternotregex'] = 'inte matchar reguljärt uttryck';
 $labels['filterunder'] = 'under';
 $labels['filterover'] = 'över';
 $labels['addrule'] = 'Lägg till regel';
@@ -38,13 +56,15 @@ $labels['recipient'] = 'Mottagare';
 $labels['vacationaddresses'] = 'Ytterligare mottagaradresser (avdelade med kommatecken)';
 $labels['vacationdays'] = 'Antal dagar mellan auto-svar:';
 $labels['vacationreason'] = 'Meddelande i auto-svar:';
+$labels['vacationsubject'] = 'Meddelandeämne:';
 $labels['rulestop'] = 'Avsluta filtrering';
+$labels['enable'] = 'Aktivera/inaktivera';
 $labels['filterset'] = 'Filtergrupp';
+$labels['filtersets'] = 'Filtergrupper';
 $labels['filtersetadd'] = 'Lägg till filtergrupp';
 $labels['filtersetdel'] = 'Ta bort filtergrupp';
 $labels['filtersetact'] = 'Aktivera filtergrupp';
 $labels['filtersetdeact'] = 'Deaktivera filtergrupp';
-$labels['filtersetget'] = 'Exportera filtergrupp i textformat';
 $labels['filterdef'] = 'Filterdefinition';
 $labels['filtersetname'] = 'Filtergruppsnamn';
 $labels['newfilterset'] = 'Ny filtergrupp';
@@ -65,29 +85,56 @@ $labels['valueislessthan'] = 'värde är mindre än';
 $labels['valueislessthanequal'] = 'värde är mindre än eller lika med';
 $labels['valueequals'] = 'värde är lika med';
 $labels['valuenotequals'] = 'värde är inte lika med';
+$labels['setflags'] = 'Flagga meddelande';
+$labels['addflags'] = 'Lägg till meddelandeflaggor';
+$labels['removeflags'] = 'Ta bort meddelandeflaggor';
+$labels['flagread'] = 'Läst';
+$labels['flagdeleted'] = 'Borttaget';
+$labels['flaganswered'] = 'Besvarat';
+$labels['flagflagged'] = 'Flaggat';
+$labels['flagdraft'] = 'Utkast';
+$labels['filtercreate'] = 'Skapa filter';
+$labels['usedata'] = 'Använd följande information i filtret:';
+$labels['nextstep'] = 'Nästa steg';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Avancerade inställningar';
+$labels['body'] = 'Meddelandeinnehåll';
+$labels['address'] = 'adress';
+$labels['envelope'] = 'kuvert';
+$labels['modifier'] = 'modifierare:';
+$labels['text'] = 'text';
+$labels['undecoded'] = 'obearbetat (rå)';
+$labels['contenttype'] = 'innehållstyp';
+$labels['modtype'] = 'typ:';
+$labels['allparts'] = 'allt';
+$labels['domain'] = 'domän';
+$labels['localpart'] = 'lokal del';
+$labels['user'] = 'användare';
+$labels['detail'] = 'detalj';
+$labels['comparator'] = 'jämförelse:';
+$labels['default'] = 'standard';
+$labels['octet'] = 'strikt (oktalt)';
+$labels['asciicasemap'] = 'teckenlägesokänslig (ascii-casemap)';
+$labels['asciinumeric'] = 'numerisk (ascii-numeric)';
+$labels['filterunknownerror'] = 'Okänt serverfel';
+$labels['filterconnerror'] = 'Anslutning till serverns filtertjänst misslyckades';
+$labels['filterdeleteerror'] = 'Filtret kunde inte tas bort på grund av serverfel';
+$labels['filterdeleted'] = 'Filtret är borttaget';
+$labels['filtersaved'] = 'Filtret har sparats';
+$labels['filtersaveerror'] = 'Filtret kunde inte sparas på grund av serverfel';
+$labels['filterdeleteconfirm'] = 'Vill du ta bort det markerade filtret?';
+$labels['ruledeleteconfirm'] = 'Vill du ta bort filterregeln?';
+$labels['actiondeleteconfirm'] = 'Vill du ta bort filteråtgärden?';
+$labels['forbiddenchars'] = 'Otillåtet tecken i fältet';
+$labels['cannotbeempty'] = 'Fältet kan inte lämnas tomt';
+$labels['setactivateerror'] = 'Filtergruppen kunde inte aktiveras på grund av serverfel';
+$labels['setdeactivateerror'] = 'Filtergruppen kunde inte deaktiveras på grund av serverfel';
+$labels['setdeleteerror'] = 'Filtergruppen kunde inte tas bort på grund av serverfel';
+$labels['setactivated'] = 'Filtergruppen är aktiverad';
+$labels['setdeactivated'] = 'Filtergruppen är deaktiverad';
+$labels['setdeleted'] = 'Filtergruppen är borttagen';
+$labels['setdeleteconfirm'] = 'Vill du ta bort filtergruppen?';
+$labels['setcreateerror'] = 'Filtergruppen kunde inte läggas till på grund av serverfel';
+$labels['setcreated'] = 'Filtergruppen har lagts till';
+$labels['nametoolong'] = 'Filtergruppen kan inte läggas till med för långt namn';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Okänt serverfel';
-$messages['filterconnerror'] = 'Anslutning till serverns filtertjänst misslyckades';
-$messages['filterdeleteerror'] = 'Filtret kunde inte tas bort på grund av serverfel';
-$messages['filterdeleted'] = 'Filtret är borttaget';
-$messages['filtersaved'] = 'Filtret har sparats';
-$messages['filtersaveerror'] = 'Filtret kunde inte sparas på grund av serverfel';
-$messages['filterdeleteconfirm'] = 'Vill du ta bort det markerade filtret?';
-$messages['ruledeleteconfirm'] = 'Vill du ta bort filterregeln?';
-$messages['actiondeleteconfirm'] = 'Vill du ta bort filteråtgärden?';
-$messages['forbiddenchars'] = 'Otillåtet tecken i fältet';
-$messages['cannotbeempty'] = 'Fältet kan inte lämnas tomt';
-$messages['setactivateerror'] = 'Filtergruppen kunde inte aktiveras på grund av serverfel';
-$messages['setdeactivateerror'] = 'Filtergruppen kunde inte deaktiveras på grund av serverfel';
-$messages['setdeleteerror'] = 'Filtergruppen kunde inte tas bort på grund av serverfel';
-$messages['setactivated'] = 'Filtergruppen är aktiverad';
-$messages['setdeactivated'] = 'Filtergruppen är deaktiverad';
-$messages['setdeleted'] = 'Filtergruppen är borttagen';
-$messages['setdeleteconfirm'] = 'Vill du ta bort filtergruppen?';
-$messages['setcreateerror'] = 'Filtergruppen kunde inte läggas till på grund av serverfel';
-$messages['setcreated'] = 'Filtergruppen har lagts till';
-$messages['emptyname'] = 'Filtergruppen kan inte läggas till utan namn';
-$messages['nametoolong'] = 'Filtergruppen kan inte läggas till med för långt namn';
-
-?>
diff --git a/plugins/managesieve/localization/uk_UA.inc b/plugins/managesieve/localization/uk_UA.inc
index 9a62af975..76ee7f96b 100644
--- a/plugins/managesieve/localization/uk_UA.inc
+++ b/plugins/managesieve/localization/uk_UA.inc
@@ -1,5 +1,19 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/uk_UA/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['filters'] = 'Фільтри';
 $labels['managefilters'] = 'Керування фільтрами вхідної пошти';
@@ -41,7 +55,6 @@ $labels['filterset'] = 'Набір фільтрів';
 $labels['filtersetadd'] = 'Додати набір фільтрів';
 $labels['filtersetdel'] = 'Видалити поточний набір';
 $labels['filtersetact'] = 'Активувати поточний набір';
-$labels['filtersetget'] = 'Зберегти набір у текстовому форматі';
 $labels['filterdef'] = 'Параметри фільтру';
 $labels['filtersetname'] = 'Назва набору фільтрів';
 $labels['newfilterset'] = 'Новий набір фільтрів';
@@ -50,27 +63,23 @@ $labels['none'] = 'нічого';
 $labels['fromset'] = 'з набору';
 $labels['fromfile'] = 'з файлу';
 $labels['filterdisabled'] = 'Фільтр вимкнено';
+$labels['filterunknownerror'] = 'Невідома помилка сервера';
+$labels['filterconnerror'] = 'Неможливо з\'єднатися з сервером';
+$labels['filterdeleteerror'] = 'Неможливо видалити фільтр. Помилка сервера';
+$labels['filterdeleted'] = 'Фільтр успішно видалено';
+$labels['filtersaved'] = 'Фільтр успішно збережено';
+$labels['filtersaveerror'] = 'Неможливо зберегти фільтр. Помилка сервера';
+$labels['filterdeleteconfirm'] = 'Ви дійсно хочете видалити обраний фільтр?';
+$labels['ruledeleteconfirm'] = 'Ви дійсно хочете видалити обране правило?';
+$labels['actiondeleteconfirm'] = 'Ви дійсно хочете видалити обрану дію?';
+$labels['forbiddenchars'] = 'Введено заборонений символ';
+$labels['cannotbeempty'] = 'Поле не може бути пустим';
+$labels['setactivateerror'] = 'Неможливо активувати обраний набір. Помилка сервера';
+$labels['setdeleteerror'] = 'Неможливо видалити обраний набір. Помилка сервера';
+$labels['setactivated'] = 'Набір фільтрів активовано успішно';
+$labels['setdeleted'] = 'Набір фільтрів видалено успішно';
+$labels['setdeleteconfirm'] = 'Ви впевнені, що хочете видалити обраний набір?';
+$labels['setcreateerror'] = 'Не вдалося створити набір. Помилка сервера';
+$labels['setcreated'] = 'Набір фільтрів створено успішно';
+$labels['nametoolong'] = 'Не вдалося створити набір. Занадто довга назва';
 
-$messages = array();
-$messages['filterunknownerror'] = 'Невідома помилка сервера';
-$messages['filterconnerror'] = 'Неможливо з\'єднатися з сервером';
-$messages['filterdeleteerror'] = 'Неможливо видалити фільтр. Помилка сервера';
-$messages['filterdeleted'] = 'Фільтр успішно видалено';
-$messages['filtersaved'] = 'Фільтр успішно збережено';
-$messages['filtersaveerror'] = 'Неможливо зберегти фільтр. Помилка сервера';
-$messages['filterdeleteconfirm'] = 'Ви дійсно хочете видалити обраний фільтр?';
-$messages['ruledeleteconfirm'] = 'Ви дійсно хочете видалити обране правило?';
-$messages['actiondeleteconfirm'] = 'Ви дійсно хочете видалити обрану дію?';
-$messages['forbiddenchars'] = 'Введено заборонений символ';
-$messages['cannotbeempty'] = 'Поле не може бути пустим';
-$messages['setactivateerror'] = 'Неможливо активувати обраний набір. Помилка сервера';
-$messages['setdeleteerror'] = 'Неможливо видалити обраний набір. Помилка сервера';
-$messages['setactivated'] = 'Набір фільтрів активовано успішно';
-$messages['setdeleted'] = 'Набір фільтрів видалено успішно';
-$messages['setdeleteconfirm'] = 'Ви впевнені, що хочете видалити обраний набір?';
-$messages['setcreateerror'] = 'Не вдалося створити набір. Помилка сервера';
-$messages['setcreated'] = 'Набір фільтрів створено успішно';
-$messages['emptyname'] = 'Не вдалося створити набір. Введіть назву набору';
-$messages['nametoolong'] = 'Не вдалося створити набір. Занадто довга назва'
-
-?>
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index a31a67d33..ac4afd190 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_CN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['filters'] = '过滤器';
 $labels['managefilters'] = '管理邮件过滤器';
 $labels['filtername'] = '过滤器名称';
@@ -17,12 +32,18 @@ $labels['filteris'] = '等于';
 $labels['filterisnot'] = '不等于';
 $labels['filterexists'] = '存在';
 $labels['filternotexists'] = '不存在';
+$labels['filtermatches'] = '匹配表达式';
+$labels['filternotmatches'] = '无匹配的表达式';
+$labels['filterregex'] = '匹配正则表达式';
+$labels['filternotregex'] = '无匹配的正则表达式';
 $labels['filterunder'] = '小于';
 $labels['filterover'] = '大于';
 $labels['addrule'] = '添加规则';
 $labels['delrule'] = '删除规则';
 $labels['messagemoveto'] = '将邮件移动到';
 $labels['messageredirect'] = '将邮件转发到';
+$labels['messagecopyto'] = '复制邮件至';
+$labels['messagesendcopy'] = '发送复制邮件至';
 $labels['messagereply'] = '回复以下信息';
 $labels['messagedelete'] = '删除邮件';
 $labels['messagediscard'] = '丢弃邮件并回复以下信息';
@@ -32,18 +53,78 @@ $labels['add'] = '添加';
 $labels['del'] = '删除';
 $labels['sender'] = '发件人';
 $labels['recipient'] = '收件人';
+$labels['vacationaddresses'] = '收件人地址的附加名单（以逗号分隔）';
+$labels['vacationdays'] = '平常如何发送邮件（天数）：';
+$labels['vacationreason'] = '邮件主体（休假原因）';
+$labels['vacationsubject'] = '邮件主题';
+$labels['rulestop'] = '停止评价规则';
+$labels['enable'] = '启用/禁用';
+$labels['filterset'] = '过滤器设置';
+$labels['filtersets'] = '过滤器设置集';
+$labels['filtersetadd'] = '增加过滤器设置集';
+$labels['filtersetdel'] = '删除当前的过滤器设置集';
+$labels['filtersetact'] = '激活当前的过滤器设置集';
+$labels['filtersetdeact'] = '停用当前的过滤器设置集';
+$labels['filterdef'] = '过滤器定义';
+$labels['filtersetname'] = '过滤器集的名称';
+$labels['newfilterset'] = '新的过滤器集';
+$labels['active'] = '活动';
+$labels['none'] = '无';
+$labels['fromset'] = '从设置';
+$labels['fromfile'] = '从文件';
+$labels['filterdisabled'] = '禁用过滤器';
+$labels['countisgreaterthan'] = '计数大于';
+$labels['countisgreaterthanequal'] = '计数大于或等于';
+$labels['countislessthan'] = '计数小于';
+$labels['countislessthanequal'] = '计数小于或等于';
+$labels['countequals'] = '计数等于';
+$labels['countnotequals'] = '计数不等于';
+$labels['valueisgreaterthan'] = '值大于';
+$labels['valueisgreaterthanequal'] = '值大于或等于';
+$labels['valueislessthan'] = '值小于';
+$labels['valueislessthanequal'] = '值小于或等于';
+$labels['valueequals'] = '值等于';
+$labels['valuenotequals'] = '值不等于';
+$labels['setflags'] = '设定邮件的标识';
+$labels['addflags'] = '增加邮件的标识';
+$labels['removeflags'] = '删除邮件的标识';
+$labels['flagread'] = '阅读';
+$labels['flagdeleted'] = '删除';
+$labels['flaganswered'] = '已答复';
+$labels['flagflagged'] = '已标记';
+$labels['flagdraft'] = '草稿';
+$labels['filtercreate'] = '创建过滤器';
+$labels['usedata'] = '在过滤器中使用以下数据';
+$labels['nextstep'] = '下一步';
+$labels['...'] = '……';
+$labels['advancedopts'] = '高级选项';
+$labels['body'] = '正文';
+$labels['address'] = '地址';
+$labels['envelope'] = '信封';
+$labels['modifier'] = '修饰符：';
+$labels['text'] = '文本';
+$labels['undecoded'] = '未解码（RAW）';
+$labels['contenttype'] = '内容类型';
+$labels['modtype'] = '类型：';
+$labels['allparts'] = '全部';
+$labels['domain'] = '域';
+$labels['localpart'] = '本地部份';
+$labels['user'] = '用户';
+$labels['detail'] = '细节';
+$labels['comparator'] = '比较：';
+$labels['default'] = '默认';
+$labels['octet'] = '严格的（字节）';
+$labels['asciicasemap'] = '不区分大小写（ascii字符）';
+$labels['asciinumeric'] = '数字（ascii数字）';
+$labels['filterunknownerror'] = '未知的服务器错误';
+$labels['filterconnerror'] = '无法连接到 managesieve 服务器';
+$labels['filterdeleteerror'] = '无法删除过滤器。服务器错误';
+$labels['filterdeleted'] = '过滤器已成功删除';
+$labels['filtersaved'] = '过滤器已成功保存。';
+$labels['filtersaveerror'] = '无法保存过滤器。服务器错误';
+$labels['filterdeleteconfirm'] = '您确定要删除所选择的过滤器吗？';
+$labels['ruledeleteconfirm'] = '您确定要删除所选择的规则吗？';
+$labels['actiondeleteconfirm'] = '您确定要删除所选择的动作吗？';
+$labels['forbiddenchars'] = '内容中包含禁用的字符';
+$labels['cannotbeempty'] = '内容不能为空';
 
-$messages = array();
-$messages['filterunknownerror'] = '未知的服务器错误';
-$messages['filterconnerror'] = '无法连接到 managesieve 服务器';
-$messages['filterdeleteerror'] = '无法删除过滤器。服务器错误';
-$messages['filterdeleted'] = '过滤器已成功删除';
-$messages['filterdeleteconfirm'] = '您确定要删除所选择的过滤器吗？';
-$messages['filtersaved'] = '过滤器已成功保存。';
-$messages['filtersaveerror'] = '无法保存过滤器。服务器错误';
-$messages['ruledeleteconfirm'] = '您确定要删除所选择的规则吗？';
-$messages['actiondeleteconfirm'] = '您确定要删除所选择的动作吗？';
-$messages['forbiddenchars'] = '内容中包含禁用的字符';
-$messages['cannotbeempty'] = '内容不能为空';
-
-?>
diff --git a/plugins/managesieve/localization/zh_TW.inc b/plugins/managesieve/localization/zh_TW.inc
index 8ab37d264..10a547ad7 100644
--- a/plugins/managesieve/localization/zh_TW.inc
+++ b/plugins/managesieve/localization/zh_TW.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_TW/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Nansen <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['filters'] = '篩選器';
 $labels['managefilters'] = '設定篩選器';
 $labels['filtername'] = '篩選器名稱';
@@ -17,12 +32,18 @@ $labels['filteris'] = '等於';
 $labels['filterisnot'] = '不等於';
 $labels['filterexists'] = '存在';
 $labels['filternotexists'] = '不存在';
+$labels['filtermatches'] = '符合表達式';
+$labels['filternotmatches'] = '不符合表達式';
+$labels['filterregex'] = '符合正規表達式';
+$labels['filternotregex'] = '不符合正規表達式';
 $labels['filterunder'] = '小於';
 $labels['filterover'] = '大於';
 $labels['addrule'] = '新增規則';
 $labels['delrule'] = '刪除規則';
 $labels['messagemoveto'] = '將信件移至';
 $labels['messageredirect'] = '將信件轉寄至';
+$labels['messagecopyto'] = '複製訊息至';
+$labels['messagesendcopy'] = '寄送訊息複本至';
 $labels['messagereply'] = '以下列內容回覆';
 $labels['messagedelete'] = '刪除信件';
 $labels['messagediscard'] = '刪除信件並以下列內容回覆';
@@ -35,13 +56,14 @@ $labels['recipient'] = '收件者';
 $labels['vacationaddresses'] = '其他收件者（用半形逗號隔開）：';
 $labels['vacationdays'] = '多久回覆一次（單位：天）：';
 $labels['vacationreason'] = '信件內容（休假原因）：';
+$labels['vacationsubject'] = '訊息主旨:';
 $labels['rulestop'] = '停止評估規則';
+$labels['enable'] = '啟用/停用';
 $labels['filterset'] = '篩選器集合';
 $labels['filtersetadd'] = '加入篩選器集合';
 $labels['filtersetdel'] = '刪除目前的篩選器集合';
 $labels['filtersetact'] = '啟用目前的篩選器集合';
 $labels['filtersetdeact'] = '停用目前的篩選器集合';
-$labels['filtersetget'] = '以純文字下載篩選器集合';
 $labels['filterdef'] = '篩選器定義';
 $labels['filtersetname'] = '篩選器集合名稱';
 $labels['newfilterset'] = '建立篩選器集合';
@@ -50,29 +72,58 @@ $labels['none'] = '無';
 $labels['fromset'] = '從集合';
 $labels['fromfile'] = '重檔案';
 $labels['filterdisabled'] = '篩選器已停用';
+$labels['countislessthanequal'] = '數量小於或等於';
+$labels['countequals'] = '數量等於';
+$labels['countnotequals'] = '數量不等於';
+$labels['valueisgreaterthan'] = '值大於';
+$labels['valueisgreaterthanequal'] = '值大於等於';
+$labels['valueislessthan'] = '值小於';
+$labels['valueislessthanequal'] = '值小於或等於';
+$labels['valueequals'] = '值等於';
+$labels['valuenotequals'] = '值不等於';
+$labels['setflags'] = '設定標幟';
+$labels['addflags'] = '新增標記到訊息';
+$labels['removeflags'] = '移除訊息標記';
+$labels['flagread'] = '讀取';
+$labels['flagdeleted'] = '刪除';
+$labels['flagflagged'] = '已加標記的郵件';
+$labels['flagdraft'] = '草稿';
+$labels['filtercreate'] = '建立郵件規則';
+$labels['usedata'] = '於規則中使用轉寄時間';
+$labels['nextstep'] = '下一步';
+$labels['...'] = '…';
+$labels['advancedopts'] = '進階選項';
+$labels['body'] = '內文';
+$labels['address'] = '郵件位址';
+$labels['text'] = '文字';
+$labels['undecoded'] = '未解碼(raw)';
+$labels['modtype'] = '型態：';
+$labels['allparts'] = '全部';
+$labels['domain'] = '網域';
+$labels['localpart'] = '本機連接埠';
+$labels['user'] = '使用者';
+$labels['detail'] = '細節';
+$labels['default'] = '預設';
+$labels['filterunknownerror'] = '未知的伺服器錯誤';
+$labels['filterconnerror'] = '無法與伺服器連線';
+$labels['filterdeleteerror'] = '無法刪除篩選器。發生伺服器錯誤';
+$labels['filterdeleted'] = '成功刪除篩選器';
+$labels['filtersaved'] = '成功儲存篩選器。';
+$labels['filtersaveerror'] = '無法儲存篩選器。發生伺服器錯誤';
+$labels['filterdeleteconfirm'] = '您確定要刪除選擇的郵件規則嗎?';
+$labels['ruledeleteconfirm'] = '您確定要刪除選的規則嗎？';
+$labels['actiondeleteconfirm'] = '您確定要刪除選擇的動作嗎？';
+$labels['forbiddenchars'] = '內容包含禁用字元';
+$labels['cannotbeempty'] = '內容不能為空白';
+$labels['ruleexist'] = '規則名稱重複';
+$labels['setactivateerror'] = '無法啟用選擇的篩選器集合。 伺服器發生錯誤';
+$labels['setdeactivateerror'] = '無法停用選擇的篩選器集合。 伺服器發生錯誤';
+$labels['setdeleteerror'] = '無法刪除選擇的篩選器集合。 伺服器發生錯誤';
+$labels['setactivated'] = '篩選器集合成功啟用';
+$labels['setdeactivated'] = '篩選器集合成功停用';
+$labels['setdeleted'] = '篩選器集合成功刪除';
+$labels['setdeleteconfirm'] = '你確定要刪除選擇的篩選器集合嗎？';
+$labels['setcreateerror'] = '無法建立篩選器集合。 伺服器發生錯誤';
+$labels['setcreated'] = '篩選器集合成功建立';
+$labels['nametoolong'] = '無法建立篩選器集合。 名稱太長';
 
-$messages = array();
-$messages['filterunknownerror'] = '未知的伺服器錯誤';
-$messages['filterconnerror'] = '無法與伺服器連線';
-$messages['filterdeleteerror'] = '無法刪除篩選器。發生伺服器錯誤';
-$messages['filterdeleted'] = '成功刪除篩選器';
-$messages['filterconfirmdelete'] = '您確定要刪除選擇的篩選器嗎？';
-$messages['filtersaved'] = '成功儲存篩選器。';
-$messages['filtersaveerror'] = '無法儲存篩選器。發生伺服器錯誤';
-$messages['ruledeleteconfirm'] = '您確定要刪除選的規則嗎？';
-$messages['actiondeleteconfirm'] = '您確定要刪除選擇的動作嗎？';
-$messages['forbiddenchars'] = '內容包含禁用字元';
-$messages['cannotbeempty'] = '內容不能為空白';
-$messages['setactivateerror'] = '無法啟用選擇的篩選器集合。 伺服器發生錯誤';
-$messages['setdeactivateerror'] = '無法停用選擇的篩選器集合。 伺服器發生錯誤';
-$messages['setdeleteerror'] = '無法刪除選擇的篩選器集合。 伺服器發生錯誤';
-$messages['setactivated'] = '篩選器集合成功啟用';
-$messages['setdeactivated'] = '篩選器集合成功停用';
-$messages['setdeleted'] = '篩選器集合成功刪除';
-$messages['setdeleteconfirm'] = '你確定要刪除選擇的篩選器集合嗎？';
-$messages['setcreateerror'] = '無法建立篩選器集合。 伺服器發生錯誤';
-$messages['setcreated'] = '篩選器集合成功建立';
-$messages['emptyname'] = '無法建立篩選器集合。 集合名稱空白';
-$messages['nametoolong'] = '無法建立篩選器集合。 名稱太長'
-
-?>
diff --git a/plugins/new_user_dialog/localization/bg_BG.inc b/plugins/new_user_dialog/localization/bg_BG.inc
index 9dc04529f..9575daa49 100644
--- a/plugins/new_user_dialog/localization/bg_BG.inc
+++ b/plugins/new_user_dialog/localization/bg_BG.inc
@@ -1,7 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/bg_BG/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['identitydialogtitle'] = 'Моля попълнете Вашите данни.';
 $labels['identitydialoghint'] = 'Това съобщение се появява само при първото влизане.';
 
-?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/pt_PT.inc b/plugins/new_user_dialog/localization/pt_PT.inc
index 64e3e6a80..7b920a485 100644
--- a/plugins/new_user_dialog/localization/pt_PT.inc
+++ b/plugins/new_user_dialog/localization/pt_PT.inc
@@ -1,7 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_PT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: David <Unknown>                                               |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
-$labels['identitydialogtitle'] = 'Por favor complete a sua identidade';
-$labels['identitydialoghint'] = 'Esta caixa aparece apenas uma vez no primeiro login.';
+$labels['identitydialogtitle'] = 'Por favor, complete a sua identidade';
+$labels['identitydialoghint'] = 'Esta caixa aparece apenas uma vez no primeiro acesso.';
 
-?>
diff --git a/plugins/new_user_dialog/localization/ru_RU.inc b/plugins/new_user_dialog/localization/ru_RU.inc
index d1eb28e71..723899602 100644
--- a/plugins/new_user_dialog/localization/ru_RU.inc
+++ b/plugins/new_user_dialog/localization/ru_RU.inc
@@ -1,7 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ru_RU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
 $labels = array();
 $labels['identitydialogtitle'] = 'Пожалуйста, укажите Ваше имя.';
 $labels['identitydialoghint'] = 'Данное сообщение отображается только при первом входе.';
 
-?>
diff --git a/plugins/newmail_notifier/localization/de_CH.inc b/plugins/newmail_notifier/localization/de_CH.inc
index 55cfd7136..4ce6134d1 100644
--- a/plugins/newmail_notifier/localization/de_CH.inc
+++ b/plugins/newmail_notifier/localization/de_CH.inc
@@ -1,8 +1,23 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_CH/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['basic'] = 'Anzeige im Browser bei neuer Nachricht';
-$labels['sound'] = 'Akustische Meldung bei neuer Nachricht';
 $labels['desktop'] = 'Desktop-Benachrichtigung bei neuer Nachricht';
+$labels['sound'] = 'Akustische Meldung bei neuer Nachricht';
 $labels['test'] = 'Test';
 $labels['title'] = 'Neue E-Mail!';
 $labels['body'] = 'Sie haben eine neue Nachricht';
@@ -10,4 +25,3 @@ $labels['testbody'] = 'Dies ist eine Testbenachrichtigung';
 $labels['desktopdisabled'] = 'Desktop-Benachrichtigungen sind deaktiviert.';
 $labels['desktopunsupported'] = 'Ihr Browser unterstützt keine Desktop-Benachrichtigungen.';
 
-?>
diff --git a/plugins/newmail_notifier/localization/de_DE.inc b/plugins/newmail_notifier/localization/de_DE.inc
index 65381ca35..f49eb4929 100644
--- a/plugins/newmail_notifier/localization/de_DE.inc
+++ b/plugins/newmail_notifier/localization/de_DE.inc
@@ -1,8 +1,23 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/de_DE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['basic'] = 'Benachrichtigung im Browser bei neuer Nachricht';
-$labels['sound'] = 'Akustische Meldung bei neuer Nachricht';
 $labels['desktop'] = 'Desktop-Benachrichtigung bei neuer Nachricht';
+$labels['sound'] = 'Akustische Meldung bei neuer Nachricht';
 $labels['test'] = 'Test';
 $labels['title'] = 'Neue E-Mail!';
 $labels['body'] = 'Sie haben eine neue Nachricht';
@@ -10,4 +25,3 @@ $labels['testbody'] = 'Dies ist eine Testbenachrichtigung';
 $labels['desktopdisabled'] = 'Desktop-Benachrichtigungen sind deaktiviert.';
 $labels['desktopunsupported'] = 'Ihr Browser unterstützt keine Desktop-Benachrichtigungen.';
 
-?>
diff --git a/plugins/newmail_notifier/localization/lv_LV.inc b/plugins/newmail_notifier/localization/lv_LV.inc
index bab30f5ef..0459d723b 100644
--- a/plugins/newmail_notifier/localization/lv_LV.inc
+++ b/plugins/newmail_notifier/localization/lv_LV.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/lv_LV/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['basic'] = 'Attēlot paziņojumu pie jaunas vēstules saņemšanas';
 $labels['desktop'] = 'Attēlot darbvirsmas paziņojumu pie jaunas vēstules saņemšanas';
 $labels['sound'] = 'Atskaņot skaņas signālu pie jaunas vēstules saņemšanas';
@@ -10,4 +25,3 @@ $labels['testbody'] = 'Šis ir testa paziņojums.';
 $labels['desktopdisabled'] = 'Darbvirsmas paziņojumi ir atslēgti Jūsu pārlūkprogrammā.';
 $labels['desktopunsupported'] = 'Jūsu pārlūkprogramma neatbalsta darbvirsmas paziņojumus.';
 
-?>
diff --git a/plugins/newmail_notifier/localization/pl_PL.inc b/plugins/newmail_notifier/localization/pl_PL.inc
index d95e658af..711dcc550 100644
--- a/plugins/newmail_notifier/localization/pl_PL.inc
+++ b/plugins/newmail_notifier/localization/pl_PL.inc
@@ -1,8 +1,23 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pl_PL/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['basic'] = 'Wyświetlaj powiadomienia o nadejściu nowej wiadomości w przeglądarce';
-$labels['sound'] = 'Odtwarzaj dźwięk o nadejściu nowej wiadomości';
 $labels['desktop'] = 'Wyświetlaj powiadomienia o nadejściu nowej wiadomości na pulpicie';
+$labels['sound'] = 'Odtwarzaj dźwięk o nadejściu nowej wiadomości';
 $labels['test'] = 'Testuj powiadomienie';
 $labels['title'] = 'Nowa wiadomość!';
 $labels['body'] = 'Nadeszła nowa wiadomość.';
@@ -10,4 +25,3 @@ $labels['testbody'] = 'To jest testowe powiadomienie.';
 $labels['desktopdisabled'] = 'Powiadomienia na pulpicie zostały zablokowane w twojej przeglądarce.';
 $labels['desktopunsupported'] = 'Twoja przeglądarka nie obsługuje powiadomień na pulpicie.';
 
-?>
diff --git a/plugins/newmail_notifier/localization/pt_BR.inc b/plugins/newmail_notifier/localization/pt_BR.inc
index 66f8e936e..600a3ff1a 100644
--- a/plugins/newmail_notifier/localization/pt_BR.inc
+++ b/plugins/newmail_notifier/localization/pt_BR.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/pt_BR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
+*/
+
+$labels = array();
 $labels['basic'] = 'Exibir notificação quando uma nova mensagem chegar';
 $labels['desktop'] = 'Exibir notificação no desktop quando uma nova mensagem chegar';
 $labels['sound'] = 'Alerta sonoro quando uma nova mensagem chegar';
@@ -10,4 +25,3 @@ $labels['testbody'] = 'Essa é uma notificação de teste.';
 $labels['desktopdisabled'] = 'As notificações no desktop estão desabilitadas no seu navegador.';
 $labels['desktopunsupported'] = 'Seu navegador não suporta notificações no desktop';
 
-?>
diff --git a/plugins/newmail_notifier/localization/ru_RU.inc b/plugins/newmail_notifier/localization/ru_RU.inc
index 65abb7437..b95a60bf7 100644
--- a/plugins/newmail_notifier/localization/ru_RU.inc
+++ b/plugins/newmail_notifier/localization/ru_RU.inc
@@ -1,21 +1,27 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/ru_RU/labels.inc                                             |
-|                                                                       |
-| Language file of the RoundCube Webmail client                         |
-| Copyright (C) 2008-2011, RoundQube Dev. - Switzerland                 |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author:        Doubrovine S.                                          |
-+-----------------------------------------------------------------------+
-
+ +-----------------------------------------------------------------------+
+ | localization/ru_RU/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
-$labels['basic'] = 'Визуальное уведомление по приходу нового сообщения';
-$labels['sound'] = 'Звуковое уведомление по приходу нового сообщения';
+$labels['basic'] = 'Показывать в браузере уведомление о приходе нового сообщения';
+$labels['desktop'] = 'Показывать на рабочем столе уведомление о приходе нового сообщения';
+$labels['sound'] = 'Подавать звуковой сигнал о приходе нового сообщения';
+$labels['test'] = 'Проверить';
+$labels['title'] = 'Свежая почта!';
+$labels['body'] = 'Вы получили новое сообщение.';
+$labels['testbody'] = 'Это тестовое уведомление.';
+$labels['desktopdisabled'] = 'В Вашем браузере отключены уведомления на рабочем столе.';
+$labels['desktopunsupported'] = 'Ваш браузер не поддерживает уведомления на рабочем столе.';
 
-?>
\ No newline at end of file
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 151fe2593..c130f7f39 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -1,20 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/de_CH/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Thomas Bruederli <roundcube@gmail.com>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/de_CH/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -42,8 +39,8 @@ $messages['savingmessage'] = 'Nachricht wird gespeichert...';
 $messages['messagesaved'] = 'Nachricht als Entwurf gespeichert';
 $messages['successfullysaved'] = 'Erfolgreich gespeichert';
 $messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt';
-$messages['contactexists'] = 'Es existiert bereits ein Eintrag mit dieser E-Mail-Adresse';
-$messages['contactnameexists'] = 'Ein Kontakt mit demselben Namen existiert bereits.';
+$messages['contactexists'] = 'Es existiert bereits ein Kontakt mit dieser E-Mail-Adresse.';
+$messages['contactnameexists'] = 'Es existiert bereits ein Kontakt mit diesem Namen';
 $messages['blockedimages'] = 'Um Ihre Privatsphäre zur schützen, wurden externe Bilder blockiert.';
 $messages['encryptedmessage'] = 'Dies ist eine verschlüsselte Nachricht und kann leider nicht angezeigt werden.';
 $messages['nocontactsfound'] = 'Keine Kontakte gefunden';
@@ -51,106 +48,111 @@ $messages['contactnotfound'] = 'Die gewählte Adresse wurde nicht gefunden';
 $messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden';
 $messages['sendingfailed'] = 'Versand der Nachricht fehlgeschlagen';
 $messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht';
-$messages['errorsavingsent'] = 'Ein Fehler ist beim Speichern der gesendeten Nachricht aufgetreten';
+$messages['errorsavingsent'] = 'Beim Speichern der gesendeten Nachricht ist ein Fehler aufgetreten.';
 $messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten';
-$messages['errormoving'] = 'Nachricht konnte nicht verschoben werden';
-$messages['errorcopying'] = 'Konnte Nachrichten nicht kopieren';
-$messages['errordeleting'] = 'Nachricht konnte nicht gelöscht werden';
-$messages['errormarking'] = 'Nachricht konnte nicht markiert werden';
+$messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.';
+$messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.';
+$messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.';
+$messages['errormarking'] = 'Nachricht(en) konnte(n) nicht markiert werden.';
 $messages['deletecontactconfirm'] = 'Wollen Sie die ausgewählten Kontakte wirklich löschen?';
 $messages['deletegroupconfirm'] = 'Wollen Sie die gewählte Gruppe wirklich löschen?';
 $messages['deletemessagesconfirm'] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
 $messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?';
 $messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
+$messages['contactdeleting'] = 'Kontakte werden gelöscht...';
 $messages['groupdeleting'] = 'Gruppe wird gelöscht...';
-$messages['folderdeleting'] = 'Lösche Ordner...';
-$messages['foldermoving'] = 'Verschiebe Ordner...';
-$messages['foldersubscribing'] = 'Abonniere Ordner...';
-$messages['folderunsubscribing'] = 'Ordner abbstellen...';
-$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt';
-$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
-$messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein';
-$messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an';
-$messages['nosenderwarning'] = 'Bitte geben Sie die E-Mail-Adresse des Senders an';
-$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an';
+$messages['folderdeleting'] = 'Order wird gelöscht...';
+$messages['foldermoving'] = 'Ordner wird verschoben...';
+$messages['foldersubscribing'] = 'Ordner wird abonniert...';
+$messages['folderunsubscribing'] = 'Ordner wird abbestellt...';
+$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt.';
+$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein.';
+$messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein.';
+$messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an.';
+$messages['nosenderwarning'] = 'Bitte geben Sie die E-Mail-Adresse des Senders an.';
+$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an.';
 $messages['nosubjectwarning'] = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
-$messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
+$messages['nobodywarning'] = 'Wollen Sie diese Nachricht ohne Inhalt senden?';
 $messages['notsentwarning'] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
 $messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus';
-$messages['nocontactsreturned'] = 'Es wurden keine Kontakte gefunden';
-$messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein';
-$messages['notuploadedwarning'] = 'Es wurden noch nicht alle Dateien hochgeladen. Bitte warten oder Upload abbrechen.';
-$messages['searchsuccessful'] = '$nr Nachrichten gefunden';
-$messages['searchnomatch'] = 'Die Suche lieferte keine Treffer';
+$messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein.';
+$messages['searchsuccessful'] = '$nr Nachrichten gefunden.';
+$messages['contactsearchsuccessful'] = '$nr Kontakte gefunden.';
+$messages['searchnomatch'] = 'Die Suche lieferte keine Treffer.';
 $messages['searching'] = 'Suche...';
-$messages['checking'] = 'Prüfe...';
-$messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden';
-$messages['folderdeleted'] = 'Ordner erfolgreich gelöscht';
-$messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert';
-$messages['folderunsubscribed'] = 'Der Ordner wurde erfolgreich abbestellt';
-$messages['folderpurged'] = 'Der Ordner wurde erfolgreich gelöscht';
-$messages['folderexpunged'] = 'Der Ordner wurde erfolgreich gepackt';
-$messages['deletedsuccessfully'] = 'Erfolgreich gelöscht';
-$messages['converting'] = 'Entferne Formatierungen...';
-$messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden';
-$messages['fileuploaderror'] = 'Der Dateiupload ist fehlgeschlagen';
-$messages['filesizeerror'] = 'Die Datei überschreitet die maximale Grösse von $size';
-$messages['copysuccess'] = '$nr Adressen erfolgreich kopiert';
-$messages['copyerror'] = 'Die Adressen konnten nicht kopiert werden';
-$messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verändert werden';
-$messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert werden';
-$messages['movingmessage'] = 'Die E-Mail wird verschoben...';
-$messages['copyingmessage'] = 'Kopiere Nachrichten...';
+$messages['checking'] = 'Überprüfung...';
+$messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden.';
+$messages['folderdeleted'] = 'Der Ordner wurde erfolgreich gelöscht.';
+$messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert.';
+$messages['folderunsubscribed'] = 'Der Ordner wurde erfolgreich abbestellt.';
+$messages['folderpurged'] = 'Der Ordner wurde erfolgreich gelöscht.';
+$messages['folderexpunged'] = 'Der Ordner wurde erfolgreich gepackt.';
+$messages['deletedsuccessfully'] = 'Erfolgreich gelöscht.';
+$messages['converting'] = 'Formatierung wird entfernt...';
+$messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden.';
+$messages['fileuploaderror'] = 'Der Dateiupload ist fehlgeschlagen.';
+$messages['filesizeerror'] = 'Die Datei überschreitet die maximale Grösse von $size.';
+$messages['copysuccess'] = '$nr Adressen erfolgreich kopiert.';
+$messages['copyerror'] = 'Die Adressen konnten nicht kopiert werden.';
+$messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verändert werden.';
+$messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert werden.';
+$messages['movingmessage'] = 'Nachrichten werden verschoben...';
+$messages['copyingmessage'] = 'Nachrichten werden kopiert...';
 $messages['copyingcontact'] = 'Kontakte werden kopiert...';
-$messages['deletingmessage'] = 'Lösche Nachricht(en)...';
-$messages['markingmessage'] = 'Markiere Nachricht(en)...';
-$messages['addingmember'] = 'Füge Kontakte der Gruppe hinzu...';
-$messages['removingmember'] = 'Entferne Kontakte von der Gruppe...';
-$messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet';
-$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden';
+$messages['deletingmessage'] = 'Nachrichten werden gelöscht...';
+$messages['markingmessage'] = 'Nachrichten werden markiert...';
+$messages['addingmember'] = 'Kontakte werden der Gruppe hinzugefügt...';
+$messages['removingmember'] = 'Kontakte werden von der Gruppe entfernt...';
+$messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet.';
+$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden.';
+$messages['deleteidentityconfirm'] = 'Möchten Sie diese Identität wirklich löschen?';
 $messages['nodeletelastidentity'] = 'Diese Identität kann nicht gelöscht werden, da dies die letzte ist.';
-$messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen';
-$messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus';
-$messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden';
-$messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt';
-$messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt';
+$messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen.';
+$messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus.';
+$messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden.';
+$messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt.';
+$messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.';
 $messages['importwait'] = 'Daten werden importiert, bitte warten...';
 $messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.';
 $messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestehende Einträge wurden übersprungen</b>';
 $messages['opnotpermitted'] = 'Operation nicht erlaubt!';
-$messages['nofromaddress'] = 'Fehlende E-Mail-Adresse in ausgewählter Identität';
+$messages['nofromaddress'] = 'Fehlende E-Mail-Adresse in ausgewählter Identität.';
 $messages['editorwarning'] = 'Beim Wechseln in den Texteditor gehen alle Textformatierungen verloren. Möchten Sie fortfahren?';
 $messages['httpreceivedencrypterror'] = 'Ein gravierender Konfigurationsfehler ist aufgetreten. Kontaktieren Sie den Server-Administrator. <b>Die Nachricht wurde nicht gesendet!</b>';
-$messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen';
-$messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen';
-$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg)';
-$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg)';
-$messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden';
-$messages['smtpdsnerror'] = 'SMTP-Fehler: Übermittlungsbestätigungen werden nicht unterstützt';
+$messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen.';
+$messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen.';
+$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg).';
+$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden.';
 $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
 $messages['toomanyrecipients'] = 'Zuviele Empfänger angegeben. Reduzieren Sie die Empfängeradressen auf $max.';
-$messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max';
+$messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max.';
 $messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen Sie den Vorgang erneut.';
-$messages['contactdelerror'] = 'Fehler beim Löschen';
-$messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht';
-$messages['contactrestoreerror'] = 'Konnte die gelöschten Kontakte nicht wiederherstellen';
+$messages['contactdelerror'] = 'Fehler beim Löschen.';
+$messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
+$messages['contactrestoreerror'] = 'Die gelöschten Kontakte konnten nicht wiederhergestellt werden.';
 $messages['contactrestored'] = 'Kontakte erfolgreich wiederhergestellt.';
-$messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht';
-$messages['grouprenamed'] = 'Gruppe erlogreich umbenannt';
-$messages['groupcreated'] = 'Gruppe erlogreich erstellt';
-$messages['messagedeleted'] = 'Nachricht(en) erfolgreich gelöscht';
-$messages['messagemoved'] = 'Nachricht(en) erfolgreich verschoben';
-$messages['messagecopied'] = 'Nachricht(en) erfolgreich kopiert';
-$messages['messagemarked'] = 'Nachricht(en) erfolgreich markiert';
-$messages['autocompletechars'] = 'Geben Sie mind. $min Zeichen für die Auto-Vervollständigung ein';
-$messages['namecannotbeempty'] = 'Der Name darf nicht leer sein';
-$messages['nametoolong'] = 'Der Name ist zu lang';
-$messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert';
-$messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt';
-$messages['invalidimageformat'] = 'Ungültiges Bildformat';
+$messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht.';
+$messages['grouprenamed'] = 'Gruppe erlogreich umbenannt.';
+$messages['groupcreated'] = 'Gruppe erlogreich erstellt.';
+$messages['savedsearchdeleted'] = 'Suche erfolgreich gelöscht.';
+$messages['savedsearchdeleteerror'] = 'Suche konnte nicht gelöscht werden.';
+$messages['savedsearchcreated'] = 'Suche erfolgreich gespeichert.';
+$messages['savedsearchcreateerror'] = 'Suche konnte nicht gespeichert werden.';
+$messages['messagedeleted'] = 'Nachricht(en) erfolgreich gelöscht.';
+$messages['messagemoved'] = 'Nachricht(en) erfolgreich verschoben.';
+$messages['messagecopied'] = 'Nachricht(en) erfolgreich kopiert.';
+$messages['messagemarked'] = 'Nachricht(en) erfolgreich markiert.';
+$messages['autocompletechars'] = 'Geben Sie mind. $min Zeichen für die Auto-Vervollständigung ein.';
+$messages['autocompletemore'] = 'Mehrere Treffer. Bitte geben Sie mehr Buchstaben ein.';
+$messages['namecannotbeempty'] = 'Der Name darf nicht leer sein.';
+$messages['nametoolong'] = 'Der Name ist zu lang.';
+$messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert.';
+$messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt.';
+$messages['invalidimageformat'] = 'Kein gültiges Bildformat.';
 $messages['mispellingsfound'] = 'Es wurden noch Rechtschreibfehler in der Nachricht gefunden.';
 $messages['parentnotwritable'] = 'Konnte den Ordner nicht erstellen/verschieben. Keine Berechtigung.';
+$messages['messagetoobig'] = 'Die Nachricht ist zu gross und kann nicht verarbeitet werden.';
 
-?>
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 13856856f..dc8811686 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -1,39 +1,34 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/de_DE/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Thomas Bruederli <roundcube@gmail.com>                        |
-| Author: Marcel Schlesinger <info@marcel-schlesinger.de>               |
-| Author: Roland Liebl <myroundcube@mail4us.net>                        |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/de_DE/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Daniel Winzen <d@winzen4.de>                                  |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Anmeldung fehlgeschlagen';
-$messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
-$messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
-$messages['imaperror'] = 'Keine Verbindung zum IMAP Server';
+$messages['loginfailed'] = 'Die Anmeldung ist fehlgeschlagen.';
+$messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies.';
+$messages['sessionerror'] = 'Ihre Sitzung ist ungültig oder abgelaufen.';
+$messages['imaperror'] = 'Keine Verbindung zum IMAP Server.';
 $messages['servererror'] = 'Serverfehler!';
 $messages['servererrormsg'] = 'Serverfehler: $msg';
 $messages['dberror'] = 'Datenbankfehler!';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.';
 $messages['invalidrequest'] = 'Ungültige Anfrage! Es wurden keine Daten gespeichert.';
-$messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner';
-$messages['loggedout'] = 'Sie haben Ihre Session erfolgreich beendet. Auf Wiedersehen!';
-$messages['mailboxempty'] = 'Ordner ist leer';
-$messages['loading'] = 'Daten werden geladen...';
+$messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner.';
+$messages['loggedout'] = 'Sie haben Ihre Sitzung erfolgreich beendet. Auf Wiedersehen!';
+$messages['mailboxempty'] = 'Ordner ist leer.';
+$messages['loading'] = 'Lädt…';
 $messages['uploading'] = 'Datei wird hochgeladen...';
 $messages['uploadingmany'] = 'Dateien werden hochgeladen...';
 $messages['loadingdata'] = 'Daten werden geladen...';
@@ -42,65 +37,66 @@ $messages['sendingmessage'] = 'Nachricht wird gesendet...';
 $messages['messagesent'] = 'Nachricht erfolgreich gesendet';
 $messages['savingmessage'] = 'Nachricht wird gespeichert...';
 $messages['messagesaved'] = 'Nachricht als Entwurf gespeichert';
-$messages['successfullysaved'] = 'Erfolgreich gespeichert';
-$messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt';
-$messages['contactexists'] = 'Es existiert bereits ein Eintrag mit dieser E-Mail-Adresse';
+$messages['successfullysaved'] = 'Erfolgreich gespeichert.';
+$messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt.';
+$messages['contactexists'] = 'Es existiert bereits ein Kontakt mit dieser E-Mail-Adresse.';
 $messages['contactnameexists'] = 'Ein Kontakt mit demselben Namen existiert bereits.';
 $messages['blockedimages'] = 'Um Ihre Privatsphäre zur schützen, wurden externe Bilder blockiert.';
-$messages['encryptedmessage'] = 'Dies ist eine verschlüsselte Nachricht und kann leider nicht angezeigt werden.';
-$messages['nocontactsfound'] = 'Keine Kontakte gefunden';
-$messages['contactnotfound'] = 'Der angeforderte Kontakt wurde nicht gefunden';
-$messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden';
-$messages['sendingfailed'] = 'Versenden der Nachricht fehlgeschlagen';
-$messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht';
-$messages['errorsavingsent'] = 'Ein Fehler ist beim Speichern der gesendeten Nachricht aufgetreten';
-$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten';
-$messages['errormoving'] = 'Nachricht konnte nicht verschoben werden';
-$messages['errorcopying'] = 'Konnte Nachrichten nicht kopieren';
-$messages['errordeleting'] = 'Nachricht konnte nicht gelöscht werden';
-$messages['errormarking'] = 'Nachricht konnte nicht markiert werden';
+$messages['encryptedmessage'] = 'Dies ist eine verschlüsselte Nachricht und kann leider nicht angezeigtwerden.';
+$messages['nocontactsfound'] = 'Keine Kontakte gefunden.';
+$messages['contactnotfound'] = 'Der angeforderte Kontakt wurde nicht gefunden.';
+$messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden.';
+$messages['sendingfailed'] = 'Versenden der Nachricht fehlgeschlagen.';
+$messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht.';
+$messages['errorsavingsent'] = 'Ein Fehler ist beim Speichern der gesendeten Nachricht aufgetreten.';
+$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten.';
+$messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.';
+$messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.';
+$messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.';
+$messages['errormarking'] = 'Nachricht(en) konnte(n) nicht markiert werden.';
 $messages['deletecontactconfirm'] = 'Wollen Sie die ausgewählten Kontakte wirklich löschen?';
 $messages['deletegroupconfirm'] = 'Wollen Sie die gewählte Gruppe wirklich löschen?';
 $messages['deletemessagesconfirm'] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
 $messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?';
 $messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
+$messages['contactdeleting'] = 'Lösche Kontakt(e)...';
 $messages['groupdeleting'] = 'Gruppe wird gelöscht...';
 $messages['folderdeleting'] = 'Lösche Ordner...';
 $messages['foldermoving'] = 'Verschiebe Ordner...';
 $messages['foldersubscribing'] = 'Abonniere Ordner...';
 $messages['folderunsubscribing'] = 'Ordner abbstellen...';
-$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt';
-$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
-$messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein';
-$messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an';
-$messages['nosenderwarning'] = 'Bitte geben Sie die E-Mail-Adresse des Senders an';
-$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an';
+$messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt.';
+$messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein.';
+$messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein.';
+$messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an.';
+$messages['nosenderwarning'] = 'Bitte geben Sie die E-Mail-Adresse des Senders an.';
+$messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an.';
 $messages['nosubjectwarning'] = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
 $messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
 $messages['notsentwarning'] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
-$messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus';
-$messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein';
+$messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus.';
+$messages['nosearchname'] = 'Bitte geben Sie einen Namen oder eine E-Mail-Adresse ein.';
 $messages['notuploadedwarning'] = 'Es wurden noch nicht alle Dateien hochgeladen. Bitte warten oder Upload abbrechen.';
-$messages['searchsuccessful'] = '$nr Nachrichten gefunden';
-$messages['contactsearchsuccessful'] = '$nr Kontakte gefunden';
-$messages['searchnomatch'] = 'Die Suche lieferte keine Treffer';
+$messages['searchsuccessful'] = '$nr Nachrichten gefunden.';
+$messages['contactsearchsuccessful'] = '$nr Kontakte gefunden.';
+$messages['searchnomatch'] = 'Die Suche lieferte keine Treffer.';
 $messages['searching'] = 'Suche...';
 $messages['checking'] = 'Prüfe...';
-$messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden';
-$messages['folderdeleted'] = 'Ordner erfolgreich gelöscht';
-$messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert';
-$messages['folderunsubscribed'] = 'Der Ordner wurde erfolgreich abbestellt';
-$messages['folderpurged'] = 'Der Ordner wurde erfolgreich gelöscht';
-$messages['folderexpunged'] = 'Der Ordner wurde erfolgreich gepackt';
-$messages['deletedsuccessfully'] = 'Erfolgreich gelöscht';
+$messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden.';
+$messages['folderdeleted'] = 'Ordner erfolgreich gelöscht.';
+$messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert.';
+$messages['folderunsubscribed'] = 'Der Ordner wurde erfolgreich abbestellt.';
+$messages['folderpurged'] = 'Der Ordner wurde erfolgreich gelöscht.';
+$messages['folderexpunged'] = 'Der Ordner wurde erfolgreich gepackt.';
+$messages['deletedsuccessfully'] = 'Erfolgreich gelöscht.';
 $messages['converting'] = 'Entferne Formatierungen...';
-$messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden';
-$messages['fileuploaderror'] = 'Hochladen der Datei fehlgeschlagen';
-$messages['filesizeerror'] = 'Die hochzuladende Datei überschreitet die Maximalgröße von $size';
-$messages['copysuccess'] = '$nr Adressen erfolgreich kopiert';
-$messages['copyerror'] = 'Die Adressen konnten nicht kopiert werden';
-$messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verändert werden';
-$messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert werden';
+$messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden.';
+$messages['fileuploaderror'] = 'Hochladen der Datei fehlgeschlagen.';
+$messages['filesizeerror'] = 'Die hochzuladende Datei überschreitet die Maximalgröße von $size.';
+$messages['copysuccess'] = '$nr Adressen erfolgreich kopiert.';
+$messages['copyerror'] = 'Die Adressen konnten nicht kopiert werden.';
+$messages['sourceisreadonly'] = 'Das Adressverzeichnis kann nicht verändert werden.';
+$messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert werden.';
 $messages['movingmessage'] = 'Die E-Mail wird verschoben...';
 $messages['copyingmessage'] = 'Kopiere Nachrichten...';
 $messages['copyingcontact'] = 'Kontakte werden kopiert...';
@@ -108,55 +104,56 @@ $messages['deletingmessage'] = 'Lösche Nachricht(en)...';
 $messages['markingmessage'] = 'Markiere Nachricht(en)...';
 $messages['addingmember'] = 'Füge Kontakte der Gruppe hinzu...';
 $messages['removingmember'] = 'Entferne Kontakte von der Gruppe...';
-$messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet';
-$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden';
+$messages['receiptsent'] = 'Lesebestätigung erfolgreich gesendet.';
+$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden.';
+$messages['deleteidentityconfirm'] = 'Möchten Sie wirklich diese Identität löschen?';
 $messages['nodeletelastidentity'] = 'Diese Identität kann nicht gelöscht werden, da dies die letzte ist.';
-$messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen';
-$messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus';
-$messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden';
-$messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt';
-$messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt';
+$messages['forbiddencharacter'] = 'Der Ordnername enthält ein ungültiges Zeichen.';
+$messages['selectimportfile'] = 'Bitte wählen Sie eine Datei zum Importieren aus.';
+$messages['addresswriterror'] = 'Das gewählte Adressbuch kann nicht verändert werden.';
+$messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt.';
+$messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.';
 $messages['importwait'] = 'Daten werden importiert, bitte warten...';
 $messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.';
-$messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert</b>';
-$messages['importconfirmskipped'] = '<b>$skipped bestehende Einträge wurden übersprungen</b>';
+$messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert.</b>';
+$messages['importconfirmskipped'] = '<b>$skipped bestehende Einträge wurden übersprungen.</b>';
 $messages['opnotpermitted'] = 'Operation nicht erlaubt!';
-$messages['nofromaddress'] = 'Fehlende E-Mail-Adresse in ausgewählter Identität';
+$messages['nofromaddress'] = 'Fehlende E-Mail-Adresse in ausgewählter Identität.';
 $messages['editorwarning'] = 'Beim Wechseln in den Texteditor gehen alle Textformatierungen verloren. Möchten Sie fortfahren?';
 $messages['httpreceivedencrypterror'] = 'Ein fataler Konfigurationsfehler ist aufgetreten. Kontaktieren Sie bitte sofort Ihren Administrator. <b>Ihre Nachricht konnte nicht versendet werden.</b>';
-$messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen';
-$messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen';
-$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg)';
-$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg)';
-$messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden';
+$messages['smtpconnerror'] = 'SMTP Fehler ($code): Die Verbindung ist fehlgeschlagen.';
+$messages['smtpautherror'] = 'SMTP Fehler ($code): Die Authentisierung ist fehlgeschlagen.';
+$messages['smtpfromerror'] = 'SMTP Fehler ($code): Der Absender "$from" konnte nicht gesetzt werden ($msg).';
+$messages['smtptoerror'] = 'SMTP Fehler ($code): Der Empfänger "$to" konnte nicht gesetzt werden ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Fehler: Die Empfängerliste konnte nicht verarbeitet werden.';
 $messages['smtperror'] = 'SMTP Fehler: $msg';
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
 $messages['toomanyrecipients'] = 'Zuviele Empfänger. Reduzieren Sie die Anzahl Empfängeradressen auf $max.';
-$messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max';
-$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen Sie den Vorgang erneut.';
-$messages['contactdelerror'] = 'Fehler beim Löschen';
-$messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht';
-$messages['contactrestoreerror'] = 'Konnte die gelöschten Kontakte nicht wiederherstellen';
+$messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max.';
+$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen es erneut.';
+$messages['contactdelerror'] = 'Fehler beim Löschen.';
+$messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
+$messages['contactrestoreerror'] = 'Konnte die gelöschten Kontakte nicht wiederherstellen.';
 $messages['contactrestored'] = 'Kontakte erfolgreich wiederhergestellt.';
-$messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht';
-$messages['grouprenamed'] = 'Gruppe erlogreich umbenannt';
-$messages['groupcreated'] = 'Gruppe erlogreich erstellt';
-$messages['savedsearchdeleted'] = 'Suchergebnisse erfolgreich gelöscht';
-$messages['savedsearchdeleteerror'] = 'Suchergebnisse konnten nicht gelöscht werden';
-$messages['savedsearchcreated'] = 'Suchergebnisse wurden erfolgreich wiederherstellt';
-$messages['savedsearchcreateerror'] = 'Suchergebnisse konnten nicht wiederhergestellt werden';
-$messages['messagedeleted'] = 'Nachricht(en) erfolgreich gelöscht';
-$messages['messagemoved'] = 'Nachricht(en) erfolgreich verschoben';
-$messages['messagecopied'] = 'Nachricht(en) erfolgreich kopiert';
-$messages['messagemarked'] = 'Nachricht(en) erfolgreich markiert';
-$messages['autocompletechars'] = 'Geben Sie mind. $min Zeichen für die Auto-Vervollständigung ein';
-$messages['autocompletemore'] = 'Mehrere Treffer. Bitte geben Sie mehr Buchstaben ein';
-$messages['namecannotbeempty'] = 'Der Name darf nicht leer sein';
-$messages['nametoolong'] = 'Der Name ist zu lang';
-$messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert';
-$messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt';
-$messages['invalidimageformat'] = 'Kein gültiges Bildformat';
+$messages['groupdeleted'] = 'Gruppe erfolgreich gelöscht.';
+$messages['grouprenamed'] = 'Gruppe erlogreich umbenannt.';
+$messages['groupcreated'] = 'Gruppe erlogreich erstellt.';
+$messages['savedsearchdeleted'] = 'Suchergebnisse erfolgreich gelöscht.';
+$messages['savedsearchdeleteerror'] = 'Suchergebnisse konnten nicht gelöscht werden.';
+$messages['savedsearchcreated'] = 'Suchergebnisse wurden erfolgreich wiederherstellt.';
+$messages['savedsearchcreateerror'] = 'Suchergebnisse konnten nicht wiederhergestellt werden.';
+$messages['messagedeleted'] = 'Nachricht(en) erfolgreich gelöscht.';
+$messages['messagemoved'] = 'Nachricht(en) erfolgreich verschoben.';
+$messages['messagecopied'] = 'Nachricht(en) erfolgreich kopiert.';
+$messages['messagemarked'] = 'Nachricht(en) erfolgreich markiert.';
+$messages['autocompletechars'] = 'Geben Sie mind. $min Zeichen für die Auto-Vervollständigung ein.';
+$messages['autocompletemore'] = 'Mehrere Treffer. Bitte geben Sie mehr Buchstaben ein.';
+$messages['namecannotbeempty'] = 'Der Name darf nicht leer sein.';
+$messages['nametoolong'] = 'Der Name ist zu lang.';
+$messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert.';
+$messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt.';
+$messages['invalidimageformat'] = 'Kein gültiges Bildformat.';
 $messages['mispellingsfound'] = 'Es wurden noch Rechtschreibfehler in der Nachricht gefunden.';
 $messages['parentnotwritable'] = 'Konnte den Ordner nicht erstellen/verschieben. Keine Berechtigung.';
+$messages['messagetoobig'] = 'Die Nachricht ist zu gross und kann nicht verarbeitet werden.';
 
-?>
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index b1449f103..fb742b0c4 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/fi_FI/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Ville Alatalo <ville@alatalo.org>                             |
-|         Veljo Velling <veve@utu.fi>                                   |
-|         Jorma Tuomainen <jt@wiza.fi>                                  |
-|         Olli <ollinpostit@gmail.com>                                  |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/fi_FI/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jiri Grönroos <Unknown>                                      |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -44,8 +39,8 @@ $labels['date'] = 'Päiväys';
 $labels['size'] = 'Koko';
 $labels['priority'] = 'Tärkeys';
 $labels['organization'] = 'Organisaatio';
-$labels['reply-to'] = 'Vastaus osoitteeseen';
 $labels['mailboxlist'] = 'Kansiot';
+$labels['folders'] = 'Kansiot';
 $labels['messagesfromto'] = 'Viestit $from-$to/$count';
 $labels['threadsfromto'] = 'Viestiketjut $from-$to/$count';
 $labels['messagenrof'] = 'Viesti $nr/$count';
@@ -75,6 +70,7 @@ $labels['feb'] = 'Helmi';
 $labels['mar'] = 'Maalis';
 $labels['apr'] = 'Huhti';
 $labels['may'] = 'Touko';
+$labels['longmay'] = 'Touko';
 $labels['jun'] = 'Kesä';
 $labels['jul'] = 'Heinä';
 $labels['aug'] = 'Elo';
@@ -86,7 +82,6 @@ $labels['longjan'] = 'Tammikuu';
 $labels['longfeb'] = 'Helmikuu';
 $labels['longmar'] = 'Maaliskuu';
 $labels['longapr'] = 'Huhtikuu';
-$labels['longmay'] = 'Toukokuu';
 $labels['longjun'] = 'Kesäkuu';
 $labels['longjul'] = 'Heinäkuu';
 $labels['longaug'] = 'Elokuu';
@@ -95,22 +90,24 @@ $labels['longoct'] = 'Lokakuu';
 $labels['longnov'] = 'Marraskuu';
 $labels['longdec'] = 'Joulukuu';
 $labels['today'] = 'Tänään';
+$labels['refresh'] = 'Päivitä';
 $labels['checkmail'] = 'Tarkista saapuneet viestit';
+$labels['compose'] = 'Viestin kirjoitus';
 $labels['writenewmessage'] = 'Kirjoita uusi viesti';
+$labels['reply'] = 'Vastaa';
 $labels['replytomessage'] = 'Vastaa viestiin';
 $labels['replytoallmessage'] = 'Vastaa kaikille';
+$labels['replyall'] = 'Vastaa kaikille';
+$labels['forward'] = 'Välitä eteenpäin';
+$labels['forwardattachment'] = 'Välitä viesti liitteenä';
 $labels['forwardmessage'] = 'Välitä viesti';
 $labels['deletemessage'] = 'Poista viesti';
 $labels['movemessagetotrash'] = 'Siirrä viesti roskakoriin';
 $labels['printmessage'] = 'Tulosta viesti';
 $labels['previousmessage'] = 'Näytä edellinen viesti';
-$labels['previousmessages'] = 'Näytä edelliset viestit';
 $labels['firstmessage'] = 'Näytä ensimmäinen viesti';
-$labels['firstmessages'] = 'Näytä ensimmäinen viestiluettelo';
 $labels['nextmessage'] = 'Näytä edellinen viesti';
-$labels['nextmessages'] = 'Näytä seuraavat viestit';
 $labels['lastmessage'] = 'Näytä viimeinen viesti';
-$labels['lastmessages'] = 'Näytä viimeinen viestiluettelo';
 $labels['backtolist'] = 'Takaisin viesteihin';
 $labels['viewsource'] = 'Näytä lähdekoodi';
 $labels['markmessages'] = 'Merkitse viestit';
@@ -118,10 +115,13 @@ $labels['markread'] = 'luetuiksi';
 $labels['markunread'] = 'ei-luetuiksi';
 $labels['markflagged'] = 'korostetuiksi';
 $labels['markunflagged'] = 'ei-korostetuiksi';
-$labels['messageactions'] = 'Lisää toimintoja...';
+$labels['moreactions'] = 'Lisää toimintoja...';
+$labels['more'] = 'Lisää';
+$labels['back'] = 'Takaisin';
 $labels['select'] = 'Valitse';
 $labels['all'] = 'Kaikki';
-$labels['none'] = 'Ei mitään';
+$labels['none'] = 'Ei mikään';
+$labels['nonesort'] = 'Ei mikään';
 $labels['currpage'] = 'Nykyinen sivu';
 $labels['unread'] = 'Lukemattomat';
 $labels['flagged'] = 'Korostettu';
@@ -139,7 +139,6 @@ $labels['do_expand'] = 'kaikki viestiketjut';
 $labels['expand_only_unread'] = 'vain ne joissa lukemattomia viestejä';
 $labels['fromto'] = 'Lähettäjä/Vastaanottaja';
 $labels['attachment'] = 'Liite';
-$labels['nonesort'] = 'Ei mikään';
 $labels['sentdate'] = 'Lähetysaika';
 $labels['arrival'] = 'Saapumisaika';
 $labels['asc'] = 'nouseva';
@@ -147,19 +146,18 @@ $labels['desc'] = 'laskeva';
 $labels['listcolumns'] = 'Näkyvät kentät';
 $labels['listsorting'] = 'Lajittelu kenttä';
 $labels['listorder'] = 'Lajittelu järjestys';
+$labels['folderactions'] = 'Kansiotoiminnot...';
 $labels['compact'] = 'Tiivistä';
 $labels['empty'] = 'Tyhjennä';
-$labels['purge'] = 'Puhdista';
 $labels['quota'] = 'Levytila';
 $labels['unknown'] = 'tuntematon';
 $labels['unlimited'] = 'rajoittamaton';
 $labels['quicksearch'] = 'Pikahaku';
 $labels['resetsearch'] = 'Nollaa haku';
-$labels['searchmod'] = 'Haku kriteerit';
+$labels['searchmod'] = 'Hakukriteerit';
 $labels['msgtext'] = 'Koko viesti';
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
-$labels['compose'] = 'Viestin kirjoitus';
 $labels['editasnew'] = 'Muokkaa uutena';
 $labels['savemessage'] = 'Tallenna tämä luonnos';
 $labels['sendmessage'] = 'Lähetä viesti';
@@ -167,6 +165,7 @@ $labels['addattachment'] = 'Liitetiedosto';
 $labels['charset'] = 'Merkistö';
 $labels['editortype'] = 'Editorin tyyppi';
 $labels['returnreceipt'] = 'Perillesaapumisilmoitus';
+$labels['originalmessage'] = 'Alkuperäinen viesti';
 $labels['checkspelling'] = 'Tarkista oikeinkirjoitus';
 $labels['resumeediting'] = 'Jatka muokkausta';
 $labels['revertto'] = 'Muuta takaisin';
@@ -181,6 +180,7 @@ $labels['highest'] = 'Korkein';
 $labels['nosubject'] = '(ei otsikkoa)';
 $labels['showimages'] = 'Näytä kuvat';
 $labels['alwaysshow'] = 'Näytä aina lähettäjältä $sender saapuneet kuvat';
+$labels['isdraft'] = 'Tämä on luonnosviesti.';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Tavallinen teksti';
 $labels['savesentmessagein'] = 'Tallenna lähetetty viesti kansioon';
@@ -196,22 +196,69 @@ $labels['receiptnote'] = 'Huom! Kuittaus tarkoittaa vain sitä, että viesti on
 $labels['name'] = 'Näkyvä nimi';
 $labels['firstname'] = 'Etunimi';
 $labels['surname'] = 'Sukunimi';
-$labels['email'] = 'E-Mail';
-$labels['addcontact'] = 'Lisää valittu kontakti osoitekirjaan';
-$labels['editcontact'] = 'Muokkaa kontaktia';
+$labels['middlename'] = 'Toinen nimi';
+$labels['nameprefix'] = 'Etuliite';
+$labels['namesuffix'] = 'Jälkiliite';
+$labels['nickname'] = 'Lempinimi';
+$labels['jobtitle'] = 'Titteli';
+$labels['department'] = 'Osasto';
+$labels['gender'] = 'Sukupuoli';
+$labels['maidenname'] = 'Tyttönimi';
+$labels['email'] = 'Sähköposti';
+$labels['phone'] = 'Puhelin';
+$labels['address'] = 'Osoite';
+$labels['street'] = 'Katu';
+$labels['locality'] = 'Kaupunki';
+$labels['zipcode'] = 'Postinumero';
+$labels['region'] = 'Osavaltio tai lääni';
+$labels['country'] = 'Maa';
+$labels['birthday'] = 'Syntymäpäivä';
+$labels['anniversary'] = 'Vuosipäivä';
+$labels['website'] = 'Verkkosivu';
+$labels['instantmessenger'] = 'Pikaviestin';
+$labels['notes'] = 'Muistiinpanot';
+$labels['male'] = 'mies';
+$labels['female'] = 'nainen';
+$labels['manager'] = 'Päällikkö';
+$labels['assistant'] = 'Avustaja';
+$labels['typeassistant'] = 'Avustaja';
+$labels['spouse'] = 'Puoliso';
+$labels['allfields'] = 'Kaikki kentät';
+$labels['search'] = 'Haku';
+$labels['advsearch'] = 'Tarkennettu haku';
+$labels['typehome'] = 'Koti';
+$labels['typework'] = 'Työ';
+$labels['typemobile'] = 'Matkapuhelin';
+$labels['typehomefax'] = 'Kotifaksi';
+$labels['typeworkfax'] = 'Työfaksi';
+$labels['typecar'] = 'Auto';
+$labels['typepager'] = 'Hakulaite';
+$labels['typehomepage'] = 'Kotisivu';
+$labels['typeblog'] = 'Blogi';
+$labels['typeprofile'] = 'Profiili';
+$labels['addfield'] = 'Lisää kenttä...';
+$labels['addcontact'] = 'Lisää uusi yhteystieto';
+$labels['editcontact'] = 'Muokkaa yhteystietoa';
+$labels['contacts'] = 'Yhteystiedot';
+$labels['contactproperties'] = 'Yhteystiedon ominaisuudet';
+$labels['personalinfo'] = 'Henkilökohtaiset tiedot';
 $labels['edit'] = 'Muokkaa';
 $labels['cancel'] = 'Peruuta';
 $labels['save'] = 'Tallenna';
 $labels['delete'] = 'Poista';
-$labels['newcontact'] = 'Luo uusi kontakti';
-$labels['deletecontact'] = 'Poista valitut kontaktit';
-$labels['composeto'] = 'Kirjoita viesti kontaktille';
-$labels['contactsfromto'] = 'Kontaktit $from-$to/$count';
+$labels['rename'] = 'Nimeä uudelleen';
+$labels['addphoto'] = 'Lisää';
+$labels['replacephoto'] = 'Korvaa';
+$labels['newcontact'] = 'Luo uusi yhteystieto';
+$labels['deletecontact'] = 'Poista valitut yhteystiedot';
+$labels['composeto'] = 'Kirjoita viesti yhteystiedolle';
+$labels['contactsfromto'] = 'Yhteystiedot $from-$to/$count';
 $labels['print'] = 'Tulosta';
 $labels['export'] = 'Vie (export)';
-$labels['exportvcards'] = 'Vie kontaktit vCard-muodossa';
-$labels['newcontactgroup'] = 'Luo uusi kontaktiryhmä';
-$labels['groupactions'] = 'Kontaktiryhmän toiminnot...';
+$labels['exportvcards'] = 'Vie yhteystiedot vCard-muodossa';
+$labels['newcontactgroup'] = 'Luo uusi yhteystietoryhmä';
+$labels['grouprename'] = 'Nimeä ryhmä uudelleen';
+$labels['groupdelete'] = 'Poista ryhmä';
 $labels['previouspage'] = 'Näytä edellinen luettelo';
 $labels['firstpage'] = 'Näytä ensimmäinen luettelo';
 $labels['nextpage'] = 'Näytä seuraava luettelo';
@@ -219,13 +266,17 @@ $labels['lastpage'] = 'Näytä viimeinen luettelo';
 $labels['group'] = 'Ryhmä';
 $labels['groups'] = 'Ryhmät';
 $labels['personaladrbook'] = 'Henkilökohtaiset osoitteet';
+$labels['searchsave'] = 'Tallenna haku';
+$labels['searchdelete'] = 'Poista haku';
 $labels['import'] = 'Tuo';
 $labels['importcontacts'] = 'Tuo yhteystiedot';
 $labels['importfromfile'] = 'Tuo tiedostosta:';
+$labels['importtarget'] = 'Lisää uudet yhteystiedot osoitekirjaan:';
 $labels['importreplace'] = 'Korvaa koko osoitekirja';
 $labels['importtext'] = 'Voit lähettää yhteystietoja muista osoitekirjoistna.Kontaktien tuomine on hetkellä mahdollista vCard-muodossa.';
 $labels['done'] = 'Valmis';
 $labels['settingsfor'] = 'Asetukset';
+$labels['about'] = 'Tietoja';
 $labels['preferences'] = 'Asetukset';
 $labels['userpreferences'] = 'Käyttäjän asetukset';
 $labels['editpreferences'] = 'Muokkaa käyttäjän asetuksia';
@@ -237,6 +288,8 @@ $labels['edititem'] = 'Muokkaa';
 $labels['preferhtml'] = 'Käytä HTML:aa';
 $labels['defaultcharset'] = 'Oletusmerkistökoodaus';
 $labels['htmlmessage'] = 'HTML-viesti';
+$labels['dateformat'] = 'Päiväyksen muoto';
+$labels['timeformat'] = 'Ajan muoto';
 $labels['prettydate'] = 'Nätit päiväykset';
 $labels['setdefault'] = 'Aseta vakioksi';
 $labels['autodetect'] = 'Automaattinen';
@@ -249,8 +302,8 @@ $labels['htmleditor'] = 'Kirjoita HTML-muodossa';
 $labels['htmlsignature'] = 'HTML-allekirjoitus';
 $labels['previewpane'] = 'Näytä esikatselulehti';
 $labels['skin'] = 'Käyttöliittymän teema';
-$labels['logoutclear'] = 'Tyhjennä roskakori ulos kirjautuessa';
-$labels['logoutcompact'] = 'Tiivistä kansiot ulos kirjautuessa';
+$labels['logoutclear'] = 'Tyhjennä roskakori kirjautuessa ulos';
+$labels['logoutcompact'] = 'Tiivistä kansiot kirjautuessa ulos';
 $labels['uisettings'] = 'Käyttöliittymä';
 $labels['serversettings'] = 'Palvelinasetukset';
 $labels['mailboxview'] = 'Postilaatikkonäkymä';
@@ -259,7 +312,7 @@ $labels['askuser'] = 'kysy käyttäjältä';
 $labels['autosend'] = 'lähetä automaattisesti';
 $labels['ignore'] = 'jätä huomiotta';
 $labels['readwhendeleted'] = 'Merkitse poistettavat viestit luetuiksi';
-$labels['flagfordeletion'] = 'Poistamisen sijaan, merkitse viestit poistettavaksi';
+$labels['flagfordeletion'] = 'Poistamisen sijaan merkitse viestit poistettavaksi';
 $labels['skipdeleted'] = 'Älä näytä poistettuja viestejä';
 $labels['deletealways'] = 'Poista viestit, joiden siirtäminen roskakoriin epäonnistuu';
 $labels['showremoteimages'] = 'Näytä ulkopuoliset kuvat viestissä';
@@ -274,19 +327,19 @@ $labels['immediately'] = 'välittömästi';
 $labels['messagesdisplaying'] = 'Viestien näyttäminen';
 $labels['messagescomposition'] = 'Viestien kirjoittaminen';
 $labels['mimeparamfolding'] = 'Liitetiedostojen nimet';
-$labels['2231folding'] = 'Täysin RFC 2231 mukainen (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 mukainen (MS Outlook)';
-$labels['2047folding'] = 'Täysin RFC 2047 mukainen (muut)';
+$labels['2231folding'] = 'Täysin RFC 2231:n mukainen (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231:n mukainen (MS Outlook)';
+$labels['2047folding'] = 'Täysin RFC 2047:n mukainen (muut)';
 $labels['force7bit'] = 'Käytä MIME-koodausta 8-bittisille merkeille';
 $labels['advancedoptions'] = 'Lisäasetukset';
 $labels['focusonnewmessage'] = 'Tarkenna selainikkuna uuteen viestiin';
 $labels['checkallfolders'] = 'Tarkista kaikki kansiot uusien viestien varalta';
 $labels['displaynext'] = 'Viestin siirron tai poiston jälkeen, näytä seuraava viesti';
+$labels['defaultfont'] = 'HTML-viestin oletuskirjasin';
 $labels['mainoptions'] = 'Pääasetukset';
 $labels['section'] = 'Kohta';
 $labels['maintenance'] = 'Huolto';
 $labels['newmessage'] = 'Uusi viesti';
-$labels['listoptions'] = 'Lista-asetukset';
 $labels['signatureoptions'] = 'Allekirjoituksen asetukset';
 $labels['whenreplying'] = 'Vastattaessa';
 $labels['replytopposting'] = 'aloita uusi viesti alkuperäisen yläpuolelle';
@@ -301,8 +354,13 @@ $labels['abovequote'] = 'lainauksen ylle';
 $labels['insertsignature'] = 'Lisää allekirjoitus';
 $labels['previewpanemarkread'] = 'Merkitse esikatsellut viestit luetuiksi';
 $labels['afternseconds'] = '$n sekunnin jälkeen';
+$labels['spellcheckbeforesend'] = 'Tarkista oikeinkirjoitus ennen viestin lähetystä';
+$labels['spellcheckoptions'] = 'Oikuluvun asetukset';
+$labels['spellcheckignoresyms'] = 'Jätä huomiotta sanat, joissa on symboleja';
+$labels['spellcheckignorenums'] = 'Jätä huomiotta sanat, joissa on numeroita';
+$labels['spellcheckignorecaps'] = 'Jätä huomiotta sanat, joissa kaikki kirjaimet on isoja';
+$labels['addtodict'] = 'Lisää sanakirjaan';
 $labels['folder'] = 'Kansio';
-$labels['folders'] = 'Kansiot';
 $labels['foldername'] = 'Kansion nimi';
 $labels['subscribed'] = 'Näytetään';
 $labels['messagecount'] = 'Viestejä';
@@ -310,9 +368,25 @@ $labels['create'] = 'Luo uusi';
 $labels['createfolder'] = 'Luo uusi kansio';
 $labels['managefolders'] = 'Kansioiden hallinta';
 $labels['specialfolders'] = 'Erikoiskansiot';
+$labels['properties'] = 'Ominaisuudet';
+$labels['folderproperties'] = 'Kansion ominaisuudet';
+$labels['parentfolder'] = 'Yläkansio';
+$labels['location'] = 'Sijanti';
+$labels['info'] = 'Tietoja';
+$labels['getfoldersize'] = 'Napsauta saadaksesi kansion koon';
+$labels['foldertype'] = 'Kansion tyyppi';
+$labels['personalfolder'] = 'Yksityinen kansio';
+$labels['otherfolder'] = 'Toisen käyttäjän kansio';
+$labels['sharedfolder'] = 'Julkinen kansio';
 $labels['sortby'] = 'Järjestä';
 $labels['sortasc'] = 'Järjestä nousevasti (a-ö)';
 $labels['sortdesc'] = 'Järjestä laskevasti (ö-a)';
+$labels['undo'] = 'Kumoa';
+$labels['plugin'] = 'Liitännäinen';
+$labels['version'] = 'Versio';
+$labels['source'] = 'Lähde';
+$labels['license'] = 'Lisenssi';
+$labels['support'] = 'Hanki tukea';
 $labels['B'] = 't';
 $labels['KB'] = 'Kt';
 $labels['MB'] = 'Mt';
@@ -336,4 +410,3 @@ $labels['japanese'] = 'Japanilainen';
 $labels['korean'] = 'Korealainen';
 $labels['chinese'] = 'Kiinalainen';
 
-?>
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index b0aab239f..381167aac 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -1,21 +1,17 @@
 <?php
 
 /*
-+-----------------------------------------------------------------------+
-| language/fi_FI/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Ville Alatalo <ville@alatalo.org>                             |
-|         Veljo Velling <veve@utu.fi>                                   |
-|         Jorma Tuomainen <jt@wiza.fi>                                  |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/fi_FI/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Jiri Grönroos <Unknown>                                      |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
@@ -23,25 +19,29 @@ $messages['loginfailed'] = 'Sisäänkirjautuminen epäonnistui';
 $messages['cookiesdisabled'] = 'Selaimesi ei hyväksy evästeitä';
 $messages['sessionerror'] = 'Sessio ei kelpaa tai ei ole enää voimassa';
 $messages['imaperror'] = 'Yhteys IMAP-palvelimeen epäonnistui';
-$messages['servererror'] = 'Palvelin virhe!';
-$messages['invalidrequest'] = 'Kelpaamaton pyyntö! Tietoa ei tallennettu.';
+$messages['servererror'] = 'Palvelinvirhe!';
+$messages['servererrormsg'] = 'Palvelinvirhe: $msg';
+$messages['dberror'] = 'Tietokantavirhe!';
+$messages['invalidrequest'] = 'Virheellinen pyyntö! Tietoa ei tallennettu.';
 $messages['nomessagesfound'] = 'Kansiossa ei ole sähköpostiviestejä';
 $messages['loggedout'] = 'Sinut on kirjattu ulos järjestelmästä.';
 $messages['mailboxempty'] = 'Kansio on tyhjä';
 $messages['loading'] = 'Ladataan...';
 $messages['uploading'] = 'Ladataan tiedostoa palvelimelle...';
+$messages['uploadingmany'] = 'Ladataan tiedostoja...';
 $messages['loadingdata'] = 'Ladataan tietoja...';
 $messages['checkingmail'] = 'Tarkistetaan saapuneita viestejä...';
 $messages['sendingmessage'] = 'Lähetetään viestiä...';
 $messages['messagesent'] = 'Viesti lähetetty';
 $messages['savingmessage'] = 'Tallennetaan viestiä...';
-$messages['messagesaved'] = 'Viesti tallennettu "Luonnokset" -kansioon';
+$messages['messagesaved'] = 'Viesti tallennettu "Luonnokset"-kansioon';
 $messages['successfullysaved'] = 'Tallennus onnistui';
-$messages['addedsuccessfully'] = 'Kontakti lisätty osoitekirjaan';
-$messages['contactexists'] = 'Samalla sähköpostiosoitteella on jo olemassa kontakti';
+$messages['addedsuccessfully'] = 'Yhteystieto lisätty osoitekirjaan';
+$messages['contactexists'] = 'Samalla sähköpostiosoitteella on jo olemassa yhteystieto';
+$messages['contactnameexists'] = 'Yhteystieto samalla nimellä on jo olemassa';
 $messages['blockedimages'] = 'Turvallisuussyistä viestin kuvia ei näytetty.';
 $messages['encryptedmessage'] = 'Viesti on salattu, eikä sitä voida näyttää.';
-$messages['nocontactsfound'] = 'Ei kontakteja';
+$messages['nocontactsfound'] = 'Yhteystietoja ei löytynyt.';
 $messages['contactnotfound'] = 'Pyydettyä yhteystietoa ei löytynyt';
 $messages['sendingfailed'] = 'Viestin lähetys epäonnistui';
 $messages['senttooquickly'] = 'Odota $sec sekunti(a) ennen viestin lähettämistä';
@@ -51,10 +51,12 @@ $messages['errormoving'] = 'Viestiä ei voitu siirtää';
 $messages['errorcopying'] = 'Viestiä ei voitu kopioida';
 $messages['errordeleting'] = 'Viestiä ei voitu poistaa';
 $messages['errormarking'] = 'Viestiä ei voitu merkiä';
-$messages['deletecontactconfirm'] = 'Haluatko varmasti poistaa valitut kontaktit?';
+$messages['deletecontactconfirm'] = 'Haluatko varmasti poistaa valitut yhteystiedot?';
+$messages['deletegroupconfirm'] = 'Haluatko varmasti poistaa valitun ryhmän?';
 $messages['deletemessagesconfirm'] = 'Haluatko varmasti poistaa valitut viestit?';
 $messages['deletefolderconfirm'] = 'Haluatko varmasti poistaa kansion?';
 $messages['purgefolderconfirm'] = 'Haluatko varmasti poistaa kaikki viestit kansiosta?';
+$messages['groupdeleting'] = 'Poistetaan ryhmää...';
 $messages['folderdeleting'] = 'Poistetaan kansiota...';
 $messages['foldermoving'] = 'Siirretään kansiota...';
 $messages['formincomplete'] = 'Lomakkeen tiedot olivat puutteelliset';
@@ -63,14 +65,14 @@ $messages['nonamewarning'] = 'Anna nimi';
 $messages['nopagesizewarning'] = 'Anna sivukoko';
 $messages['nosenderwarning'] = 'Anna lähettäjän sähköpostiosoite';
 $messages['norecipientwarning'] = 'Anna ainakin yksi vastaanottaja';
-$messages['nosubjectwarning'] = '"Otsikko" -kenttä on tyhjä. Haluaisitko kirjoittaa viestillesi otsikon?';
+$messages['nosubjectwarning'] = '"Otsikko"-kenttä on tyhjä. Haluatko kirjoittaa viestillesi otsikon?';
 $messages['nobodywarning'] = 'Lähetetäänkö viesti ilman tekstiä?';
 $messages['notsentwarning'] = 'Viestiä ei lähetetty. Haluatko poistaa viestin?';
-$messages['noldapserver'] = 'Valitse LDAP -palvelin';
-$messages['nocontactsreturned'] = 'Yhtään kontaktia ei löytynyt';
-$messages['nosearchname'] = 'Anna kontaktin nimi tai sähköpostiosoite';
+$messages['noldapserver'] = 'Valitse LDAP-palvelin';
+$messages['nosearchname'] = 'Anna yhteystiedon nimi tai sähköpostiosoite';
 $messages['notuploadedwarning'] = 'Kaikkia liitteitä ei ole vielä ladattu palvelimelle. Odota tai peruuta lataus.';
 $messages['searchsuccessful'] = 'Löydetty $nr viestiä';
+$messages['contactsearchsuccessful'] = 'Löydetty $nr yhteystietoa';
 $messages['searchnomatch'] = 'Haku ei tuottanut tuloksia';
 $messages['searching'] = 'Etsitään...';
 $messages['checking'] = 'Tarkistetaan...';
@@ -93,11 +95,11 @@ $messages['nodeletelastidentity'] = 'Et voi poistaa tätä identiteettiä, koska
 $messages['forbiddencharacter'] = 'Kansion nimessä on kiellettyjä merkkejä';
 $messages['selectimportfile'] = 'Valitse lähetettävä tiedosto';
 $messages['addresswriterror'] = 'Valittuun osoitekirjaan ei voi kirjoittaa';
-$messages['contactaddedtogroup'] = 'Kontaktit lisätty ryhmään';
-$messages['contactremovedfromgroup'] = 'Kontaktit poistettu ryhmästä';
+$messages['contactaddedtogroup'] = 'Yhteystiedot lisätty ryhmään';
+$messages['contactremovedfromgroup'] = 'Yhteystiedot poistettu ryhmästä';
 $messages['importwait'] = 'Tuodaan, odota...';
-$messages['importerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole vCard -muodossa.';
-$messages['importconfirm'] = '<b>$inserted kontaktia tuotu onnistuneesti $inserted kontaktioa, $skipped olemassaolevaa kontaktia hypättiin yli</b>:<p><em>$names</em></p>';
+$messages['importerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole vCard-muodossa.';
+$messages['importconfirm'] = '<b>$inserted yhteystietoa tuotu onnistuneesti</b>';
 $messages['opnotpermitted'] = 'Toiminto ei ole sallittu!';
 $messages['nofromaddress'] = 'Valittu identiteetti ei sisällä sähköpostiosoitetta';
 $messages['editorwarning'] = 'Vaihtaminen tekstieditoriin aiheuttaa viestin muotoilun katoamisen. Haluatko jatkaa?';
@@ -108,8 +110,20 @@ $messages['smtpfromerror'] = 'SMTP-virhe ($code): Lähettäjän "$from" asettami
 $messages['smtptoerror'] = 'SMTP-virhe ($code): Vastaanottajan "$to" lisääminen epäonnistui ($msg)';
 $messages['smtprecipientserror'] = 'SMTP-virhe: Ei voida jäsentää vastaanottajien listaa';
 $messages['smtperror'] = 'SMTP-virhe: $msg';
-$messages['emailformaterror'] = 'Väärä sähköpostiosoite: $email';
+$messages['emailformaterror'] = 'Virheellinen sähköpostiosoite: $email';
 $messages['toomanyrecipients'] = 'Liikaa vastaanottajia. Vähennä vastaanottajien määrä maksimiin $max.';
 $messages['maxgroupmembersreached'] = 'Ryhmän jäsenten määrä ylittää maksimin $max';
+$messages['internalerror'] = 'Ilmeni sisäinen virhe. Yritä uudelleen.';
+$messages['groupdeleted'] = 'Ryhmä poistettu onnistuneesti.';
+$messages['grouprenamed'] = 'Ryhmä nimetty uudelleen onnistuneesti.';
+$messages['groupcreated'] = 'Ryhmä luotu onnistuneesti.';
+$messages['savedsearchdeleted'] = 'Tallennettu haku poistettu onnistuneesti.';
+$messages['savedsearchdeleteerror'] = 'Tallennetun haun poisto epäonnistui.';
+$messages['savedsearchcreated'] = 'Tallennettu haku luotu onnistuneesti.';
+$messages['savedsearchcreateerror'] = 'Tallennetun haun tallennus epäonnistui.';
+$messages['namecannotbeempty'] = 'Nimi ei voi olla tyhjä.';
+$messages['nametoolong'] = 'Nimi on liian pitkä.';
+$messages['folderupdated'] = 'Kansio päivitetty onnistuneesti.';
+$messages['foldercreated'] = 'Kansio luotu onnistuneesti.';
+$messages['mispellingsfound'] = 'Viestissä havaittiin kielioppivirheitä.';
 
-?>
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 122e01e09..fb068b443 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -2,74 +2,55 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hi/labels.inc                                            |
+ | localization/hi_IN/labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aniruddha "Karim" Shankar <karim@sarai.net>                   |
+ | Author: Vibhav Pant <vibhavp@gmail.com>                               |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $labels = array();
-
-// login page
-$labels['welcome']   = '$product में स्वागत है';
-$labels['username']  = 'यूसरनाम';
-$labels['password']  = 'पासवर्ड';
-$labels['server']    = 'सर्वर';
-$labels['login']     = 'लॉगिन';
-
-// taskbar
-$labels['logout']   = 'लॉगआऊट';
-$labels['mail']     = 'ई-मेल';
+$labels['welcome'] = '$product में स्वागत है';
+$labels['username'] = 'यूसरनाम';
+$labels['password'] = 'पासवर्ड';
+$labels['server'] = 'सर्वर';
+$labels['login'] = 'लॉगिन';
+$labels['logout'] = 'लॉगआऊट';
+$labels['mail'] = 'ई-मेल';
 $labels['settings'] = 'निजी सैटिंग';
 $labels['addressbook'] = 'पता खाता';
-
-// mailbox names
-$labels['inbox']  = 'इनबॉक्स';
+$labels['inbox'] = 'इनबॉक्स';
 $labels['drafts'] = 'ड्राफ़ट';
-$labels['sent']   = 'भेजा गया';
-$labels['trash']  = 'रद्दी';
-$labels['junk']   = 'स्पैम';
-
-// message listing
+$labels['sent'] = 'भेजा गया';
+$labels['trash'] = 'रद्दी';
+$labels['junk'] = 'स्पैम';
 $labels['subject'] = 'विशय';
-$labels['from']    = 'भेजने वाला';
-$labels['to']      = 'पाने वाला';
-$labels['cc']      = 'कार्बन';
-$labels['bcc']     = 'अंधा कार्बन';
+$labels['from'] = 'भेजने वाला';
+$labels['to'] = 'पाने वाला';
+$labels['cc'] = 'कार्बन';
+$labels['bcc'] = 'अंधा कार्बन';
 $labels['replyto'] = 'जवाब यहाँ';
-$labels['date']    = 'तारीख';
-$labels['size']    = 'माप';
+$labels['followupto'] = 'को- फॉलोअप';
+$labels['date'] = 'तारीख';
+$labels['size'] = 'माप';
 $labels['priority'] = 'मेल की महत्वपूर्णता';
 $labels['organization'] = 'संस्था';
-
-// aliases
-$labels['reply-to'] = $labels['replyto'];
-
-$labels['mailboxlist'] = 'फ़ोलडर';
+$labels['mailboxlist'] = 'फ़ोल्डर';
+$labels['folders'] = 'फ़ोल्डर';
 $labels['messagesfromto'] = '$from से ले कर $to, $count मेल में से';
 $labels['messagenrof'] = '$nr नम्बर मेल, $count में से';
-
-$labels['moveto']   = 'खीस्काऐं...';
+$labels['copy'] = 'कार्बन';
+$labels['move'] = 'स्थानांतरित करें';
+$labels['moveto'] = 'खीस्काऐं...';
 $labels['download'] = 'डाऊनलोड';
-
 $labels['filename'] = 'फ़ाईल नाम';
 $labels['filesize'] = 'फ़ाईल माप';
-
-$labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) दिखाऐं';
-$labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूप मेल करें';
-$labels['prettydate'] = 'सुनदर तारीखें';
-
 $labels['addtoaddressbook'] = 'पता खाते में जोडें';
-
-// weekdays short
 $labels['sun'] = 'रवि';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंग';
@@ -77,159 +58,134 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'गुरु';
 $labels['fri'] = 'शुक्र';
 $labels['sat'] = 'शनि';
-
-// weekdays long
-$labels['sunday']    = 'रविवार';
-$labels['monday']    = 'सोमवार';
-$labels['tuesday']   = 'मंगलवार';
+$labels['sunday'] = 'रविवार';
+$labels['monday'] = 'सोमवार';
+$labels['tuesday'] = 'मंगलवार';
 $labels['wednesday'] = 'बुधवार';
-$labels['thursday']  = 'गुरुवार';
-$labels['friday']    = 'शुक्रवार';
-$labels['saturday']  = 'शनिवार';
-
+$labels['thursday'] = 'गुरुवार';
+$labels['friday'] = 'शुक्रवार';
+$labels['saturday'] = 'शनिवार';
+$labels['jan'] = 'जनवरी';
+$labels['feb'] = 'फ़रवरी';
+$labels['mar'] = 'मार्च';
+$labels['apr'] = 'अप्रेल';
+$labels['may'] = 'मई';
+$labels['longmay'] = 'मई';
+$labels['jun'] = 'जून';
+$labels['jul'] = 'जुलाई';
+$labels['longjan'] = 'जनवरी';
+$labels['longfeb'] = 'फ़रवरी';
+$labels['longmar'] = 'मार्च';
+$labels['longapr'] = 'अप्रैल';
+$labels['longjun'] = 'जून';
+$labels['longjul'] = 'जुलाई';
+$labels['longaug'] = 'अगस्त';
+$labels['longsep'] = 'सितंबर';
+$labels['longoct'] = 'अक्टूबर';
+$labels['longnov'] = 'नवम्बर';
+$labels['longdec'] = 'दिसंबर';
 $labels['today'] = 'आज';
-
-// toolbar buttons
-$labels['checkmail']        = 'नये मेल लाऐं';
-$labels['writenewmessage']  = 'मेल लिखें';
-$labels['replytomessage']   = 'मेल का जवाब दें';
+$labels['refresh'] = 'ताज़ा करें';
+$labels['checkmail'] = 'नये मेल लाऐं';
+$labels['compose'] = 'मेल लिखें';
+$labels['writenewmessage'] = 'मेल लिखें';
+$labels['reply'] = 'जवाब';
+$labels['replytomessage'] = 'मेल का जवाब दें';
 $labels['replytoallmessage'] = 'सभी को जवाब लिखें';
-$labels['forwardmessage']   = 'आगे भेजें';
-$labels['deletemessage']    = 'रद्द करें';
-$labels['printmessage']     = 'मेल छापें';
-$labels['previousmessage']	= 'पीछे के मेल दिखाऐं';
-$labels['previousmessages']	= 'पीछे के मेल का बन्डल दिखाऐं';
-$labels['firstmessage']		= 'पहला मेल दिखाऐं';
-$labels['firstmessages']	= 'पहला मेल का बन्डल दिखाऐं';
-$labels['nextmessage']		= 'अगला मेल दिखाऐं';
-$labels['nextmessages']		= 'अगले मेल का बन्डल दिखाऐं';
-$labels['lastmessage']		= 'आखीरी मेल दिखाऐं';
-$labels['lastmessages']		= 'आखिरी मेल का बन्डल दिखाऐं';
-$labels['backtolist']		= 'मेल सूची देखें';
-$labels['viewsource']		= 'सोर्स दिखाऐं';
-
-$labels['select']		= 'चुनें';
-$labels['all']			= 'सभी';
-$labels['none']			= 'कोई नहीं';
-$labels['unread']		= 'अनदेखी';
-
-$labels['compact']		= 'छोटा करें';
-$labels['empty']		= 'मेल रद्दी में डालें';
-$labels['purge']		= 'मिटाऐं';
-
-$labels['quota']		= 'डिस्क उपयोग';
-$labels['unknown']		= 'अज्ञात';
-$labels['unlimited']		= 'असीम';
-
-$labels['quicksearch']		= 'तेज़ खोज';
-$labels['resetsearch']		= 'खोज खाली करें';
-
-
-// message compose
-$labels['compose']		= 'मेल लिखें';
-$labels['sendmessage']		= 'मेल भेजें';
-$labels['savemessage']		= 'ड्राफ़ट सहेजें';
-$labels['addattachment']	= 'फ़ाईल जोडें';
-$labels['charset']		= 'कैरेक्टर सैट';
-$labels['editortype']		= 'सम्पादक प्राकार';
-$labels['returnreceipt']	= 'मेल रसीद';
-
-$labels['checkspelling']	= 'स्पैलिंग जाँचें';
-$labels['resumeediting']	= 'सम्पादन फिर शुरू करें';
-$labels['revertto']		= 'पहले की स्थिती पर जाऐं';
-
-$labels['attachments']		= 'जुडे फाईल';
-$labels['upload']		= 'अपलोड';
-$labels['close']		= 'बंद';
-
-$labels['low']			= 'कम';
-$labels['lowest']		= 'सबसे कम';
-$labels['normal']		= 'साधारण';
-$labels['high']			= 'उच्च';
-$labels['highest']		= 'उच्चतम';
-
-$labels['nosubject']		= '(कोई विशय नहीं)';
-$labels['showimages']		= 'चित्र दिखाऐं';
-
-$labels['htmltoggle']		= 'ऐच-टी-ऐम-एल (HTML)';
-$labels['plaintoggle']		= 'सादा पाठ';
-
-
-// address boook
-$labels['name']			= 'दिखने वाला नाम';
-$labels['firstname']		= 'पहला नाम';
-$labels['surname']		= 'उपनाम';
-$labels['email']		= 'मेल';
-
-$labels['addcontact']		= 'नया पता जोडें';
-$labels['editcontact']		= 'पता सम्पाद';
-
-$labels['edit']			= 'सम्पाद';
-$labels['cancel']		= 'रद्द';
-$labels['save']			= 'सहेज';
-$labels['delete']		= 'मिटा';
-
-$labels['newcontact']		= 'नया पता कार्ड बनाऐं';
-$labels['deletecontact']	= 'चुने पते मिटाऐं';
-$labels['composeto']		= 'को मेल भेजें';
-$labels['contactsfromto']	= '$from से ले कर $to, $count पते में से';
-$labels['print']		= 'छापें';
-$labels['export']		= 'ऐक्स्पोर्ट';
-
-$labels['previouspage']		= 'इससे पहले के बन्डल को दिखाऐं';
-$labels['firstpage']		= 'पहला बन्डल दिखाऐं';
-$labels['nextpage']		= 'अगला बन्डल दिखाऐं';
-$labels['lastpage']		= 'आखिरी बन्डल दिखाऐं';
-
-
-// LDAP search
-$labels['ldapsearch']		= 'ऐलडैप (LDAP) डाईरेक्टरी खोजें';
-
-$labels['ldappublicsearchname']	= 'पता का नाम';
-$labels['ldappublicsearchtype']	= 'सख़त मैच?';
-$labels['ldappublicserverselect']	= 'सर्वर चुनें';
-$labels['ldappublicsearchfield']	= 'यहाँ खोजें';
-$labels['ldappublicsearchform']	= 'पता के लिये खोजें';
-$labels['ldappublicsearch']	= 'खोज';
-
-
-// settings
-$labels['settingsfor']		= 'इनके विन्यास:';
-
-$labels['preferences']		= 'पसंद';
-$labels['userpreferences']	= 'यूसर पसंद';
-$labels['editpreferences']	= 'यूसर पसंद सम्पादें';
-
-$labels['identities']		= 'पहचान';
-$labels['manageidentities']	= 'इस खाते के पहचान व्यवस्थित करें';
-$labels['newidentity']		= 'नया पहचान';
-
-$labels['newitem']		= 'नया चीज़';
-$labels['edititem']		= 'चीज़ सम्पादें';
-
-$labels['setdefault']		= 'तयशुदा चुनें';
-$labels['language']		= 'भाषा';
-$labels['timezone']		= 'समय क्षेत्र';
-$labels['pagesize']		= 'हर पन्ने पर इतने';
-$labels['signature']		= 'दस्तखत';
-$labels['dstactive']		= 'रौशनी बचाव';
-$labels['htmleditor']		= 'मेल ऐच-टी-ऐम-एल (HTML) मे लिखें';
-$labels['htmlsignature']	= 'ऐच-टी-ऐम-एल (HTML) दस्तखत';
-$labels['previewpane']		= 'झलक पट्टी दिखाऐं';
-
-$labels['autosavedraft']	= 'ड्राफ़ट अपने आप सहेजते जाऐं';
-$labels['never']		= 'कभी नहाीं';
-
-$labels['folder']		= 'फ़ोल्डर';
-$labels['folders']		= 'फ़ोल्डर';
-$labels['foldername']		= 'फ़ोल्डर नाम';
-$labels['subscribed']		= 'सबस्क्राईब किया गया';
-$labels['create']		= 'बनाऐं';
-$labels['createfolder']		= 'फ़ोलडर बनाऐं';
-$labels['managefolders']	= 'फ़ोलडर को व्यवस्थित करें';
-
-$labels['sortby']		= 'ऐसे तय करें';
-$labels['sortasc']		= 'पहले से आखीरी तय करें';
-$labels['sortdesc']		= 'आखीरी से पहले तय करें';
+$labels['forward'] = 'अग्रेषित करें';
+$labels['forwardmessage'] = 'आगे भेजें';
+$labels['deletemessage'] = 'रद्द करें';
+$labels['printmessage'] = 'मेल छापें';
+$labels['previousmessage'] = 'पीछे के मेल दिखाऐं';
+$labels['firstmessage'] = 'पहला मेल दिखाऐं';
+$labels['nextmessage'] = 'अगला मेल दिखाऐं';
+$labels['lastmessage'] = 'आखीरी मेल दिखाऐं';
+$labels['backtolist'] = 'मेल सूची देखें';
+$labels['viewsource'] = 'सोर्स दिखाऐं';
+$labels['mark'] = 'चिह्नित';
+$labels['select'] = 'चुनें';
+$labels['all'] = 'सभी';
+$labels['none'] = 'कोई नहीं';
+$labels['nonesort'] = 'कोई नहीं';
+$labels['unread'] = 'अनदेखी';
+$labels['compact'] = 'छोटा करें';
+$labels['empty'] = 'मेल रद्दी में डालें';
+$labels['quota'] = 'डिस्क उपयोग';
+$labels['unknown'] = 'अज्ञात';
+$labels['unlimited'] = 'असीम';
+$labels['quicksearch'] = 'तेज़ खोज';
+$labels['resetsearch'] = 'खोज खाली करें';
+$labels['savemessage'] = 'ड्राफ़ट सहेजें';
+$labels['sendmessage'] = 'मेल भेजें';
+$labels['addattachment'] = 'फ़ाईल जोडें';
+$labels['charset'] = 'कैरेक्टर सैट';
+$labels['editortype'] = 'सम्पादक प्राकार';
+$labels['returnreceipt'] = 'मेल रसीद';
+$labels['checkspelling'] = 'स्पैलिंग जाँचें';
+$labels['resumeediting'] = 'सम्पादन फिर शुरू करें';
+$labels['revertto'] = 'पहले की स्थिती पर जाऐं';
+$labels['attachments'] = 'जुडे फाईल';
+$labels['upload'] = 'अपलोड';
+$labels['close'] = 'बंद';
+$labels['low'] = 'कम';
+$labels['lowest'] = 'सबसे कम';
+$labels['normal'] = 'साधारण';
+$labels['high'] = 'उच्च';
+$labels['highest'] = 'उच्चतम';
+$labels['nosubject'] = '(कोई विशय नहीं)';
+$labels['showimages'] = 'चित्र दिखाऐं';
+$labels['htmltoggle'] = 'ऐच-टी-ऐम-एल (HTML)';
+$labels['plaintoggle'] = 'सादा पाठ';
+$labels['name'] = 'दिखने वाला नाम';
+$labels['firstname'] = 'पहला नाम';
+$labels['surname'] = 'उपनाम';
+$labels['email'] = 'मेल';
+$labels['addcontact'] = 'नया पता जोडें';
+$labels['editcontact'] = 'पता सम्पाद';
+$labels['edit'] = 'सम्पाद';
+$labels['cancel'] = 'रद्द';
+$labels['save'] = 'सहेज';
+$labels['delete'] = 'मिटा';
+$labels['newcontact'] = 'नया पता कार्ड बनाऐं';
+$labels['deletecontact'] = 'चुने पते मिटाऐं';
+$labels['composeto'] = 'को मेल भेजें';
+$labels['contactsfromto'] = '$from से ले कर $to, $count पते में से';
+$labels['print'] = 'छापें';
+$labels['export'] = 'ऐक्स्पोर्ट';
+$labels['previouspage'] = 'इससे पहले के बन्डल को दिखाऐं';
+$labels['firstpage'] = 'पहला बन्डल दिखाऐं';
+$labels['nextpage'] = 'अगला बन्डल दिखाऐं';
+$labels['lastpage'] = 'आखिरी बन्डल दिखाऐं';
+$labels['settingsfor'] = 'इनके विन्यास:';
+$labels['preferences'] = 'पसंद';
+$labels['userpreferences'] = 'यूसर पसंद';
+$labels['editpreferences'] = 'यूसर पसंद सम्पादें';
+$labels['identities'] = 'पहचान';
+$labels['manageidentities'] = 'इस खाते के पहचान व्यवस्थित करें';
+$labels['newidentity'] = 'नया पहचान';
+$labels['newitem'] = 'नया चीज़';
+$labels['edititem'] = 'चीज़ सम्पादें';
+$labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) दिखाऐं';
+$labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूप मेल करें';
+$labels['prettydate'] = 'सुनदर तारीखें';
+$labels['setdefault'] = 'तयशुदा चुनें';
+$labels['language'] = 'भाषा';
+$labels['timezone'] = 'समय क्षेत्र';
+$labels['pagesize'] = 'हर पन्ने पर इतने';
+$labels['signature'] = 'दस्तखत';
+$labels['dstactive'] = 'रौशनी बचाव';
+$labels['htmleditor'] = 'मेल ऐच-टी-ऐम-एल (HTML) मे लिखें';
+$labels['htmlsignature'] = 'ऐच-टी-ऐम-एल (HTML) दस्तखत';
+$labels['previewpane'] = 'झलक पट्टी दिखाऐं';
+$labels['autosavedraft'] = 'ड्राफ़ट अपने आप सहेजते जाऐं';
+$labels['never'] = 'कभी नहाीं';
+$labels['folder'] = 'फ़ोल्डर';
+$labels['foldername'] = 'फ़ोल्डर नाम';
+$labels['subscribed'] = 'सबस्क्राईब किया गया';
+$labels['create'] = 'बनाऐं';
+$labels['createfolder'] = 'फ़ोलडर बनाऐं';
+$labels['managefolders'] = 'फ़ोलडर को व्यवस्थित करें';
+$labels['sortby'] = 'ऐसे तय करें';
+$labels['sortasc'] = 'पहले से आखीरी तय करें';
+$labels['sortdesc'] = 'आखीरी से पहले तय करें';
 
-?>
\ No newline at end of file
diff --git a/program/localization/hi_IN/messages.inc b/program/localization/hi_IN/messages.inc
index 9274c4d0b..8056dec5e 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -2,71 +2,66 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hi/messages.inc                                          |
+ | localization/hi_IN/messages.inc                                       |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aniruddha "Karim" Shankar <karim@sarai.net>                   |
+ | Author: Thomas <Unknown>                                              |
  +-----------------------------------------------------------------------+
-
  @version $Id$
-
 */
 
 $messages = array();
+$messages['loginfailed'] = 'लॉगिन नहीं हो पाया';
+$messages['cookiesdisabled'] = 'आपका ब्राऊसर कुकी स्वीकार नहीं कर रहा है';
+$messages['sessionerror'] = 'सत्र समाप्त या अवैद्य';
+$messages['imaperror'] = 'आईमैप (IMAP) सर्वर से सम्पर्क नहीं हो पाया';
+$messages['nomessagesfound'] = 'इस मेलबॉक्स में कोई मेल नहीं है';
+$messages['loggedout'] = 'सत्र समाप्त. टा टा!';
+$messages['mailboxempty'] = 'मेलबॉक्स खाली है';
+$messages['loading'] = 'लोड हो रहा है';
+$messages['loadingdata'] = 'डाटा लोड हो रहा है...';
+$messages['checkingmail'] = 'क्या नया मेल है?...';
+$messages['sendingmessage'] = 'मेल भेजा जा रहा है...';
+$messages['messagesent'] = 'मेल भेजा गया है';
+$messages['savingmessage'] = 'मेल सहेजा जा रहा है...';
+$messages['messagesaved'] = 'मेल ड्राफ़्ट फोल्डर में जमा हो रहा है';
+$messages['successfullysaved'] = 'सहेजा गया है';
+$messages['addedsuccessfully'] = 'पता खाते में पता जोडा गया है';
+$messages['contactexists'] = 'इस ई-मेल पता से एक पता पेहले से है';
+$messages['blockedimages'] = 'आप के प्राईवेसी के लिये और स्पैम से बचने के लिये इस मेल में सदूर चित्र नहीं दिखाये गये हैं।';
+$messages['encryptedmessage'] = 'माफ़ कीजिये, यह मेल कूट रूप में है, इस कारण दिखाया नहीं जा सकता।';
+$messages['nocontactsfound'] = 'कोई पता नहीं मिला';
+$messages['sendingfailed'] = 'मेल नहीं भिज पाया';
+$messages['errorsaving'] = 'सहेजते-सहेजते गडबड हो गया';
+$messages['errormoving'] = 'मेल खिस्का नहीं';
+$messages['errordeleting'] = 'मेल मिटा नहीं';
+$messages['deletecontactconfirm'] = 'चुने गये पते को सचमुच मिटाना है ?';
+$messages['deletemessagesconfirm'] = 'चुने गये मेल को सचमुच मिटाना है ?';
+$messages['deletefolderconfirm'] = 'फ़ोल्डर को सचमुच मिटाऐं ?';
+$messages['purgefolderconfirm'] = 'फ़ोल्डर में पडे सारे मेल को सचमुच मिटाना है?';
+$messages['formincomplete'] = 'फ़ॉर्म पूरी तरह से भरा नहीं';
+$messages['noemailwarning'] = 'वैद्य मेल पता भरें';
+$messages['nonamewarning'] = 'नाम भरें';
+$messages['nopagesizewarning'] = 'पन्ना माप भरें';
+$messages['norecipientwarning'] = 'कम-से-कम एक पाने वाले का पता भरें';
+$messages['nosubjectwarning'] = 'मेल का कोई विशय नहीं बताया गया है। क्या आप विशय डालना चाहते हैं ?';
+$messages['nobodywarning'] = 'बिना कुछ लिखे मेल भेजें?';
+$messages['notsentwarning'] = 'मेल भिजा नहीं. मेल रद्द करें ?';
+$messages['noldapserver'] = 'खोज के लिये एक ऐलडैप सर्वर चुनें';
+$messages['nosearchname'] = 'पता या पते का नाम भरें';
+$messages['searchsuccessful'] = '$nr मेल मिले';
+$messages['searchnomatch'] = 'खोज असफ़ल';
+$messages['searching'] = 'खोजा रहे हैं...';
+$messages['checking'] = 'चाँचा चा रहा है...';
+$messages['nospellerrors'] = 'कोई स्पैलिंग गलती नहीं मिली';
+$messages['folderdeleted'] = 'फ़ोल्डर मिट गया';
+$messages['deletedsuccessfully'] = 'मिट गया';
+$messages['converting'] = 'मेल से फ़ॉर्मैटिंग निकाला जा रहा है...';
+$messages['messageopenerror'] = 'सर्वर से मेल लोड नहीं हो पाया';
+$messages['fileuploaderror'] = 'फ़ाईल अपलोड नहीं हो पाया';
+$messages['filesizeerror'] = 'अपलोड के लिये फ़ाईल हद $size से बड़ा है';
 
-$messages['loginfailed']	= 'लॉगिन नहीं हो पाया';
-$messages['cookiesdisabled']	= 'आपका ब्राऊसर कुकी स्वीकार नहीं कर रहा है';
-$messages['sessionerror']	= 'सत्र समाप्त या अवैद्य';
-$messages['imaperror']		= 'आईमैप (IMAP) सर्वर से सम्पर्क नहीं हो पाया';
-$messages['nomessagesfound']	= 'इस मेलबॉक्स में कोई मेल नहीं है';
-$messages['loggedout']		= 'सत्र समाप्त. टा टा!';
-$messages['mailboxempty']	= 'मेलबॉक्स खाली है';
-$messages['loading']		= 'लोड हो रहा है';
-$messages['loadingdata']	= 'डाटा लोड हो रहा है...';
-$messages['checkingmail']	= 'क्या नया मेल है?...';
-$messages['sendingmessage']	= 'मेल भेजा जा रहा है...';
-$messages['messagesent']	= 'मेल भेजा गया है';
-$messages['savingmessage']	= 'मेल सहेजा जा रहा है...';
-$messages['messagesaved']	= 'मेल ड्राफ़्ट फोल्डर में जमा हो रहा है';
-$messages['successfullysaved']	= 'सहेजा गया है';
-$messages['addedsuccessfully']	= 'पता खाते में पता जोडा गया है';
-$messages['contactexists']	= 'इस ई-मेल पता से एक पता पेहले से है';
-$messages['blockedimages']	= 'आप के प्राईवेसी के लिये और स्पैम से बचने के लिये इस मेल में सदूर चित्र नहीं दिखाये गये हैं।';
-$messages['encryptedmessage']	= 'माफ़ कीजिये, यह मेल कूट रूप में है, इस कारण दिखाया नहीं जा सकता।';
-$messages['nocontactsfound']	= 'कोई पता नहीं मिला';
-$messages['sendingfailed']	= 'मेल नहीं भिज पाया';
-$messages['errorsaving']	= 'सहेजते-सहेजते गडबड हो गया';
-$messages['errormoving']	= 'मेल खिस्का नहीं';
-$messages['errordeleting']	= 'मेल मिटा नहीं';
-$messages['deletecontactconfirm']	= 'चुने गये पते को सचमुच मिटाना है ?';
-$messages['deletemessagesconfirm']	= 'चुने गये मेल को सचमुच मिटाना है ?';
-$messages['deletefolderconfirm']	= 'फ़ोल्डर को सचमुच मिटाऐं ?';
-$messages['purgefolderconfirm']	= 'फ़ोल्डर में पडे सारे मेल को सचमुच मिटाना है?';
-$messages['formincomplete']	= 'फ़ॉर्म पूरी तरह से भरा नहीं';
-$messages['noemailwarning']	= 'वैद्य मेल पता भरें';
-$messages['nonamewarning']	= 'नाम भरें';
-$messages['nopagesizewarning']	= 'पन्ना माप भरें';
-$messages['norecipientwarning']	= 'कम-से-कम एक पाने वाले का पता भरें';
-$messages['nosubjectwarning']	= 'मेल का कोई विशय नहीं बताया गया है। क्या आप विशय डालना चाहते हैं ?';
-$messages['nobodywarning']	= 'बिना कुछ लिखे मेल भेजें?';
-$messages['notsentwarning']	= 'मेल भिजा नहीं. मेल रद्द करें ?';
-$messages['noldapserver']	= 'खोज के लिये एक ऐलडैप सर्वर चुनें';
-$messages['nocontactsreturned']	= 'कोई पते नहीं मिले';
-$messages['nosearchname']	= 'पता या पते का नाम भरें';
-$messages['searchsuccessful']	= '$nr मेल मिले';
-$messages['searchnomatch']	= 'खोज असफ़ल';
-$messages['searching']		= 'खोजा रहे हैं...';
-$messages['checking']		= 'चाँचा चा रहा है...';
-$messages['nospellerrors']	= 'कोई स्पैलिंग गलती नहीं मिली';
-$messages['folderdeleted']	= 'फ़ोल्डर मिट गया';
-$messages['deletedsuccessfully']	= "मिट गया";
-$messages['converting']		= 'मेल से फ़ॉर्मैटिंग निकाला जा रहा है...';
-$messages['messageopenerror']	= 'सर्वर से मेल लोड नहीं हो पाया';
-$messages['fileuploaderror']	= 'फ़ाईल अपलोड नहीं हो पाया';
-$messages['filesizeerror']	= 'अपलोड के लिये फ़ाईल हद $size से बड़ा है';
-
-?>
\ No newline at end of file
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 9161bbceb..0eefa5ec2 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -1,33 +1,27 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| language/nl_NL/messages.inc                                           |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Mark Moses <mark@katmoda.com>                                 |
-|         Lazlo Westerhof <roundcube@lazlo.me>                          |
-|         Frits Letteboer <f.letteboer@radiotwenterand.nl>              |
-|         Justin van Beusekom <j.v.beusekom@beus-it.nl>                 |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/nl_NL/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Geert Wirken <Unknown>                                        |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $messages = array();
 $messages['loginfailed'] = 'Inloggen mislukt.';
 $messages['cookiesdisabled'] = 'Uw browser accepteert geen cookies.';
 $messages['sessionerror'] = 'Uw sessie is verlopen of ongeldig.';
-$messages['imaperror'] = 'Connectie met IMAP server mislukt.';
-$messages['servererror'] = 'Server Fout!';
-$messages['servererrormsg'] = 'Server Fout: $msg';
-$messages['dberror'] = 'Database Fout!';
+$messages['imaperror'] = 'Verbinding met IMAP-server mislukt.';
+$messages['servererror'] = 'Serverfout!';
+$messages['servererrormsg'] = 'Serverfout: $msg';
+$messages['dberror'] = 'Databasefout!';
 $messages['errorreadonly'] = 'Niet in staat om de bewerking uit te voeren. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Niet in staat om de bewerking uit te voeren. Toestemming geweigerd.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
@@ -37,35 +31,35 @@ $messages['mailboxempty'] = 'Mailbox is leeg.';
 $messages['loading'] = 'Laden...';
 $messages['uploading'] = 'Bestand wordt geüpload...';
 $messages['uploadingmany'] = 'Bestanden worden geüpload...';
-$messages['loadingdata'] = 'Laden van data...';
+$messages['loadingdata'] = 'Gegevens worden geladen...';
 $messages['checkingmail'] = 'Controleren op nieuwe berichten...';
-$messages['sendingmessage'] = 'Bezig met bericht versturen...';
+$messages['sendingmessage'] = 'Bericht versturen...';
 $messages['messagesent'] = 'Bericht succesvol verstuurd.';
-$messages['savingmessage'] = 'Bezig met bericht opslaan...';
-$messages['messagesaved'] = 'Bericht bewaard als concept.';
+$messages['savingmessage'] = 'Bericht wordt opgeslagen...';
+$messages['messagesaved'] = 'Bericht opgeslagen in Concepten.';
 $messages['successfullysaved'] = 'Succesvol opgeslagen.';
 $messages['addedsuccessfully'] = 'Contact is succesvol toegevoegd aan het adresboek.';
 $messages['contactexists'] = 'Er bestaat al een contactpersoon met dit e-mailadres.';
 $messages['contactnameexists'] = 'Er bestaat al een contactpersoon met deze naam.';
-$messages['blockedimages'] = 'Uit privacyoverwegingen zijn niet bijgevoegde afbeeldingen geblokkeerd in dit bericht.';
+$messages['blockedimages'] = 'Om uw privacy te beschermen zijn externe afbeeldingen geblokkeerd in dit bericht.';
 $messages['encryptedmessage'] = 'Dit is een gecodeerd bericht en kan niet weergegeven worden. Excuses!';
 $messages['nocontactsfound'] = 'Geen contactpersonen gevonden.';
 $messages['contactnotfound'] = 'Contactpersoon niet gevonden.';
-$messages['contactsearchonly'] = 'Voer enkele zoektermen in om contactpersonen te zoeken.';
+$messages['contactsearchonly'] = 'Voer enkele zoektermen in om contactpersonen te zoeken';
 $messages['sendingfailed'] = 'Verzenden van bericht is mislukt.';
-$messages['senttooquickly'] = 'Je moet $sec seconden wachten om het bericht te versturen.';
+$messages['senttooquickly'] = 'Wacht alstublieft $sec seconde(n) voordat u dit bericht verstuurt.';
 $messages['errorsavingsent'] = 'Er is een fout opgetreden tijdens het opslaan van het verzonden bericht.';
 $messages['errorsaving'] = 'Er is een fout opgetreden tijdens het opslaan.';
-$messages['errormoving'] = 'Kan het bericht niet verplaatsen.';
-$messages['errorcopying'] = 'Kan de bericht(en) niet kopiëren.';
-$messages['errordeleting'] = 'Kan het bericht niet verwijderen.';
-$messages['errormarking'] = 'Kon bericht niet markeren.';
-$messages['deletecontactconfirm'] = 'Weet u zeker dat u de geselecteerde contactperso(o)n/en wilt verwijderen?';
+$messages['errormoving'] = 'Kan bericht(en) niet verplaatsen.';
+$messages['errorcopying'] = 'Kan bericht(en) niet kopiëren.';
+$messages['errordeleting'] = 'Kan bericht(en) niet verwijderen.';
+$messages['errormarking'] = 'Kan bericht(en) niet markeren.';
+$messages['deletecontactconfirm'] = 'Weet u zeker dat u de geselecteerde contact(en) wilt verwijderen?';
 $messages['deletegroupconfirm'] = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
 $messages['deletemessagesconfirm'] = 'Weet u zeker dat u de geselecteerde bericht(en) wilt verwijderen?';
 $messages['deletefolderconfirm'] = 'Weet u zeker dat u deze map wilt verwijderen?';
 $messages['purgefolderconfirm'] = 'Weet u zeker dat u alle berichten in deze map wilt verwijderen?';
-$messages['contactdeleting'] = 'Bezig met verwijderen één of meer contactpersonen...';
+$messages['contactdeleting'] = 'Bezig met verwijderen van contact(en)...';
 $messages['groupdeleting'] = 'Groep wordt verwijderd...';
 $messages['folderdeleting'] = 'Map wordt verwijderd...';
 $messages['foldermoving'] = 'Map wordt verplaatst...';
@@ -80,8 +74,8 @@ $messages['norecipientwarning'] = 'Geef tenminste één ontvanger op.';
 $messages['nosubjectwarning'] = 'Het \'Onderwerp\' veld is leeg. Wilt u nu alsnog een onderwerp opgeven?';
 $messages['nobodywarning'] = 'Dit bericht zonder inhoud versturen?';
 $messages['notsentwarning'] = 'Bericht is niet verstuurd. Weet u zeker dat u het niet wilt bewaren?';
-$messages['noldapserver'] = 'Geef een LDAP adresboek server op om te doorzoeken.';
-$messages['nosearchname'] = 'Geef de naam of e-mail op van de contactpersoon.';
+$messages['noldapserver'] = 'Selecteer een LDAP-server om te zoeken.';
+$messages['nosearchname'] = 'Vul de naam of e-mailadres in van een contactpersoon.';
 $messages['notuploadedwarning'] = 'Nog niet alle bijlagen zijn geüpload. Wacht even of annuleer de upload.';
 $messages['searchsuccessful'] = '$nr berichten gevonden.';
 $messages['contactsearchsuccessful'] = '$nr contactpersonen gevonden.';
@@ -94,7 +88,7 @@ $messages['foldersubscribed'] = 'Folder succesvol geabonneerd.';
 $messages['folderunsubscribed'] = 'Folder succesvol uitgeschreven.';
 $messages['folderpurged'] = 'Folder met succes geleegd.';
 $messages['folderexpunged'] = 'Folder succesvol geleegd.';
-$messages['deletedsuccessfully'] = 'Successvol verwijderd.';
+$messages['deletedsuccessfully'] = 'Met succes verwijderd.';
 $messages['converting'] = 'Opmaak van bericht verwijderen...';
 $messages['messageopenerror'] = 'Kan het bericht niet van de server laden.';
 $messages['fileuploaderror'] = 'Bestand uploaden mislukt.';
@@ -103,15 +97,16 @@ $messages['copysuccess'] = '$nr adressen succesvol gekopieerd.';
 $messages['copyerror'] = 'Kan geen adressen kopiëren.';
 $messages['sourceisreadonly'] = 'Het adres is alleen-lezen.';
 $messages['errorsavingcontact'] = 'Kan het ontvanger-adres niet opslaan.';
-$messages['movingmessage'] = 'Bericht verplaatsen...';
-$messages['copyingmessage'] = 'Kopiëren bericht...';
-$messages['copyingcontact'] = 'Kopiëren contactpersonen...';
-$messages['deletingmessage'] = 'Verwijderen bericht(en)...';
-$messages['markingmessage'] = 'Markeren bericht(en)...';
+$messages['movingmessage'] = 'Bericht(en) verplaatsen...';
+$messages['copyingmessage'] = 'Bericht(en) kopiëren...';
+$messages['copyingcontact'] = 'Contact(en) kopiëren...';
+$messages['deletingmessage'] = 'Bericht(en) verwijderen...';
+$messages['markingmessage'] = 'Bericht(en) markeren...';
 $messages['addingmember'] = 'Contactpersonen worden toegevoegd aan de groep...';
 $messages['removingmember'] = 'Contactpersonen worden verwijderd uit de groep...';
 $messages['receiptsent'] = 'Ontvangstbevestiging is verstuurd.';
 $messages['errorsendingreceipt'] = 'Kan de ontvangstbevestiging niet versturen.';
+$messages['deleteidentityconfirm'] = 'Weet u zeker dat u deze identiteit wilt verwijderen?';
 $messages['nodeletelastidentity'] = 'U kunt uw enige identiteit niet verwijderen.';
 $messages['forbiddencharacter'] = 'De naam van de map bevat een karakter dat niet is toegestaan.';
 $messages['selectimportfile'] = 'Selecteer een bestand om de uploaden.';
@@ -124,7 +119,7 @@ $messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol ge�
 $messages['importconfirmskipped'] = '<b>$skipped bestaande contactpersonen overgeslagen</b>';
 $messages['opnotpermitted'] = 'Deze verrichting is niet toegestaan!';
 $messages['nofromaddress'] = 'Het e-mailadres mist in de geselecteerde identiteit.';
-$messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet je zeker dat je verder wil gaan?';
+$messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet u zeker dat u verder wilt gaan?';
 $messages['httpreceivedencrypterror'] = 'Er is een fatale fout opgetreden. Neem direct contact op met uw systeembeheerder. <b>Uw bericht kon niet worden verzonden.</b>';
 $messages['smtpconnerror'] = 'SMTP Fout ($code): Verbinding met server mislukt.';
 $messages['smtpautherror'] = 'SMTP Fout ($code): Autenticatie mislukt.';
@@ -160,5 +155,5 @@ $messages['foldercreated'] = 'Map succesvol aangemaakt';
 $messages['invalidimageformat'] = 'Geen geldig afbeeldings formaat';
 $messages['mispellingsfound'] = 'Spelfouten gedetecteerd in bericht';
 $messages['parentnotwritable'] = 'U heeft niet voldoende rechten een map te maken / verplaatsen in deze map.';
+$messages['messagetoobig'] = 'Het bericht is te groot om te verwerken.';
 
-?>
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 1d3a54ddb..fe0e81da1 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -1,22 +1,17 @@
 <?php
 
 /*
-
-+-----------------------------------------------------------------------+
-| localization/zh_TW/labels.inc                                         |
-|                                                                       |
-| Language file of the Roundcube Webmail client                         |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: WayneSan <waynesan@zerozone.tw>                               |
-|         kourge <kourge@gmail.com>                                     |
-|         Ting-Hung Chiu <earrl@mmlab.cse.yzu.edu.tw>                   |
-+-----------------------------------------------------------------------+
-
-@version $Id$
-
+ +-----------------------------------------------------------------------+
+ | localization/zh_TW/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Nansen <Unknown>                                              |
+ +-----------------------------------------------------------------------+
+ @version $Id$
 */
 
 $labels = array();
@@ -47,6 +42,7 @@ $labels['priority'] = '優先順序';
 $labels['organization'] = '組織';
 $labels['readstatus'] = '讀信狀態';
 $labels['mailboxlist'] = '資料夾';
+$labels['folders'] = '資料夾';
 $labels['messagesfromto'] = '郵件 $from 至 $to，共有 $count 封郵件';
 $labels['threadsfromto'] = '郵件串 $from 至 $to，共有 $count 個';
 $labels['messagenrof'] = '第 $nr 封郵件，共有 $count 封';
@@ -75,7 +71,8 @@ $labels['jan'] = '一';
 $labels['feb'] = '二';
 $labels['mar'] = '三';
 $labels['apr'] = '四';
-$labels['may'] = '五';
+$labels['may'] = '五月';
+$labels['longmay'] = '五月';
 $labels['jun'] = '六';
 $labels['jul'] = '七';
 $labels['aug'] = '八';
@@ -87,7 +84,6 @@ $labels['longjan'] = '一月';
 $labels['longfeb'] = '二月';
 $labels['longmar'] = '三月';
 $labels['longapr'] = '四月';
-$labels['longmay'] = '五月';
 $labels['longjun'] = '六月';
 $labels['longjul'] = '七月';
 $labels['longaug'] = '八月';
@@ -96,12 +92,18 @@ $labels['longoct'] = '十月';
 $labels['longnov'] = '十一月';
 $labels['longdec'] = '十二月';
 $labels['today'] = '今日';
+$labels['refresh'] = '重新整理';
 $labels['checkmail'] = '檢查新郵件';
+$labels['compose'] = '撰寫新郵件';
 $labels['writenewmessage'] = '撰寫新郵件';
+$labels['reply'] = '回覆';
 $labels['replytomessage'] = '回覆';
 $labels['replytoallmessage'] = '全部回覆';
 $labels['replyall'] = '全部回覆';
 $labels['replylist'] = '清單回覆';
+$labels['forward'] = '轉寄';
+$labels['forwardinline'] = '轉寄';
+$labels['forwardattachment'] = '以附件方式轉寄';
 $labels['forwardmessage'] = '轉寄';
 $labels['deletemessage'] = '刪除郵件';
 $labels['movemessagetotrash'] = '移動郵件至垃圾桶';
@@ -112,15 +114,20 @@ $labels['nextmessage'] = '顯示下一封郵件';
 $labels['lastmessage'] = '顯示最後一封郵件';
 $labels['backtolist'] = '回到郵件清單';
 $labels['viewsource'] = '顯示原始郵件';
+$labels['mark'] = '標記';
 $labels['markmessages'] = '標記選取的郵件為';
 $labels['markread'] = '標示為已讀取';
 $labels['markunread'] = '標示為未讀取';
 $labels['markflagged'] = '標上旗標';
 $labels['markunflagged'] = '移除旗標';
-$labels['messageactions'] = '更多動作…';
+$labels['moreactions'] = '資料夾動做...';
+$labels['more'] = '更多';
+$labels['back'] = '上一頁';
+$labels['options'] = '選項';
 $labels['select'] = '選取';
 $labels['all'] = '全部郵件';
 $labels['none'] = '無';
+$labels['nonesort'] = '無';
 $labels['currpage'] = '目前頁面';
 $labels['unread'] = '未讀取的郵件';
 $labels['flagged'] = '已加標記的郵件';
@@ -140,7 +147,6 @@ $labels['expand_only_unread'] = '只展開未讀訊息';
 $labels['fromto'] = '寄件者/收件者';
 $labels['flag'] = '旗標';
 $labels['attachment'] = '附件';
-$labels['nonesort'] = '無';
 $labels['sentdate'] = '寄送時間';
 $labels['arrival'] = '到達時間';
 $labels['asc'] = '遞增';
@@ -161,7 +167,6 @@ $labels['searchmod'] = '修改搜尋';
 $labels['msgtext'] = '整封郵件';
 $labels['openinextwin'] = '在新視窗開啟';
 $labels['emlsave'] = '下載（.eml）';
-$labels['compose'] = '撰寫新郵件';
 $labels['editasnew'] = '已新郵件編輯';
 $labels['savemessage'] = '儲存成草稿';
 $labels['sendmessage'] = '立即寄出';
@@ -170,10 +175,13 @@ $labels['charset'] = '郵件編碼';
 $labels['editortype'] = '編輯器類型';
 $labels['returnreceipt'] = '要求讀取回條';
 $labels['dsn'] = '傳送狀態通知';
+$labels['mailreplyintro'] = '$sender 於 $data 寫到:';
+$labels['originalmessage'] = '郵件顯示設定';
 $labels['editidents'] = '編輯身份資訊';
 $labels['checkspelling'] = '拼字檢查';
 $labels['resumeediting'] = '繼續編輯';
 $labels['revertto'] = '恢復至';
+$labels['attach'] = '附件';
 $labels['attachments'] = '附加檔案';
 $labels['upload'] = '上傳';
 $labels['close'] = '關閉';
@@ -186,6 +194,7 @@ $labels['highest'] = '最高';
 $labels['nosubject'] = '（沒有主旨）';
 $labels['showimages'] = '顯示圖片';
 $labels['alwaysshow'] = '永遠顯示來自 $sender 的圖片';
+$labels['isdraft'] = '這是一封草稿';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '純文字';
 $labels['savesentmessagein'] = '儲存寄件備份至';
@@ -227,10 +236,16 @@ $labels['male'] = '男';
 $labels['female'] = '女';
 $labels['manager'] = '經理';
 $labels['assistant'] = '助理';
+$labels['typeassistant'] = '助理';
 $labels['spouse'] = '配偶';
+$labels['allfields'] = '所有欄位';
+$labels['search'] = '搜尋';
+$labels['advsearch'] = '進階搜尋';
+$labels['advanced'] = '進階設定';
+$labels['other'] = '其他';
+$labels['typeother'] = '其他';
 $labels['typehome'] = '住家';
 $labels['typework'] = '工作';
-$labels['typeother'] = '其他';
 $labels['typemobile'] = '行動電話';
 $labels['typemain'] = '主要';
 $labels['typehomefax'] = '住家傳真';
@@ -238,7 +253,9 @@ $labels['typeworkfax'] = '工作傳真';
 $labels['typecar'] = '汽車';
 $labels['typepager'] = '傳呼機';
 $labels['typevideo'] = '影片';
-$labels['typeassistant'] = '助理';
+$labels['typehomepage'] = '首頁';
+$labels['typeblog'] = '部落格';
+$labels['typeprofile'] = '設定檔';
 $labels['addfield'] = '新增欄位...';
 $labels['addcontact'] = '新增聯絡人';
 $labels['editcontact'] = '編輯聯絡人';
@@ -260,7 +277,8 @@ $labels['print'] = '列印';
 $labels['export'] = '匯出通訊錄';
 $labels['exportvcards'] = '匯出通訊錄為 vCard 格式';
 $labels['newcontactgroup'] = '新增聯絡人群組';
-$labels['groupactions'] = '聯絡人群組的動作';
+$labels['grouprename'] = '重新命名群組';
+$labels['groupdelete'] = '刪除群組';
 $labels['previouspage'] = '顯示上一頁';
 $labels['firstpage'] = '顯示第一頁';
 $labels['nextpage'] = '顯示下一頁';
@@ -268,13 +286,17 @@ $labels['lastpage'] = '顯示最後一頁';
 $labels['group'] = '群組';
 $labels['groups'] = '群組';
 $labels['personaladrbook'] = '個人住址';
+$labels['searchsave'] = '儲存搜尋結果';
+$labels['searchdelete'] = '刪除搜尋結果';
 $labels['import'] = '匯入通訊錄';
 $labels['importcontacts'] = '由檔案匯入通訊錄';
 $labels['importfromfile'] = '選擇你要匯入的檔案:';
+$labels['importtarget'] = '新增連絡人至通訊錄:';
 $labels['importreplace'] = '以匯入的資料取代已存在的重複資料';
 $labels['importtext'] = '你可以由已存在的通訊錄上傳資料，<br/>目前系統僅支援匯入 <a href="http://zh.wikipedia.org/wiki/VCard" target="_blank">vCard</a> 格式的資料。';
 $labels['done'] = '完成';
 $labels['settingsfor'] = '設定';
+$labels['about'] = '關於';
 $labels['preferences'] = '設定';
 $labels['userpreferences'] = '個人設定';
 $labels['editpreferences'] = '編輯個人設定';
@@ -286,6 +308,8 @@ $labels['edititem'] = '編輯項目';
 $labels['preferhtml'] = '使用 HTML 顯示';
 $labels['defaultcharset'] = '預設編碼';
 $labels['htmlmessage'] = 'HTML 郵件';
+$labels['dateformat'] = '日期格式';
+$labels['timeformat'] = '時間格式';
 $labels['prettydate'] = '簡短日期顯示';
 $labels['setdefault'] = '設成預設i值';
 $labels['autodetect'] = '自動選擇';
@@ -334,11 +358,11 @@ $labels['advancedoptions'] = '顯示進階設定選項';
 $labels['focusonnewmessage'] = '收到新郵件時使瀏覽器獲得焦點';
 $labels['checkallfolders'] = '檢查所有資料夾中的新郵件';
 $labels['displaynext'] = '郵件刪除／移動時顯示下一個郵件';
+$labels['defaultfont'] = 'HTML格式預設字型';
 $labels['mainoptions'] = '主要選項';
 $labels['section'] = '分類';
 $labels['maintenance'] = '管理';
 $labels['newmessage'] = '新郵件';
-$labels['listoptions'] = '排列選項';
 $labels['signatureoptions'] = '簽名檔選項';
 $labels['whenreplying'] = '回覆時';
 $labels['replytopposting'] = '在原來的上方開始新訊息';
@@ -356,8 +380,14 @@ $labels['afternseconds'] = '$n 秒之後';
 $labels['reqmdn'] = '永遠索取讀取回條';
 $labels['reqdsn'] = '總是要求傳送狀態通知';
 $labels['replysamefolder'] = '將回覆與回覆信件放置於相同資料夾';
+$labels['defaultaddressbook'] = '新增連絡人至指定通訊錄';
+$labels['spellcheckbeforesend'] = '寄送前執行拼字檢查';
+$labels['spellcheckoptions'] = '拼字檢查選項';
+$labels['spellcheckignoresyms'] = '忽略符號';
+$labels['spellcheckignorenums'] = '忽略數字';
+$labels['spellcheckignorecaps'] = '忽略大寫字母';
+$labels['addtodict'] = '加入詞典';
 $labels['folder'] = '資料夾';
-$labels['folders'] = '資料夾';
 $labels['foldername'] = '資料夾名稱';
 $labels['subscribed'] = '顯示';
 $labels['messagecount'] = '郵件數目';
@@ -379,6 +409,12 @@ $labels['sharedfolder'] = '公用資料夾';
 $labels['sortby'] = '排序';
 $labels['sortasc'] = '遞增排序';
 $labels['sortdesc'] = '遞減排序';
+$labels['undo'] = '復原';
+$labels['plugin'] = '擴充套件';
+$labels['version'] = '版本';
+$labels['source'] = '來源';
+$labels['license'] = '授權許可';
+$labels['support'] = '取得支援';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
@@ -402,4 +438,3 @@ $labels['japanese'] = '日本';
 $labels['korean'] = '韓國';
 $labels['chinese'] = '國語';
 
-?>