Synchrnonized translations from Transifex

132 files changed, 1099 insertions, 419 deletions

diff --git a/plugins/acl/localization/ar_SA.inc b/plugins/acl/localization/ar_SA.inc
new file mode 100644
index 000000000..ef6cddba6
--- /dev/null
+++ b/plugins/acl/localization/ar_SA.inc
@@ -0,0 +1,91 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['sharing'] = 'مشاركة';
+$labels['myrights'] = 'حقوق الوصول';
+$labels['username'] = 'مستخدم:';
+$labels['advanced'] = 'وضع متقدم';
+$labels['newuser'] = 'اضافة مدخل';
+$labels['editperms'] = 'تعديل الصلاحيات';
+$labels['actions'] = 'اجراءات حقوق الوصول...';
+$labels['anyone'] = 'كل المستخدمين(اي شخص)';
+$labels['anonymous'] = 'ضيف (مجهول)';
+$labels['identifier'] = 'معرف';
+$labels['acll'] = 'بحث';
+$labels['aclr'] = 'قراءة الرسائل';
+$labels['acls'] = 'ابقاء حالة الزيارة';
+$labels['aclw'] = 'اكتب رمز';
+$labels['acli'] = 'ادخل (نسخ الى)';
+$labels['aclp'] = 'نشر';
+$labels['aclc'] = 'إنشاء مجلدات فرعية';
+$labels['aclk'] = 'إنشاء مجلدات فرعية';
+$labels['acld'] = 'حذف الرسائل';
+$labels['aclt'] = 'حذف الرسائل';
+$labels['acle'] = 'حُذف';
+$labels['aclx'] = 'حذف المجلد';
+$labels['acla'] = 'ادارة';
+$labels['aclfull'] = 'تحكم كامل';
+$labels['aclother'] = 'اخرى';
+$labels['aclread'] = 'قراءة ';
+$labels['aclwrite'] = 'كتابة';
+$labels['acldelete'] = 'حذف';
+$labels['shortacll'] = 'بحث';
+$labels['shortaclr'] = 'قراءة ';
+$labels['shortacls'] = 'ابقاء';
+$labels['shortaclw'] = 'قراءة';
+$labels['shortacli'] = 'ادراج';
+$labels['shortaclp'] = 'نشر';
+$labels['shortaclc'] = 'أنشئ';
+$labels['shortaclk'] = 'أنشئ';
+$labels['shortacld'] = 'حذف';
+$labels['shortaclt'] = 'حذف';
+$labels['shortacle'] = 'حُذف';
+$labels['shortaclx'] = 'حذف المجلد';
+$labels['shortacla'] = 'ادارة';
+$labels['shortaclother'] = 'اخرى';
+$labels['shortaclread'] = 'قراءة ';
+$labels['shortaclwrite'] = 'كتابة';
+$labels['shortacldelete'] = 'حذف';
+$labels['longacll'] = 'المجلد مرئي في القائمة وبالامكان ايضا الاشتراك';
+$labels['longaclr'] = 'من الممكن فتح المجلد للقراءة';
+$labels['longacls'] = 'وسم الزيارة في الرسائل بالامكان تغييره';
+$labels['longaclw'] = 'وسم والكلمات الرئيسية في الرسائل يمكن تغييره, ماعدا الزيارة والحذف ';
+$labels['longacli'] = 'بالامكان كتابة الرسائل ونسخها الى هذا المجلد';
+$labels['longaclp'] = 'بالامكان نشر الرسائل الى هذ المجلد';
+$labels['longaclc'] = 'بالامكان انشاء المجلدات ( او اعادة التسمية ) مباشرة تحت هذا المجلد';
+$labels['longaclk'] = 'بالامكان انشاء المجلدات ( او اعادة التسمية ) مباشرة تحت هذا المجلد';
+$labels['longacld'] = 'حذف وسم الرسائل من الممكن تغييرة';
+$labels['longaclt'] = 'حذف وسم الرسائل من الممكن تغييرة';
+$labels['longacle'] = 'بالامكان شطب الرسائل';
+$labels['longaclx'] = 'هذا المجلد بالامكان حذفة او اعادة تسميته';
+$labels['longacla'] = 'حقوق الوصول لهذا المجلد بالامكان تغييره';
+$labels['longaclfull'] = 'التحكم الكامل يتضمن ادارة المجلدات';
+$labels['longaclread'] = 'من الممكن فتح المجلد للقراءة';
+$labels['longaclwrite'] = 'لا يمكن وضع علامة على الرسائل, كتبت او نسخة الى هذا المجلد';
+$labels['longacldelete'] = 'لا يمكن حذف الرسائل';
+$messages['deleting'] = 'جاري حذف حقوق الوصول...';
+$messages['saving'] = 'جاري حفظ حقوق الوصول...';
+$messages['updatesuccess'] = 'تم تغيير حقوق الوصول بنجاح';
+$messages['deletesuccess'] = 'تم حذف حقوق الوصول بنجاح';
+$messages['createsuccess'] = 'تم اضافة حقوق الوصول بنجاح';
+$messages['updateerror'] = 'لا يمكن تحديث حقوق الوصول';
+$messages['deleteerror'] = 'لا يمكن حذف حقوق الوصول';
+$messages['createerror'] = 'لا يمكن اضافة حقوق الوصول';
+$messages['deleteconfirm'] = 'هل تريد فعلاً حذف حقوق الوصول لـ المستخدمين المحددين ؟';
+$messages['norights'] = 'لم يتم تحديد حقوق وصول!';
+$messages['nouser'] = 'لم يتم تحديد اسم مستخدم!';
+?>
diff --git a/plugins/acl/localization/az_AZ.inc b/plugins/acl/localization/az_AZ.inc
index d1cbb076d..9bf23d4f3 100644
--- a/plugins/acl/localization/az_AZ.inc
+++ b/plugins/acl/localization/az_AZ.inc
@@ -20,6 +20,7 @@ $labels['myrights'] = 'Giriş hüququ';
 $labels['username'] = 'İstifadəçi:';
 $labels['advanced'] = 'Ekspert rejimi';
 $labels['newuser'] = 'Sahə əlavə et';
+$labels['editperms'] = 'Cavabları redaktə et';
 $labels['actions'] = 'Giriş hüququ ilə hərəkət...';
 $labels['anyone'] = 'Bütün istifadəçilər (istənilən)';
 $labels['anonymous'] = 'Qonaqlar (anonimlər)';
diff --git a/plugins/acl/localization/be_BE.inc b/plugins/acl/localization/be_BE.inc
index bce5915f0..82bafcec4 100644
--- a/plugins/acl/localization/be_BE.inc
+++ b/plugins/acl/localization/be_BE.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Сумесны доступ';
 $labels['myrights'] = 'Правы доступа';
 $labels['username'] = 'Карыстальнік:';
-$labels['advanced'] = 'экспертны рэжым';
+$labels['advanced'] = 'Пашыраны рэжым';
 $labels['newuser'] = 'Дадаць запіс';
+$labels['editperms'] = 'Рэдагаваць правы доступу';
 $labels['actions'] = 'Дзеянні з правамі доступа...';
 $labels['anyone'] = 'Усе карыстальнікі (любыя)';
 $labels['anonymous'] = 'Госці (ананімныя)';
diff --git a/plugins/acl/localization/bg_BG.inc b/plugins/acl/localization/bg_BG.inc
index 2e3c57dcf..c30fa6eb5 100644
--- a/plugins/acl/localization/bg_BG.inc
+++ b/plugins/acl/localization/bg_BG.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Споделяне';
 $labels['myrights'] = 'Права за достъп';
 $labels['username'] = 'Потребител:';
-$labels['advanced'] = 'разширен режим';
+$labels['advanced'] = 'Разширен режим';
 $labels['newuser'] = 'Добавяне на запис';
+$labels['editperms'] = 'Редакция на права';
 $labels['actions'] = 'Действия на права за достъп...';
 $labels['anyone'] = 'Всички потребители (който и да е)';
 $labels['anonymous'] = 'Гости (анонимни)';
diff --git a/plugins/acl/localization/br.inc b/plugins/acl/localization/br.inc
index bd2f0cbc0..b3ae1c79f 100644
--- a/plugins/acl/localization/br.inc
+++ b/plugins/acl/localization/br.inc
@@ -18,8 +18,10 @@
 $labels['sharing'] = 'Rannañ';
 $labels['myrights'] = 'Aotreoù mont e-barzh';
 $labels['username'] = 'Implijer:';
-$labels['advanced'] = 'Doare araokaet';
+$labels['newuser'] = 'Ouzhpenan un enporzh';
+$labels['actions'] = 'Aotreoù mont e-barzh';
 $labels['anyone'] = 'An holl implijerien (neb hini)';
+$labels['anonymous'] = 'pedet (dizanv)';
 $labels['aclr'] = 'Kemennadoù lennet';
 $labels['aclc'] = 'Krouiñ isrenkelloù';
 $labels['aclk'] = 'Krouiñ isrenkelloù';
@@ -28,4 +30,19 @@ $labels['aclt'] = 'Dilemel kemennadoù';
 $labels['aclx'] = 'Dilemel ar renkell';
 $labels['aclread'] = 'Lennet';
 $labels['aclwrite'] = 'Skrivañ';
+$labels['acldelete'] = 'Dilemel';
+$labels['shortaclr'] = 'Lenn';
+$labels['shortacls'] = 'Gwarezin';
+$labels['shortaclw'] = 'Skrivañ';
+$labels['shortacli'] = 'Enlakaat';
+$labels['shortaclc'] = 'Krouiñ';
+$labels['shortaclk'] = 'Krouiñ';
+$labels['shortacld'] = 'Dilemel';
+$labels['shortaclt'] = 'Dilemel';
+$labels['shortacle'] = 'Dilemel pep tra';
+$labels['shortaclx'] = 'Dilemel ar renkell';
+$labels['shortaclother'] = 'traoù all';
+$labels['shortaclread'] = 'Lenn';
+$labels['shortaclwrite'] = 'Skrivañ';
+$labels['shortacldelete'] = 'Dilemel';
 ?>
diff --git a/plugins/acl/localization/bs_BA.inc b/plugins/acl/localization/bs_BA.inc
index 7cedc8c5c..208d26a07 100644
--- a/plugins/acl/localization/bs_BA.inc
+++ b/plugins/acl/localization/bs_BA.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Razmjena';
 $labels['myrights'] = 'Prava pristupa';
 $labels['username'] = 'Korisnik:';
-$labels['advanced'] = 'napredni mod';
+$labels['advanced'] = 'Napredni mod';
 $labels['newuser'] = 'Dodaj unos';
+$labels['editperms'] = 'Uredi dozvole';
 $labels['actions'] = 'Akcije za prava pristupa...';
 $labels['anyone'] = 'Svi korisnici (bilo ko)';
 $labels['anonymous'] = 'Gosti (anonimno)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Obriši poruke';
 $labels['acle'] = 'Izbriši';
 $labels['aclx'] = 'Obriši folder';
 $labels['acla'] = 'Administracija';
+$labels['acln'] = 'Obilježi poruke';
 $labels['aclfull'] = 'Puna kontrola';
 $labels['aclother'] = 'Ostalo';
 $labels['aclread'] = 'Pročitano';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Obriši';
 $labels['shortacle'] = 'Izbriši';
 $labels['shortaclx'] = 'Brisanje foldera';
 $labels['shortacla'] = 'Administracija';
+$labels['shortacln'] = 'Obilježli';
 $labels['shortaclother'] = 'Ostalo';
 $labels['shortaclread'] = 'Pročitano';
 $labels['shortaclwrite'] = 'Piši';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Oznaka za obrisane poruke se može mijenjati';
 $labels['longacle'] = 'Poruke je moguće obrisati';
 $labels['longaclx'] = 'Folder je moguće obrisati ili preimenovati';
 $labels['longacla'] = 'Pristupna prava foldera je moguće promijeniti';
+$labels['longacln'] = 'Dijeljeni podaci (obilježavanja) poruka mogu se mijenjati';
 $labels['longaclfull'] = 'Puna kontrola uključujući i administraciju foldera';
 $labels['longaclread'] = 'Folder je moguće otvoriti radi čitanja';
 $labels['longaclwrite'] = 'Moguće je označavati, zapisivati i kopirati poruke u folder';
diff --git a/plugins/acl/localization/ca_ES.inc b/plugins/acl/localization/ca_ES.inc
index 56012f457..fccce75f7 100644
--- a/plugins/acl/localization/ca_ES.inc
+++ b/plugins/acl/localization/ca_ES.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Comparteix';
 $labels['myrights'] = 'Permisos d\'accés';
 $labels['username'] = 'Usuari:';
-$labels['advanced'] = 'mode avançat';
+$labels['advanced'] = 'Mode Avançat';
 $labels['newuser'] = 'Afegeix una entrada';
+$labels['editperms'] = 'Editar Permisos';
 $labels['actions'] = 'Accions dels permisos d\'accés...';
 $labels['anyone'] = 'Tots els usuaris (qualsevol)';
 $labels['anonymous'] = 'Convidats (anònim)';
diff --git a/plugins/acl/localization/cs_CZ.inc b/plugins/acl/localization/cs_CZ.inc
index 437b46aef..fd8fdca73 100644
--- a/plugins/acl/localization/cs_CZ.inc
+++ b/plugins/acl/localization/cs_CZ.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Sdílení';
 $labels['myrights'] = 'Přístupová práva';
 $labels['username'] = 'Uživatel:';
-$labels['advanced'] = 'pokročilý režim';
+$labels['advanced'] = 'Pokročilý režim';
 $labels['newuser'] = 'Přidat záznam';
+$labels['editperms'] = 'Upravit oprávnění';
 $labels['actions'] = 'Přístupové právo akce ...';
 $labels['anyone'] = 'Všichni uživatelé (kdokoli)';
 $labels['anonymous'] = 'Hosté (anonymní)';
diff --git a/plugins/acl/localization/cy_GB.inc b/plugins/acl/localization/cy_GB.inc
index 30b0aaffe..0b9d11979 100644
--- a/plugins/acl/localization/cy_GB.inc
+++ b/plugins/acl/localization/cy_GB.inc
@@ -20,6 +20,7 @@ $labels['myrights'] = 'Hawliau Mynediad';
 $labels['username'] = 'Defnyddiwr:';
 $labels['advanced'] = 'Modd uwch';
 $labels['newuser'] = 'Ychwanegu cofnod';
+$labels['editperms'] = 'Golygu hawliau';
 $labels['actions'] = 'Gweithredoedd hawl mynediad...';
 $labels['anyone'] = 'Pob defnyddiwr (unrhywun)';
 $labels['anonymous'] = 'Gwestai (anhysbys)';
diff --git a/plugins/acl/localization/da_DK.inc b/plugins/acl/localization/da_DK.inc
index f31137644..cbb077064 100644
--- a/plugins/acl/localization/da_DK.inc
+++ b/plugins/acl/localization/da_DK.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Adgangrettigheder';
 $labels['username'] = 'Bruger:';
-$labels['advanced'] = 'avanceret mode';
+$labels['advanced'] = 'Avanceret tilstand';
 $labels['newuser'] = 'Tilføj indgang';
+$labels['editperms'] = 'Rediger tilladelser';
 $labels['actions'] = 'Tilgangsrettigheder...';
 $labels['anyone'] = 'Alle brugere';
 $labels['anonymous'] = 'Gæst (anonym)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Slet beskeder';
 $labels['acle'] = 'Udslet';
 $labels['aclx'] = 'Slet mappe';
 $labels['acla'] = 'Administrer';
+$labels['acln'] = 'Annoter beskeder';
 $labels['aclfull'] = 'Fuld kontrol';
 $labels['aclother'] = 'Andet';
 $labels['aclread'] = 'Læse';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Slet';
 $labels['shortacle'] = 'Udslet';
 $labels['shortaclx'] = 'Slet mappe';
 $labels['shortacla'] = 'Administrer';
+$labels['shortacln'] = 'Annoter';
 $labels['shortaclother'] = 'Andet';
 $labels['shortaclread'] = 'Læse';
 $labels['shortaclwrite'] = 'Skrive';
diff --git a/plugins/acl/localization/de_CH.inc b/plugins/acl/localization/de_CH.inc
index 98e555a64..9f3b99c05 100644
--- a/plugins/acl/localization/de_CH.inc
+++ b/plugins/acl/localization/de_CH.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
-$labels['advanced'] = 'erweiterter Modus';
+$labels['advanced'] = 'Expertenmodus';
 $labels['newuser'] = 'Eintrag hinzufügen';
+$labels['editperms'] = 'Zugriffsrechte bearbeiten';
 $labels['actions'] = 'Zugriffsrechte Aktionen...';
 $labels['anyone'] = 'Alle Benutzer (anyone)';
 $labels['anonymous'] = 'Gäste (anonymous)';
diff --git a/plugins/acl/localization/de_DE.inc b/plugins/acl/localization/de_DE.inc
index 3df3dc63f..50522fc8c 100644
--- a/plugins/acl/localization/de_DE.inc
+++ b/plugins/acl/localization/de_DE.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
-$labels['advanced'] = 'erweiterter Modus';
+$labels['advanced'] = 'Erweiterter Modus';
 $labels['newuser'] = 'Eintrag hinzufügen';
+$labels['editperms'] = 'Zugriffsrechte bearbeiten';
 $labels['actions'] = 'Zugriffsrechte Aktionen...';
 $labels['anyone'] = 'Alle Benutzer (anyone)';
 $labels['anonymous'] = 'Gäste (anonymous)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Nachrichten als gelöscht markieren';
 $labels['acle'] = 'Endgültig löschen';
 $labels['aclx'] = 'Ordner löschen';
 $labels['acla'] = 'Verwalten';
+$labels['acln'] = 'Nachrichten kommentieren';
 $labels['aclfull'] = 'Vollzugriff';
 $labels['aclother'] = 'Andere';
 $labels['aclread'] = 'Lesen';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Löschen';
 $labels['shortacle'] = 'Endgültig löschen';
 $labels['shortaclx'] = 'Ordner löschen';
 $labels['shortacla'] = 'Verwalten';
+$labels['shortacln'] = 'Kommentieren';
 $labels['shortaclother'] = 'Andere';
 $labels['shortaclread'] = 'Lesen';
 $labels['shortaclwrite'] = 'Schreiben';
diff --git a/plugins/acl/localization/el_GR.inc b/plugins/acl/localization/el_GR.inc
index 56e1081b3..67b109adb 100644
--- a/plugins/acl/localization/el_GR.inc
+++ b/plugins/acl/localization/el_GR.inc
@@ -15,76 +15,80 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-$labels['sharing'] = 'Μοιρασμα';
+$labels['sharing'] = 'Κοινή χρήση';
 $labels['myrights'] = 'Δικαιώματα Πρόσβασης ';
-$labels['username'] = 'Χρηστης:';
-$labels['advanced'] = 'προηγμένη λειτουργία ';
+$labels['username'] = 'Χρήστης:';
+$labels['advanced'] = 'Προηγμένη λειτουργία';
 $labels['newuser'] = 'Προσθήκη καταχώρησης ';
-$labels['actions'] = 'Πρόσβαση σωστων ενέργειων...';
-$labels['anyone'] = 'Όλοι οι χρήστες (ο καθένας)';
-$labels['anonymous'] = 'Οι επισκέπτες (ανώνυμα) ';
+$labels['editperms'] = 'Μεταβολή δικαιωμάτων';
+$labels['actions'] = 'Ενέργειες δικαιωμάτων πρόσβασης...';
+$labels['anyone'] = 'Όλοι οι χρήστες (οποιοσδήποτε)';
+$labels['anonymous'] = 'Επισκέπτες (ανώνυμοι)';
 $labels['identifier'] = 'Αναγνωριστικό';
-$labels['acll'] = 'Αναζήτηση ';
+$labels['acll'] = 'Αναζήτηση';
 $labels['aclr'] = 'Διαβάστε τα μηνύματα ';
-$labels['acls'] = 'Κρατήστε Επίσκεψη κατάσταση';
-$labels['aclw'] = 'Δημιουργια σημαιων';
+$labels['acls'] = 'Διατήρηση κατάστασης ανάγνωσης';
+$labels['aclw'] = 'Ρυθμίσεις εγγραφής';
 $labels['acli'] = 'Εισάγωγη (Αντιγραφή σε) ';
 $labels['aclp'] = 'Καταχώρηση';
-$labels['aclc'] = 'Δημιουργια υποφακελων';
-$labels['aclk'] = 'Δημιουργια υποφακελων';
+$labels['aclc'] = 'Δημιουργία υποφακέλων';
+$labels['aclk'] = 'Δημιουργία υποφακέλων';
 $labels['acld'] = 'Διαγραφή μηνυμάτων';
 $labels['aclt'] = 'Διαγραφή μηνυμάτων';
-$labels['acle'] = 'Απαλειψη';
+$labels['acle'] = 'Απαλοιφή';
 $labels['aclx'] = 'Διαγραφή φακέλου';
-$labels['acla'] = 'Χορηγος';
-$labels['aclfull'] = 'Πληρης ελεγχος';
-$labels['aclother'] = 'Άλλα';
-$labels['aclread'] = 'Αναγνωση';
-$labels['aclwrite'] = 'Δημιουργια';
+$labels['acla'] = 'Διαχείριση';
+$labels['acln'] = 'Προσθήκη υπομνήματος στα μηνύματα';
+$labels['aclfull'] = 'Πλήρης πρόσβαση';
+$labels['aclother'] = 'Άλλο';
+$labels['aclread'] = 'Ανάγνωση';
+$labels['aclwrite'] = 'Εγγραφή';
 $labels['acldelete'] = 'Διαγραφή';
 $labels['shortacll'] = 'Αναζήτηση';
-$labels['shortaclr'] = 'Αναγνωση';
-$labels['shortacls'] = 'Κρατηση';
-$labels['shortaclw'] = 'Δημιουργια';
-$labels['shortacli'] = 'Αντιστροφη';
-$labels['shortaclp'] = 'Καταχωρηση';
+$labels['shortaclr'] = 'Ανάγνωση';
+$labels['shortacls'] = 'Τήρηση';
+$labels['shortaclw'] = 'Εγγραφή';
+$labels['shortacli'] = 'Εισαγωγή';
+$labels['shortaclp'] = 'Καταχώρηση';
 $labels['shortaclc'] = 'Δημιουργία';
 $labels['shortaclk'] = 'Δημιουργία';
 $labels['shortacld'] = 'Διαγραφή';
 $labels['shortaclt'] = 'Διαγραφή';
-$labels['shortacle'] = 'Απαλειψη';
-$labels['shortaclx'] = 'Διαγραφη φακελου';
-$labels['shortacla'] = 'Χορηγος';
-$labels['shortaclother'] = 'Άλλα';
-$labels['shortaclread'] = 'Αναγνωση';
-$labels['shortaclwrite'] = 'Δημιουργια';
+$labels['shortacle'] = 'Απαλοιφή';
+$labels['shortaclx'] = 'Διαγραφή φακέλου';
+$labels['shortacla'] = 'Διαχείριση';
+$labels['shortacln'] = 'Προσθήκη υπομνήματος';
+$labels['shortaclother'] = 'Άλλο';
+$labels['shortaclread'] = 'Ανάγνωση';
+$labels['shortaclwrite'] = 'Εγγραφή';
 $labels['shortacldelete'] = 'Διαγραφή';
-$labels['longacll'] = 'Ο φάκελος είναι ορατος στης λιστες και μπορεί να εγγραφεί';
-$labels['longaclr'] = 'Ο φάκελος μπορεί να ανοίξει για την ανάγνωση ';
-$labels['longacls'] = 'Η σημαια μυνηματων μπορει να αλλαχθει';
-$labels['longaclw'] = 'Μηνύματα σημαίες και λέξεις-κλειδιά που μπορεί να αλλάξει, εκτός δει και διαγράφεται ';
-$labels['longacli'] = 'Τα μηνύματα μπορούν να γραφθουν ή να αντιγραφθούν στο φάκελο ';
+$labels['longacll'] = 'Ο φάκελος είναι ορατός στους καταλόγους και μπορείτε να εγγραφείτε σε αυτόν';
+$labels['longaclr'] = 'Ο φάκελος μπορεί να προσπελαστεί για ανάγνωση ';
+$labels['longacls'] = 'Η κατάσταση ανάγνωσης μηνυμάτων μπορεί να αλλαχθεί';
+$labels['longaclw'] = 'Μπορούν να μεταβληθούν οι καταστάσεις μηνυμάτων και οι λέξεις κλειδιά, εκτός από τις καταστάσεις Ανάγνωσης και Διαγραφής';
+$labels['longacli'] = 'Τα μηνύματα μπορούν να εγγραφούν ή να αντιγραφούν στον φάκελο ';
 $labels['longaclp'] = 'Τα μηνύματα μπορούν να τοποθετηθούν σε αυτόν το φάκελο ';
-$labels['longaclc'] = 'Μπορούν να δημιουργηθούν φάκελοι (ή να μετονομαστουν ) ακριβώς κάτω από αυτόν το φάκελο ';
-$labels['longaclk'] = 'Μπορούν να δημιουργηθούν φάκελοι (ή να μετονομαστουν ) ακριβώς κάτω από αυτόν το φάκελο ';
-$labels['longacld'] = 'Διαγραφή μηνυμάτων σημαίας μπορεί να αλλάξει ';
-$labels['longaclt'] = 'Διαγραφή μηνυμάτων σημαίας μπορεί να αλλάξει ';
-$labels['longacle'] = 'Μυνηματα που μπορουν να απαλειφθουν';
-$labels['longaclx'] = 'Ο φακελος δεν μπορει να μετονομασθει η να διαγραφθει';
-$labels['longacla'] = 'Τα δικαιώματα πρόσβασης στο φάκελο και μπορεί να αλλάξει';
-$labels['longaclfull'] = 'Πλήρης έλεγχος συμπεριλαμβανομένης της διοίκησης ';
-$labels['longaclread'] = 'Ο φάκελος μπορεί να ανοίξει για την ανάγνωση ';
-$labels['longaclwrite'] = 'Μηνύματα να σημαδεύονται, γραπτή ή αντιγράφονται στο φάκελο';
-$labels['longacldelete'] = 'Τα μυνηματα μπορουν να διαγραφθουν';
+$labels['longaclc'] = 'Μπορούν να δημιουργηθούν (ή να μετονομαστούν) φάκελοι ακριβώς κάτω από αυτόν τον φάκελο ';
+$labels['longaclk'] = 'Μπορούν να δημιουργηθούν (ή να μετονομαστούν) φάκελοι ακριβώς κάτω από αυτόν τον φάκελο ';
+$labels['longacld'] = 'Η κατάσταση διαγραφής μηνυμάτων μπορεί να μεταβληθεί';
+$labels['longaclt'] = 'Η κατάσταση διαγραφής μηνυμάτων μπορεί να μεταβληθεί';
+$labels['longacle'] = 'Τα μηνύματα μπορούν να απαλειφθούν';
+$labels['longaclx'] = 'Ο φάκελος μπορεί να μετονομασθεί ή να διαγραφεί';
+$labels['longacla'] = 'Τα δικαιώματα πρόσβασης στον φάκελο μπορούν να μεταβληθούν';
+$labels['longacln'] = 'Το διαμοιραζόμενο υπόμνημα των μηνυμάτων είναι δυνατό να μεταβληθεί';
+$labels['longaclfull'] = 'Πλήρης έλεγχος συμπεριλαμβανόμενης της διαχείρισης φακέλων';
+$labels['longaclread'] = 'Ο φάκελος είναι δυνατό να προσπελαστεί για ανάγνωση';
+$labels['longaclwrite'] = 'Τα μηνύματα μπορούν να σημαδεύονται, να εγγράφονται ή να αντιγράφονται στον φάκελο';
+$labels['longacldelete'] = 'Τα μηνύματα μπορούν να διαγραφούν';
 $messages['deleting'] = 'Διαγραφή των δικαιωμάτων πρόσβασης...';
 $messages['saving'] = 'Αποθήκευση δικαιώματων πρόσβασης...';
-$messages['updatesuccess'] = 'Άλλαξε με επιτυχία τα δικαιώματα πρόσβασης ';
-$messages['deletesuccess'] = 'Διαγράφηκε με επιτυχία τα δικαιώματα πρόσβασης ';
-$messages['createsuccess'] = 'Προστέθηκε με επιτυχία τα δικαιώματα πρόσβασης ';
-$messages['updateerror'] = 'Δεν είναι δυνατή η ενημέρωση δικαιωμάτων πρόσβασης';
+$messages['updatesuccess'] = 'Επιτυχής μεταβολή των δικαιωμάτων πρόσβασης';
+$messages['deletesuccess'] = 'Επιτυχής διαγραφή των δικαιωμάτων πρόσβασης';
+$messages['createsuccess'] = 'Επιτυχής προσθήκη δικαιωμάτων πρόσβασης';
+$messages['updateerror'] = 'Δεν είναι δυνατή η ενημέρωση των δικαιωμάτων πρόσβασης';
 $messages['deleteerror'] = 'Δεν είναι δυνατή η διαγραφή των δικαιωμάτων πρόσβασης ';
-$messages['createerror'] = 'Δεν είναι δυνατή η προσθήκη δικαιώματα πρόσβασης ';
-$messages['deleteconfirm'] = 'Είσαι σίγουρος, ότι θέλετε να καταργήσετε τα δικαιώματα πρόσβασης του επιλεγμένου(ων) χρήστης ';
-$messages['norights'] = 'Κανένα δικαίωμα έχει καθοριστεί';
-$messages['nouser'] = 'Το όνομα δεν έχει καθοριστεί! ';
+$messages['createerror'] = 'Δεν είναι δυνατή η προσθήκη δικαιωμάτων πρόσβασης ';
+$messages['deleteconfirm'] = 'Είστε βέβαιοι ότι θέλετε να καταργήσετε τα δικαιώματα πρόσβασης του επιλεγμένου(ων) χρήστη(ών);';
+$messages['norights'] = 'Κανένα δικαίωμα δεν έχει καθοριστεί!';
+$messages['nouser'] = 'Το όνομα χρήστη δεν έχει καθοριστεί! ';
 ?>
diff --git a/plugins/acl/localization/en_CA.inc b/plugins/acl/localization/en_CA.inc
index 2dd7e4ec0..53d14ff9a 100644
--- a/plugins/acl/localization/en_CA.inc
+++ b/plugins/acl/localization/en_CA.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
-$labels['advanced'] = 'advanced mode';
 $labels['newuser'] = 'Add entry';
 $labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'All users (anyone)';
diff --git a/plugins/acl/localization/en_GB.inc b/plugins/acl/localization/en_GB.inc
index cf8156ba5..58d57fe7e 100644
--- a/plugins/acl/localization/en_GB.inc
+++ b/plugins/acl/localization/en_GB.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
-$labels['advanced'] = 'advanced mode';
+$labels['advanced'] = 'Advanced mode';
 $labels['newuser'] = 'Add entry';
+$labels['editperms'] = 'Edit permissions';
 $labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'All users (anyone)';
 $labels['anonymous'] = 'Guests (anonymous)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Delete messages';
 $labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Delete folder';
 $labels['acla'] = 'Administer';
+$labels['acln'] = 'Annotate messages';
 $labels['aclfull'] = 'Full control';
 $labels['aclother'] = 'Other';
 $labels['aclread'] = 'Read';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Delete';
 $labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Folder delete';
 $labels['shortacla'] = 'Administer';
+$labels['shortacln'] = 'Annotate';
 $labels['shortaclother'] = 'Other';
 $labels['shortaclread'] = 'Read';
 $labels['shortaclwrite'] = 'Write';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Messages Delete flag can be changed';
 $labels['longacle'] = 'Messages can be expunged';
 $labels['longaclx'] = 'The folder can be deleted or renamed';
 $labels['longacla'] = 'The folder access rights can be changed';
+$labels['longacln'] = 'Messages shared metadata (annotations) can be changed';
 $labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = 'The folder can be opened for reading';
 $labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
diff --git a/plugins/acl/localization/eo.inc b/plugins/acl/localization/eo.inc
index 888ea4def..e06a38fff 100644
--- a/plugins/acl/localization/eo.inc
+++ b/plugins/acl/localization/eo.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Kunhavigado';
 $labels['myrights'] = 'Atingrajtoj';
 $labels['username'] = 'Uzanto:';
-$labels['advanced'] = 'progresinta reĝimo';
 $labels['newuser'] = 'Aldoni eron';
 $labels['actions'] = 'Agoj de atingrajtoj...';
 $labels['anyone'] = 'Ĉiuj uzantoj (iu ajn)';
diff --git a/plugins/acl/localization/es_419.inc b/plugins/acl/localization/es_419.inc
index f83196175..4b045aa25 100644
--- a/plugins/acl/localization/es_419.inc
+++ b/plugins/acl/localization/es_419.inc
@@ -16,7 +16,6 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 $labels['username'] = 'Usuario:';
-$labels['advanced'] = 'modo avanzado';
 $labels['newuser'] = 'Agregar entrada';
 $labels['anyone'] = 'Todos los usuarios ';
 $labels['anonymous'] = 'Invitados (anonimos)';
diff --git a/plugins/acl/localization/es_AR.inc b/plugins/acl/localization/es_AR.inc
index 0fa111167..3611e898b 100644
--- a/plugins/acl/localization/es_AR.inc
+++ b/plugins/acl/localization/es_AR.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Compartiendo';
 $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Usuario:';
-$labels['advanced'] = 'modo avanzado';
 $labels['newuser'] = 'Agregar entrada';
 $labels['actions'] = 'Acciones para los permisos de acceso...';
 $labels['anyone'] = 'Todos los usuarios (cualquiera)';
diff --git a/plugins/acl/localization/es_ES.inc b/plugins/acl/localization/es_ES.inc
index 3e64bfee6..4b6bfa075 100644
--- a/plugins/acl/localization/es_ES.inc
+++ b/plugins/acl/localization/es_ES.inc
@@ -20,6 +20,7 @@ $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Usuario:';
 $labels['advanced'] = 'Modo avanzado';
 $labels['newuser'] = 'Añadir una entrada';
+$labels['editperms'] = 'Editar permisos';
 $labels['actions'] = 'Acciones sobre los permisos de acceso…';
 $labels['anyone'] = 'Todos los usuarios (cualquiera)';
 $labels['anonymous'] = 'Invitados (anónimo)';
diff --git a/plugins/acl/localization/et_EE.inc b/plugins/acl/localization/et_EE.inc
index 5a64ac8fb..4b6f437aa 100644
--- a/plugins/acl/localization/et_EE.inc
+++ b/plugins/acl/localization/et_EE.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Jagamine';
 $labels['myrights'] = 'Ligipääsuõigused';
 $labels['username'] = 'Kasutaja:';
-$labels['advanced'] = 'laiendatud režiim';
 $labels['newuser'] = 'Lisa sissekanne';
 $labels['actions'] = 'Ligipääsuõiguste toimingud...';
 $labels['anyone'] = 'Kõik kasutajad';
diff --git a/plugins/acl/localization/eu_ES.inc b/plugins/acl/localization/eu_ES.inc
index 4fa9f3b08..e13d2033a 100644
--- a/plugins/acl/localization/eu_ES.inc
+++ b/plugins/acl/localization/eu_ES.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Partekatzen';
 $labels['myrights'] = 'Sarbide-eskubideak';
 $labels['username'] = 'Erabiltzailea:';
-$labels['advanced'] = 'modu aurreratua';
 $labels['newuser'] = 'Gehitu sarrera';
 $labels['actions'] = 'Sarbide-eskubideen ekintzak...';
 $labels['anyone'] = 'Erabiltzaile guztiak (edozein)';
diff --git a/plugins/acl/localization/fa_IR.inc b/plugins/acl/localization/fa_IR.inc
index 993783ff4..8b030bebd 100644
--- a/plugins/acl/localization/fa_IR.inc
+++ b/plugins/acl/localization/fa_IR.inc
@@ -16,11 +16,12 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 $labels['sharing'] = 'اشتراک‌گذاری';
-$labels['myrights'] = 'مجوزهای دسترسی';
+$labels['myrights'] = 'حقوق دسترسی';
 $labels['username'] = 'کاربر:';
 $labels['advanced'] = 'حالت پیشرفته';
-$labels['newuser'] = 'افزودن مدخل';
-$labels['actions'] = 'فعالیت‌های مجوز دسترسی...';
+$labels['newuser'] = 'افزودن ورودی';
+$labels['editperms'] = 'ویرایش مجوزها';
+$labels['actions'] = 'فعالیت‌های حق دسترسی...';
 $labels['anyone'] = 'همه‌ی کاربران (هر کسی)';
 $labels['anonymous'] = 'مهمان‌ها (ناشناس)';
 $labels['identifier'] = 'شناساگر';
@@ -28,39 +29,39 @@ $labels['acll'] = 'یافتن';
 $labels['aclr'] = 'پیغام‌های خوانده شده';
 $labels['acls'] = 'نگه داشتن حالت بازدید';
 $labels['aclw'] = 'پرچم‌های نوشتن';
-$labels['acli'] = 'وارد کردن (کپی کردن در)';
-$labels['aclp'] = 'ارسال';
+$labels['acli'] = 'وارد کردن (رونوشت در)';
+$labels['aclp'] = 'نوشته';
 $labels['aclc'] = 'ایجاد زیرپوشه‌ها';
 $labels['aclk'] = 'ایجاد زیرپوشه‌ها';
-$labels['acld'] = 'پاک کردن پیغام‌ها';
-$labels['aclt'] = 'پاک کردن پیغام‌ها';
+$labels['acld'] = 'حذف پیغام‌ها';
+$labels['aclt'] = 'حذف پیغام‌ها';
 $labels['acle'] = 'پاک کردن';
 $labels['aclx'] = 'حذف پوشه';
-$labels['acla'] = 'مدیریت کردن';
+$labels['acla'] = 'اداره کردن';
 $labels['aclfull'] = 'کنترل کامل';
 $labels['aclother'] = 'دیگر';
 $labels['aclread'] = 'خواندن';
 $labels['aclwrite'] = 'نوشتن';
-$labels['acldelete'] = 'حذف';
+$labels['acldelete'] = 'حذف کردن';
 $labels['shortacll'] = 'یافتن';
 $labels['shortaclr'] = 'خواندن';
 $labels['shortacls'] = 'نگه داشتن';
 $labels['shortaclw'] = 'نوشتن';
-$labels['shortacli'] = 'اضافه کردن';
-$labels['shortaclp'] = 'ارسال';
+$labels['shortacli'] = 'جاگذارى';
+$labels['shortaclp'] = 'پست کردن';
 $labels['shortaclc'] = 'ایجاد';
 $labels['shortaclk'] = 'ایجاد';
 $labels['shortacld'] = 'حذف';
 $labels['shortaclt'] = 'حذف';
 $labels['shortacle'] = 'پاک کردن';
-$labels['shortaclx'] = 'حذف کردن پوشه';
-$labels['shortacla'] = 'مدیریت کردن';
+$labels['shortaclx'] = 'حذف پوشه';
+$labels['shortacla'] = 'اداره کردن';
 $labels['shortaclother'] = 'دیگر';
 $labels['shortaclread'] = 'خواندن';
 $labels['shortaclwrite'] = 'نوشتن';
-$labels['shortacldelete'] = 'حذف';
-$labels['longacll'] = 'پوشه را می‌توان در فهرست‌ها دید و در آن مشترک شد';
-$labels['longaclr'] = 'پوشه می‌تواند برای خوانده شدن باز شود';
+$labels['shortacldelete'] = 'حذف کردن';
+$labels['longacll'] = 'پوشه در فهرست‌ها قابل مشاهده است و می‌تواند مشترک آن شد';
+$labels['longaclr'] = 'پوشه می‌تواند برای خواندن باز شود';
 $labels['longacls'] = 'پرچم بازدید پیغام‌ها می‌تواند تغییر داده شود';
 $labels['longaclw'] = 'پرچم و کلیدواژه پیغام‌ها می‌تواند تغییر داده شود، به غیر از بازدید و حذف';
 $labels['longacli'] = 'پیغام‌ها می‌توانند کپی یا نوشته شوند به پوشه';
@@ -71,20 +72,20 @@ $labels['longacld'] = 'پرچم حذف پیغام‌ها می‌تواند تغ�
 $labels['longaclt'] = 'پرچم حذف پیغام‌ها می‌تواند تغییر داده شود';
 $labels['longacle'] = 'پیغام‌ها می‌توانند حذف شوند';
 $labels['longaclx'] = 'پوشه می‌تواند حذف یا تغییر نام داده شود';
-$labels['longacla'] = 'قوانین دسترسی پوشه می‌تواند تغییر داده شود';
+$labels['longacla'] = 'حقوق دسترسی پوشه می‌تواند تغییر داده شود';
 $labels['longaclfull'] = 'کنترل کامل شما مدیریت پوشه';
 $labels['longaclread'] = 'پوشه می‌تواند برای خواندن باز شود';
 $labels['longaclwrite'] = 'پیغام‌ها می‌توانند علامتگذاری، نوشته و یا کپی شوند در پوشه';
 $labels['longacldelete'] = 'پیغام‌ها می‌توانند حذف شوند';
-$messages['deleting'] = 'حذف کردن قوانین دسترسی...';
-$messages['saving'] = 'ذخیره قوانین دسترسی...';
-$messages['updatesuccess'] = 'قوانین دسترسی با موفقیت تغییر کردند';
-$messages['deletesuccess'] = 'قوانین دسترسی با موفقیت حذف شدند';
-$messages['createsuccess'] = 'قوانین دسترسی با موفقیت اضافه شدند';
-$messages['updateerror'] = 'ناتوانی در به روز کردن قوانین دسترسی';
-$messages['deleteerror'] = 'ناتوانی در حذف قوانین دسترسی';
-$messages['createerror'] = 'ناتوانی در اضافه کردن قوانین دسترسی';
-$messages['deleteconfirm'] = 'آیا شما مطمئن هستید که می‌خواهید قوانین دسترسی را برای کاربر(ان) انتخاب شده حذف نمایید؟';
-$messages['norights'] = 'هیچ قانونی مشخص نشده است!';
+$messages['deleting'] = 'حذف کردن حقوق دسترسی...';
+$messages['saving'] = 'ذخیره حقوق دسترسی...';
+$messages['updatesuccess'] = 'حقوق دسترسی با موفقیت تغییر کردند';
+$messages['deletesuccess'] = 'حقوق دسترسی با موفقیت حذف شدند';
+$messages['createsuccess'] = 'حقوق دسترسی با موفقیت اضافه شدند';
+$messages['updateerror'] = 'ناتوانی در روزآمد کردن حقوق دسترسی';
+$messages['deleteerror'] = 'ناتوانی در حذف حقوق دسترسی';
+$messages['createerror'] = 'ناتوانی در اضافه کردن حقوق دسترسی';
+$messages['deleteconfirm'] = 'آیا شما مطمئن هستید که می‌خواهید حقوق دسترسی را برای کاربر(ان) انتخاب شده حذف نمایید؟';
+$messages['norights'] = 'هیچ حقی مشخص نشده است!';
 $messages['nouser'] = 'هیج نام‌کاربری‌ای مشخص نشده است!';
 ?>
diff --git a/plugins/acl/localization/fi_FI.inc b/plugins/acl/localization/fi_FI.inc
index ab3222464..eb69eda3a 100644
--- a/plugins/acl/localization/fi_FI.inc
+++ b/plugins/acl/localization/fi_FI.inc
@@ -18,7 +18,7 @@
 $labels['sharing'] = 'Jakaminen';
 $labels['myrights'] = 'Käyttöoikeudet';
 $labels['username'] = 'Käyttäjä:';
-$labels['advanced'] = 'edistynyt tila';
+$labels['editperms'] = 'Muokkaa oikeuksia';
 $labels['anyone'] = 'Kaikki käyttäjät (kuka tahansa)';
 $labels['anonymous'] = 'Vieraat (anonyymit)';
 $labels['aclother'] = 'Muu';
diff --git a/plugins/acl/localization/fo_FO.inc b/plugins/acl/localization/fo_FO.inc
index b2712b86d..fd56f465a 100644
--- a/plugins/acl/localization/fo_FO.inc
+++ b/plugins/acl/localization/fo_FO.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Deiling';
 $labels['myrights'] = 'Atgongdar-rættindi';
 $labels['username'] = 'Brúkari:';
-$labels['advanced'] = 'Framkomin støða';
+$labels['advanced'] = 'Víðkað útgáva';
 $labels['newuser'] = 'Legg inn';
+$labels['editperms'] = 'Broyt atgonguloyvi';
 $labels['actions'] = 'Stillingar til atgongu-rættindi';
 $labels['anyone'] = 'Allir brúkarir (øll)';
 $labels['anonymous'] = 'Gestir (dulnevnd)';
diff --git a/plugins/acl/localization/fr_FR.inc b/plugins/acl/localization/fr_FR.inc
index b4e47bb17..6e73fa0e0 100644
--- a/plugins/acl/localization/fr_FR.inc
+++ b/plugins/acl/localization/fr_FR.inc
@@ -20,16 +20,17 @@ $labels['myrights'] = 'Droits d\'accès';
 $labels['username'] = 'Utilisateur :';
 $labels['advanced'] = 'Mode avancé';
 $labels['newuser'] = 'Ajouter l\'entrée';
-$labels['actions'] = 'Action sur les droits d\'accès...';
-$labels['anyone'] = 'Tous les utilisateurs (tout le monde)';
-$labels['anonymous'] = 'Invités (anonymes)';
+$labels['editperms'] = 'Modifier les permissions';
+$labels['actions'] = 'Actions des droits d\'accès...';
+$labels['anyone'] = 'Tous les utilisateurs (n\'importe qui)';
+$labels['anonymous'] = 'Invités (anonyme)';
 $labels['identifier'] = 'Identifiant';
 $labels['acll'] = 'Consultation';
 $labels['aclr'] = 'Lire les messages';
-$labels['acls'] = 'Garder l\'état vu';
-$labels['aclw'] = 'Écrire une étiquette';
-$labels['acli'] = 'Insérer (Copier dans)';
-$labels['aclp'] = 'Envoyer';
+$labels['acls'] = 'Garder l\'état « vu »';
+$labels['aclw'] = 'Drapeaux d\'écriture';
+$labels['acli'] = 'Insérer (copier dans)';
+$labels['aclp'] = 'Publier';
 $labels['aclc'] = 'Créer des sous-dossiers';
 $labels['aclk'] = 'Créer des sous-dossiers';
 $labels['acld'] = 'Supprimer des messages';
@@ -37,54 +38,57 @@ $labels['aclt'] = 'Supprimer des messages';
 $labels['acle'] = 'Purger';
 $labels['aclx'] = 'Supprimer un dossier';
 $labels['acla'] = 'Administrer';
+$labels['acln'] = 'Annoter les messages';
 $labels['aclfull'] = 'Contrôle total';
 $labels['aclother'] = 'Autre';
 $labels['aclread'] = 'Lecture';
 $labels['aclwrite'] = 'Écriture';
-$labels['acldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['acldelete'] = 'Supprimer';
 $labels['shortacll'] = 'Consultation';
 $labels['shortaclr'] = 'Lecture';
 $labels['shortacls'] = 'Conserver';
 $labels['shortaclw'] = 'Écriture';
 $labels['shortacli'] = 'Insérer';
-$labels['shortaclp'] = 'Envoyer';
+$labels['shortaclp'] = 'Publier';
 $labels['shortaclc'] = 'Créer';
 $labels['shortaclk'] = 'Créer';
-$labels['shortacld'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
-$labels['shortaclt'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['shortacld'] = 'Supprimer';
+$labels['shortaclt'] = 'Supprimer';
 $labels['shortacle'] = 'Purger';
-$labels['shortaclx'] = 'Supprimer un dossier';
+$labels['shortaclx'] = 'Suppression de dossier';
 $labels['shortacla'] = 'Administrer';
+$labels['shortacln'] = 'Annoter';
 $labels['shortaclother'] = 'Autre';
 $labels['shortaclread'] = 'Lecture';
 $labels['shortaclwrite'] = 'Écriture';
-$labels['shortacldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
-$labels['longacll'] = 'Ce dossier est visible dans les listes et peut être souscrit';
-$labels['longaclr'] = 'Le dossier peut-être ouvert pour lecture';
-$labels['longacls'] = 'L\'étiquette Lu peut-être changée';
-$labels['longaclw'] = 'Les étiquettes et les mot-clés peuvent-être changé, sauf pour Vu et Supprimé';
-$labels['longacli'] = 'Les messages peuvent-être écrit ou copié dans le dossier';
-$labels['longaclp'] = 'Les messages peuvent-être envoyé dans ce dossier';
-$labels['longaclc'] = 'Les dossiers peuvent-être créer (ou renommer) directement depuis ce dossier';
-$labels['longaclk'] = 'Les dossiers peuvent-être créer (ou renommer) directement depuis ce dossier';
-$labels['longacld'] = 'L\'étiquette de suppression des messages peut-être modifiée';
-$labels['longaclt'] = 'L\'étiquette de suppression des messages peut-être modifiée';
+$labels['shortacldelete'] = 'Supprimer';
+$labels['longacll'] = 'Ce dossier est visible dans les listes et on peut s\'y abonner';
+$labels['longaclr'] = 'Le dossier peut-être ouvert en lecture';
+$labels['longacls'] = 'Le drapeau Vu des messages peut-être changée';
+$labels['longaclw'] = 'Les drapeaux et mot-clefs des messages peuvent-être changés, sauf pour Vu et Supprimé';
+$labels['longacli'] = 'Les messages peuvent-être écrits ou copiés dans le dossier';
+$labels['longaclp'] = 'Les messages peuvent-être publiés dans ce dossier';
+$labels['longaclc'] = 'Les dossiers peuvent-être créés (ou renommés) directement depuis ce dossier';
+$labels['longaclk'] = 'Les dossiers peuvent-être créés (ou renommés) directement depuis ce dossier';
+$labels['longacld'] = 'Le drapeau de suppression des messages peut-être modifiée';
+$labels['longaclt'] = 'Le drapeau de suppression des messages peut-être modifiée';
 $labels['longacle'] = 'Les messages peuvent-être purgés';
 $labels['longaclx'] = 'Le dossier peut-être supprimé ou renommé';
-$labels['longacla'] = 'Les droits d\'accès au dossier peuvent-être modifiés';
-$labels['longaclfull'] = 'Contrôle total, dossier d\'administration inclus';
-$labels['longaclread'] = 'Le dossier peut-être ouvert pour lecture';
-$labels['longaclwrite'] = 'Les messages peuvent-être marqué, écrit ou copié dans ce dossier';
-$labels['longacldelete'] = 'Les messages peuvent-être supprimé';
+$labels['longacla'] = 'Les droits d\'accès du dossier peuvent être modifiés';
+$labels['longacln'] = 'Les métadonnées partagées par les messages (annotations) peuvent être changées';
+$labels['longaclfull'] = 'Contrôle total, incluant l\'administration des dossiers';
+$labels['longaclread'] = 'Le dossier peut-être ouvert en lecture';
+$labels['longaclwrite'] = 'Les messages peuvent-être marqués, écrits ou copiés dans ce dossier';
+$labels['longacldelete'] = 'Les messages peuvent être supprimés';
 $messages['deleting'] = 'Suppression des droits d\'accès…';
-$messages['saving'] = 'Sauvegarde des droits d\'accès…';
-$messages['updatesuccess'] = 'Les droits d\'accès ont été changé avec succès';
-$messages['deletesuccess'] = 'Les droits d\'accès ont été supprimé avec succès';
-$messages['createsuccess'] = 'Les droits d\'accès ont été ajouté avec succès';
+$messages['saving'] = 'Enregistrement des droits d\'accès…';
+$messages['updatesuccess'] = 'Les droits d\'accès ont été changés avec succès';
+$messages['deletesuccess'] = 'Les droits d\'accès ont été supprimés avec succès';
+$messages['createsuccess'] = 'Les droits d\'accès ont été ajoutés avec succès';
 $messages['updateerror'] = 'Impossible de mettre à jour les droits d\'accès';
 $messages['deleteerror'] = 'Impossible de supprimer les droits d\'accès';
 $messages['createerror'] = 'Impossible d\'ajouter des droits d\'accès';
-$messages['deleteconfirm'] = 'Êtes-vous sûr de vouloir retirer les droits d\'accès du/des utilisateur(s) sélectionné ?';
-$messages['norights'] = 'Aucun droit n\'a été spécifié !';
-$messages['nouser'] = 'Aucun nom d\'utilisateur n\'a été spécifié !';
+$messages['deleteconfirm'] = 'Êtes-vous sûr de vouloir retirer les droits d\'accès des utilisateurs sélectionnés?';
+$messages['norights'] = 'Aucun droit n\'a été spécifié!';
+$messages['nouser'] = 'Aucun nom d\'utilisateur n\'a été spécifié!';
 ?>
diff --git a/plugins/acl/localization/gl_ES.inc b/plugins/acl/localization/gl_ES.inc
index cd8f9a47a..4f2e7f456 100644
--- a/plugins/acl/localization/gl_ES.inc
+++ b/plugins/acl/localization/gl_ES.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Compartindo';
 $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Utente:';
-$labels['advanced'] = 'Modo avanzado';
 $labels['newuser'] = 'Engadir entrada';
 $labels['actions'] = 'Accións sobre os Permisos de acceso...';
 $labels['anyone'] = 'Todas as persoas usuarias (calquera)';
diff --git a/plugins/acl/localization/he_IL.inc b/plugins/acl/localization/he_IL.inc
index 921c6eef6..199f9d05e 100644
--- a/plugins/acl/localization/he_IL.inc
+++ b/plugins/acl/localization/he_IL.inc
@@ -20,6 +20,7 @@ $labels['myrights'] = 'זכויות גישה';
 $labels['username'] = 'משתמש:';
 $labels['advanced'] = 'מצב מתקדם';
 $labels['newuser'] = 'הוסף ערך';
+$labels['editperms'] = 'עריכת הרשאות';
 $labels['actions'] = 'פעולות על זכויות גישה...';
 $labels['anyone'] = 'כל המשתמשים (כל אחד)';
 $labels['anonymous'] = 'אורחים (אנונימי)';
diff --git a/plugins/acl/localization/hr_HR.inc b/plugins/acl/localization/hr_HR.inc
index ce666c4a8..83ad4844b 100644
--- a/plugins/acl/localization/hr_HR.inc
+++ b/plugins/acl/localization/hr_HR.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Dijeljenje';
 $labels['myrights'] = 'Prava pristupa';
 $labels['username'] = 'Korisnik:';
-$labels['advanced'] = 'Napredni način';
 $labels['newuser'] = 'Dodaj unos/pravilo';
 $labels['actions'] = 'Akcije prava pristupa...';
 $labels['anyone'] = 'Svi korisnici (anyone)';
diff --git a/plugins/acl/localization/hu_HU.inc b/plugins/acl/localization/hu_HU.inc
index b61a2eb1f..f393a917a 100644
--- a/plugins/acl/localization/hu_HU.inc
+++ b/plugins/acl/localization/hu_HU.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Megosztás';
 $labels['myrights'] = 'Hozzáférési jogok';
 $labels['username'] = 'Felhasználó:';
-$labels['advanced'] = 'Haladó beállítások';
+$labels['advanced'] = 'Haladó mód';
 $labels['newuser'] = 'Elem hozzáadása';
+$labels['editperms'] = 'Jogosultságok szerkesztése';
 $labels['actions'] = 'Hozzáférési jogok müveletei..';
 $labels['anyone'] = 'Minden felhasználó (bárki)';
 $labels['anonymous'] = 'Vendégek (névtelen)';
diff --git a/plugins/acl/localization/hy_AM.inc b/plugins/acl/localization/hy_AM.inc
index 403b5ab10..08126121e 100644
--- a/plugins/acl/localization/hy_AM.inc
+++ b/plugins/acl/localization/hy_AM.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Կիսվել';
 $labels['myrights'] = 'Մուտքի իրավունքներ';
 $labels['username'] = 'Օգտատեր`';
-$labels['advanced'] = 'Ընդլայնված տարբերակ';
 $labels['newuser'] = 'Ավելացնել գրառում';
 $labels['actions'] = 'Մուտքի իրավունքների գործողություններ…';
 $labels['anyone'] = 'Բոլոր օգտվողները (ցանկացած)';
diff --git a/plugins/acl/localization/id_ID.inc b/plugins/acl/localization/id_ID.inc
index d7c4b55cd..6099e0e44 100644
--- a/plugins/acl/localization/id_ID.inc
+++ b/plugins/acl/localization/id_ID.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Berbagi';
 $labels['myrights'] = 'Hak Akses';
 $labels['username'] = 'Pengguna:';
-$labels['advanced'] = 'mode canggih';
 $labels['newuser'] = 'Tambahkan entri';
 $labels['actions'] = 'Aksi hak akses...';
 $labels['anyone'] = 'Semua pengguna (siapa saja)';
diff --git a/plugins/acl/localization/it_IT.inc b/plugins/acl/localization/it_IT.inc
index f610ac031..36c66cda5 100644
--- a/plugins/acl/localization/it_IT.inc
+++ b/plugins/acl/localization/it_IT.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Condivisione';
 $labels['myrights'] = 'Diritti d\'accesso';
 $labels['username'] = 'Utente:';
-$labels['advanced'] = 'modalità avanzata';
+$labels['advanced'] = 'Modalità avanzata';
 $labels['newuser'] = 'Aggiungi voce';
+$labels['editperms'] = 'Modifica permessi';
 $labels['actions'] = 'Azioni permessi d\'accesso...';
 $labels['anyone'] = 'Tutti gli utenti';
 $labels['anonymous'] = 'Osptiti (anonimi)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Elimina messaggi';
 $labels['acle'] = 'Elimina';
 $labels['aclx'] = 'Elimina cartella';
 $labels['acla'] = 'Amministra';
+$labels['acln'] = 'Annota messaggi';
 $labels['aclfull'] = 'Controllo completo';
 $labels['aclother'] = 'Altro';
 $labels['aclread'] = 'Lettura';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Elimina';
 $labels['shortacle'] = 'Elimina';
 $labels['shortaclx'] = 'Elimina cartella';
 $labels['shortacla'] = 'Amministra';
+$labels['shortacln'] = 'Annota';
 $labels['shortaclother'] = 'Altro';
 $labels['shortaclread'] = 'Lettura';
 $labels['shortaclwrite'] = 'Scrittura';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Il flag Messaggio Eliminato può essere cambiato';
 $labels['longacle'] = 'I messaggi possono essere cancellati';
 $labels['longaclx'] = 'La cartella può essere eliminata o rinominata';
 $labels['longacla'] = 'I diritti di accesso della cartella possono essere cambiati';
+$labels['longacln'] = 'I metadati (annotazioni) dei messaggi condivisi possono essere modificati';
 $labels['longaclfull'] = 'Controllo completo incluso cartella di amministrazione';
 $labels['longaclread'] = 'Questa cartella può essere aperta in lettura';
 $labels['longaclwrite'] = 'I messaggi possono essere marcati, scritti o copiati nella cartella';
diff --git a/plugins/acl/localization/ja_JP.inc b/plugins/acl/localization/ja_JP.inc
index 15da70b3d..42a386714 100644
--- a/plugins/acl/localization/ja_JP.inc
+++ b/plugins/acl/localization/ja_JP.inc
@@ -20,6 +20,7 @@ $labels['myrights'] = 'アクセス権';
 $labels['username'] = 'ユーザー:';
 $labels['advanced'] = '詳細なモード';
 $labels['newuser'] = '項目を追加';
+$labels['editperms'] = '編集の権限';
 $labels['actions'] = 'アクセス権の動作...';
 $labels['anyone'] = '(誰でも)すべてのユーザー';
 $labels['anonymous'] = 'ゲスト(匿名)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'メッセージを削除';
 $labels['acle'] = '抹消';
 $labels['aclx'] = 'フォルダーを削除';
 $labels['acla'] = '管理';
+$labels['acln'] = 'メッセージに注釈';
 $labels['aclfull'] = '完全な制御';
 $labels['aclother'] = 'その他';
 $labels['aclread'] = '読み込み';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = '削除';
 $labels['shortacle'] = '抹消';
 $labels['shortaclx'] = 'フォルダーの削除';
 $labels['shortacla'] = '管理';
+$labels['shortacln'] = '注釈';
 $labels['shortaclother'] = 'その他';
 $labels['shortaclread'] = '読み込み';
 $labels['shortaclwrite'] = '書き込み';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'メッセージの削除フラッグの変更を可能';
 $labels['longacle'] = 'メッセージの抹消を可能';
 $labels['longaclx'] = 'このフォルダーの削除や名前の変更を可能';
 $labels['longacla'] = 'フォルダーのアクセス権の変更を可能';
+$labels['longacln'] = 'メッセージの共有されるメタデータ(注釈)の変更を可能';
 $labels['longaclfull'] = 'フォルダーの管理を含めた完全な制御を可能';
 $labels['longaclread'] = 'フォルダーを読むことを可能';
 $labels['longaclwrite'] = 'メッセージにマークの設定、書き込み、フォルダーに複製を可能';
diff --git a/plugins/acl/localization/km_KH.inc b/plugins/acl/localization/km_KH.inc
index f112f3cf3..2e562e221 100644
--- a/plugins/acl/localization/km_KH.inc
+++ b/plugins/acl/localization/km_KH.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'ការ​ចែក​រំលែក';
 $labels['myrights'] = 'សិទ្ធិ​ចូល';
 $labels['username'] = 'អ្នក​ប្រើ៖';
-$labels['advanced'] = 'បែប​កម្រិត​ខ្ពស់';
 $labels['newuser'] = 'បន្ថែម​ធាតុ';
 $labels['actions'] = 'សកម្មភាព​សិទ្ធិ​ចូល...';
 $labels['anyone'] = 'អ្នក​ប្រើ​ទាំង​អស់ (នរណា​ម្នាក់)';
diff --git a/plugins/acl/localization/ko_KR.inc b/plugins/acl/localization/ko_KR.inc
index c7c3e466e..dc93541f3 100644
--- a/plugins/acl/localization/ko_KR.inc
+++ b/plugins/acl/localization/ko_KR.inc
@@ -20,6 +20,7 @@ $labels['myrights'] = '접근 권한';
 $labels['username'] = '사용자:';
 $labels['advanced'] = '고급 모드';
 $labels['newuser'] = '엔트리 추가';
+$labels['editperms'] = '권한 수정';
 $labels['actions'] = '접근 권한 동작...';
 $labels['anyone'] = '모든 사용자 (아무나)';
 $labels['anonymous'] = '방문자 (익명)';
@@ -62,9 +63,9 @@ $labels['shortacldelete'] = '삭제';
 $labels['longacll'] = '폴더가 목록에 나타나고 다음 사용자가 구독할 수 있음:';
 $labels['longaclr'] = '읽기 위해 폴더를 열 수 있음';
 $labels['longacls'] = '읽은 메시지 깃발이 변경될 수 있음';
-$labels['longaclw'] = '메시지 깃발 및 키워드를 변경할 수 있음, 다만 읽음 및 삭제됨은 제외';
+$labels['longaclw'] = '메시지 깃발 및 키워드를 변경할 수 있음, 다만 읽음 및 삭제됨은 제외됨';
 $labels['longacli'] = '메시지를 폴더에 복사하거나 작성할 수 있음';
-$labels['longaclp'] = '메시지를 이 폴더로 게시할 수 있음';
+$labels['longaclp'] = '메시지가 이 폴더에 게시될 수 있음';
 $labels['longaclc'] = '이 폴더의 바로 아래에 폴더를 생성(또는 이름 변경)할 수 있음';
 $labels['longaclk'] = '이 폴더의 바로 아래에 폴더를 생성(또는 이름 변경)할 수 있음';
 $labels['longacld'] = '메시지 삭제 깃발이 변경될 수 있음';
@@ -74,7 +75,7 @@ $labels['longaclx'] = '폴더를 삭제하거나 이름을 변경 할 수 있음
 $labels['longacla'] = '폴더의 접근 권한을 변경할 수 있음';
 $labels['longaclfull'] = '폴더 관리를 포함한 모든 제어권';
 $labels['longaclread'] = '폴더를 열어 읽을 수 있음';
-$labels['longaclwrite'] = '메시지에 표시하거나, 폴더로 이동하거나 복사할 수 있음';
+$labels['longaclwrite'] = '메시지를 표시하거나, 폴더로 이동 또는 복사할 수 있음';
 $labels['longacldelete'] = '메시지를 삭제할 수 있음';
 $messages['deleting'] = '접근 권한을 삭제하는 중...';
 $messages['saving'] = '접근 권한을 저장하는 중...';
@@ -82,8 +83,8 @@ $messages['updatesuccess'] = '접근 권한을 성공적으로 변경함.';
 $messages['deletesuccess'] = '접근 권한을 성공적으로 삭제함.';
 $messages['createsuccess'] = '접근 권한을 성공적으로 추가함.';
 $messages['updateerror'] = '접근 권한을 업데이트 할 수 없음';
-$messages['deleteerror'] = '접근 권한을 삭제할 수 없음.';
-$messages['createerror'] = '접근 권한을 추가할 수 없음.';
+$messages['deleteerror'] = '접근 권한을 삭제할 수 없음';
+$messages['createerror'] = '접근 권한을 추가할 수 없음';
 $messages['deleteconfirm'] = '정말로 선택한 사용자의 접근 권한을 삭제하시겠습니까?';
 $messages['norights'] = '지정된 권한이 없음!';
 $messages['nouser'] = '지정된 사용자명이 없음!';
diff --git a/plugins/acl/localization/lb_LU.inc b/plugins/acl/localization/lb_LU.inc
index be03a7297..ec48b1990 100644
--- a/plugins/acl/localization/lb_LU.inc
+++ b/plugins/acl/localization/lb_LU.inc
@@ -18,7 +18,7 @@
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Zougrëffsrechter';
 $labels['username'] = 'Benotzer:';
-$labels['advanced'] = 'avancéierte Modus';
+$labels['advanced'] = 'Avancéierte Modus';
 $labels['newuser'] = 'Element dobäisetzen';
 $labels['actions'] = 'Optioune fir d\'Zougrëffsrechter';
 $labels['anyone'] = 'All d\'Benotzer (jiddwereen)';
diff --git a/plugins/acl/localization/lt_LT.inc b/plugins/acl/localization/lt_LT.inc
index ab4cbbaa1..d0851ac87 100644
--- a/plugins/acl/localization/lt_LT.inc
+++ b/plugins/acl/localization/lt_LT.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Dalinimasis';
 $labels['myrights'] = 'Prieigos teisės';
 $labels['username'] = 'Vartotojas:';
-$labels['advanced'] = 'pažengusio vartotojo rėžimas';
 $labels['newuser'] = 'Pridėti įrašą';
 $labels['actions'] = 'Prieigos teisių veiksmai...';
 $labels['anyone'] = 'Visi vartotojai (bet kas)';
diff --git a/plugins/acl/localization/lv_LV.inc b/plugins/acl/localization/lv_LV.inc
index cadb34ae2..f092e9451 100644
--- a/plugins/acl/localization/lv_LV.inc
+++ b/plugins/acl/localization/lv_LV.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Dalīšanās';
 $labels['myrights'] = 'Piekļuves tiesības';
 $labels['username'] = 'Lietotājs:';
-$labels['advanced'] = 'paplašinātais režīms';
 $labels['newuser'] = 'Pievienot ierakstu';
 $labels['actions'] = 'Darbības ar piekļuves tiesībām...';
 $labels['anyone'] = 'Visi lietotāji (ikviens)';
diff --git a/plugins/acl/localization/nb_NO.inc b/plugins/acl/localization/nb_NO.inc
index 56a9b20a7..a1af91f67 100644
--- a/plugins/acl/localization/nb_NO.inc
+++ b/plugins/acl/localization/nb_NO.inc
@@ -20,6 +20,7 @@ $labels['myrights'] = 'Tilgangsrettigheter';
 $labels['username'] = 'Bruker:';
 $labels['advanced'] = 'Avansert modus';
 $labels['newuser'] = 'Legg til oppføring';
+$labels['editperms'] = 'Rediger tilgangsrettigheter';
 $labels['actions'] = 'Valg for tilgangsrettigheter.';
 $labels['anyone'] = 'Alle brukere (alle)';
 $labels['anonymous'] = 'Gjester (anonyme)';
@@ -81,6 +82,7 @@ $messages['saving'] = 'Lagrer tilgangsrettigheter';
 $messages['updatesuccess'] = 'Tilgangsrettigheter ble endret';
 $messages['deletesuccess'] = 'Tilgangsrettigheter ble slettet';
 $messages['createsuccess'] = 'Tilgangsrettigheter ble lagt til';
+$messages['updateerror'] = 'Kunne ikke oppdatere tilgangsrettigheter';
 $messages['deleteerror'] = 'Kunne ikke fjerne tilgangsrettigheter';
 $messages['createerror'] = 'Kunne ikke legge til tilgangsrettigheter';
 $messages['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valgte brukere';
diff --git a/plugins/acl/localization/nl_NL.inc b/plugins/acl/localization/nl_NL.inc
index 4bf6870ed..9bb2e3bae 100644
--- a/plugins/acl/localization/nl_NL.inc
+++ b/plugins/acl/localization/nl_NL.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Delen';
 $labels['myrights'] = 'Toegangsrechten';
 $labels['username'] = 'Gebruiker:';
-$labels['advanced'] = 'geavanceerde modus';
+$labels['advanced'] = 'Geavanceerde modus';
 $labels['newuser'] = 'Item toevoegen';
+$labels['editperms'] = 'Rechten bewerken';
 $labels['actions'] = 'Toegangsrechtenopties...';
 $labels['anyone'] = 'Alle gebruikers (iedereen)';
 $labels['anonymous'] = 'Gasten (anoniem)';
diff --git a/plugins/acl/localization/nn_NO.inc b/plugins/acl/localization/nn_NO.inc
index 4690a304c..e5af45b6d 100644
--- a/plugins/acl/localization/nn_NO.inc
+++ b/plugins/acl/localization/nn_NO.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Tilgangsrettar';
 $labels['username'] = 'Brukar:';
-$labels['advanced'] = 'Avansert modus';
 $labels['newuser'] = 'Legg til oppføring';
 $labels['actions'] = 'Val for tilgangsrettar...';
 $labels['anyone'] = 'Alle brukarar (alle)';
diff --git a/plugins/acl/localization/pl_PL.inc b/plugins/acl/localization/pl_PL.inc
index d3804ac26..642fde1b6 100644
--- a/plugins/acl/localization/pl_PL.inc
+++ b/plugins/acl/localization/pl_PL.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Udostępnianie';
 $labels['myrights'] = 'Prawa dostępu';
 $labels['username'] = 'Użytkownik:';
-$labels['advanced'] = 'tryb zaawansowany';
+$labels['advanced'] = 'Tryb zaawansowany';
 $labels['newuser'] = 'Dodaj rekord';
+$labels['editperms'] = 'Edytuj zezwolenia';
 $labels['actions'] = 'Akcje na prawach...';
 $labels['anyone'] = 'Wszyscy (anyone)';
 $labels['anonymous'] = 'Goście (anonymous)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Usuwanie wiadomości (Delete)';
 $labels['acle'] = 'Porządkowanie';
 $labels['aclx'] = 'Usuwanie folderu (Delete)';
 $labels['acla'] = 'Administracja';
+$labels['acln'] = 'Adnotacje wiadomości';
 $labels['aclfull'] = 'Wszystkie';
 $labels['aclother'] = 'Pozostałe';
 $labels['aclread'] = 'Odczyt';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Usuwanie';
 $labels['shortacle'] = 'Porządkowanie';
 $labels['shortaclx'] = 'Usuwanie folderu';
 $labels['shortacla'] = 'Administracja';
+$labels['shortacln'] = 'Adnotacje';
 $labels['shortaclother'] = 'Pozostałe';
 $labels['shortaclread'] = 'Odczyt';
 $labels['shortaclwrite'] = 'Zapis';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Pozwala zmianiać flagę "Usunięto" wiadomości';
 $labels['longacle'] = 'Pozwala na usuwanie wiadomości oznaczonych do usunięcia';
 $labels['longaclx'] = 'Pozwala na zmianę nazwy lub usunięcie folderu';
 $labels['longacla'] = 'Pozwala na zmiane praw dostępu do folderu';
+$labels['longacln'] = 'Pozwala na zmianę współdzielonych meta-danych wiadomości (adnotacji)';
 $labels['longaclfull'] = 'Pełna kontrola włącznie z administrowaniem folderem';
 $labels['longaclread'] = 'Folder może być otwarty w trybie do odczytu';
 $labels['longaclwrite'] = 'Wiadomości mogą być oznaczane, zapisywane i kopiowane do folderu';
diff --git a/plugins/acl/localization/pt_BR.inc b/plugins/acl/localization/pt_BR.inc
index 70217626f..a7cf8354d 100644
--- a/plugins/acl/localization/pt_BR.inc
+++ b/plugins/acl/localization/pt_BR.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Compartilhamento';
 $labels['myrights'] = 'Permissões de Acesso';
 $labels['username'] = 'Usuário:';
-$labels['advanced'] = 'modo avançado';
+$labels['advanced'] = 'Modo avançado';
 $labels['newuser'] = 'Adicionar entrada';
+$labels['editperms'] = 'Editar permissões';
 $labels['actions'] = 'Ações de direito de acesso...';
 $labels['anyone'] = 'Todos os usuários (qualquer um)';
 $labels['anonymous'] = 'Convidados (anônimos)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Apagar mensagens';
 $labels['acle'] = 'Expurgar';
 $labels['aclx'] = 'Apagar pasta';
 $labels['acla'] = 'Administrar';
+$labels['acln'] = 'Inserir anotações nas mensagens';
 $labels['aclfull'] = 'Controle total';
 $labels['aclother'] = 'Outro';
 $labels['aclread'] = 'Ler';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Excluir';
 $labels['shortacle'] = 'Expurgar';
 $labels['shortaclx'] = 'Excluir pasta';
 $labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Anotar';
 $labels['shortaclother'] = 'Outro';
 $labels['shortaclread'] = 'Ler';
 $labels['shortaclwrite'] = 'Salvar';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'O marcador de Mensagens Excluídas podem ser modificadas'
 $labels['longacle'] = 'As mensagens podem ser expurgadas';
 $labels['longaclx'] = 'A pasta pode ser apagada ou renomeada';
 $labels['longacla'] = 'As permissões de acesso da pasta podem ser alteradas';
+$labels['longacln'] = 'Metadados compartilhados das mensagens (anotações) podem ser alterados';
 $labels['longaclfull'] = 'Controle total incluindo a pasta de administração';
 $labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longaclwrite'] = 'As mensagens podem ser marcadas, salvas ou copiadas para a pasta';
diff --git a/plugins/acl/localization/pt_PT.inc b/plugins/acl/localization/pt_PT.inc
index 3f1a8f076..77f831375 100644
--- a/plugins/acl/localization/pt_PT.inc
+++ b/plugins/acl/localization/pt_PT.inc
@@ -20,70 +20,74 @@ $labels['myrights'] = 'Permissões de acesso';
 $labels['username'] = 'Utilizador:';
 $labels['advanced'] = 'Modo avançado';
 $labels['newuser'] = 'Adicionar entrada';
+$labels['editperms'] = 'Editar permissões';
 $labels['actions'] = 'Acções de permissão de acesso...';
 $labels['anyone'] = 'Todos os utilizadores (todos)';
-$labels['anonymous'] = 'Convidado (anónimo)';
+$labels['anonymous'] = 'Convidados (anónimo)';
 $labels['identifier'] = 'Identificador';
 $labels['acll'] = 'Pesquisar';
 $labels['aclr'] = 'Ler mensagens';
-$labels['acls'] = 'Manter estado de enviado';
+$labels['acls'] = 'Manter estado Visto';
 $labels['aclw'] = 'Guardar marcadores';
-$labels['acli'] = 'Inserir (cópia em)';
+$labels['acli'] = 'Inserir (Copiar para)';
 $labels['aclp'] = 'Publicar';
 $labels['aclc'] = 'Criar subpastas';
 $labels['aclk'] = 'Criar subpastas';
 $labels['acld'] = 'Eliminar mensagens';
 $labels['aclt'] = 'Eliminar mensagens';
-$labels['acle'] = 'Eliminar';
+$labels['acle'] = 'Purgar';
 $labels['aclx'] = 'Eliminar pasta';
 $labels['acla'] = 'Administrar';
+$labels['acln'] = 'Anotar mensagens';
 $labels['aclfull'] = 'Controlo total';
 $labels['aclother'] = 'Outro';
 $labels['aclread'] = 'Ler';
-$labels['aclwrite'] = 'Guardar';
+$labels['aclwrite'] = 'Escrever';
 $labels['acldelete'] = 'Eliminar';
 $labels['shortacll'] = 'Pesquisar';
 $labels['shortaclr'] = 'Ler';
 $labels['shortacls'] = 'Manter';
-$labels['shortaclw'] = 'Guardar';
+$labels['shortaclw'] = 'Escrever';
 $labels['shortacli'] = 'Inserir';
 $labels['shortaclp'] = 'Publicar';
 $labels['shortaclc'] = 'Criar';
 $labels['shortaclk'] = 'Criar';
 $labels['shortacld'] = 'Eliminar';
 $labels['shortaclt'] = 'Eliminar';
-$labels['shortacle'] = 'Eliminar';
+$labels['shortacle'] = 'Purgar';
 $labels['shortaclx'] = 'Eliminar pasta';
 $labels['shortacla'] = 'Administrar';
+$labels['shortacln'] = 'Anotar';
 $labels['shortaclother'] = 'Outro';
 $labels['shortaclread'] = 'Ler';
-$labels['shortaclwrite'] = 'Guardar';
+$labels['shortaclwrite'] = 'Escrever';
 $labels['shortacldelete'] = 'Eliminar';
-$labels['longacll'] = 'A pasta está visível na lista e pode subscrita para';
+$labels['longacll'] = 'A pasta está visível em listas e pode subscrita';
 $labels['longaclr'] = 'A pasta pode ser aberta para leitura';
-$labels['longacls'] = 'O marcador de mensagem enviada pode ser alterado';
-$labels['longaclw'] = 'Marcadores de mensagens e palavras-chave podem ser alterados, excepto de Enviadas e Eliminadas';
-$labels['longacli'] = 'As mensagens podem ser escritas e copiadas para a pasta';
-$labels['longaclp'] = 'As mensagens podem ser publicadas na pasta';
-$labels['longaclc'] = 'As pastas podem ser criadas (ou renomeadas) directamente nesta pasta';
-$labels['longaclk'] = 'As pastas podem ser criadas (ou renomeadas) directamente nesta pasta';
-$labels['longacld'] = 'O marcador de mensagens Eliminadas pode ser alterado';
-$labels['longaclt'] = 'O marcador de mensagens Eliminadas pode ser alterado';
-$labels['longacle'] = 'As mensagens podem ser eliminadas';
+$labels['longacls'] = 'O marcador Mensagens Vistas pode ser alterado';
+$labels['longaclw'] = 'Marcadores de mensagens e palavras-chave podem ser alterados, excepto Vistas e Eliminadas';
+$labels['longacli'] = 'As mensagens podem ser escritas ou copiadas para a pasta';
+$labels['longaclp'] = 'As mensagens podem ser publicadas para esta pasta';
+$labels['longaclc'] = 'As pastas podem ser criadas (ou renomeadas) directamente debaixo desta pasta';
+$labels['longaclk'] = 'As pastas podem ser criadas (ou renomeadas) directamente debaixo desta pasta';
+$labels['longacld'] = 'O marcador Apagar Mensagens pode ser alterado';
+$labels['longaclt'] = 'O marcador Apagar Mensagens pode ser alterado';
+$labels['longacle'] = 'As mensagens podem ser purgadas';
 $labels['longaclx'] = 'A pasta pode ser eliminada ou renomeada';
 $labels['longacla'] = 'As permissões de acesso da pasta podem ser alteradas';
-$labels['longaclfull'] = 'Controlo total incluindo administração da pasta';
+$labels['longacln'] = 'Mensagens partilhadas de metadados (anotações) podem ser alteradas';
+$labels['longaclfull'] = 'Controlo total incluindo administração de pastas';
 $labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longaclwrite'] = 'As mensagens podem ser marcadas, guardadas ou copiadas para a pasta';
 $labels['longacldelete'] = 'As mensagens podem ser eliminadas';
-$messages['deleting'] = 'A eliminar as permissões de acesso...';
-$messages['saving'] = 'A guardar as permissões de acesso...';
+$messages['deleting'] = 'A eliminar permissões de acesso...';
+$messages['saving'] = 'A guardar permissões de acesso...';
 $messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
 $messages['deletesuccess'] = 'Permissões de acesso eliminadas com sucesso';
 $messages['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
 $messages['updateerror'] = 'Não foi possível actualizar os direitos de acesso';
-$messages['deleteerror'] = 'Não foi possível eliminar as permissões de acesso';
-$messages['createerror'] = 'Não foi possível adicionar as permissões de acesso';
+$messages['deleteerror'] = 'Não foi possível eliminar permissões de acesso';
+$messages['createerror'] = 'Não foi possível adicionar permissões de acesso';
 $messages['deleteconfirm'] = 'Tem a certeza que pretende remover as permissões de acesso do(s) utilizador(es) seleccionado(s)?';
 $messages['norights'] = 'Não foram especificadas quaisquer permissões!';
 $messages['nouser'] = 'Não foi especificado nenhum nome de utilizador!';
diff --git a/plugins/acl/localization/ro_RO.inc b/plugins/acl/localization/ro_RO.inc
index 571314b42..7ce4ca86f 100644
--- a/plugins/acl/localization/ro_RO.inc
+++ b/plugins/acl/localization/ro_RO.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Partajare';
 $labels['myrights'] = 'Drepturi de acces';
 $labels['username'] = 'Utilizator:';
-$labels['advanced'] = 'mod avansat';
+$labels['advanced'] = 'Modul avansat';
 $labels['newuser'] = 'Adăugare intrare';
+$labels['editperms'] = 'Editare permisiuni';
 $labels['actions'] = 'Acțiunea drepturilor de acces...';
 $labels['anyone'] = 'Toți utilizatori (oricare)';
 $labels['anonymous'] = 'Vizitator';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Ștergere mesaje';
 $labels['acle'] = 'Elimină';
 $labels['aclx'] = 'Ștergere dosar';
 $labels['acla'] = 'Administrează';
+$labels['acln'] = 'Adnoteaza mesajele';
 $labels['aclfull'] = 'Control complet';
 $labels['aclother'] = 'Altul';
 $labels['aclread'] = 'Citeşte';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Șterge';
 $labels['shortacle'] = 'Elimină';
 $labels['shortaclx'] = 'Ștergere dosar';
 $labels['shortacla'] = 'Administrează';
+$labels['shortacln'] = 'Adnota';
 $labels['shortaclother'] = 'Altul';
 $labels['shortaclread'] = 'Citeşte';
 $labels['shortaclwrite'] = 'Scrie';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Indicatorul de Șters al mesajelor se poate modifica';
 $labels['longacle'] = 'Mesajele se pot elimina';
 $labels['longaclx'] = 'Dosarul se poate șterge sau redenumi';
 $labels['longacla'] = 'Drepturile de acces la dosar se pot schimba';
+$labels['longacln'] = 'Metadatele (adnotarile) impartite ale mesajelor pot fi schimbate';
 $labels['longaclfull'] = 'Control complet include și administrare dosar';
 $labels['longaclread'] = 'Dosarul se poate deschide pentru citire';
 $labels['longaclwrite'] = 'Mesajul se poate marca, scrie sau copia într-un dosar';
diff --git a/plugins/acl/localization/ru_RU.inc b/plugins/acl/localization/ru_RU.inc
index 3fcb3f970..afc22bc8f 100644
--- a/plugins/acl/localization/ru_RU.inc
+++ b/plugins/acl/localization/ru_RU.inc
@@ -20,6 +20,7 @@ $labels['myrights'] = 'Права доступа';
 $labels['username'] = 'Пользователь:';
 $labels['advanced'] = 'Экспертный режим';
 $labels['newuser'] = 'Добавить поле';
+$labels['editperms'] = 'Редактировать права';
 $labels['actions'] = 'Действия с правами доступа...';
 $labels['anyone'] = 'Все пользователи (любые)';
 $labels['anonymous'] = 'Гости (анонимные)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Удалить сообщения';
 $labels['acle'] = 'Уничтожить сообщения';
 $labels['aclx'] = 'Удалить папку';
 $labels['acla'] = 'Администрировать';
+$labels['acln'] = 'Комментировать сообщения';
 $labels['aclfull'] = 'Полный доступ';
 $labels['aclother'] = 'Другое';
 $labels['aclread'] = 'Чтение';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Удаление';
 $labels['shortacle'] = 'Уничтожить сообщения';
 $labels['shortaclx'] = 'Удаление папки';
 $labels['shortacla'] = 'Администрировать';
+$labels['shortacln'] = 'Комментировать';
 $labels['shortaclother'] = 'Другое';
 $labels['shortaclread'] = 'Чтение';
 $labels['shortaclwrite'] = 'Запись';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Флаг Удалено может быть измене�
 $labels['longacle'] = 'Сообщения могут быть уничтожены';
 $labels['longaclx'] = 'Эта папка может быть переименована или удалена';
 $labels['longacla'] = 'Права доступа к папке могут быть изменены';
+$labels['longacln'] = 'Совместные медаданные сообщений (комментарии) могут быть изменены';
 $labels['longaclfull'] = 'Полный доступ, включая управление папкой';
 $labels['longaclread'] = 'Эта папка может быть открыта для чтения';
 $labels['longaclwrite'] = 'Сообщения можно помечать, записывать или копировать в папку';
diff --git a/plugins/acl/localization/sk_SK.inc b/plugins/acl/localization/sk_SK.inc
index c4ea0e53c..ec15dbbe8 100644
--- a/plugins/acl/localization/sk_SK.inc
+++ b/plugins/acl/localization/sk_SK.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Zdieľanie';
 $labels['myrights'] = 'Prístupové oprávnenia';
 $labels['username'] = 'Používateľ:';
-$labels['advanced'] = 'pokročilý režim';
+$labels['advanced'] = 'Režim pre pokročilých';
 $labels['newuser'] = 'Pridať záznam';
+$labels['editperms'] = 'Upraviť oprávnenia';
 $labels['actions'] = 'Prístupové práva pre akcie...';
 $labels['anyone'] = 'Všetci užívatelia (ktokoľvek)';
 $labels['anonymous'] = 'Hostia (anonymní)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Vymazať správy';
 $labels['acle'] = 'Vyčistiť';
 $labels['aclx'] = 'Vymazať priečinok';
 $labels['acla'] = 'Spravovať';
+$labels['acln'] = 'Označiť správy poznámkou';
 $labels['aclfull'] = 'Úplný prístup';
 $labels['aclother'] = 'Iné';
 $labels['aclread'] = 'Čítanie';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Vymazať';
 $labels['shortacle'] = 'Vyčistiť';
 $labels['shortaclx'] = 'Vymazať priečinok';
 $labels['shortacla'] = 'Spravovať';
+$labels['shortacln'] = 'Označiť poznámkou';
 $labels['shortaclother'] = 'Iné';
 $labels['shortaclread'] = 'Čítanie';
 $labels['shortaclwrite'] = 'Zápis';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Príznak správ "Vymazané" je možné zmeniť';
 $labels['longacle'] = 'Správy je možné vyčistiť';
 $labels['longaclx'] = 'Priečinok je možné vymazať alebo premenovať';
 $labels['longacla'] = 'Prístupové oprávnenia k tomuto priečinku je možné zmeniť';
+$labels['longacln'] = 'Meta-dáta (poznámky) zdieľané medzi správami, je možné zmeniť';
 $labels['longaclfull'] = 'Úplný prístup, vrátane správy priečinka';
 $labels['longaclread'] = 'Prečinok je možné otvoriť na čítanie';
 $labels['longaclwrite'] = 'Správy je možné označiť, zapísať alebo skopírovať do prečinka';
diff --git a/plugins/acl/localization/sl_SI.inc b/plugins/acl/localization/sl_SI.inc
index fb75af833..5fa7ac235 100644
--- a/plugins/acl/localization/sl_SI.inc
+++ b/plugins/acl/localization/sl_SI.inc
@@ -20,6 +20,7 @@ $labels['myrights'] = 'Pravice dostopa';
 $labels['username'] = 'Uporabnik:';
 $labels['advanced'] = 'Napredni način';
 $labels['newuser'] = 'Dodaj vnos';
+$labels['editperms'] = 'Uredi pravice';
 $labels['actions'] = 'Nastavitve pravic dostopa';
 $labels['anyone'] = 'Vsi uporabniki';
 $labels['anonymous'] = 'Gosti';
diff --git a/plugins/acl/localization/sv_SE.inc b/plugins/acl/localization/sv_SE.inc
index 529c11f47..ff52ea599 100644
--- a/plugins/acl/localization/sv_SE.inc
+++ b/plugins/acl/localization/sv_SE.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Utdelning';
 $labels['myrights'] = 'Åtkomsträttigheter';
 $labels['username'] = 'Användare:';
-$labels['advanced'] = 'avancerat läge';
+$labels['advanced'] = 'Avancerat läge';
 $labels['newuser'] = 'Lägg till';
+$labels['editperms'] = 'Ändra rättigheter';
 $labels['actions'] = 'Hantera åtkomsträttigheter...';
 $labels['anyone'] = 'Alla användare (vem som helst)';
 $labels['anonymous'] = 'Gäster (anonyma)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Ta bort meddelanden';
 $labels['acle'] = 'Utplåna';
 $labels['aclx'] = 'Ta bort katalog';
 $labels['acla'] = 'Administrera';
+$labels['acln'] = 'Kommentera meddelanden';
 $labels['aclfull'] = 'Full kontroll';
 $labels['aclother'] = 'Övrig';
 $labels['aclread'] = 'Läs';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Ta bort';
 $labels['shortacle'] = 'Utplåna';
 $labels['shortaclx'] = 'Ta bort katalog';
 $labels['shortacla'] = 'Administrera';
+$labels['shortacln'] = 'Kommentera';
 $labels['shortaclother'] = 'Övrig';
 $labels['shortaclread'] = 'Läs';
 $labels['shortaclwrite'] = 'Skriv';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'Meddelandeflagga Borttaget kan ändras';
 $labels['longacle'] = 'Meddelanden kan utplånas';
 $labels['longaclx'] = 'Katalogen kan tas bort eller ges annat namn';
 $labels['longacla'] = 'Katalogens åtkomsträttigheter kan ändras';
+$labels['longacln'] = 'Delad information om meddelanden (kommentarer) kan ändras';
 $labels['longaclfull'] = 'Full kontroll inklusive katalogadministration';
 $labels['longaclread'] = 'Katalogen kan öppnas för läsning';
 $labels['longaclwrite'] = 'Meddelanden kan märkas, skrivas eller kopieras till katalogen';
diff --git a/plugins/acl/localization/th_TH.inc b/plugins/acl/localization/th_TH.inc
index 8eb1d279c..2b346b621 100644
--- a/plugins/acl/localization/th_TH.inc
+++ b/plugins/acl/localization/th_TH.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'การแชร์ข้อมูล';
 $labels['myrights'] = 'สิทธิ์การเข้าใช้';
 $labels['username'] = 'ผู้ใช้งาน:';
-$labels['advanced'] = 'โหมดขั้นสูง';
 $labels['newuser'] = 'เพิ่มรายการ';
 $labels['anyone'] = 'ผู้ใช้งานทั้งหมด (ใครก็ได้)';
 $labels['anonymous'] = 'ผู้เยี่ยมชม (คนแปลกหน้า)';
diff --git a/plugins/acl/localization/ti.inc b/plugins/acl/localization/ti.inc
index 751be8736..1af3a1926 100644
--- a/plugins/acl/localization/ti.inc
+++ b/plugins/acl/localization/ti.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'ንኻልእ';
 $labels['myrights'] = 'መሰላት በዓል ዋና';
 $labels['username'] = 'በዓል ዋና';
-$labels['advanced'] = 'ዝማዕበለ አሰራርሓ';
 $labels['newuser'] = 'እታዎ ክውስኽ';
 $labels['actions'] = 'ንጥፈታት መብት ተጠቃማይነት';
 $labels['anyone'] = 'ኩሉም በዓልቲ ዋናታት(ዝኾነ ሰብ)';
diff --git a/plugins/acl/localization/tr_TR.inc b/plugins/acl/localization/tr_TR.inc
index 673403b0b..3deb31e24 100644
--- a/plugins/acl/localization/tr_TR.inc
+++ b/plugins/acl/localization/tr_TR.inc
@@ -18,8 +18,9 @@
 $labels['sharing'] = 'Paylaşım';
 $labels['myrights'] = 'Erişim Hakları';
 $labels['username'] = 'Kullanıcı:';
-$labels['advanced'] = 'İleri seviye mod';
+$labels['advanced'] = 'Gelişmiş mod';
 $labels['newuser'] = 'Girdi ekle';
+$labels['editperms'] = 'İzinleri düzenle';
 $labels['actions'] = 'Erişim hakları aksiyonları...';
 $labels['anyone'] = 'Tüm kullanıcılar(kim olursa)';
 $labels['anonymous'] = 'Ziyaretçiler(anonim)';
@@ -37,6 +38,7 @@ $labels['aclt'] = 'Mesajları  sil';
 $labels['acle'] = 'Sil';
 $labels['aclx'] = 'Dizini sil';
 $labels['acla'] = 'Yönet';
+$labels['acln'] = 'Mesajlara not ekle';
 $labels['aclfull'] = 'Tam kontrol';
 $labels['aclother'] = 'Diğer';
 $labels['aclread'] = 'Oku';
@@ -55,6 +57,7 @@ $labels['shortaclt'] = 'Sil';
 $labels['shortacle'] = 'Sil';
 $labels['shortaclx'] = 'Dizin sil';
 $labels['shortacla'] = 'Yönet';
+$labels['shortacln'] = 'Not ekle';
 $labels['shortaclother'] = 'Diğer';
 $labels['shortaclread'] = 'Oku';
 $labels['shortaclwrite'] = 'Yaz';
@@ -72,6 +75,7 @@ $labels['longaclt'] = 'mesajları sil bayrakları değiştirilebilir';
 $labels['longacle'] = 'Mesajlar silinebilir';
 $labels['longaclx'] = 'Klasörü silinebilir veya yeniden adlandırılabilir';
 $labels['longacla'] = 'Dizin erişim hakları değiştirilebilir';
+$labels['longacln'] = 'Mesajların paylaşılan üst verileri (notlar) değiştirilebilir';
 $labels['longaclfull'] = 'Dizin yönetimi de dahil olmak üzere tam kontrol';
 $labels['longaclread'] = 'Dizin yazma için okunabilir';
 $labels['longaclwrite'] = 'Dizin yönetimi de dahil olmak üzere tam kontrol';
diff --git a/plugins/acl/localization/uk_UA.inc b/plugins/acl/localization/uk_UA.inc
index ada0afa3c..f0522a2cf 100644
--- a/plugins/acl/localization/uk_UA.inc
+++ b/plugins/acl/localization/uk_UA.inc
@@ -17,7 +17,6 @@
 */
 $labels['myrights'] = 'Права доступу';
 $labels['username'] = 'Користувач:';
-$labels['advanced'] = 'розширений режим';
 $labels['anyone'] = 'Всі користувачі (кожен)';
 $labels['anonymous'] = 'Гості (аноніми)';
 $labels['aclc'] = 'Створити підтеки';
diff --git a/plugins/acl/localization/vi_VN.inc b/plugins/acl/localization/vi_VN.inc
index e772eb8e7..61ef9b142 100644
--- a/plugins/acl/localization/vi_VN.inc
+++ b/plugins/acl/localization/vi_VN.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = 'Chia sẻ';
 $labels['myrights'] = 'Quyền truy cập';
 $labels['username'] = 'Người dùng:';
-$labels['advanced'] = 'Chế độ tính năng cao hơn';
 $labels['newuser'] = 'Thêm bài viết';
 $labels['actions'] = 'Các thao tác quyền truy cập';
 $labels['anyone'] = 'Tất cả người dùng (bất kỳ ai)';
diff --git a/plugins/acl/localization/zh_CN.inc b/plugins/acl/localization/zh_CN.inc
index 2542c3237..da69484db 100644
--- a/plugins/acl/localization/zh_CN.inc
+++ b/plugins/acl/localization/zh_CN.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = '共享';
 $labels['myrights'] = '访问权限';
 $labels['username'] = '用户：';
-$labels['advanced'] = '高级模式';
 $labels['newuser'] = '新增条目';
 $labels['actions'] = '权限设置...';
 $labels['anyone'] = '所有用户(任何人)';
diff --git a/plugins/acl/localization/zh_TW.inc b/plugins/acl/localization/zh_TW.inc
index e3adc04a3..d9c5d9770 100644
--- a/plugins/acl/localization/zh_TW.inc
+++ b/plugins/acl/localization/zh_TW.inc
@@ -18,7 +18,6 @@
 $labels['sharing'] = '分享';
 $labels['myrights'] = '存取權限';
 $labels['username'] = '使用者：';
-$labels['advanced'] = '進階模式';
 $labels['newuser'] = '新增項目';
 $labels['actions'] = '權限設定';
 $labels['anyone'] = '所有使用者 (anyone)';
diff --git a/plugins/archive/localization/el_GR.inc b/plugins/archive/localization/el_GR.inc
index 17eefab11..4254a306d 100644
--- a/plugins/archive/localization/el_GR.inc
+++ b/plugins/archive/localization/el_GR.inc
@@ -18,14 +18,14 @@
 $labels['buttontext'] = 'Αρχειοθέτηση';
 $labels['buttontitle'] = 'Αρχειοθέτηση μηνύματος';
 $labels['archived'] = 'Αρχειοθετήθηκε με επιτυχία';
-$labels['archivedreload'] = 'Επιτυχής αρχειοθετηση. Ανανέωση της σελίδας για να δείτε τους νέους φακέλους αρχειοθέτησης. ';
-$labels['archiveerror'] = 'Ορισμένα μηνύματα δεν μπορεσαν να αρχειοθετηθουν. ';
+$labels['archivedreload'] = 'Επιτυχής αρχειοθέτηση. Ανανεώστε την σελίδα για να δείτε τους νέους φακέλους αρχειοθέτησης. ';
+$labels['archiveerror'] = 'Ορισμένα μηνύματα δεν ήταν δυνατό να αρχειοθετηθούν. ';
 $labels['archivefolder'] = 'Αρχειοθέτηση';
 $labels['settingstitle'] = 'Αρχειοθέτηση';
-$labels['archivetype'] = 'Χασμα αρχειου απο';
-$labels['archivetypeyear'] = 'Χρονος (π.χ. Αρχειο/2012)';
-$labels['archivetypemonth'] = 'Μηνας (π.χ. Αρχειο/2012/06)';
-$labels['archivetypefolder'] = 'Αυθεντικος φακελος';
+$labels['archivetype'] = 'Τμηματοποίηση αρχείου με βάση';
+$labels['archivetypeyear'] = 'Έτος (π.χ. Αρχείο/2012)';
+$labels['archivetypemonth'] = 'Μήνα (π.χ. Αρχείο/2012/06)';
+$labels['archivetypefolder'] = 'Αρχικός φάκελος';
 $labels['archivetypesender'] = 'Αποστολέας email';
 $labels['unkownsender'] = 'άγνωστο';
 ?>
diff --git a/plugins/archive/localization/fr_FR.inc b/plugins/archive/localization/fr_FR.inc
index 989abc74e..7fba1aa0e 100644
--- a/plugins/archive/localization/fr_FR.inc
+++ b/plugins/archive/localization/fr_FR.inc
@@ -18,14 +18,14 @@
 $labels['buttontext'] = 'Archive';
 $labels['buttontitle'] = 'Archiver ce message';
 $labels['archived'] = 'Message archivé avec succès';
-$labels['archivedreload'] = 'Archivé avec succès. Rechargez la page pour voir les nouveaux dossiers d\'archivage.';
+$labels['archivedreload'] = 'Archivé avec succès. Recharger la page pour voir les nouveaux dossiers d\'archives.';
 $labels['archiveerror'] = 'Certains messages n\'ont pas pu être archivés.';
 $labels['archivefolder'] = 'Archive';
 $labels['settingstitle'] = 'Archive';
 $labels['archivetype'] = 'Diviser l\'archive par';
-$labels['archivetypeyear'] = 'Année (ex Archives/2012)';
-$labels['archivetypemonth'] = 'Mois (ex Archives/2012/06)';
+$labels['archivetypeyear'] = 'Année (ex. Archives/2012)';
+$labels['archivetypemonth'] = 'Mois (ex. Archives/2012/06)';
 $labels['archivetypefolder'] = 'Dossier original';
-$labels['archivetypesender'] = 'Courriel de l\'émetteur';
+$labels['archivetypesender'] = 'Courriel de l\'expéditeur';
 $labels['unkownsender'] = 'inconnu';
 ?>
diff --git a/plugins/attachment_reminder/localization/br.inc b/plugins/attachment_reminder/localization/br.inc
new file mode 100644
index 000000000..93eaace5e
--- /dev/null
+++ b/plugins/attachment_reminder/localization/br.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
+$messages['forgotattachment'] = "Disonjet ho peus stagan er restr ?";
+$messages['reminderoption'] = "Adgalv war ar pezhiou stag disonjet";
+$messages['keywords'] = "pezh stag, restr, stagan, aman staget, stagit, ouzhpenan, CV, lizher youl";
diff --git a/plugins/attachment_reminder/localization/el_GR.inc b/plugins/attachment_reminder/localization/el_GR.inc
index c0d01b404..11a3cb822 100644
--- a/plugins/attachment_reminder/localization/el_GR.inc
+++ b/plugins/attachment_reminder/localization/el_GR.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-$messages['forgotattachment'] = "Μήπως ξεχάσετε να επισυνάψετε ένα αρχείο; ";
-$messages['reminderoption'] = "Μήπως ξεχάσετε να επισυνάψετε ένα αρχείο; ";
-$messages['keywords'] = "συνημμένο, αρχείο, συννημενο, επισυναψη, επισυνάπτοντας, κλειστό, βιογραφικό σημείωμα, συνοδευτική επιστολή";
+$messages['forgotattachment'] = "Μήπως ξεχάσετε να επισυνάψετε αρχείο; ";
+$messages['reminderoption'] = "Υπενθύμιση για συνημμένα";
+$messages['keywords'] = "συνημμένο, αρχείο, επισύναψη, συνημμένο, επισυνάπτοντας, εσωκλείοντας, βιογραφικό σημείωμα, συνοδευτική επιστολή";
diff --git a/plugins/attachment_reminder/localization/fr_FR.inc b/plugins/attachment_reminder/localization/fr_FR.inc
index bda3eba90..45b8e1091 100644
--- a/plugins/attachment_reminder/localization/fr_FR.inc
+++ b/plugins/attachment_reminder/localization/fr_FR.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-$messages['forgotattachment'] = "Avez vous oublié d'attacher un fichier ?";
-$messages['reminderoption'] = "Rappel à propos des pièces jointes oubliées";
-$messages['keywords'] = "joins,joint,attaché,CV";
+$messages['forgotattachment'] = "Avez-vous oublié de joindre un fichier?";
+$messages['reminderoption'] = "Rappeler les pièces jointes oubliées";
+$messages['keywords'] = "joins,joint,attaché,fichier,inclus,ci-inclus,CV";
diff --git a/plugins/help/localization/fr_FR.inc b/plugins/help/localization/fr_FR.inc
index 97e00176d..11a282f10 100644
--- a/plugins/help/localization/fr_FR.inc
+++ b/plugins/help/localization/fr_FR.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-$labels['help'] = 'Aide';
-$labels['about'] = 'A propos';
-$labels['license'] = 'Licence';
+$labels['help'] = 'Help';
+$labels['about'] = 'About';
+$labels['license'] = 'License';
 ?>
diff --git a/plugins/hide_blockquote/localization/ar_SA.inc b/plugins/hide_blockquote/localization/ar_SA.inc
index 30ade1397..9c80c477f 100644
--- a/plugins/hide_blockquote/localization/ar_SA.inc
+++ b/plugins/hide_blockquote/localization/ar_SA.inc
@@ -17,4 +17,5 @@
 */
 $labels['hide'] = 'إخفاء';
 $labels['show'] = 'إظهار';
+$labels['quotelimit'] = 'اخف الاقتباس اذا كان عدد الاسطر اكبر من ';
 ?>
diff --git a/plugins/hide_blockquote/localization/el_GR.inc b/plugins/hide_blockquote/localization/el_GR.inc
index a5572957a..c2fa45703 100644
--- a/plugins/hide_blockquote/localization/el_GR.inc
+++ b/plugins/hide_blockquote/localization/el_GR.inc
@@ -17,5 +17,5 @@
 */
 $labels['hide'] = 'Αποκρυψη';
 $labels['show'] = 'Εμφάνιση';
-$labels['quotelimit'] = 'Απόκρυψη παραπομπων όταν οι γραμμές μέτρησης είναι μεγαλύτερες από';
+$labels['quotelimit'] = 'Απόκρυψη παραπομπων όταν ο αριθμός γραμμών είναι μεγαλύτερος από';
 ?>
diff --git a/plugins/hide_blockquote/localization/fr_FR.inc b/plugins/hide_blockquote/localization/fr_FR.inc
index 00c1c918f..0e1171152 100644
--- a/plugins/hide_blockquote/localization/fr_FR.inc
+++ b/plugins/hide_blockquote/localization/fr_FR.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-$labels['hide'] = 'Cacher';
-$labels['show'] = 'Afficher';
-$labels['quotelimit'] = 'Cacher la citation quand le nombre de lignes est plus grand que';
+$labels['hide'] = 'Masquer';
+$labels['show'] = 'Montrer';
+$labels['quotelimit'] = 'Masquer la citation quand le nombre de lignes est supérieur à';
 ?>
diff --git a/plugins/managesieve/localization/ar_SA.inc b/plugins/managesieve/localization/ar_SA.inc
index 8e6d8414a..e55301bbd 100644
--- a/plugins/managesieve/localization/ar_SA.inc
+++ b/plugins/managesieve/localization/ar_SA.inc
@@ -15,19 +15,167 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
+$labels['filters'] = 'تصفية';
+$labels['managefilters'] = 'ادارة تصفية البريد الوارد';
+$labels['filtername'] = 'اسم التصفية';
+$labels['newfilter'] = 'تصفية جديدة';
+$labels['filteradd'] = 'اضافة تصفية';
+$labels['filterdel'] = 'حذف تصفية';
+$labels['moveup'] = 'نقل الى الاعلى ';
+$labels['movedown'] = 'نقل الى الاسفل';
+$labels['filterallof'] = 'مطابقة جميع القواعد التالية';
+$labels['filteranyof'] = 'مطابقة اي القواعد التالية';
+$labels['filterany'] = 'كل الرسائل';
+$labels['filtercontains'] = 'محتوى';
+$labels['filternotcontains'] = 'بدون محتوى';
+$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'] = 'تجاهل مع الرسالة';
+$labels['messagekeep'] = 'إبقاء الرسالة في علبة الوارد';
+$labels['messagesrules'] = 'للبريد الوارد:';
+$labels['messagesactions'] = '...تنفيذ المهام التالية:';
 $labels['add'] = 'إضافة';
 $labels['del'] = 'حذف';
+$labels['sender'] = 'المرسل';
 $labels['recipient'] = 'مستلم';
+$labels['vacationaddr'] = 'عناوين البريد الالكتروني(ـة) الاضافية:';
+$labels['vacationdays'] = 'في الغالب كم رسالة ترسل (بالايام):';
+$labels['vacationinterval'] = 'كم عدد الرسائل المرسلة عادةً:';
+$labels['vacationreason'] = 'نص الرسالة (بسبب الاجازة):';
+$labels['vacationsubject'] = 'موضوع الرسالة:';
+$labels['days'] = 'ايام';
+$labels['seconds'] = 'ثواني';
+$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['setvariable'] = 'تعيين متغير';
+$labels['setvarname'] = 'اسم المتغير:';
+$labels['setvarvalue'] = 'قيمة المتغير:';
+$labels['setvarmodifiers'] = 'تعديلات:';
+$labels['varquotewildcard'] = 'أقتبس أحرف خاصة';
+$labels['varlength'] = 'الطول';
+$labels['notify'] = 'ارسل تنبية';
+$labels['notifyaddress'] = 'الى عنوان البريد الالكتروني:';
+$labels['notifybody'] = 'نص التنبية:';
+$labels['notifysubject'] = 'موضوع التنبية:';
+$labels['notifyfrom'] = 'مرسل التنبية:';
+$labels['notifyimportance'] = 'اهمية:';
 $labels['notifyimportancelow'] = 'منخفض';
 $labels['notifyimportancenormal'] = 'عادي';
 $labels['notifyimportancehigh'] = 'مرتفع';
+$labels['filtercreate'] = 'انشئ تصفية';
+$labels['usedata'] = 'استخدم البيانات التالية في الفلتر:';
+$labels['nextstep'] = 'الخطوة التالية';
+$labels['...'] = '...';
+$labels['currdate'] = 'التاريخ الحالي';
+$labels['datetest'] = 'التاريخ';
+$labels['dateheader'] = 'الراس:';
+$labels['year'] = 'السنة';
+$labels['month'] = 'شهر';
+$labels['day'] = 'يوم';
+$labels['date'] = 'التاريخ (yyyy-mm-dd)';
+$labels['julian'] = 'التاريخ (يوليان)';
+$labels['hour'] = 'ساعات';
+$labels['minute'] = 'دقائق';
+$labels['second'] = 'ثواني';
+$labels['time'] = 'الوقت (hh:mm:ss)';
+$labels['iso8601'] = 'التاريخ (ISO8601)';
+$labels['std11'] = 'التاريخ (RFC2822)';
+$labels['zone'] = 'المنطقة الزمنية';
+$labels['weekday'] = 'ايام العمل (0-6)';
 $labels['advancedopts'] = 'خيارات متقدّمة';
+$labels['body'] = 'نص';
 $labels['address'] = 'العنوان';
+$labels['modifier'] = 'تعديل:';
+$labels['text'] = 'نص';
+$labels['contenttype'] = 'نوع المحتوى';
+$labels['modtype'] = 'نوع:';
 $labels['allparts'] = 'الكل';
 $labels['domain'] = 'المجال';
+$labels['localpart'] = 'الجزء المحلي';
+$labels['user'] = 'مستخدم';
+$labels['detail'] = 'تفاصيل';
+$labels['default'] = 'افتراضي';
+$labels['index'] = 'الوارد:';
+$labels['indexlast'] = 'تراجع';
+$messages['filterunknownerror'] = 'خطا غير معروف من الخادم.';
+$messages['filterconnerror'] = 'لا يمكن الاتصال بالخادم.';
+$messages['filterdeleteerror'] = 'لا يمكن حذف التصفية.خطا في الخادم.';
+$messages['filterdeleted'] = 'تم حذف التصفية بنجاح.';
+$messages['filtersaved'] = 'تم حفظ التصفية بنجاح.';
+$messages['filtersaveerror'] = 'لا يمكن حفظ التصفية.خطا في الخادم.';
+$messages['filterdeleteconfirm'] = 'هل تريد فعلاً حذف التصفية المحددة؟';
+$messages['ruledeleteconfirm'] = 'هل تريد فعلاً حذف القواعد المحددة؟';
+$messages['actiondeleteconfirm'] = 'هل تريد فعلاً حذف الاجراءات المحددة؟';
+$messages['forbiddenchars'] = 'احرف محظورة في هذا الحقل.';
+$messages['cannotbeempty'] = 'لا يمكن ترك الحقل فارغاً';
+$messages['ruleexist'] = 'اسم هذة التصفية موجود مسبقاً';
+$messages['setactivateerror'] = 'لا يمكن تفعيل مجموعة التصفية المحددة.خطا في الخادم.';
+$messages['setdeactivateerror'] = 'لا يمكن تعطيل مجموعة التصفية المحددة.خطا في الخادم.';
+$messages['setdeleteerror'] = 'لا يمكن حذف مجموعة التصفية المحددة.خطا في الخادم.';
+$messages['setactivated'] = 'تم تفعيل مجموعة التصفية بنجاح.';
+$messages['setdeactivated'] = 'تم تعطيل مجموعة التصفية بنجاح.';
+$messages['setdeleted'] = 'تم حذف مجموعة التصفية بنجاح.';
+$messages['setdeleteconfirm'] = 'هل تريد فعلاً حذف مجموعات التصفية المحددة؟';
+$messages['setcreateerror'] = 'لا يمكن انشاء مجموعة تصفية.خطا في الخادم.';
+$messages['setcreated'] = 'تم انشاء مجموعة التصفية بنجاح.';
+$messages['activateerror'] = 'لا يمكن تمكين التصفية(ـات) المحددة .خطا في الخادم.';
+$messages['deactivateerror'] = 'لا يمكن تعطيل التصفية(ـات) المحددة .خطا في الخادم.';
+$messages['deactivated'] = 'تم تعطيل المصفيـ(ـاة) بنجاح.';
+$messages['activated'] = 'تم تفعيل المصفيـ(ـاة) بنجاح.';
+$messages['moved'] = 'تم نقل التصفية بنجاح.';
+$messages['moveerror'] = 'لا يمكن نقل التصفياة المحددة.خطا في الخادم.';
+$messages['nametoolong'] = 'الإسم طويل جداً';
+$messages['setexist'] = 'المجموعة موجودة مسبقا.';
+$messages['nodata'] = 'يجب تحديد موضع واحد على الأقل!';
+$messages['invaliddateformat'] = 'تاريخ غير صحيح او يوجد خطا في تنسق اجزاء التاريخ';
 ?>
diff --git a/plugins/managesieve/localization/az_AZ.inc b/plugins/managesieve/localization/az_AZ.inc
index d692b9620..b11f8a670 100644
--- a/plugins/managesieve/localization/az_AZ.inc
+++ b/plugins/managesieve/localization/az_AZ.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Qəbul edən';
 $labels['vacationaddr'] = 'Mənim əlavə e-poçt ünvan(lar)ım: ';
 $labels['vacationdays'] = 'Məktub neçə müddətdən bir göndərilsin (gündə):';
 $labels['vacationinterval'] = 'Məktublar nə qədər sıx göndərilsin:';
-$labels['days'] = 'günlər';
-$labels['seconds'] = 'saniyələr';
 $labels['vacationreason'] = 'Məktubun mətni (səbəb yoxdur):';
 $labels['vacationsubject'] = 'Məktubun mövzusu:';
+$labels['days'] = 'günlər';
+$labels['seconds'] = 'saniyələr';
 $labels['rulestop'] = 'Yerinə yetirməyi dayandır';
 $labels['enable'] = 'Yandır/Söndür';
 $labels['filterset'] = 'Süzgəc dəsti';
diff --git a/plugins/managesieve/localization/be_BE.inc b/plugins/managesieve/localization/be_BE.inc
index 29c97ad94..1dbca6003 100644
--- a/plugins/managesieve/localization/be_BE.inc
+++ b/plugins/managesieve/localization/be_BE.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Каму';
 $labels['vacationaddr'] = 'Дадатковы(я) адрасы эл. пошты:';
 $labels['vacationdays'] = 'Як часта дасылаць паведамленні (у днях):';
 $labels['vacationinterval'] = 'Як часта дасылаць паведамленні:';
-$labels['days'] = 'дзён';
-$labels['seconds'] = 'секунд';
 $labels['vacationreason'] = 'Цела паведамлення (прычына вакацый):';
 $labels['vacationsubject'] = 'Тэма паведамлення:';
+$labels['days'] = 'дзён';
+$labels['seconds'] = 'секунд';
 $labels['rulestop'] = 'Перастаць выконваць праверку правілаў';
 $labels['enable'] = 'Уключыць/Выключыць';
 $labels['filterset'] = 'Набор фільтраў';
diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc
index c9d06d2fd..e940c7c05 100644
--- a/plugins/managesieve/localization/bg_BG.inc
+++ b/plugins/managesieve/localization/bg_BG.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Получател';
 $labels['vacationaddr'] = 'Мои допълнителни e-mail адреси:';
 $labels['vacationdays'] = 'Колко често да праща писма (в дни):';
 $labels['vacationinterval'] = 'Колко често да праща писма:';
-$labels['days'] = 'дни';
-$labels['seconds'] = 'секунди';
 $labels['vacationreason'] = 'Текст на писмото (причина за ваканцията)';
 $labels['vacationsubject'] = 'Заглавие на писмото';
+$labels['days'] = 'дни';
+$labels['seconds'] = 'секунди';
 $labels['rulestop'] = 'Спри проверка на други условия';
 $labels['enable'] = 'Включи/Изключи';
 $labels['filterset'] = 'Набор филтри';
diff --git a/plugins/managesieve/localization/br.inc b/plugins/managesieve/localization/br.inc
new file mode 100644
index 000000000..c7d89f575
--- /dev/null
+++ b/plugins/managesieve/localization/br.inc
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/managesieve/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
+*/
+$labels['filters'] = 'sil';
+$labels['newfilter'] = 'Sil nevez';
+$labels['filteradd'] = 'Ouzhpenan ur sil';
+$labels['filterdel'] = 'Dilemel ar sil';
+$labels['filterany'] = 'An holl postel';
+$labels['messagecopyto'] = 'eilan ar postel e';
+$labels['messagedelete'] = 'Dilemel ar postel';
+$labels['add'] = 'Ouzhpenan';
+$labels['del'] = 'Dilemel';
+$labels['sender'] = 'Kaser';
+$labels['recipient'] = 'Resever';
+$labels['vacationsubject'] = 'Sujed';
+?>
diff --git a/plugins/managesieve/localization/bs_BA.inc b/plugins/managesieve/localization/bs_BA.inc
index 0667db33c..f0fd118cb 100644
--- a/plugins/managesieve/localization/bs_BA.inc
+++ b/plugins/managesieve/localization/bs_BA.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Primaoc';
 $labels['vacationaddr'] = 'Moje dodatne email adrese:';
 $labels['vacationdays'] = 'Frekvencija slanja poruka (u danima):';
 $labels['vacationinterval'] = 'Frekvencija slanja poruka:';
-$labels['days'] = 'dana';
-$labels['seconds'] = 'sekundi';
 $labels['vacationreason'] = 'Tijelo poruke (razlog za odmor):';
 $labels['vacationsubject'] = 'Naslov poruke:';
+$labels['days'] = 'dana';
+$labels['seconds'] = 'sekundi';
 $labels['rulestop'] = 'Prestani procjenjivati pravila';
 $labels['enable'] = 'Omogući/Onemogući';
 $labels['filterset'] = 'Set filtera';
@@ -157,6 +157,21 @@ $labels['asciicasemap'] = 'osjetljivo na velika/mala slova (ascii-casemap)';
 $labels['asciinumeric'] = 'numerički (ascii-numeric)';
 $labels['index'] = 'indeks:';
 $labels['indexlast'] = 'unazad';
+$labels['vacation'] = 'Odmor';
+$labels['vacation.reply'] = 'Poruka sa odgovorom';
+$labels['vacation.advanced'] = 'Napredmen postavke';
+$labels['vacation.subject'] = 'Naslov';
+$labels['vacation.body'] = 'Tijelo';
+$labels['vacation.dates'] = 'Vrijeme odmora';
+$labels['vacation.from'] = 'Od:';
+$labels['vacation.to'] = 'Do:';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.on'] = 'Uključeno';
+$labels['vacation.off'] = 'Isključeno';
+$labels['vacation.addresses'] = 'Moje dodatne adrese';
+$labels['vacation.interval'] = 'Interval odgovora';
+$labels['vacation.after'] = 'Pravilo za odmor stavi nakon';
+$labels['vacation.saving'] = 'Snimam podatke...';
 $messages['filterunknownerror'] = 'Nepoznata serverska greška.';
 $messages['filterconnerror'] = 'Nije se moguće povezati na server.';
 $messages['filterdeleteerror'] = 'Nije moguće obrisati filter. Desila se serverska greška.';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Ime je rezervisano.';
 $messages['setexist'] = 'Set već postoji.';
 $messages['nodata'] = 'Morate označiti barem jednu poziciju!';
 $messages['invaliddateformat'] = 'Netačan datum ili dio formata datuma';
+$messages['saveerror'] = 'Nije moguće snimiti podatke. Desila se serverska greška.';
+$messages['vacationsaved'] = 'Podaci o odmoru su uspješno snimljeni.';
 ?>
diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc
index 5e54c6a7b..dc461225d 100644
--- a/plugins/managesieve/localization/ca_ES.inc
+++ b/plugins/managesieve/localization/ca_ES.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Destinatari';
 $labels['vacationaddr'] = 'Les meves adreces de correu addicionals:';
 $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):';
 $labels['vacationinterval'] = 'Amb quina freqüència s\'han d\'enviar els missatges:';
-$labels['days'] = 'dies';
-$labels['seconds'] = 'segons';
 $labels['vacationreason'] = 'Cos del missatge (raó de l\'absència):';
 $labels['vacationsubject'] = 'Assumpte del missatge:';
+$labels['days'] = 'dies';
+$labels['seconds'] = 'segons';
 $labels['rulestop'] = 'Deixa d\'avaluar regles';
 $labels['enable'] = 'Habilita/Deshabilita';
 $labels['filterset'] = 'Conjunt de filtres';
diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc
index d304da61e..596b35b00 100644
--- a/plugins/managesieve/localization/cs_CZ.inc
+++ b/plugins/managesieve/localization/cs_CZ.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Příjemce';
 $labels['vacationaddr'] = 'Moje další e-mailová adresa(y):';
 $labels['vacationdays'] = 'Počet dnů mezi automatickými odpověďmi:';
 $labels['vacationinterval'] = 'Prodleva mezi automatickými odpověďmi:';
-$labels['days'] = 'dnů';
-$labels['seconds'] = 'sekund';
 $labels['vacationreason'] = 'Zpráva (Důvod nepřítomnosti):';
 $labels['vacationsubject'] = 'Předmět zprávy:';
+$labels['days'] = 'dnů';
+$labels['seconds'] = 'sekund';
 $labels['rulestop'] = 'Zastavit pravidla';
 $labels['enable'] = 'Zapnout/Vypnout';
 $labels['filterset'] = 'Sada filtrů';
@@ -157,6 +157,21 @@ $labels['asciicasemap'] = 'necitlivé na velikost písmen (ascii-casemap)';
 $labels['asciinumeric'] = 'číslené (ascii-numeric)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'pozpátku';
+$labels['vacation'] = 'Dovolená';
+$labels['vacation.reply'] = 'Odpověd';
+$labels['vacation.advanced'] = 'Pokročilá nastavení';
+$labels['vacation.subject'] = 'Předmět';
+$labels['vacation.body'] = 'Tělo';
+$labels['vacation.dates'] = 'Doba dovolené';
+$labels['vacation.from'] = 'Od:';
+$labels['vacation.to'] = 'Do:';
+$labels['vacation.status'] = 'Stav';
+$labels['vacation.on'] = 'Zapnuto';
+$labels['vacation.off'] = 'Vypnuto';
+$labels['vacation.addresses'] = 'Moje další adresy:';
+$labels['vacation.interval'] = 'Doba mezi odpověďmi';
+$labels['vacation.after'] = 'Uložit pravidlo o dovolené za';
+$labels['vacation.saving'] = 'Ukládám data...';
 $messages['filterunknownerror'] = 'Neznámá chyba serveru';
 $messages['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
 $messages['filterdeleteerror'] = 'Nebylo možné smazat filtr. Došlo k chybě serveru.';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Vyhrazený název.';
 $messages['setexist'] = 'Sada již existuje.';
 $messages['nodata'] = 'Musí být vybrána minimálně jedna pozice!';
 $messages['invaliddateformat'] = 'Neplatné datum nebo část data';
+$messages['saveerror'] = 'Nebylo možné uložit data. Došlo k chybě serveru.';
+$messages['vacationsaved'] = 'Data o dovolené byla uložena.';
 ?>
diff --git a/plugins/managesieve/localization/cy_GB.inc b/plugins/managesieve/localization/cy_GB.inc
index a10205d09..5431ef081 100644
--- a/plugins/managesieve/localization/cy_GB.inc
+++ b/plugins/managesieve/localization/cy_GB.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Derbynnwr';
 $labels['vacationaddr'] = 'Fy nghyfeiriad(au) ebost ychwanegol:';
 $labels['vacationdays'] = 'Pa mor aml i ddanfon negeseuon (mewn dyddiau):';
 $labels['vacationinterval'] = 'Pa mor aml i ddanfon negeseuon:';
-$labels['days'] = 'dyddiau';
-$labels['seconds'] = 'eiliadau';
 $labels['vacationreason'] = 'Corff neges (rheswm ar wyliau):';
 $labels['vacationsubject'] = 'Pwnc neges:';
+$labels['days'] = 'dyddiau';
+$labels['seconds'] = 'eiliadau';
 $labels['rulestop'] = 'Stopio gwerthuso rheolau';
 $labels['enable'] = 'Galluogi/Analluogi';
 $labels['filterset'] = 'Set hidlyddion';
diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc
index b240741dc..8f5413a35 100644
--- a/plugins/managesieve/localization/da_DK.inc
+++ b/plugins/managesieve/localization/da_DK.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Modtager';
 $labels['vacationaddr'] = 'Min(e) yderligere email-adresse(r):';
 $labels['vacationdays'] = 'Hvor tit skal besked sendes (i dage):';
 $labels['vacationinterval'] = 'Hvor tit skal besked sendes:';
-$labels['days'] = 'dage';
-$labels['seconds'] = 'sekunder';
 $labels['vacationreason'] = 'Besked (ved ferie):';
 $labels['vacationsubject'] = 'Besked emne:';
+$labels['days'] = 'dage';
+$labels['seconds'] = 'sekunder';
 $labels['rulestop'] = 'Stop behandling af regler';
 $labels['enable'] = 'Aktivér/Deaktivér';
 $labels['filterset'] = 'Filter sæt';
diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc
index 234f31315..c9cf061ca 100644
--- a/plugins/managesieve/localization/de_CH.inc
+++ b/plugins/managesieve/localization/de_CH.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Empfänger';
 $labels['vacationaddr'] = 'Meine weiteren E-Mail-Adressen:';
 $labels['vacationdays'] = 'Antwort wird erneut gesendet nach (in Tagen):';
 $labels['vacationinterval'] = 'Wie oft senden:';
-$labels['days'] = 'Tage';
-$labels['seconds'] = 'Sekunden';
 $labels['vacationreason'] = 'Inhalt der Nachricht (Abwesenheitsgrund):';
 $labels['vacationsubject'] = 'Betreff';
+$labels['days'] = 'Tage';
+$labels['seconds'] = 'Sekunden';
 $labels['rulestop'] = 'Regelauswertung anhalten';
 $labels['enable'] = 'Aktivieren/Deaktivieren';
 $labels['filterset'] = 'Filtersätze';
diff --git a/plugins/managesieve/localization/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
index 2eaa21580..e2abacf60 100644
--- a/plugins/managesieve/localization/de_DE.inc
+++ b/plugins/managesieve/localization/de_DE.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Empfänger';
 $labels['vacationaddr'] = 'Meine zusätzliche E-Mail-Adresse(n):';
 $labels['vacationdays'] = 'Wie oft sollen Nachrichten gesendet werden (in Tagen):';
 $labels['vacationinterval'] = 'Wie oft sollen Nachrichten gesendet werden:';
-$labels['days'] = 'Tage';
-$labels['seconds'] = 'Sekunden';
 $labels['vacationreason'] = 'Nachrichteninhalt (Abwesenheitsgrund):';
 $labels['vacationsubject'] = 'Nachrichtenbetreff';
+$labels['days'] = 'Tage';
+$labels['seconds'] = 'Sekunden';
 $labels['rulestop'] = 'Regelauswertung anhalten';
 $labels['enable'] = 'Aktivieren/Deaktivieren';
 $labels['filterset'] = 'Filtersätze';
diff --git a/plugins/managesieve/localization/el_GR.inc b/plugins/managesieve/localization/el_GR.inc
index 73ec78632..c5f270247 100644
--- a/plugins/managesieve/localization/el_GR.inc
+++ b/plugins/managesieve/localization/el_GR.inc
@@ -47,18 +47,20 @@ $labels['messagesendcopy'] = 'Αποστολη της αντιγραφης μυ�
 $labels['messagereply'] = 'Απάντηση με μήνυμα';
 $labels['messagedelete'] = 'Διαγραφή μηνύματος';
 $labels['messagediscard'] = 'Απόρριψη με μήνυμα';
+$labels['messagekeep'] = 'Διατήρηση μηνύματος στα Εισερχόμενα';
 $labels['messagesrules'] = 'Για εισερχόμενα μηνύματα που:';
 $labels['messagesactions'] = '...εκτέλεση των παρακάτω ενεργειών:';
 $labels['add'] = 'Προσθήκη';
 $labels['del'] = 'Διαγραφή';
 $labels['sender'] = 'Αποστολέας';
 $labels['recipient'] = 'Παραλήπτης';
+$labels['vacationaddr'] = 'Πρόσθετες διευθύνσεις email:';
 $labels['vacationdays'] = 'Συχνότητα αποστολής μηνυμάτων (σε ημέρες):';
 $labels['vacationinterval'] = 'Συχνότητα αποστολής μηνυμάτων:';
-$labels['days'] = 'ημερες';
-$labels['seconds'] = 'δευτερόλεπτα';
 $labels['vacationreason'] = 'Σώμα μηνύματος (λόγος απουσίας):';
 $labels['vacationsubject'] = 'Θέμα μηνύματος: ';
+$labels['days'] = 'ημερες';
+$labels['seconds'] = 'δευτερόλεπτα';
 $labels['rulestop'] = 'Παύση επαλήθευσης κανόνων';
 $labels['enable'] = 'Ενεργοποιηση/Απενεργοποιηση';
 $labels['filterset'] = 'Φίλτρα';
@@ -157,22 +159,31 @@ $labels['index'] = 'ευρετήριο:';
 $labels['indexlast'] = 'προς τα πίσω';
 $messages['filterunknownerror'] = 'Άγνωστο σφάλμα διακομιστή';
 $messages['filterconnerror'] = 'Αδυναμία σύνδεσης στον διακομιστή managesieve';
+$messages['filterdeleteerror'] = 'Αδυναμία διαγραφής φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
 $messages['filterdeleted'] = 'Το φίλτρο διαγράφηκε επιτυχώς';
 $messages['filtersaved'] = 'Το φίλτρο αποθηκεύτηκε επιτυχώς';
+$messages['filtersaveerror'] = 'Αδυναμία αποθήκευσης φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
 $messages['filterdeleteconfirm'] = 'Είστε σίγουροι ότι θέλετε να διαγράψετε το επιλεγμένο φίλτρο? ';
 $messages['ruledeleteconfirm'] = 'Θέλετε όντως να διαγράψετε τον επιλεγμένο κανόνα;';
 $messages['actiondeleteconfirm'] = 'Θέλετε όντως να διαγράψετε την επιλεγμένη ενέργεια;';
 $messages['forbiddenchars'] = 'Μη επιτρεπτοί χαρακτήρες στο πεδίο';
 $messages['cannotbeempty'] = 'Το πεδίο δεν μπορεί να είναι κενό';
 $messages['ruleexist'] = 'Φιλτρο με αυτο το όνομα υπάρχει ήδη. ';
+$messages['setactivateerror'] = 'Αδυναμία ενεργοποίησης επιλεγμένων ομάδων φίλτρων. Προέκυψε σφάλμα στον διακομιστή.';
+$messages['setdeactivateerror'] = 'Αδυναμία απενεργοποίησης επιλεγμένων ομάδων φίλτρων. Προέκυψε σφάλμα στον διακομιστή.';
+$messages['setdeleteerror'] = 'Αδυναμία διαγραφής των επιλεγμένων ομάδων φίλτρων. Προέκυψε σφάλμα στον διακομιστή';
 $messages['setactivated'] = 'Φίλτρα ενεργοποιήθηκαν με επιτυχία.';
 $messages['setdeactivated'] = 'Φίλτρα απενεργοποιήθηκαν με επιτυχία.';
 $messages['setdeleted'] = 'Τα φίλτρα διαγράφηκαν επιτυχώς.';
 $messages['setdeleteconfirm'] = 'Θέλετε όντως να διαγράψετε τα επιλεγμένα φιλτρα?';
+$messages['setcreateerror'] = 'Αδυναμία δημιουργίας ομάδας φίλτρων. Προέκυψε σφάλμα στον διακομιστή.';
 $messages['setcreated'] = 'Τα φιλτρα δημιουργηθηκαν επιτυχως.';
+$messages['activateerror'] = 'Αδυναμία ενεργοποίησης επιλεγμένου φίλτρου(ων). Προέκυψε σφάλμα στον διακομιστή.';
+$messages['deactivateerror'] = 'Αδυναμία απενεργοποίησης επιλεγμένου φίλτρου(ων). Προέκυψε σφάλμα στον διακομιστή.';
 $messages['deactivated'] = 'Το φιλτρο(α) απενεργοποιηθηκαν επιτυχως.';
 $messages['activated'] = 'Το φίλτρο(α) ενεργοποιηθηκαν επιτυχώς.';
 $messages['moved'] = 'Το φίλτρο μετακινηθηκε επιτυχώς.';
+$messages['moveerror'] = 'Αδυναμία μετακίνησης επιλεγμένου φίλτρου. Προέκυψε σφάλμα στον διακομιστή.';
 $messages['nametoolong'] = 'Το όνομα είναι πολύ μεγάλο.';
 $messages['namereserved'] = 'Δεσμευμένο όνομα. ';
 $messages['setexist'] = 'Set υπάρχει ήδη. ';
diff --git a/plugins/managesieve/localization/en_CA.inc b/plugins/managesieve/localization/en_CA.inc
index 311e5953e..9cc831b99 100644
--- a/plugins/managesieve/localization/en_CA.inc
+++ b/plugins/managesieve/localization/en_CA.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Recipient';
 $labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'How often send messages (in days):';
 $labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['rulestop'] = 'Stop evaluating rules';
 $labels['enable'] = 'Enable/Disable';
 $labels['filterset'] = 'Filters set';
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
index f899e60fe..59a019d4e 100644
--- a/plugins/managesieve/localization/en_GB.inc
+++ b/plugins/managesieve/localization/en_GB.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Recipient';
 $labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'How often send messages (in days):';
 $labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['rulestop'] = 'Stop evaluating rules';
 $labels['enable'] = 'Enable/Disable';
 $labels['filterset'] = 'Filters set';
@@ -157,6 +157,21 @@ $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'backwards';
+$labels['vacation'] = 'Vacation';
+$labels['vacation.reply'] = 'Reply message';
+$labels['vacation.advanced'] = 'Advanced settings';
+$labels['vacation.subject'] = 'Subject';
+$labels['vacation.body'] = 'Body';
+$labels['vacation.dates'] = 'Vacation time';
+$labels['vacation.from'] = 'From:';
+$labels['vacation.to'] = 'To:';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.on'] = 'On';
+$labels['vacation.off'] = 'Off';
+$labels['vacation.addresses'] = 'My additional addresses';
+$labels['vacation.interval'] = 'Reply interval';
+$labels['vacation.after'] = 'Put vacation rule after';
+$labels['vacation.saving'] = 'Saving data...';
 $messages['filterunknownerror'] = 'Unknown server error';
 $messages['filterconnerror'] = 'Unable to connect to managesieve server';
 $messages['filterdeleteerror'] = 'Unable to delete filter. Server error occurred.';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Reserved name.';
 $messages['setexist'] = 'Set already exists.';
 $messages['nodata'] = 'At least one position must be selected!';
 $messages['invaliddateformat'] = 'Invalid date or date part format';
+$messages['saveerror'] = 'Unable to save data. Server error occurred.';
+$messages['vacationsaved'] = 'Vacation data saved successfully.';
 ?>
diff --git a/plugins/managesieve/localization/es_419.inc b/plugins/managesieve/localization/es_419.inc
index f459bdb67..bc9fbba30 100644
--- a/plugins/managesieve/localization/es_419.inc
+++ b/plugins/managesieve/localization/es_419.inc
@@ -56,10 +56,10 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationdays'] = '¿Cada cuánto enviar mensajes (en días)?';
 $labels['vacationinterval'] = '¿Con que frecuencia enviar mensajes?';
-$labels['days'] = 'días';
-$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Cuerpo del mensaje (motivo de las vacaciones):';
 $labels['vacationsubject'] = 'Título del mensaje:';
+$labels['days'] = 'días';
+$labels['seconds'] = 'segundos';
 $labels['rulestop'] = 'Detener la evaluación de reglas';
 $labels['enable'] = 'Habilitar/Deshabilitar';
 $labels['filterdef'] = 'Definición del filtro';
diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc
index 91602ee7b..cd8e24dfb 100644
--- a/plugins/managesieve/localization/es_ES.inc
+++ b/plugins/managesieve/localization/es_ES.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Destinatario';
 $labels['vacationaddr'] = 'Mis direcciones adicionales de correo electrónico:';
 $labels['vacationdays'] = 'Cada cuánto enviar mensajes (en días):';
 $labels['vacationinterval'] = 'Cada cuánto enviar mensajes:';
-$labels['days'] = 'días';
-$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razón de vacaciones):';
 $labels['vacationsubject'] = 'Asunto del Mensaje:';
+$labels['days'] = 'días';
+$labels['seconds'] = 'segundos';
 $labels['rulestop'] = 'Parar de evaluar reglas';
 $labels['enable'] = 'Habilitar/Deshabilitar';
 $labels['filterset'] = 'Conjunto de filtros';
diff --git a/plugins/managesieve/localization/et_EE.inc b/plugins/managesieve/localization/et_EE.inc
index e8a3bd3c1..6f1f73555 100644
--- a/plugins/managesieve/localization/et_EE.inc
+++ b/plugins/managesieve/localization/et_EE.inc
@@ -55,10 +55,10 @@ $labels['sender'] = 'Saatja';
 $labels['recipient'] = 'Saaja';
 $labels['vacationdays'] = 'Kui tihti kirju saata (päevades):';
 $labels['vacationinterval'] = 'Kui tihti kirju saata:';
-$labels['days'] = 'päeva';
-$labels['seconds'] = 'sekundit';
 $labels['vacationreason'] = 'Kirja sisu (puhkuse põhjus):';
 $labels['vacationsubject'] = 'Kirja teema:';
+$labels['days'] = 'päeva';
+$labels['seconds'] = 'sekundit';
 $labels['rulestop'] = 'Peata reeglite otsimine';
 $labels['enable'] = 'Luba/keela';
 $labels['filterset'] = 'Filtrite kogum';
diff --git a/plugins/managesieve/localization/eu_ES.inc b/plugins/managesieve/localization/eu_ES.inc
index fe29e5859..c16718523 100644
--- a/plugins/managesieve/localization/eu_ES.inc
+++ b/plugins/managesieve/localization/eu_ES.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Hartzailea';
 $labels['vacationaddr'] = 'Nire helbide elektroniko osagarria(k):';
 $labels['vacationdays'] = 'Zer maiztasunarekin bidaltzen ditu mezuak (egunak)';
 $labels['vacationinterval'] = 'Zenbatero bidali mezuak:';
-$labels['days'] = 'egun';
-$labels['seconds'] = 'segundo';
 $labels['vacationreason'] = 'Mezuaren gorputza (oporrak direla medio):';
 $labels['vacationsubject'] = 'Mezuaren izenburua:';
+$labels['days'] = 'egun';
+$labels['seconds'] = 'segundo';
 $labels['rulestop'] = 'Gelditu arauak ebaluatzen';
 $labels['enable'] = 'Gaitu/Ezgaitu';
 $labels['filterset'] = 'Iragazki-paketea';
diff --git a/plugins/managesieve/localization/fa_IR.inc b/plugins/managesieve/localization/fa_IR.inc
index b938c5850..37cd82548 100644
--- a/plugins/managesieve/localization/fa_IR.inc
+++ b/plugins/managesieve/localization/fa_IR.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'گیرنده';
 $labels['vacationaddr'] = 'آدرس(های) ایمیل اضافی من:';
 $labels['vacationdays'] = 'پیغام ها در چه مواقعی فرستاده شدند (در روزهای):';
 $labels['vacationinterval'] = 'مواقعی که پیغام‌ها ارسال می‌شوند:';
-$labels['days'] = 'روزها';
-$labels['seconds'] = 'ثانیه‌ها';
 $labels['vacationreason'] = 'بدنه پیغام (علت مسافرت):';
 $labels['vacationsubject'] = 'موضوع پیغام:';
+$labels['days'] = 'روزها';
+$labels['seconds'] = 'ثانیه‌ها';
 $labels['rulestop'] = 'توقف قوانین ارزیابی';
 $labels['enable'] = 'فعال/غیرفعال‌سازی';
 $labels['filterset'] = 'مجموعه صافی‌ها';
diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
index 67a73a9aa..a06ee178c 100644
--- a/plugins/managesieve/localization/fr_FR.inc
+++ b/plugins/managesieve/localization/fr_FR.inc
@@ -16,14 +16,14 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 $labels['filters'] = 'Filtres';
-$labels['managefilters'] = 'Gérer les filtres sur les courriels entrants';
+$labels['managefilters'] = 'Gérer les filtres de courriels entrants';
 $labels['filtername'] = 'Nom du filtre';
 $labels['newfilter'] = 'Nouveau filtre';
 $labels['filteradd'] = 'Ajouter un filtre';
 $labels['filterdel'] = 'Supprimer le filtre';
 $labels['moveup'] = 'Monter';
 $labels['movedown'] = 'Descendre';
-$labels['filterallof'] = 'valident toutes les conditions suivantes';
+$labels['filterallof'] = 'correspondant à toutes les règles suivantes';
 $labels['filteranyof'] = 'valident au moins une des conditions suivantes';
 $labels['filterany'] = 'tous les messages';
 $labels['filtercontains'] = 'contient';
@@ -32,16 +32,16 @@ $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['filtermatches'] = 'correspond à l\'expression';
+$labels['filternotmatches'] = 'ne correspond pas à l\'expression';
+$labels['filterregex'] = 'correspond à l\'expression rationnelle';
+$labels['filternotregex'] = 'ne correspond pas à l\'expression rationnelle';
+$labels['filterunder'] = 'plus petit que';
+$labels['filterover'] = '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['messageredirect'] = 'Rediriger le message à';
 $labels['messagecopyto'] = 'Copier le message vers';
 $labels['messagesendcopy'] = 'Envoyer une copie du message à';
 $labels['messagereply'] = 'Répondre avec le message';
@@ -49,84 +49,84 @@ $labels['messagedelete'] = 'Supprimer le message';
 $labels['messagediscard'] = 'Rejeter avec le message';
 $labels['messagekeep'] = 'Conserver le message dans la boîte de réception';
 $labels['messagesrules'] = 'Pour les courriels entrants :';
-$labels['messagesactions'] = '...exécuter les actions suivantes:';
+$labels['messagesactions'] = '...exécuter les actions suivantes :';
 $labels['add'] = 'Ajouter';
 $labels['del'] = 'Supprimer';
 $labels['sender'] = 'Expéditeur';
 $labels['recipient'] = 'Destinataire';
-$labels['vacationaddr'] = 'Adresse(s) e-mail additionnelle(s):';
-$labels['vacationdays'] = 'Ne pas renvoyer un message avant (jours) :';
-$labels['vacationinterval'] = 'Comment envoyer les messages :';
+$labels['vacationaddr'] = 'Mes adresses courriel additionnelles :';
+$labels['vacationdays'] = 'Fréquence d\'envoi des messages (en jours) :';
+$labels['vacationinterval'] = 'Fréquence d\'envoi des messages :';
+$labels['vacationreason'] = 'Corps du message (raison de l\'absence) :';
+$labels['vacationsubject'] = 'Objet du message :';
 $labels['days'] = 'jours';
 $labels['seconds'] = 'secondes';
-$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['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['rulestop'] = 'Arrêter l\'évaluation des règles';
+$labels['enable'] = 'Activer/désactiver';
+$labels['filterset'] = 'Jeu de filtres';
+$labels['filtersets'] = 'Jeux de filtres';
+$labels['filtersetadd'] = 'Ajouter un jeu de filtres';
+$labels['filtersetdel'] = 'Supprimer le jeu de filtres actuel';
+$labels['filtersetact'] = 'Activer le jeu de filtres actuel';
+$labels['filtersetdeact'] = 'Désactiver le jeu 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['filtersetname'] = 'Nom du jeu de filtres';
+$labels['newfilterset'] = 'Nouveau jeu de filtres';
+$labels['active'] = 'activer';
 $labels['none'] = 'aucun';
-$labels['fromset'] = 'à partir du filtre';
+$labels['fromset'] = 'à partir du jeu';
 $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['countislessthanequal'] = 'total inférieur ou égal à';
 $labels['countequals'] = 'total égal à';
-$labels['countnotequals'] = 'le comptage n\'est pas égal à';
+$labels['countnotequals'] = 'le nombre n\'est pas égal à';
 $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'] = 'la valeur n\'est pas égale à';
-$labels['setflags'] = 'Mettre les marqueurs au message';
-$labels['addflags'] = 'Ajouter les marqueurs au message';
-$labels['removeflags'] = 'Supprimer les marqueurs du message';
+$labels['setflags'] = 'Définir les drapeaux pour le message';
+$labels['addflags'] = 'Ajouter les drapeaux au message';
+$labels['removeflags'] = 'Supprimer les drapeaux du message';
 $labels['flagread'] = 'Lu';
 $labels['flagdeleted'] = 'Supprimé';
-$labels['flaganswered'] = 'Répondu';
-$labels['flagflagged'] = 'Marqué';
+$labels['flaganswered'] = 'Réponse envoyée';
+$labels['flagflagged'] = 'Signalé';
 $labels['flagdraft'] = 'Brouillon';
 $labels['setvariable'] = 'Définir une variable';
 $labels['setvarname'] = 'Nom de la variable :';
 $labels['setvarvalue'] = 'Valeur de la variable :';
-$labels['setvarmodifiers'] = 'Modifications :';
+$labels['setvarmodifiers'] = 'Modificateurs :';
 $labels['varlower'] = 'minuscule';
 $labels['varupper'] = 'majuscule';
-$labels['varlowerfirst'] = 'premier caractère minuscule';
-$labels['varupperfirst'] = 'premier caractère majuscule';
-$labels['varquotewildcard'] = 'Échapper les caractères spéciaux';
+$labels['varlowerfirst'] = 'premier caractère en minuscule';
+$labels['varupperfirst'] = 'premier caractère en majuscule';
+$labels['varquotewildcard'] = 'citer les caractères spéciaux';
 $labels['varlength'] = 'longueur';
 $labels['notify'] = 'Envoyer la notification';
-$labels['notifyaddress'] = 'A l\'adresse e-mail :';
+$labels['notifyaddress'] = 'À l\'adresse courriel :';
 $labels['notifybody'] = 'Corps de la notification :';
 $labels['notifysubject'] = 'Objet de la notification :';
 $labels['notifyfrom'] = 'Expéditeur de la notification :';
 $labels['notifyimportance'] = 'Importance :';
 $labels['notifyimportancelow'] = 'faible';
-$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancenormal'] = 'normale';
 $labels['notifyimportancehigh'] = 'haute';
 $labels['filtercreate'] = 'Créer un filtre';
-$labels['usedata'] = 'Utiliser les informations suivantes dans le filtre';
+$labels['usedata'] = 'Utiliser les données suivantes dans le filtre :';
 $labels['nextstep'] = 'Étape suivante';
 $labels['...'] = '...';
 $labels['currdate'] = 'Date actuelle';
 $labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
+$labels['dateheader'] = 'en-tête :';
 $labels['year'] = 'année';
 $labels['month'] = 'mois';
 $labels['day'] = 'jour';
-$labels['date'] = 'date (yyyy-mm-dd)';
+$labels['date'] = 'date (aaaa-mm-jj)';
 $labels['julian'] = 'date (julien)';
 $labels['hour'] = 'heure';
 $labels['minute'] = 'minute';
@@ -137,56 +137,73 @@ $labels['std11'] = 'date (RFC2822)';
 $labels['zone'] = 'fuseau horaire';
 $labels['weekday'] = 'jour de la semaine (0-6)';
 $labels['advancedopts'] = 'Options avancées';
-$labels['body'] = 'Corps du message';
+$labels['body'] = 'Corps';
 $labels['address'] = 'adresse';
 $labels['envelope'] = 'enveloppe';
-$labels['modifier'] = 'modificateur:';
+$labels['modifier'] = 'modificateur :';
 $labels['text'] = 'texte';
 $labels['undecoded'] = 'non décodé (brut)';
 $labels['contenttype'] = 'type de contenu';
-$labels['modtype'] = 'type:';
+$labels['modtype'] = 'type :';
 $labels['allparts'] = 'tout';
 $labels['domain'] = 'domaine';
 $labels['localpart'] = 'partie locale';
 $labels['user'] = 'utilisateur';
 $labels['detail'] = 'détail';
-$labels['comparator'] = 'comparateur';
+$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['index'] = 'index:';
-$labels['indexlast'] = 'retour arrière';
-$messages['filterunknownerror'] = 'Erreur du serveur inconnue';
-$messages['filterconnerror'] = 'Connexion au serveur Managesieve impossible';
-$messages['filterdeleteerror'] = 'Impossible de supprimer le filtre. Une erreur serveur est survenue.';
-$messages['filterdeleted'] = 'Le filtre a bien été supprimé';
-$messages['filtersaved'] = 'Le filtre a bien été enregistré';
-$messages['filtersaveerror'] = 'Impossible de sauvegarder le filtre. Une erreur serveur est survenue.';
+$labels['index'] = 'index :';
+$labels['indexlast'] = 'à l\'envers';
+$labels['vacation'] = 'Vacances';
+$labels['vacation.reply'] = 'Message de réponse';
+$labels['vacation.advanced'] = 'Paramètres avancés';
+$labels['vacation.subject'] = 'Objet';
+$labels['vacation.body'] = 'Corps';
+$labels['vacation.dates'] = 'Période de vacances';
+$labels['vacation.from'] = 'De :';
+$labels['vacation.to'] = 'À :';
+$labels['vacation.status'] = 'État';
+$labels['vacation.on'] = 'Arrêt';
+$labels['vacation.off'] = 'Marche';
+$labels['vacation.addresses'] = 'Mes adresses supplémentaires';
+$labels['vacation.interval'] = 'Plage de réponse';
+$labels['vacation.after'] = 'Mettre en place la règle de vacances après';
+$labels['vacation.saving'] = 'Enregistrement des données...';
+$messages['filterunknownerror'] = 'Erreur de serveur inconnue';
+$messages['filterconnerror'] = 'Connexion au serveur impossible.';
+$messages['filterdeleteerror'] = 'Impossible de supprimer le filtre. Une erreur de serveur est survenue.';
+$messages['filterdeleted'] = 'Le filtre a été supprimé avec succès.';
+$messages['filtersaved'] = 'Le filtre a été enregistré avec succès.';
+$messages['filtersaveerror'] = 'Impossible d\'enregistrer le filtre. Une erreur de serveur est survenue.';
 $messages['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
 $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';
 $messages['ruleexist'] = 'Un filtre existe déjà avec ce nom.';
-$messages['setactivateerror'] = 'Impossible d\'activer le set de filtres sélectionné. Une erreur serveur est survenue.';
-$messages['setdeactivateerror'] = 'Impossible de désactiver le set de filtres sélectionné. Une erreur serveur est survenue.';
-$messages['setdeleteerror'] = 'Impossible de supprimer les set de filtres sélectionné. Une erreur serveur est survenue.';
-$messages['setactivated'] = 'Le groupe de filtres a bien été activé.';
-$messages['setdeactivated'] = 'Le groupe de filtres a bien été désactivé.';
-$messages['setdeleted'] = 'Le groupe de filtres a bien été supprimé.';
-$messages['setdeleteconfirm'] = 'Voulez vous vraiment supprimer le groupe de filtres sélectionné ?';
-$messages['setcreateerror'] = 'Impossible de créer un set de filtres. Une erreur serveur est survenue.';
-$messages['setcreated'] = 'Le groupe de filtres a bien été créé.';
-$messages['activateerror'] = 'Impossible d\'activer le ou les filtres sélectionné(s). Une erreur serveur est survenue.';
-$messages['deactivateerror'] = 'Impossible de désactiver le ou les filtres sélectionné(s). Une erreur serveur est survenue.';
+$messages['setactivateerror'] = 'Impossible d\'activer le jeu de filtres sélectionné. Une erreur de serveur est survenue.';
+$messages['setdeactivateerror'] = 'Impossible de désactiver le jeu de filtres sélectionné. Une erreur de serveur est survenue.';
+$messages['setdeleteerror'] = 'Impossible de supprimer le jeu de filtres sélectionné. Une erreur de serveur est survenue.';
+$messages['setactivated'] = 'Le jeu de filtres a été activé avec succès.';
+$messages['setdeactivated'] = 'Le jeu de filtres a été désactivé avec succès.';
+$messages['setdeleted'] = 'Le jeu de filtres a été supprimé avec succès.';
+$messages['setdeleteconfirm'] = 'Voulez vous vraiment supprimer le jeu de filtres sélectionné?';
+$messages['setcreateerror'] = 'Impossible de créer un jeu de filtres. Une erreur de serveur est survenue.';
+$messages['setcreated'] = 'Le jeu de filtres a été créé avec succès.';
+$messages['activateerror'] = 'Impossible d\'activer le/les filtre(s) sélectionné(s). Une erreur de serveur est survenue.';
+$messages['deactivateerror'] = 'Impossible de désactiver le/les filtre(s) sélectionné(s). Une erreur de serveur est survenue.';
 $messages['deactivated'] = 'Filtre(s) désactivé(s) avec succès.';
 $messages['activated'] = 'Filtre(s) activé(s) avec succès.';
 $messages['moved'] = 'Filtre déplacé avec succès.';
-$messages['moveerror'] = 'Impossible de déplacer le filtre sélectionné. Une erreur serveur est survenue.';
+$messages['moveerror'] = 'Impossible de déplacer le filtre sélectionné. Une erreur de serveur est survenue.';
 $messages['nametoolong'] = 'Nom trop long.';
 $messages['namereserved'] = 'Nom réservé.';
-$messages['setexist'] = 'Ce groupe existe déjà.';
-$messages['nodata'] = 'Au moins un élément doit être selectionné !';
-$messages['invaliddateformat'] = 'Date non valide ou format d\'une partie de la date';
+$messages['setexist'] = 'Le jeu existe déjà.';
+$messages['nodata'] = 'Au moins un élément doit être sélectionné!';
+$messages['invaliddateformat'] = 'Format de date ou d\'une partie de la date invalide';
+$messages['saveerror'] = 'Impossible d\'enregistrer les données. Une erreur du serveur est survenue.';
+$messages['vacationsaved'] = 'Les données de vacances ont été enregistrées avec succès.';
 ?>
diff --git a/plugins/managesieve/localization/gl_ES.inc b/plugins/managesieve/localization/gl_ES.inc
index f1f9d2faa..20f66f9f6 100644
--- a/plugins/managesieve/localization/gl_ES.inc
+++ b/plugins/managesieve/localization/gl_ES.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Persoa destinataria';
 $labels['vacationaddr'] = 'O(s) meu(s) outro (s) enderezo(s) de correo:';
 $labels['vacationdays'] = 'Cada canto enviar mensaxes (en días):';
 $labels['vacationinterval'] = 'Con que frecuencia se van enviar mensaxes:';
-$labels['days'] = 'días';
-$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Corpo da mensaxe (por vacacións):';
 $labels['vacationsubject'] = 'Asunto da mensaxe:';
+$labels['days'] = 'días';
+$labels['seconds'] = 'segundos';
 $labels['rulestop'] = 'Parar de avaliar regras';
 $labels['enable'] = 'Activar/Desactivar';
 $labels['filterset'] = 'Conxunto de filtros';
diff --git a/plugins/managesieve/localization/he_IL.inc b/plugins/managesieve/localization/he_IL.inc
index f347d945d..c0cc6e7c2 100644
--- a/plugins/managesieve/localization/he_IL.inc
+++ b/plugins/managesieve/localization/he_IL.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'הנמען';
 $labels['vacationaddr'] = 'כתובות דוא"ל נוספות:';
 $labels['vacationdays'] = 'באיזו תדירות ( בימים ) לשלוח הודעות:';
 $labels['vacationinterval'] = 'באיזו תדירות לשלוח ההודעה';
-$labels['days'] = 'ימים';
-$labels['seconds'] = 'שניות';
 $labels['vacationreason'] = 'גוף ההודעה (סיבת החופשה):';
 $labels['vacationsubject'] = 'נושא ההודעה:';
+$labels['days'] = 'ימים';
+$labels['seconds'] = 'שניות';
 $labels['rulestop'] = 'עצירה של בחינת הכללים';
 $labels['enable'] = 'אפשור/ניטרול';
 $labels['filterset'] = 'קבוצת מסננים';
diff --git a/plugins/managesieve/localization/hr_HR.inc b/plugins/managesieve/localization/hr_HR.inc
index b3192abe5..ce5259b5f 100644
--- a/plugins/managesieve/localization/hr_HR.inc
+++ b/plugins/managesieve/localization/hr_HR.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Primatelj';
 $labels['vacationaddr'] = 'Dodatna e-mail adresa(e):';
 $labels['vacationdays'] = 'Koliko često slati poruku (u danima):';
 $labels['vacationinterval'] = 'Koliko često slati poruku:';
-$labels['days'] = 'dana';
-$labels['seconds'] = 'sekundi';
 $labels['vacationreason'] = 'Tijelo poruke (razlog odmora):';
 $labels['vacationsubject'] = 'Naslov poruke:';
+$labels['days'] = 'dana';
+$labels['seconds'] = 'sekundi';
 $labels['rulestop'] = 'Prekini izvođenje filtera';
 $labels['enable'] = 'Omogući/Onemogući';
 $labels['filterset'] = 'Grupa filtera';
diff --git a/plugins/managesieve/localization/hu_HU.inc b/plugins/managesieve/localization/hu_HU.inc
index afab3f3a6..af28679ad 100644
--- a/plugins/managesieve/localization/hu_HU.inc
+++ b/plugins/managesieve/localization/hu_HU.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Címzett';
 $labels['vacationaddr'] = 'További e-mail címeim:';
 $labels['vacationdays'] = 'Válaszüzenet küldése ennyi naponként:';
 $labels['vacationinterval'] = 'Milyen gyakran küld üzeneteket:';
-$labels['days'] = 'napok';
-$labels['seconds'] = 'másodpercek';
 $labels['vacationreason'] = 'Levél szövege (automatikus válasz):';
 $labels['vacationsubject'] = 'Üzenet tárgya:';
+$labels['days'] = 'napok';
+$labels['seconds'] = 'másodpercek';
 $labels['rulestop'] = 'Műveletek végrehajtásának befejezése';
 $labels['enable'] = 'Bekapcsol/Kikapcsol';
 $labels['filterset'] = 'Szűrök készlet';
diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc
index b7fc970e5..c42a09dba 100644
--- a/plugins/managesieve/localization/it_IT.inc
+++ b/plugins/managesieve/localization/it_IT.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Destinatario';
 $labels['vacationaddr'] = 'Account email aggiuntivo(i):';
 $labels['vacationdays'] = 'Ogni quanti giorni ribadire il messaggio allo stesso mittente';
 $labels['vacationinterval'] = 'Ogni quanto tempo inviare i messaggi:';
-$labels['days'] = 'giorni';
-$labels['seconds'] = 'secondi';
 $labels['vacationreason'] = 'Corpo del messaggio (dettagli relativi all\'assenza):';
 $labels['vacationsubject'] = 'Oggetto del messaggio';
+$labels['days'] = 'giorni';
+$labels['seconds'] = 'secondi';
 $labels['rulestop'] = 'Non valutare le regole successive';
 $labels['enable'] = 'Abilita/disabilita';
 $labels['filterset'] = 'Gruppi di filtri';
@@ -157,6 +157,21 @@ $labels['asciicasemap'] = 'non differenziare maiuscole/minuscole (ascii-casemap)
 $labels['asciinumeric'] = 'numerico';
 $labels['index'] = 'indice:';
 $labels['indexlast'] = 'indietro';
+$labels['vacation'] = 'Vacanza';
+$labels['vacation.reply'] = 'Messaggio di risposta';
+$labels['vacation.advanced'] = 'Impostazioni avanzate';
+$labels['vacation.subject'] = 'Oggetto';
+$labels['vacation.body'] = 'Testo';
+$labels['vacation.dates'] = 'Tempo di vacanza';
+$labels['vacation.from'] = 'Da:';
+$labels['vacation.to'] = 'A:';
+$labels['vacation.status'] = 'Stato';
+$labels['vacation.on'] = 'Attivato';
+$labels['vacation.off'] = 'Disattivato';
+$labels['vacation.addresses'] = 'I miei indirizzi aggiuntivi';
+$labels['vacation.interval'] = 'Intervallo di risposta';
+$labels['vacation.after'] = 'Imposta regola di vacanza dopo';
+$labels['vacation.saving'] = 'Salvataggio...';
 $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.';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'nome riservato';
 $messages['setexist'] = 'Il gruppo esiste già';
 $messages['nodata'] = 'selezionare almeno una posizione';
 $messages['invaliddateformat'] = 'Formato della data non valido';
+$messages['saveerror'] = 'Impossibile salvare i dati. Errore del server.';
+$messages['vacationsaved'] = 'Dati di vacanza salvati correttamente.';
 ?>
diff --git a/plugins/managesieve/localization/ja_JP.inc b/plugins/managesieve/localization/ja_JP.inc
index 1fff7e333..cb9e1b2c7 100644
--- a/plugins/managesieve/localization/ja_JP.inc
+++ b/plugins/managesieve/localization/ja_JP.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = '宛先';
 $labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'メッセージを(1日に)送信する頻度:';
 $labels['vacationinterval'] = 'メッセージを送信する頻度:';
-$labels['days'] = '日';
-$labels['seconds'] = '秒';
 $labels['vacationreason'] = 'メッセージ本体(休暇の理由):';
 $labels['vacationsubject'] = 'メッセージの件名:';
+$labels['days'] = '日';
+$labels['seconds'] = '秒';
 $labels['rulestop'] = 'ルールの評価を停止';
 $labels['enable'] = '有効/無効';
 $labels['filterset'] = 'フィルターセット';
diff --git a/plugins/managesieve/localization/km_KH.inc b/plugins/managesieve/localization/km_KH.inc
index a6094be55..0c833543a 100644
--- a/plugins/managesieve/localization/km_KH.inc
+++ b/plugins/managesieve/localization/km_KH.inc
@@ -51,16 +51,17 @@ $labels['del'] = 'លុប';
 $labels['sender'] = 'អ្នក​ផ្ញើ';
 $labels['recipient'] = 'អ្នក​ទទួល';
 $labels['vacationdays'] = 'តើ​ផ្ញើ​សារ​ញឹកញាប់​ប៉ុណ្ណា (ក្នុង​មួយ​ថ្ងៃ)៖';
-$labels['days'] = 'ថ្ងៃ';
-$labels['seconds'] = 'វិនាទី';
 $labels['vacationreason'] = 'តួ​សារ (ហេតុផល​វិស្សមកាល)៖';
 $labels['vacationsubject'] = 'ប្រធានបទ​សារ៖';
+$labels['days'] = 'ថ្ងៃ';
+$labels['seconds'] = 'វិនាទី';
 $labels['rulestop'] = 'ឈប់​គិត​ទៅ​លើ​លក្ខខណ្ឌ';
 $labels['enable'] = 'បើក/បិទ';
 $labels['filterdef'] = 'អត្ថន័យ​តម្រង';
 $labels['active'] = 'សកម្ម';
 $labels['none'] = 'គ្មាន';
 $labels['fromfile'] = 'ពី​ឯកសារ';
+$labels['filterdisabled'] = 'បាន​បិទ​តម្រង';
 $labels['valuenotequals'] = 'តម្លៃ​មិន​ស្មើ​នឹង';
 $labels['flagread'] = 'បាន​អាន';
 $labels['flagdeleted'] = 'បាន​លុប';
diff --git a/plugins/managesieve/localization/ko_KR.inc b/plugins/managesieve/localization/ko_KR.inc
index b552fa9ac..3b4070252 100644
--- a/plugins/managesieve/localization/ko_KR.inc
+++ b/plugins/managesieve/localization/ko_KR.inc
@@ -23,13 +23,13 @@ $labels['filteradd'] = '필터 추가';
 $labels['filterdel'] = '필터 삭제';
 $labels['moveup'] = '위로 이동';
 $labels['movedown'] = '아래로 이동';
-$labels['filterallof'] = '다음의 모든 규칙과 일치함';
+$labels['filterallof'] = '다음 모든 규칙과 일치함';
 $labels['filteranyof'] = '다음 규칙 중 하나라도 일치함';
 $labels['filterany'] = '모든 메시지';
 $labels['filtercontains'] = '다음을 포함함';
 $labels['filternotcontains'] = '다음을 포함하지 않음';
-$labels['filteris'] = '다음과 같음';
-$labels['filterisnot'] = '다음과 같지 않음';
+$labels['filteris'] = '다음과 일치함';
+$labels['filterisnot'] = '다음과 일치하지 않음';
 $labels['filterexists'] = '다음이 존재함';
 $labels['filternotexists'] = '다음이 존재하지 않음';
 $labels['filtermatches'] = '다음 표현식과 일치함';
@@ -54,12 +54,13 @@ $labels['add'] = '추가';
 $labels['del'] = '삭제';
 $labels['sender'] = '발신인';
 $labels['recipient'] = '수신인';
+$labels['vacationaddr'] = '나의 추가적인 이메일 주소:';
 $labels['vacationdays'] = '메시지 발신 주기 (일):';
 $labels['vacationinterval'] = '메시지 발신 주기:';
-$labels['days'] = '일';
-$labels['seconds'] = '초';
 $labels['vacationreason'] = '메시지 본문 (휴가 사유):';
 $labels['vacationsubject'] = '메시지 제목:';
+$labels['days'] = '일';
+$labels['seconds'] = '초';
 $labels['rulestop'] = '규칙 평가를 중단';
 $labels['enable'] = '활성화/비활성화';
 $labels['filterset'] = '필터 세트';
@@ -81,13 +82,13 @@ $labels['countisgreaterthanequal'] = '개수가 다음보다 크거나 같음';
 $labels['countislessthan'] = '개수가 다음보다 작음';
 $labels['countislessthanequal'] = '개수가 작거나 같음';
 $labels['countequals'] = '개수가 다음과 같음';
-$labels['countnotequals'] = '갯수가 다음과 같지 않음';
+$labels['countnotequals'] = '개수가 다음과 일치하지 않음';
 $labels['valueisgreaterthan'] = '값이 다음보다 큼';
 $labels['valueisgreaterthanequal'] = '값이 다음보다 크거나 같음';
 $labels['valueislessthan'] = '값이 다음보다 작음';
 $labels['valueislessthanequal'] = '값이 다음보다 작거나 같음';
 $labels['valueequals'] = '값이 다음과 같음';
-$labels['valuenotequals'] = '값이 다음과 같지 않음';
+$labels['valuenotequals'] = '값이 다음과 일치하지 않음';
 $labels['setflags'] = '메시지에 깃발을 설정';
 $labels['addflags'] = '메시지에 깃발을 추가';
 $labels['removeflags'] = '메시지에서 깃발을 제거';
@@ -110,7 +111,7 @@ $labels['notify'] = '알림 메시지 보내기';
 $labels['notifyaddress'] = '대상 이메일 주소:';
 $labels['notifybody'] = '알림 메시지 본문:';
 $labels['notifysubject'] = '알림 메시지 제목:';
-$labels['notifyfrom'] = '알림 메시지 발신인:';
+$labels['notifyfrom'] = '알림 발신인:';
 $labels['notifyimportance'] = '중요도:';
 $labels['notifyimportancelow'] = '낮음';
 $labels['notifyimportancenormal'] = '보통';
@@ -141,7 +142,7 @@ $labels['address'] = '주소';
 $labels['envelope'] = '봉투';
 $labels['modifier'] = '수식자:';
 $labels['text'] = '텍스트';
-$labels['undecoded'] = '암호화되지 않음 (원상태)';
+$labels['undecoded'] = '암호화되지 않음(원상태)';
 $labels['contenttype'] = '내용 유형';
 $labels['modtype'] = '유형:';
 $labels['allparts'] = '모두';
@@ -158,22 +159,31 @@ $labels['index'] = '색인:';
 $labels['indexlast'] = '역방향';
 $messages['filterunknownerror'] = '알수 없는 서버 오류.';
 $messages['filterconnerror'] = '서버에 연결할 수 없음.';
+$messages['filterdeleteerror'] = '필터를 삭제할 수 없음. 서버 오류가 발생하였음.';
 $messages['filterdeleted'] = '필터가 성공적으로 삭제됨.';
 $messages['filtersaved'] = '필터가 성공적으로 저장됨.';
+$messages['filtersaveerror'] = '필터를 저장할 수 없음. 서버 오류가 발생하였음.';
 $messages['filterdeleteconfirm'] = '정말로 선택한 필터를 삭제하시겠습니까?';
 $messages['ruledeleteconfirm'] = '정말로 선택한 규칙을 삭제하시겠습니까?';
 $messages['actiondeleteconfirm'] = '정말로 선택한 동작을 삭제하시겠습니까?';
 $messages['forbiddenchars'] = '필드에 금지된 문자가 존재함.';
-$messages['cannotbeempty'] = '필드는 비워둘 수 없음.';
+$messages['cannotbeempty'] = '필드는 비어있을 수 없음.';
 $messages['ruleexist'] = '지정한 이름의 필터가 이미 존재함.';
+$messages['setactivateerror'] = '선택한 필터 세트를 활성화할 수 없음. 서버 오류가 발생하였음.';
+$messages['setdeactivateerror'] = '선택한 필터 세트를 비활성화할 수 없음. 서버 오류가 발생하였음.';
+$messages['setdeleteerror'] = '선택한 필터 세트를 삭제할 수 없음. 서버 오류가 발생하였음.';
 $messages['setactivated'] = '필터 세트가 성공적으로 활성화됨.';
 $messages['setdeactivated'] = '필터 세트가 성공적으로 비활성화됨.';
 $messages['setdeleted'] = '필터 세트가 성공적으로 삭제됨.';
 $messages['setdeleteconfirm'] = '정말로 선택한 필터 세트를 삭제하시겠습니까?';
+$messages['setcreateerror'] = '선택한 필터 세트를 생성할 수 없음. 서버 오류가 발생하였음.';
 $messages['setcreated'] = '필터 세트가 성공적으로 생성됨.';
+$messages['activateerror'] = '선택한 필터를 활성화할 수 없음. 서버 오류가 발생하였음.';
+$messages['deactivateerror'] = '선택한 필터를 비활성화할 수 없음. 서버 오류가 발생하였음.';
 $messages['deactivated'] = '필터가 성공적으로 비활성화됨.';
 $messages['activated'] = '필터가 성공적으로 활성화됨.';
 $messages['moved'] = '필터가 성공적으로 이동함.';
+$messages['moveerror'] = '선택한 필터를 이동할 수 없음. 서버 오류가 발생하였음.';
 $messages['nametoolong'] = '이름이 너무 김.';
 $messages['namereserved'] = '예약된 이름.';
 $messages['setexist'] = '세트가 이미 존재함.';
diff --git a/plugins/managesieve/localization/lt_LT.inc b/plugins/managesieve/localization/lt_LT.inc
index 5dc81afc6..510185d14 100644
--- a/plugins/managesieve/localization/lt_LT.inc
+++ b/plugins/managesieve/localization/lt_LT.inc
@@ -55,10 +55,10 @@ $labels['recipient'] = 'Gavėjas';
 $labels['vacationaddr'] = 'Papildomas gavėjų adresų sąrašas:';
 $labels['vacationdays'] = 'Kaip dažnai išsiųsti laiškus (dienomis):';
 $labels['vacationinterval'] = 'Kaip dažnai siųsti laiškus:';
-$labels['days'] = 'd.';
-$labels['seconds'] = 'sek.';
 $labels['vacationreason'] = 'Laiško tekstas';
 $labels['vacationsubject'] = 'Laiško tema:';
+$labels['days'] = 'd.';
+$labels['seconds'] = 'sek.';
 $labels['rulestop'] = 'Nutraukti taisyklių vykdymą';
 $labels['enable'] = 'Įjungti / išjungti';
 $labels['filterset'] = 'Filtrų rinkinys';
diff --git a/plugins/managesieve/localization/lv_LV.inc b/plugins/managesieve/localization/lv_LV.inc
index 111f3b4f6..9a2f95d93 100644
--- a/plugins/managesieve/localization/lv_LV.inc
+++ b/plugins/managesieve/localization/lv_LV.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Saņēmējs';
 $labels['vacationaddr'] = 'Mana(s) papildus e-pasta adrese(s):';
 $labels['vacationdays'] = 'Cik bieži sūtī ziņojumus (dienās):';
 $labels['vacationinterval'] = 'Cik bieži sūtīt vēstules:';
-$labels['days'] = 'dienas';
-$labels['seconds'] = 'sekundes';
 $labels['vacationreason'] = 'Atvaļinājuma paziņojuma teksts:';
 $labels['vacationsubject'] = 'Vēstules tēma:';
+$labels['days'] = 'dienas';
+$labels['seconds'] = 'sekundes';
 $labels['rulestop'] = 'Apturēt nosacījumu pārbaudi';
 $labels['enable'] = 'Ieslēgt/Izslēgt';
 $labels['filterset'] = 'Filtru kopa';
diff --git a/plugins/managesieve/localization/nb_NO.inc b/plugins/managesieve/localization/nb_NO.inc
index e0a34483f..f8ec3eded 100644
--- a/plugins/managesieve/localization/nb_NO.inc
+++ b/plugins/managesieve/localization/nb_NO.inc
@@ -47,18 +47,20 @@ $labels['messagesendcopy'] = 'Send en kopi av meldingen til';
 $labels['messagereply'] = 'Svar med melding';
 $labels['messagedelete'] = 'Slett melding';
 $labels['messagediscard'] = 'Avvis med melding';
+$labels['messagekeep'] = 'Behold melding i innboks';
 $labels['messagesrules'] = 'For innkommende e-post';
 $labels['messagesactions'] = '... gjør følgende:';
 $labels['add'] = 'Legg til';
 $labels['del'] = 'Slett';
 $labels['sender'] = 'Avsender';
 $labels['recipient'] = 'Mottaker';
+$labels['vacationaddr'] = 'Tilleggs epost-adresse(r):';
 $labels['vacationdays'] = 'Periode mellom meldinger (i dager):';
 $labels['vacationinterval'] = 'Periode mellom meldinger:';
-$labels['days'] = 'dager';
-$labels['seconds'] = 'sekunder';
 $labels['vacationreason'] = 'Innhold (begrunnelse for fravær)';
 $labels['vacationsubject'] = 'Meldingsemne:';
+$labels['days'] = 'dager';
+$labels['seconds'] = 'sekunder';
 $labels['rulestop'] = 'Stopp evaluering av regler';
 $labels['enable'] = 'Aktiver/Deaktiver';
 $labels['filterset'] = 'Filtersett';
@@ -157,22 +159,31 @@ $labels['index'] = 'index:';
 $labels['indexlast'] = 'baklengs';
 $messages['filterunknownerror'] = 'Ukjent problem med tjener.';
 $messages['filterconnerror'] = 'Kunne ikke koble til tjeneren.';
+$messages['filterdeleteerror'] = 'Kunne ikke slette filter. Fikk feilmelding fra server.';
 $messages['filterdeleted'] = 'Filteret er blitt slettet.';
 $messages['filtersaved'] = 'Filteret er blitt lagret.';
+$messages['filtersaveerror'] = 'Kunne ikke lagre filter. Fikk feilmelding fra server.';
 $messages['filterdeleteconfirm'] = 'Vil du virkelig slette det valgte filteret?';
 $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.';
 $messages['ruleexist'] = 'Det finnes allerede et filter med dette navnet.';
+$messages['setactivateerror'] = 'Kunne ikke aktivere valgte filtersett. Fikk feilmelding fra server.';
+$messages['setdeactivateerror'] = 'Kunne ikke deaktivere valgte filtersett. Fikk feilmelding fra server.';
+$messages['setdeleteerror'] = 'Kunne ikke slette valgte filtersett. Fikk feilmelding fra server.';
 $messages['setactivated'] = 'Filtersett aktivert.';
 $messages['setdeactivated'] = 'Filtersett deaktivert.';
 $messages['setdeleted'] = 'Filtersett slettet.';
 $messages['setdeleteconfirm'] = 'Er du sikker på at du vil slette det valgte filtersettet?';
+$messages['setcreateerror'] = 'Kunne ikke opprette filtersett. Fikk feilmelding fra server.';
 $messages['setcreated'] = 'Filtersett opprettet.';
+$messages['activateerror'] = 'Kunne ikke aktivere valgte filter(e). Fikk feilmelding fra server.';
+$messages['deactivateerror'] = 'Kunne ikke deaktivere valgte filter(e). Fikk feilmelding fra server.';
 $messages['deactivated'] = 'Filter skrudd på.';
 $messages['activated'] = 'Filter skrudd av.';
 $messages['moved'] = 'Filter ble flyttet.';
+$messages['moveerror'] = 'Kunne ikke flytte valgte filter. Fikk feilmelding fra server.';
 $messages['nametoolong'] = 'Navnet er for langt.';
 $messages['namereserved'] = 'Navnet er reservert.';
 $messages['setexist'] = 'Settet eksisterer allerede.';
diff --git a/plugins/managesieve/localization/nl_NL.inc b/plugins/managesieve/localization/nl_NL.inc
index 97a4e1685..be0ab7737 100644
--- a/plugins/managesieve/localization/nl_NL.inc
+++ b/plugins/managesieve/localization/nl_NL.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Ontvanger';
 $labels['vacationaddr'] = 'Mijn extra e-mailadres(sen):';
 $labels['vacationdays'] = 'Hoe vaak moet een bericht verstuurd worden (in dagen):';
 $labels['vacationinterval'] = 'Hoe vaak moet een bericht verstuurd worden:';
-$labels['days'] = 'dagen';
-$labels['seconds'] = 'seconden';
 $labels['vacationreason'] = 'Bericht (vakantiereden):';
 $labels['vacationsubject'] = 'Onderwerp:';
+$labels['days'] = 'dagen';
+$labels['seconds'] = 'seconden';
 $labels['rulestop'] = 'Stop met regels uitvoeren';
 $labels['enable'] = 'In-/uitschakelen';
 $labels['filterset'] = 'Filterset';
@@ -157,6 +157,20 @@ $labels['asciicasemap'] = 'hoofdletterongevoelig (ascii-casemap)';
 $labels['asciinumeric'] = 'numeriek (ascii-numeriek)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'terugwaarts';
+$labels['vacation'] = 'Vakantie';
+$labels['vacation.reply'] = 'Antwoordbericht';
+$labels['vacation.advanced'] = 'Geavanceerde opties';
+$labels['vacation.subject'] = 'Onderwerp';
+$labels['vacation.body'] = 'Inhoud';
+$labels['vacation.dates'] = 'Lengte van vakantie';
+$labels['vacation.from'] = 'Afzender:';
+$labels['vacation.to'] = 'Aan:';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.on'] = 'Aan';
+$labels['vacation.off'] = 'Uit';
+$labels['vacation.addresses'] = 'Mijn extra e-mailadressen';
+$labels['vacation.interval'] = 'Antwoordinterval';
+$labels['vacation.saving'] = 'Gegevens worden opgeslagen...';
 $messages['filterunknownerror'] = 'Onbekende fout';
 $messages['filterconnerror'] = 'Kan geen verbinding maken met de managesieve server';
 $messages['filterdeleteerror'] = 'Kan filter niet verwijderen. Er trad een serverfout op.';
@@ -189,4 +203,6 @@ $messages['namereserved'] = 'Gereserveerde naam.';
 $messages['setexist'] = 'Filterset bestaat al.';
 $messages['nodata'] = 'Tenminste één positie moet geselecteerd worden!';
 $messages['invaliddateformat'] = 'Ongeldige datum of datumformaat';
+$messages['saveerror'] = 'Het opslaan van de gegevens is mislukt. Er trad een serverfout op.';
+$messages['vacationsaved'] = 'Vakantiegegevens met succes opgeslagen.';
 ?>
diff --git a/plugins/managesieve/localization/pl_PL.inc b/plugins/managesieve/localization/pl_PL.inc
index 2759309ee..880dbad71 100644
--- a/plugins/managesieve/localization/pl_PL.inc
+++ b/plugins/managesieve/localization/pl_PL.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Odbiorca';
 $labels['vacationaddr'] = 'Moje dodatkowe adresy email:';
 $labels['vacationdays'] = 'Częstotliwość wysyłania wiadomości (w dniach):';
 $labels['vacationinterval'] = 'Jak często wysyłać wiadomości:';
-$labels['days'] = 'dni';
-$labels['seconds'] = 'sekundy';
 $labels['vacationreason'] = 'Treść (przyczyna nieobecności):';
 $labels['vacationsubject'] = 'Temat wiadomości:';
+$labels['days'] = 'dni';
+$labels['seconds'] = 'sekundy';
 $labels['rulestop'] = 'Przerwij przetwarzanie reguł';
 $labels['enable'] = 'Włącz/Wyłącz';
 $labels['filterset'] = 'Zbiór filtrów';
@@ -157,6 +157,21 @@ $labels['asciicasemap'] = 'nierozróżniający wielkości liter (ascii-casemap)'
 $labels['asciinumeric'] = 'numeryczny (ascii-numeric)';
 $labels['index'] = 'indeks:';
 $labels['indexlast'] = 'wstecz';
+$labels['vacation'] = 'Nieobecność';
+$labels['vacation.reply'] = 'Odpowiedź';
+$labels['vacation.advanced'] = 'Ustawienia zaawansowane';
+$labels['vacation.subject'] = 'Temat';
+$labels['vacation.body'] = 'Treść';
+$labels['vacation.dates'] = 'Czas nieobecności';
+$labels['vacation.from'] = 'Od:';
+$labels['vacation.to'] = 'Do:';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.on'] = 'włączone';
+$labels['vacation.off'] = 'wyłączone';
+$labels['vacation.addresses'] = 'Moje dodatkowe adresy';
+$labels['vacation.interval'] = 'Częstotliwość odpowiedzi';
+$labels['vacation.after'] = 'Umieść regułę odpowiedzi po';
+$labels['vacation.saving'] = 'Zapisywanie danych...';
 $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.';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Nazwa zarezerwowana.';
 $messages['setexist'] = 'Zbiór już istnieje.';
 $messages['nodata'] = 'Należy wybrać co najmniej jedną pozycję!';
 $messages['invaliddateformat'] = 'Nieprawidłowy format daty lub fragmentu daty';
+$messages['saveerror'] = 'Nie można zapisać danych. Wystąpił błąd serwera.';
+$messages['vacationsaved'] = 'Dane nieobecności zapisano pomyślnie.';
 ?>
diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc
index 063c60c5f..cffded95f 100644
--- a/plugins/managesieve/localization/pt_BR.inc
+++ b/plugins/managesieve/localization/pt_BR.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Destinatário';
 $labels['vacationaddr'] = 'Meu endereço de e-mail adicional:';
 $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
 $labels['vacationinterval'] = 'Como geralmente enviam mensagens:';
-$labels['days'] = 'dias';
-$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Corpo da mensagem (motivo de férias):';
 $labels['vacationsubject'] = 'Título da mensagem:';
+$labels['days'] = 'dias';
+$labels['seconds'] = 'segundos';
 $labels['rulestop'] = 'Parar de avaliar regras';
 $labels['enable'] = 'Habilitar/Desabilitar';
 $labels['filterset'] = 'Conjunto de filtros';
@@ -157,6 +157,21 @@ $labels['asciicasemap'] = 'caso insensível (mapa de caracteres ascii)';
 $labels['asciinumeric'] = 'numérico (ascii-numeric)';
 $labels['index'] = 'índice:';
 $labels['indexlast'] = 'retroceder';
+$labels['vacation'] = 'Férias';
+$labels['vacation.reply'] = 'Responder mensagem';
+$labels['vacation.advanced'] = 'Opções avançadas';
+$labels['vacation.subject'] = 'Assunto';
+$labels['vacation.body'] = 'Conteúdo';
+$labels['vacation.dates'] = 'Período de férias';
+$labels['vacation.from'] = 'De:';
+$labels['vacation.to'] = 'Para:';
+$labels['vacation.status'] = 'Estado';
+$labels['vacation.on'] = 'Ligado';
+$labels['vacation.off'] = 'Desligado';
+$labels['vacation.addresses'] = 'Meus endereços de e-mail adicionais';
+$labels['vacation.interval'] = 'Intervalo de resposta';
+$labels['vacation.after'] = 'Colocar regra de férias após';
+$labels['vacation.saving'] = 'Salvando dados...';
 $messages['filterunknownerror'] = 'Erro desconhecido de servidor';
 $messages['filterconnerror'] = 'Não foi possível conectar ao servidor managesieve';
 $messages['filterdeleteerror'] = 'Impossível excluir o filtro. Ocorreu um erro no servidor.';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Nome reservado.';
 $messages['setexist'] = 'Conjunto já existe.';
 $messages['nodata'] = 'Pelo menos uma posição precisa ser selecionada!';
 $messages['invaliddateformat'] = 'Data inválida';
+$messages['saveerror'] = 'Impossível salvar dados. Ocorreu um erro no servidor.';
+$messages['vacationsaved'] = 'Dados de férias salvos com sucesso.';
 ?>
diff --git a/plugins/managesieve/localization/pt_PT.inc b/plugins/managesieve/localization/pt_PT.inc
index 4e93076a7..40f8d8e3b 100644
--- a/plugins/managesieve/localization/pt_PT.inc
+++ b/plugins/managesieve/localization/pt_PT.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Destinatário';
 $labels['vacationaddr'] = 'Os meus endereços de e-mail adicionais:';
 $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
 $labels['vacationinterval'] = 'Com que frequência envia mensagens:';
-$labels['days'] = 'dias';
-$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Conteúdo da mensagem (motivo da ausência):';
 $labels['vacationsubject'] = 'Assunto da mensagem:';
+$labels['days'] = 'dias';
+$labels['seconds'] = 'segundos';
 $labels['rulestop'] = 'Parar de avaliar regras';
 $labels['enable'] = 'Activar/Desactivar';
 $labels['filterset'] = 'Filtros definidos';
@@ -157,6 +157,21 @@ $labels['asciicasemap'] = 'não sensível a maiúsculas/minúsculas (caracteres
 $labels['asciinumeric'] = 'numérico (numérico ascii)';
 $labels['index'] = 'índice:';
 $labels['indexlast'] = 'retroceder';
+$labels['vacation'] = 'Férias';
+$labels['vacation.reply'] = 'Mensagem de resposta';
+$labels['vacation.advanced'] = 'Definições avançadas';
+$labels['vacation.subject'] = 'Assunto';
+$labels['vacation.body'] = 'Corpo da mensagem';
+$labels['vacation.dates'] = 'Tempo de férias';
+$labels['vacation.from'] = 'De:';
+$labels['vacation.to'] = 'Para:';
+$labels['vacation.status'] = 'Estado';
+$labels['vacation.on'] = 'Ligar';
+$labels['vacation.off'] = 'Desligar';
+$labels['vacation.addresses'] = 'Meus endereços adicionais';
+$labels['vacation.interval'] = 'Intervalo de resposta';
+$labels['vacation.after'] = 'Coloque regra de férias depois';
+$labels['vacation.saving'] = 'A guardar dados...';
 $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.  Ocorreu um erro no servidor.';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Nome invertido.';
 $messages['setexist'] = 'O conjunto já existe.';
 $messages['nodata'] = 'Deve selecionar pelo menos uma posição.';
 $messages['invaliddateformat'] = 'Data ou formato de data inválido.';
+$messages['saveerror'] = 'Não foi possível guardar os dados. Ocorreu um erro no servidor.';
+$messages['vacationsaved'] = 'Dados de férias guardados com sucesso.';
 ?>
diff --git a/plugins/managesieve/localization/ro_RO.inc b/plugins/managesieve/localization/ro_RO.inc
index 2cddf36ae..9bba85e72 100644
--- a/plugins/managesieve/localization/ro_RO.inc
+++ b/plugins/managesieve/localization/ro_RO.inc
@@ -54,13 +54,13 @@ $labels['add'] = 'Adauga';
 $labels['del'] = 'Sterge';
 $labels['sender'] = 'Expeditor';
 $labels['recipient'] = 'Destinatar';
-$labels['vacationaddr'] = 'Adrese(le) mele de email suplimentare:';
+$labels['vacationaddr'] = 'Adresele mele de e-mail (adiţionale)';
 $labels['vacationdays'] = 'Cat de des sa trimit mesajele (in zile):';
 $labels['vacationinterval'] = 'Cât de des să trimit mesaje:';
-$labels['days'] = 'zile';
-$labels['seconds'] = 'secunde';
 $labels['vacationreason'] = 'Corpul mesajului (motivul vacantei):';
 $labels['vacationsubject'] = 'Subiectul mesajului:';
+$labels['days'] = 'zile';
+$labels['seconds'] = 'secunde';
 $labels['rulestop'] = 'Nu mai evalua reguli';
 $labels['enable'] = 'Activeaza/Dezactiveaza';
 $labels['filterset'] = 'Filtre setate';
@@ -157,27 +157,53 @@ $labels['asciicasemap'] = 'ignoră majusculele (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'invers';
+$labels['vacation'] = 'Vacanta';
+$labels['vacation.reply'] = 'Raspunde mesajului';
+$labels['vacation.advanced'] = 'Setari avansate';
+$labels['vacation.subject'] = 'Subiect';
+$labels['vacation.body'] = 'Structura';
+$labels['vacation.dates'] = 'Timp de vacanta';
+$labels['vacation.from'] = 'De la:';
+$labels['vacation.to'] = 'Catre:';
+$labels['vacation.status'] = 'Statut';
+$labels['vacation.on'] = 'Pe';
+$labels['vacation.off'] = 'De pe';
+$labels['vacation.addresses'] = 'Adresa mea aditionala';
+$labels['vacation.interval'] = 'Interval de raspundere';
+$labels['vacation.after'] = 'Pune regula de vacanta dupa';
+$labels['vacation.saving'] = 'Salvez datele...';
 $messages['filterunknownerror'] = 'Eroare necunoscută la server:';
 $messages['filterconnerror'] = 'Nu mă pot conecta la server.';
+$messages['filterdeleteerror'] = 'Nu pot şterge filtrul. S-a produs o eroare la server.';
 $messages['filterdeleted'] = 'Filtrul a fost şters cu succes.';
 $messages['filtersaved'] = 'Filtrul a fost salvat cu succes.';
+$messages['filtersaveerror'] = 'Nu am putut salva filtrul. S-a produs o eroare la server.';
 $messages['filterdeleteconfirm'] = 'Chiar vrei să ştergi filtrul selectat?';
 $messages['ruledeleteconfirm'] = 'Eşti sigur că vrei să ştergi regula selectată?';
 $messages['actiondeleteconfirm'] = 'Eşti sigur că vrei să ştergi acţiunea selectată?';
 $messages['forbiddenchars'] = 'Caractere nepermise în câmp.';
 $messages['cannotbeempty'] = 'Câmpul nu poate fi gol.';
 $messages['ruleexist'] = 'Filtrul cu numele specificat există deja.';
+$messages['setactivateerror'] = 'Nu pot activa setul de filtre selectat. S-a produs o eroare la server.';
+$messages['setdeactivateerror'] = 'Nu pot dezactiva setul de filtre selectat. S-a produs o eroare la server.';
+$messages['setdeleteerror'] = 'Nu pot şterge setul de filtre selectat. S-a produs o eroare la server.';
 $messages['setactivated'] = 'Setul de filtre activat cu succes.';
 $messages['setdeactivated'] = 'Setul de filtre dezactivat cu succes.';
 $messages['setdeleted'] = 'Setul de filtre şters cu succes.';
 $messages['setdeleteconfirm'] = 'Eşti sigur(ă) că vrei să ştergi setul de filtre selectat?';
+$messages['setcreateerror'] = 'Nu am putut crea setul de filtre. S-a produs o eroare la server.';
 $messages['setcreated'] = 'Setul de filtre creat cu succes.';
+$messages['activateerror'] = 'Nu am putut activa filtrul (filtrele) selectate. S-a produs o eroare la server.';
+$messages['deactivateerror'] = 'Nu am putut dezactiva filtrele (filtrele) selectate. S-a produs o eroare la server.';
 $messages['deactivated'] = 'Filtrele au fost activate cu succes.';
 $messages['activated'] = 'Filtrele au fost dezactivate cu succes.';
 $messages['moved'] = 'Filtrele au fost mutate cu succes.';
+$messages['moveerror'] = 'Nu am putut muta filtrul selectat. S-a produs o eroare la server.';
 $messages['nametoolong'] = 'Numele este prea lung.';
 $messages['namereserved'] = 'Nume rezervat.';
 $messages['setexist'] = 'Setul există deja.';
 $messages['nodata'] = 'Trebuie selectată cel putin o poziţie!';
 $messages['invaliddateformat'] = 'Data sau parte din data in format invalid';
+$messages['saveerror'] = 'Nu am putut salva datele. A aparut o eroare de server.';
+$messages['vacationsaved'] = 'Data de vacanta salvata cu succes';
 ?>
diff --git a/plugins/managesieve/localization/ru_RU.inc b/plugins/managesieve/localization/ru_RU.inc
index eccce9470..08a0041f8 100644
--- a/plugins/managesieve/localization/ru_RU.inc
+++ b/plugins/managesieve/localization/ru_RU.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Получатель';
 $labels['vacationaddr'] = 'Мой дополнительный адрес(а):';
 $labels['vacationdays'] = 'Как часто отправлять сообщения (в днях):';
 $labels['vacationinterval'] = 'Как часто отправлять сообщения:';
-$labels['days'] = 'дней';
-$labels['seconds'] = 'секунд';
 $labels['vacationreason'] = 'Текст сообщения (причина отсутствия):';
 $labels['vacationsubject'] = 'Тема сообщения:';
+$labels['days'] = 'дней';
+$labels['seconds'] = 'секунд';
 $labels['rulestop'] = 'Закончить выполнение';
 $labels['enable'] = 'Включить/Выключить';
 $labels['filterset'] = 'Набор фильтров';
diff --git a/plugins/managesieve/localization/sk_SK.inc b/plugins/managesieve/localization/sk_SK.inc
index 9a75586fa..ba9f4f552 100644
--- a/plugins/managesieve/localization/sk_SK.inc
+++ b/plugins/managesieve/localization/sk_SK.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Príjemca';
 $labels['vacationaddr'] = 'Iná moja e-mailová adresa (adresy):';
 $labels['vacationdays'] = 'Ako často odosielať správy (v dňoch):';
 $labels['vacationinterval'] = 'Ako často odosielať správy:';
-$labels['days'] = 'dní';
-$labels['seconds'] = 'sekúnd';
 $labels['vacationreason'] = 'Telo správy (dôvod neprítomnosti):';
 $labels['vacationsubject'] = 'Predmet správy:';
+$labels['days'] = 'dní';
+$labels['seconds'] = 'sekúnd';
 $labels['rulestop'] = 'Koniec pravidiel';
 $labels['enable'] = 'Zapnúť/vypnúť';
 $labels['filterset'] = 'Súprava filtrov';
@@ -157,6 +157,21 @@ $labels['asciicasemap'] = 'nerozlišuje veľké a malé písmená (ascii tabuľk
 $labels['asciinumeric'] = 'numerické (ascii čísla)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'dozadu';
+$labels['vacation'] = 'Dovolenka';
+$labels['vacation.reply'] = 'Odpoveď na správu';
+$labels['vacation.advanced'] = 'Pokročilé nastavenia';
+$labels['vacation.subject'] = 'Predmet';
+$labels['vacation.body'] = 'Telo';
+$labels['vacation.dates'] = 'Čas dovolenky';
+$labels['vacation.from'] = 'Od:';
+$labels['vacation.to'] = 'Komu:';
+$labels['vacation.status'] = 'Stav';
+$labels['vacation.on'] = 'Zap.';
+$labels['vacation.off'] = 'Vyp.';
+$labels['vacation.addresses'] = 'Moje ďalšie adresy';
+$labels['vacation.interval'] = 'Interval odpovedania';
+$labels['vacation.after'] = 'Nastaviť pravidlo pre dovolenku po';
+$labels['vacation.saving'] = 'Ukladanie údajov...';
 $messages['filterunknownerror'] = 'Neznáma chyba servera.';
 $messages['filterconnerror'] = 'Nepodarilo sa pripojiť k serveru.';
 $messages['filterdeleteerror'] = 'Nemožno vymazať filter. Nastala chyba servera.';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Rezervovaný názov.';
 $messages['setexist'] = 'Súprava už existuje.';
 $messages['nodata'] = 'Aspoň jedna pozícia musí byť zvolená!';
 $messages['invaliddateformat'] = 'Neplatný formát dátumu alebo časti dátumu';
+$messages['saveerror'] = 'Údaje nemožno uložiť. Nastala chyba servera.';
+$messages['vacationsaved'] = 'Údaje o dovolenke boli úspešne uložené.';
 ?>
diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc
index 2915684d3..8c37b9c76 100644
--- a/plugins/managesieve/localization/sl_SI.inc
+++ b/plugins/managesieve/localization/sl_SI.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Prejemnik';
 $labels['vacationaddr'] = 'Moji dodatni e-naslovi';
 $labels['vacationdays'] = 'Kako pogosto naj bodo sporočila poslana (v dnevih):';
 $labels['vacationinterval'] = 'Sporočila pošlji na:';
-$labels['days'] = 'dni';
-$labels['seconds'] = 'sekund';
 $labels['vacationreason'] = 'Vsebina sporočila (vzrok za odsotnost):';
 $labels['vacationsubject'] = 'Zadeva sporočila';
+$labels['days'] = 'dni';
+$labels['seconds'] = 'sekund';
 $labels['rulestop'] = 'Prekini z izvajanjem pravil';
 $labels['enable'] = 'Omogoči/Onemogoči';
 $labels['filterset'] = 'Nastavitev filtrov';
diff --git a/plugins/managesieve/localization/sv_SE.inc b/plugins/managesieve/localization/sv_SE.inc
index 131d46c5f..f0d3da778 100644
--- a/plugins/managesieve/localization/sv_SE.inc
+++ b/plugins/managesieve/localization/sv_SE.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Mottagare';
 $labels['vacationaddr'] = 'Ytterligare mottagaradresser:';
 $labels['vacationdays'] = 'Antal dagar mellan auto-svar:';
 $labels['vacationinterval'] = 'Tid mellan auto-svar:';
+$labels['vacationreason'] = 'Meddelandetext (frånvaroanledning):';
+$labels['vacationsubject'] = 'Meddelandeämne:';
 $labels['days'] = 'Dagar';
 $labels['seconds'] = 'Sekunder';
-$labels['vacationreason'] = 'Meddelande i auto-svar:';
-$labels['vacationsubject'] = 'Meddelandeämne:';
 $labels['rulestop'] = 'Avsluta filtrering';
 $labels['enable'] = 'Aktivera/deaktivera';
 $labels['filterset'] = 'Filtergrupp';
@@ -157,6 +157,21 @@ $labels['asciicasemap'] = 'teckenlägesokänslig (ascii-casemap)';
 $labels['asciinumeric'] = 'numerisk (ascii-numeric)';
 $labels['index'] = 'index:';
 $labels['indexlast'] = 'omvänd';
+$labels['vacation'] = 'Frånvaro';
+$labels['vacation.reply'] = 'Besvara meddelande';
+$labels['vacation.advanced'] = 'Avancerade inställningar';
+$labels['vacation.subject'] = 'Ämne';
+$labels['vacation.body'] = 'Innehåll';
+$labels['vacation.dates'] = 'Frånvarotid';
+$labels['vacation.from'] = 'Avsändare:';
+$labels['vacation.to'] = 'Mottagare:';
+$labels['vacation.status'] = 'Status';
+$labels['vacation.on'] = 'På';
+$labels['vacation.off'] = 'Av';
+$labels['vacation.addresses'] = 'Ytterligare mottagaradresser';
+$labels['vacation.interval'] = 'Svarsintervall';
+$labels['vacation.after'] = 'Placera frånvaroregel efter';
+$labels['vacation.saving'] = 'Sparar data...';
 $messages['filterunknownerror'] = 'Okänt serverfel';
 $messages['filterconnerror'] = 'Anslutning till serverns filtertjänst misslyckades';
 $messages['filterdeleteerror'] = 'Filtret kunde inte tas bort på grund av serverfel';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'Reserverat namn.';
 $messages['setexist'] = 'Filtergrupp finns redan.';
 $messages['nodata'] = 'Minst en position måste väljas!';
 $messages['invaliddateformat'] = 'Ogiltigt datum eller del av datumformat';
+$messages['saveerror'] = 'Datan kunde inte sparas på grund av serverfel.';
+$messages['vacationsaved'] = 'Frånvarodatan har sparats.';
 ?>
diff --git a/plugins/managesieve/localization/tr_TR.inc b/plugins/managesieve/localization/tr_TR.inc
index b0b09e18a..c4b4f82db 100644
--- a/plugins/managesieve/localization/tr_TR.inc
+++ b/plugins/managesieve/localization/tr_TR.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Alıcı';
 $labels['vacationaddr'] = 'Ek e-posta adres(ler)im:';
 $labels['vacationdays'] = 'Ne sıklıkla mesajlar gönderilir(gün)';
 $labels['vacationinterval'] = 'Ne kadar sıklıkla mesaj gönderirsiniz:';
-$labels['days'] = 'günler';
-$labels['seconds'] = 'saniyeler';
 $labels['vacationreason'] = 'Mesaj gövdesi(tatil sebebi):';
 $labels['vacationsubject'] = 'Mesaj konusu:';
+$labels['days'] = 'günler';
+$labels['seconds'] = 'saniyeler';
 $labels['rulestop'] = 'Kuralları değerlendirmeyi bitir';
 $labels['enable'] = 'Etkinleştir/Etkisiz Kıl';
 $labels['filterset'] = 'Filtre seti';
@@ -157,11 +157,26 @@ $labels['asciicasemap'] = 'büyük küçük harf duyarsız(ascii-casemap)';
 $labels['asciinumeric'] = 'sayı (ascii-numeric)';
 $labels['index'] = 'indeks:';
 $labels['indexlast'] = 'geriye yönelik';
+$labels['vacation'] = 'Tatil';
+$labels['vacation.reply'] = 'Cevap mesajı';
+$labels['vacation.advanced'] = 'Gelişmiş seçenekler';
+$labels['vacation.subject'] = 'Konu';
+$labels['vacation.body'] = 'Gövde';
+$labels['vacation.dates'] = 'Tatil zamanı';
+$labels['vacation.from'] = 'Gönderen:';
+$labels['vacation.to'] = 'Kime:';
+$labels['vacation.status'] = 'Durum';
+$labels['vacation.on'] = 'Aktif';
+$labels['vacation.off'] = 'Devre dışı';
+$labels['vacation.addresses'] = 'Ek adresler';
+$labels['vacation.interval'] = 'Cevap aralığı';
+$labels['vacation.after'] = 'Şundan sonra tatil kuralı koy';
+$labels['vacation.saving'] = 'Veriyi kaydediyor';
 $messages['filterunknownerror'] = 'Bilinmeyen sunucu hatası.';
 $messages['filterconnerror'] = 'Sunucuya bağlanamıyor.';
 $messages['filterdeleteerror'] = 'Filtre silinemedi. Sunucuda hata oluştu.';
 $messages['filterdeleted'] = 'Filtre başarıyla silindi.';
-$messages['filtersaved'] = 'Filter başarıyla kaydedildi.';
+$messages['filtersaved'] = 'Filtre başarıyla kaydedildi.';
 $messages['filtersaveerror'] = 'Filtre kaydedilemedi. Sunucuda hata oluştu.';
 $messages['filterdeleteconfirm'] = 'Seçilen filtreleri  gerçekten silmek istiyor musun?';
 $messages['ruledeleteconfirm'] = 'Seçili kuralları silmek istediğinizden emin misiniz?';
@@ -189,4 +204,6 @@ $messages['namereserved'] = 'rezerve edilmiş isim.';
 $messages['setexist'] = 'Set zaten var.';
 $messages['nodata'] = 'En az bir pozisyon seçilmelidir.';
 $messages['invaliddateformat'] = 'geçersiz tarih veya tarih biçimi';
+$messages['saveerror'] = 'Veri kaydedilemedi. Sunucuda hata oluştu.';
+$messages['vacationsaved'] = 'Tatil verisi başarıyla kaydedildi.';
 ?>
diff --git a/plugins/managesieve/localization/uk_UA.inc b/plugins/managesieve/localization/uk_UA.inc
index d85b03bf5..d77b592f9 100644
--- a/plugins/managesieve/localization/uk_UA.inc
+++ b/plugins/managesieve/localization/uk_UA.inc
@@ -52,10 +52,10 @@ $labels['sender'] = 'Відправник';
 $labels['recipient'] = 'Отримувач';
 $labels['vacationaddr'] = 'Додаткова адреса(и):';
 $labels['vacationdays'] = 'Як часто повторювати (у днях):';
-$labels['days'] = 'днів';
-$labels['seconds'] = 'секунд';
 $labels['vacationreason'] = 'Текст повідомлення:';
 $labels['vacationsubject'] = 'Тема листа:';
+$labels['days'] = 'днів';
+$labels['seconds'] = 'секунд';
 $labels['rulestop'] = 'Зупинити перевірку правил';
 $labels['enable'] = 'Увімкнути/Вимкнуни';
 $labels['filterset'] = 'Набір фільтрів';
diff --git a/plugins/managesieve/localization/vi_VN.inc b/plugins/managesieve/localization/vi_VN.inc
index c7913813e..4960c2a47 100644
--- a/plugins/managesieve/localization/vi_VN.inc
+++ b/plugins/managesieve/localization/vi_VN.inc
@@ -57,10 +57,10 @@ $labels['recipient'] = 'Người nhận';
 $labels['vacationaddr'] = '(Các) Địa chỉ email bổ sung của tôi:';
 $labels['vacationdays'] = 'Số lần gửi thư (trong ngày)';
 $labels['vacationinterval'] = 'Tần suất gửi thư:';
-$labels['days'] = 'ngày';
-$labels['seconds'] = 'giây';
 $labels['vacationreason'] = 'Nội dung chính';
 $labels['vacationsubject'] = 'Tiêu đề thư';
+$labels['days'] = 'ngày';
+$labels['seconds'] = 'giây';
 $labels['rulestop'] = 'Ngừng đánh giá qui luật';
 $labels['enable'] = 'Kích hoạt/Không kích hoạt';
 $labels['filterset'] = 'Đặt các bộ lọc';
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index 5c38cfe7f..e62c3f974 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -55,10 +55,10 @@ $labels['sender'] = '发件人';
 $labels['recipient'] = '收件人';
 $labels['vacationdays'] = '发送邮件频率(单位：天):';
 $labels['vacationinterval'] = '发送邮件频率:';
-$labels['days'] = '天';
-$labels['seconds'] = '秒';
 $labels['vacationreason'] = '邮件正文(假期原因)';
 $labels['vacationsubject'] = '邮件主题';
+$labels['days'] = '天';
+$labels['seconds'] = '秒';
 $labels['rulestop'] = '停止评价规则';
 $labels['enable'] = '启用/禁用';
 $labels['filterset'] = '过滤器设置';
diff --git a/plugins/markasjunk/localization/ar_SA.inc b/plugins/markasjunk/localization/ar_SA.inc
new file mode 100644
index 000000000..f6c405ea2
--- /dev/null
+++ b/plugins/markasjunk/localization/ar_SA.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/markasjunk/localization/<lang>.inc                            |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
+*/
+$labels['buttontext'] = 'غير المرغوب';
+$labels['buttontitle'] = 'وضع علامة كـ غير المرغوب فيه';
+$labels['reportedasjunk'] = 'تمت الافادة كـ غير مرغوب فية بنجاح';
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/fr_FR.inc b/plugins/markasjunk/localization/fr_FR.inc
index 1eaa48074..68e2e8b41 100644
--- a/plugins/markasjunk/localization/fr_FR.inc
+++ b/plugins/markasjunk/localization/fr_FR.inc
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-$labels['buttontext'] = 'Indésirables';
-$labels['buttontitle'] = 'Marquer comme indésirable';
-$labels['reportedasjunk'] = 'Notification de message indésirable envoyée';
+$labels['buttontext'] = 'Pourriel';
+$labels['buttontitle'] = 'Marqué comme pourriel';
+$labels['reportedasjunk'] = 'Signaler comme pourriel avec succès';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ar_SA.inc b/plugins/new_user_dialog/localization/ar_SA.inc
index ea65a059c..bdaf22693 100644
--- a/plugins/new_user_dialog/localization/ar_SA.inc
+++ b/plugins/new_user_dialog/localization/ar_SA.inc
@@ -15,5 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
+$labels['identitydialogtitle'] = 'يرجى اكمال هوية المُرسل.';
 $labels['identitydialoghint'] = 'يظهر هذا المربع مرة واحدة فقط عند أول الدخول';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/fr_FR.inc b/plugins/new_user_dialog/localization/fr_FR.inc
index e34f0bcd0..d9ceb7324 100644
--- a/plugins/new_user_dialog/localization/fr_FR.inc
+++ b/plugins/new_user_dialog/localization/fr_FR.inc
@@ -16,5 +16,5 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 $labels['identitydialogtitle'] = 'Veuillez saisir votre identité d\'expéditeur';
-$labels['identitydialoghint'] = 'Cette fenêtre de dialogue ne s\'affiche qu\'une seule fois à la première connexion.';
+$labels['identitydialoghint'] = 'Ce champs n\'apparaît que lors de la première connexion.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ko_KR.inc b/plugins/new_user_dialog/localization/ko_KR.inc
index 2f14b0fc8..51b98f03c 100644
--- a/plugins/new_user_dialog/localization/ko_KR.inc
+++ b/plugins/new_user_dialog/localization/ko_KR.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-$labels['identitydialogtitle'] = '수신인의 신원을 완성하시기 바랍니다.';
+$labels['identitydialogtitle'] = '발신인의 신원을 완성하시기 바랍니다.';
 $labels['identitydialoghint'] = '이 상자는 최초로 로그인할 때만 나타납니다.';
 ?>
\ No newline at end of file
diff --git a/plugins/newmail_notifier/localization/ar_SA.inc b/plugins/newmail_notifier/localization/ar_SA.inc
index 7ea3d2e52..175a4e464 100644
--- a/plugins/newmail_notifier/localization/ar_SA.inc
+++ b/plugins/newmail_notifier/localization/ar_SA.inc
@@ -24,4 +24,5 @@ $labels['body'] = 'لديك رسالة جديدة';
 $labels['testbody'] = 'هذه رسالة تجربية';
 $labels['desktopdisabled'] = 'رسائل التنبيه على سطح المكتب غير مفعلة فى متصفح الانترنت الخاص بك';
 $labels['desktopunsupported'] = 'المتصفح الخاص بك لا يدعم رسائل سطح المكتب';
+$labels['desktoptimeout'] = 'اغلاق تنبيهات سطح المكتب';
 ?>
diff --git a/plugins/newmail_notifier/localization/br.inc b/plugins/newmail_notifier/localization/br.inc
index 0ef3c86dd..60db9a529 100644
--- a/plugins/newmail_notifier/localization/br.inc
+++ b/plugins/newmail_notifier/localization/br.inc
@@ -16,5 +16,9 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 $labels['sound'] = 'Seniñ ar son pa kemennadenn nevez';
+$labels['test'] = 'Taol-arnod';
 $labels['title'] = 'Kemennadenn nevez !';
+$labels['body'] = 'Resevet ho p\'eus ur postel nevez';
+$labels['testbody'] = 'An dra se a zo un taol arnod kemenn';
+$labels['desktoptimeout'] = 'Serr burev kemen';
 ?>
diff --git a/plugins/newmail_notifier/localization/el_GR.inc b/plugins/newmail_notifier/localization/el_GR.inc
index ea4339e90..04f005465 100644
--- a/plugins/newmail_notifier/localization/el_GR.inc
+++ b/plugins/newmail_notifier/localization/el_GR.inc
@@ -18,11 +18,11 @@
 $labels['basic'] = 'Εμφανίση ειδοποιήσεων πρόγραμματος περιήγησης στο νέο μήνυμα';
 $labels['desktop'] = 'Εμφάνιση ειδοποιήσεων στην επιφάνεια εργασίας για νέο μήνυμα ';
 $labels['sound'] = 'Ηχητική ειδοποίηση κατά την λήψη νέων μηνυμάτων';
-$labels['test'] = 'Δοκιμη';
+$labels['test'] = 'Δοκιμή';
 $labels['title'] = 'Nεο Email!';
 $labels['body'] = 'Έχετε λάβει ένα νέο μήνυμα.';
 $labels['testbody'] = 'Αυτή είναι μια δοκιμή ειδοποίησης.';
-$labels['desktopdisabled'] = 'Οι κοινοποιήσεις Desktop ειναι απενεργοποιημένη στον περιηγητή σας.';
+$labels['desktopdisabled'] = 'Οι ειδοποιήσεις στην επιφάνεια εργασίας ειναι απενεργοποιημένες στον περιηγητή σας.';
 $labels['desktopunsupported'] = 'Ο περιηγητής σας δεν υποστηρίζει ειδοποιήσεις στην επιφάνεια εργασίας.';
 $labels['desktoptimeout'] = 'Κλείσιμο ειδοποίησης επιφάνειας εργασίας';
 ?>
diff --git a/plugins/newmail_notifier/localization/fr_FR.inc b/plugins/newmail_notifier/localization/fr_FR.inc
index 613b409ae..92ec698c8 100644
--- a/plugins/newmail_notifier/localization/fr_FR.inc
+++ b/plugins/newmail_notifier/localization/fr_FR.inc
@@ -15,14 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-$labels['basic'] = 'Afficher une notification dans le navigateur à réception d\'un nouveau message';
-$labels['desktop'] = 'Afficher une notification sur le bureau à réception d\'un nouveau message';
-$labels['sound'] = 'Jouer un son à réception d\'un nouveau message';
-$labels['test'] = 'Tester';
-$labels['title'] = 'Nouveau message !';
-$labels['body'] = 'Vous avez reçu un nouveau message';
-$labels['testbody'] = 'Test de notification';
-$labels['desktopdisabled'] = 'Les notifications sur le bureau sont désactivées dans votre navigateur';
-$labels['desktopunsupported'] = 'Votre navigateur ne supporte pas les notifications sur le bureau';
-$labels['desktoptimeout'] = 'Fermer les notifications de bureau';
+$labels['basic'] = 'Afficher les notifications du navigateur pour les nouveaux messages';
+$labels['desktop'] = 'Afficher les notifications du navigateur pour les nouveaux messages';
+$labels['sound'] = 'Jouer un pour les nouveaux messages';
+$labels['test'] = 'Test';
+$labels['title'] = 'Nouveau courriel';
+$labels['body'] = 'Vous avez reçu un nouveau courriel.';
+$labels['testbody'] = 'Ceci est une notification de test.';
+$labels['desktopdisabled'] = 'Les notifications du bureau sont désactivées dans votre navigateur.';
+$labels['desktopunsupported'] = 'Votre navigateur ne prend pas en charge les notifications du bureau.';
+$labels['desktoptimeout'] = 'Fermer la notification du bureau';
 ?>
diff --git a/plugins/newmail_notifier/localization/ko_KR.inc b/plugins/newmail_notifier/localization/ko_KR.inc
index 81abd55b9..9c3a2b16a 100644
--- a/plugins/newmail_notifier/localization/ko_KR.inc
+++ b/plugins/newmail_notifier/localization/ko_KR.inc
@@ -24,4 +24,5 @@ $labels['body'] = '새로운 메시지를 수신하였습니다.';
 $labels['testbody'] = '이 것은 시험용 알림입니다.';
 $labels['desktopdisabled'] = '당신의 브라우져에서는 데스크탑의 알림이 불가능하도록 되어있습니다.';
 $labels['desktopunsupported'] = '당신의 브라우져에서는 데스크탑의 알림을 지원하지 않습니다.';
+$labels['desktoptimeout'] = '데스크탑 알림 닫기';
 ?>
diff --git a/plugins/newmail_notifier/localization/nb_NO.inc b/plugins/newmail_notifier/localization/nb_NO.inc
index 7174da15f..7ec41db0a 100644
--- a/plugins/newmail_notifier/localization/nb_NO.inc
+++ b/plugins/newmail_notifier/localization/nb_NO.inc
@@ -24,4 +24,5 @@ $labels['body'] = 'Du har mottatt en ny melding';
 $labels['testbody'] = 'Dette er et testvarsel.';
 $labels['desktopdisabled'] = 'Skrivebordsvarsel er slått av i din nettleser.';
 $labels['desktopunsupported'] = 'Din nettleser støtter ikke visning av varsel på skrivebordet.';
+$labels['desktoptimeout'] = 'Lukk skrivebordsvarsling';
 ?>
diff --git a/plugins/password/localization/ar_SA.inc b/plugins/password/localization/ar_SA.inc
index 990505bac..d9fd11fbf 100644
--- a/plugins/password/localization/ar_SA.inc
+++ b/plugins/password/localization/ar_SA.inc
@@ -23,7 +23,10 @@ $messages['nopassword'] = 'من فضلك أدخل كلمة مرور جديدة';
 $messages['nocurpassword'] = 'من فضلك أدخل كلمة المرور الحالية';
 $messages['passwordincorrect'] = 'كلمة المرور الحالية غير صحيحة';
 $messages['passwordinconsistency'] = 'كلمة المرور غير مطابقة, أعد المحاولة';
+$messages['crypterror'] = 'تعذر حفظ كلمة المرور الجديدة. دالة التشفير مفقودة.';
 $messages['connecterror'] = 'تعذر حفظ كلمة المرور الجديدة. خطأ في الإتصال';
 $messages['internalerror'] = 'تعذر حفظ كلمة المرور الجديدة';
+$messages['passwordshort'] = 'كلمة المرور يجب ان تحتوي على الاقل $length احرف.';
+$messages['passwordweak'] = 'كلمة المرور يجب ان تتضمن على الاقل رقم و علامة ترميز.';
 $messages['passwordforbidden'] = 'كلمة المرور تحتوي حروفاً ممنوعة';
 ?>
diff --git a/plugins/password/localization/fa_IR.inc b/plugins/password/localization/fa_IR.inc
index 5f9285770..006d8e0a6 100644
--- a/plugins/password/localization/fa_IR.inc
+++ b/plugins/password/localization/fa_IR.inc
@@ -16,17 +16,17 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 $labels['changepasswd']  = 'تغییر گذرواژه';
-$labels['curpasswd']  = 'گذرواژه فعلی';
-$labels['newpasswd']  = 'گذرواژه جدید';
-$labels['confpasswd']  = 'تایید گذرواژه جدید';
-$messages['nopassword'] = 'گذرواژه جدید را وارد نمایید';
-$messages['nocurpassword'] = 'گذرواژه فعلی را وارد نمایید';
-$messages['passwordincorrect'] = 'گذرواژه فعلی اشتباه است';
+$labels['curpasswd']  = 'گذرواژه فعلی:';
+$labels['newpasswd']  = 'گذرواژه جدید:';
+$labels['confpasswd']  = 'تایید گذرواژه جدید:';
+$messages['nopassword'] = 'لطفا گذرواژه جدید را وارد نمایید.';
+$messages['nocurpassword'] = ' لطفا گذرواژه فعلی را وارد نمایید.';
+$messages['passwordincorrect'] = 'گذرواژه فعلی اشتباه است.';
 $messages['passwordinconsistency'] = 'گذرواژه‌ها با هم مطابقت ندارند، دوباره سعی نمایید.';
-$messages['crypterror'] = 'گذرواژه جدید نمی‌توانست ذخیره شود. نبودن تابع رمزگذاری.';
-$messages['connecterror'] = 'گذرواژه جدید نمی‌توانست ذخیره شود. خطای ارتباط.';
-$messages['internalerror'] = 'گذرواژه جدید ذخیره نشد';
+$messages['crypterror'] = 'گذرواژه جدید نمی‌تواند ذخیره شود. نبود تابع رمزگذاری.';
+$messages['connecterror'] = 'گذرواژه جدید نمی‌تواند ذخیره شود. خطای ارتباط.';
+$messages['internalerror'] = 'گذرواژه جدید نتوانست ذخیره نشد.';
 $messages['passwordshort'] = 'گذرواژه باید حداقل $length کاراکتر طول داشته باشد.';
 $messages['passwordweak'] = 'گذرواژه باید شامل حداقل یک عدد و یک کاراکتر نشانه‌ای باشد.';
-$messages['passwordforbidden'] = 'گذرواژه شما کاراکترهای غیرمجاز است.';
+$messages['passwordforbidden'] = 'گذرواژه شامل کاراکترهای غیرمجاز است.';
 ?>
diff --git a/plugins/password/localization/fr_FR.inc b/plugins/password/localization/fr_FR.inc
index c38abc558..799fd48d7 100644
--- a/plugins/password/localization/fr_FR.inc
+++ b/plugins/password/localization/fr_FR.inc
@@ -16,17 +16,17 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 $labels['changepasswd']  = 'Changer le mot de passe';
-$labels['curpasswd']  = 'Mot de passe actuel:';
-$labels['newpasswd']  = 'Nouveau mot de passe:';
-$labels['confpasswd']  = 'Confirmez le nouveau mot de passe:';
+$labels['curpasswd']  = 'Mot de passe actuel :';
+$labels['newpasswd']  = 'Nouveau mot de passe :';
+$labels['confpasswd']  = 'Confirmer le nouveau mot de passe :';
 $messages['nopassword'] = 'Veuillez saisir le nouveau mot de passe.';
 $messages['nocurpassword'] = 'Veuillez saisir le mot de passe actuel.';
-$messages['passwordincorrect'] = 'Mot de passe actuel incorrect.';
-$messages['passwordinconsistency'] = 'Les nouveaux mots de passe ne correspondent pas, veuillez réessayer.';
-$messages['crypterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Fonction de cryptage manquante.';
-$messages['connecterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Erreur de connexion au serveur.';
+$messages['passwordincorrect'] = 'Le mot de passe actuel est erroné.';
+$messages['passwordinconsistency'] = 'Les mots de passe ne correspondent pas, veuillez ressayer.';
+$messages['crypterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. La fonction de chiffrement est manquante.';
+$messages['connecterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Erreur de connexion.';
 $messages['internalerror'] = 'Impossible d\'enregistrer le nouveau mot de passe.';
-$messages['passwordshort'] = 'Le mot de passe doit être composé d\'au moins $length caractères.';
-$messages['passwordweak'] = 'Le mot de passe doit contenir au moins un chiffre et un signe de ponctuation.';
+$messages['passwordshort'] = 'Le mot de passe doit comporter au moins $length caractères.';
+$messages['passwordweak'] = 'Le mot de passe doit comporter au moins un chiffre et un signe de ponctuation.';
 $messages['passwordforbidden'] = 'Le mot de passe contient des caractères interdits.';
 ?>
diff --git a/plugins/subscriptions_option/localization/ar_SA.inc b/plugins/subscriptions_option/localization/ar_SA.inc
new file mode 100644
index 000000000..b27a13d95
--- /dev/null
+++ b/plugins/subscriptions_option/localization/ar_SA.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
+*/
+$labels['useimapsubscriptions']  = 'استخدم اشتراكات IMAP';
+?>
diff --git a/plugins/userinfo/localization/br.inc b/plugins/userinfo/localization/br.inc
index a751bd660..b3de88227 100644
--- a/plugins/userinfo/localization/br.inc
+++ b/plugins/userinfo/localization/br.inc
@@ -18,4 +18,5 @@
 $labels['userinfo'] = 'Titouroù an arveriad';
 $labels['created'] = 'Krouet';
 $labels['lastlogin'] = 'Kennask diwezhañ';
+$labels['defaultidentity'] = 'Identelezh dre ziouer';
 ?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/fr_FR.inc b/plugins/userinfo/localization/fr_FR.inc
index 828101c69..bcb314a3e 100644
--- a/plugins/userinfo/localization/fr_FR.inc
+++ b/plugins/userinfo/localization/fr_FR.inc
@@ -15,8 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-$labels['userinfo'] = 'Info utilisateur';
-$labels['created'] = 'Date de création';
+$labels['userinfo'] = 'Infos utilisateur';
+$labels['created'] = 'Créé';
 $labels['lastlogin'] = 'Dernière connexion';
-$labels['defaultidentity'] = 'Identité principale';
+$labels['defaultidentity'] = 'Identité par défaut';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/fr_FR.inc b/plugins/vcard_attachments/localization/fr_FR.inc
index 243f6aea8..6bf588d81 100644
--- a/plugins/vcard_attachments/localization/fr_FR.inc
+++ b/plugins/vcard_attachments/localization/fr_FR.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-$labels['addvcardmsg'] = 'Ajouter la vCard au carnet d\'adresses';
-$labels['vcardsavefailed'] = 'Impossible d\'enregistrer la vCard';
+$labels['addvcardmsg'] = 'Ajouter la vcard au carnet d\'adresses';
+$labels['vcardsavefailed'] = 'Impossible d\'enregistrer la vcard';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/el_GR.inc b/plugins/zipdownload/localization/el_GR.inc
index 2a12b5da0..e1ee35eb4 100644
--- a/plugins/zipdownload/localization/el_GR.inc
+++ b/plugins/zipdownload/localization/el_GR.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-$labels['downloadall'] = 'Λυψη ολων των συννημενων';
-$labels['downloadfolder'] = 'Λυψη φακελου';
+$labels['downloadall'] = 'Λήψη όλων των συνημμένων';
+$labels['downloadfolder'] = 'Λήψη φακέλου';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fr_FR.inc b/plugins/zipdownload/localization/fr_FR.inc
index 993e1421b..d921cd0a1 100644
--- a/plugins/zipdownload/localization/fr_FR.inc
+++ b/plugins/zipdownload/localization/fr_FR.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-$labels['downloadall'] = 'Télécharger toutes les pièces jointes';
-$labels['downloadfolder'] = 'Télécharger le répertoire';
+$labels['downloadall'] = 'Télécharger tous les fichiers joints';
+$labels['downloadfolder'] = 'Dossier de téléchargement';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/km_KH.inc b/plugins/zipdownload/localization/km_KH.inc
index 9a4593e18..0ada98dfc 100644
--- a/plugins/zipdownload/localization/km_KH.inc
+++ b/plugins/zipdownload/localization/km_KH.inc
@@ -15,6 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-$labels['downloadall'] = 'ទាញយក ឯកសារភ្ជាប់ទាំងអស់';
-$labels['downloadfolder'] = 'ទាញយក ថតឯកសារ';
+$labels['downloadall'] = 'ទាញ​យក​ឯកសារ​ភ្ជាប់​ទាំងអស់';
+$labels['downloadfolder'] = 'ទាញ​យក​ថត​ឯកសារ';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/vi_VN.inc b/plugins/zipdownload/localization/vi_VN.inc
index b9fdd3e43..7e33bc75a 100644
--- a/plugins/zipdownload/localization/vi_VN.inc
+++ b/plugins/zipdownload/localization/vi_VN.inc
@@ -16,5 +16,5 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'Tải tất cả đính kèm về';
-$labels['downloadfolder'] = 'Tải giữ liệu về';
+$labels['downloadfolder'] = 'Tải thư mục về';
 ?>
\ No newline at end of file