Synchrnonized translations from Transifex

188 files changed, 1896 insertions, 939 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
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index 4100f7c4a..28fb22dbf 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -29,8 +29,10 @@ $labels['drafts'] = 'المسودات';
 $labels['sent']   = 'المرسل';
 $labels['trash']  = 'المهملات';
 $labels['junk']   = 'غير المرغوب';
+$labels['show_real_foldernames'] = 'عرض الاسم الحقيقي لـ المجلدات المميزة ';
 $labels['subject'] = 'الموضوع';
 $labels['from']    = 'المرسل';
+$labels['sender']  = 'المرسل';
 $labels['to']      = 'المستقبل';
 $labels['cc']      = 'نسخة';
 $labels['bcc']     = 'نسخة مخفية';
@@ -41,15 +43,20 @@ $labels['size']    = 'الحجم';
 $labels['priority'] = 'الأولوية';
 $labels['organization'] = 'المنظمة';
 $labels['readstatus'] = 'حالة القراءة';
+$labels['listoptions'] = 'قائمة الخيارات...';
 $labels['mailboxlist'] = 'مجلدات';
 $labels['messagesfromto'] = 'الرسالة $from إلى $to من مجموع $count';
 $labels['threadsfromto'] = 'جهات الإتصال $from إلى $to من مجموع $count';
 $labels['messagenrof'] = 'الرسالة $nr من $count';
+$labels['fromtoshort'] = '$from – $to من  $count';
 $labels['copy']     = 'نسخ';
 $labels['move']     = 'نقل';
 $labels['moveto']   = 'نقل إلى...';
+$labels['copyto']   = 'نسخ الى ';
 $labels['download'] = 'تنزيل';
 $labels['open']     = 'فتح';
+$labels['showattachment'] = 'إظهار';
+$labels['showanyway'] = 'عرض على أي حال';
 $labels['filename'] = 'اسم الملف';
 $labels['filesize'] = 'حجم الملف';
 $labels['addtoaddressbook'] = 'إضافة إلى دفتر العناوين';
@@ -160,6 +167,7 @@ $labels['listmode'] = 'وضع طريقة السرد';
 $labels['folderactions'] = 'إجراءات المجلد...';
 $labels['compact'] = 'ضغط';
 $labels['empty'] = 'تفريغ';
+$labels['importmessages'] = 'استيراد الرسائل';
 $labels['quota'] = 'المساحة المستخدمة';
 $labels['unknown']  = 'مجهول';
 $labels['unlimited']  = 'غير محدود';
@@ -167,8 +175,13 @@ $labels['quicksearch']  = 'البحث السريع';
 $labels['resetsearch']  = 'استعادة البحث للافتراضي';
 $labels['searchmod']  = 'أماكن البحث';
 $labels['msgtext']  = 'كامل الرسالة';
+$labels['body']  = 'محتوى ';
+$labels['type'] = 'نوع ';
+$labels['namex'] = 'الاسم ';
 $labels['openinextwin'] = 'افتح في نافذة جديدة';
 $labels['emlsave'] = 'تنزيل (.eml)';
+$labels['changeformattext'] = 'عرض بتنسيق النص العادي';
+$labels['changeformathtml'] = 'عرض بتنسيق HTML';
 $labels['editasnew']      = 'تعديل كجديد';
 $labels['send']           = 'ارسل';
 $labels['sendmessage']    = 'إرسال الرسالة الآن';
@@ -185,6 +198,16 @@ $labels['spellcheck']    = 'التدقيق اﻹملائى';
 $labels['checkspelling'] = 'التدقيق الإملائي';
 $labels['resumeediting'] = 'متابعة التحرير';
 $labels['revertto']      = 'استعادة إلى';
+$labels['restore'] = 'استعادة';
+$labels['restoremessage'] = 'استعادة الرسائل؟';
+$labels['responses'] = 'ردود';
+$labels['insertresponse'] = 'اضافة رد ';
+$labels['manageresponses'] = 'ادارة الردود';
+$labels['savenewresponse'] = 'حفظ الرد الجديد';
+$labels['editresponses'] = 'تعديل الردود';
+$labels['editresponse'] = 'تعديل الرد ';
+$labels['responsename'] = 'الاسم';
+$labels['responsetext'] = 'نص الرد';
 $labels['attach'] = 'إرفاق';
 $labels['attachments'] = 'مرفقات';
 $labels['upload'] = 'تحميل';
@@ -201,6 +224,7 @@ $labels['showimages'] = 'إظهار الصور';
 $labels['alwaysshow'] = 'دائماً أظهر الصّور القادمة من $sender';
 $labels['isdraft']    = 'هذه مسودّة رسالة';
 $labels['andnmore']   = '$nr المزيد ...';
+$labels['togglemoreheaders'] = 'عرض المزيد من رؤوس الرسائل';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'نص مجرد';
 $labels['savesentmessagein'] = 'احفظ الرسالة المُرسلة في';
@@ -283,6 +307,7 @@ $labels['contactsfromto'] = 'المراسلون $from إلى $to من $count';
 $labels['print']          = 'طباعة';
 $labels['export']         = 'تصدير';
 $labels['exportall']      = 'تصدير الكل';
+$labels['exportsel']      = 'تصدير المختارات';
 $labels['exportvcards']   = 'صدّر المراسلين بنسق vCard';
 $labels['newcontactgroup'] = 'إنشاء مجموعة مراسلين جديدة';
 $labels['grouprename']    = 'تغيير اسم المجموعة';
@@ -294,13 +319,19 @@ $labels['nextpage']       = 'عرض المجموعة التالية';
 $labels['lastpage']       = 'عرض المجموعة الأخيرة';
 $labels['group'] = 'مجموعة';
 $labels['groups'] = 'المجموعات';
+$labels['listgroup'] = 'قائمة اعضاء المجموعة ';
 $labels['personaladrbook'] = 'العناوين الشخصية';
 $labels['searchsave'] = 'حفظ البحث';
 $labels['searchdelete'] = 'حذف البحث';
 $labels['import'] = 'استورد';
 $labels['importcontacts'] = 'استورد المراسلين';
 $labels['importfromfile'] = 'استورد من ملف:';
+$labels['importtarget'] = 'اضافة جهة الاتصال الى ';
 $labels['importreplace'] = 'استبدل دفتر العناوين بأكمله';
+$labels['importgroups'] = 'استيراد مهام المجموعة ';
+$labels['importgroupsall'] = 'الكل (انشاء مجموعة في حال الحاجة)';
+$labels['importgroupsexisting'] = 'فقط للمجموعات الموجودة ';
+$labels['importdesc'] = 'يمكنك رفع جهات الاتصال من دفاتر العناوين الموجودة. <br/> نحن الان ندعم استيراد العناوين من <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> او CSV (comma-separated) data format.';
 $labels['done'] = 'تم';
 $labels['settingsfor'] = 'إعدادات';
 $labels['about'] = 'نبذة';
@@ -315,6 +346,7 @@ $labels['edititem'] = 'تحرير عنصر';
 $labels['preferhtml'] = 'تفضيل صيغة HTML';
 $labels['defaultcharset'] = 'ترميز المحارف الافتراضي';
 $labels['htmlmessage'] = 'رسالة بنسق HTML';
+$labels['messagepart'] = 'جزء';
 $labels['digitalsig'] = 'التوقيع الالكتروني';
 $labels['dateformat'] = 'نسق التاريخ';
 $labels['timeformat'] = 'نسق الوقت';
@@ -330,7 +362,9 @@ $labels['showinextwin'] = 'فتح الرسالة فى نافذة جديدة';
 $labels['composeextwin'] = 'أرسال عن طريق نافذة جديدة';
 $labels['htmleditor'] = 'إنشاء رسائل بنسق HTML';
 $labels['htmlonreply'] = 'حال الرد على الرسائل بصيغة HTML فقط';
+$labels['htmlonreplyandforward'] = 'على التوجية او الرد على رسائل HTML';
 $labels['htmlsignature'] = 'توقيع HTML';
+$labels['showemail'] = 'عرض عنوان البريد الالكتروني مع الاسم ';
 $labels['previewpane'] = 'إظهار قسم المعاينة';
 $labels['skin'] = 'شكل الواجهة';
 $labels['logoutclear'] = 'إفراغ سلة المحذوفات عند الخروج';
@@ -348,12 +382,14 @@ $labels['readwhendeleted'] = 'تحديد الرسالة كمقروءة عند ح
 $labels['flagfordeletion'] = 'وضع علامة على الرسالة لحذفها بدلاً منحذفها';
 $labels['skipdeleted'] = 'لا تظهر الرسائل المحذوفة';
 $labels['deletealways'] = 'حذف الرسائل مباشرة، إن تعذر نقلها إلىالمهملات';
+$labels['deletejunk'] = 'مباشرة احذف الرسائل الموجودة في غير المرغوب فيه';
 $labels['showremoteimages'] = 'إظهار الصور الخارجية المدمجة';
 $labels['fromknownsenders'] = 'للمرسلين المعلومين';
 $labels['always'] = 'دائماً';
 $labels['showinlineimages'] = 'إظهار الصّور المرفقة أسفل الرسالة';
 $labels['autosavedraft']  = 'حفظ المسودة تلقائياً';
 $labels['everynminutes']  = 'كل $n دقيقة';
+$labels['refreshinterval']  = 'تحديث (التاكد من الرسائل الجديدة, الخ.)';
 $labels['never']  = 'أبداً';
 $labels['immediately']  = 'حالاً';
 $labels['messagesdisplaying'] = 'إظهار الرسائل';
@@ -367,12 +403,15 @@ $labels['advancedoptions'] = 'خيارات متقدّمة';
 $labels['focusonnewmessage'] = 'التركيز على نافذة المتصفح عند وجود رسالةجديدة';
 $labels['checkallfolders'] = 'التحقق من وجود رسائل جديدة في جميعالمجلدات';
 $labels['displaynext'] = 'إظهار الرسالة التالية بعد حذف/نقلالرسالة الحالية';
+$labels['defaultfont'] = 'الخط الافتراضي لـ رسائل HTML';
 $labels['mainoptions'] = 'الخيارات الأساسية';
+$labels['browseroptions'] = 'خيارات المتصفح';
 $labels['section'] = 'قسم';
 $labels['maintenance'] = 'الصيانة';
 $labels['newmessage'] = 'رسالة جديدة';
 $labels['signatureoptions'] = 'خيارات التوقيع';
 $labels['whenreplying'] = 'عند الرد';
+$labels['replyempty'] = 'لا تقتبس رسالة الاصل';
 $labels['replytopposting'] = 'بدء رسالة جديدة ووضع النص أعلى الأصلية';
 $labels['replybottomposting'] = 'بدء رسالة جديدة ووضع النص أسفل الأصلية';
 $labels['replyremovesignature'] = 'إزالة التوقيع من الرسالة عند الرد';
@@ -385,13 +424,23 @@ $labels['afternseconds']  = 'بعد $n ثواني';
 $labels['reqmdn'] = 'طلب إشعار استلام دائماً';
 $labels['reqdsn'] = 'طلب تنويه لحالة التوصيل دائماً';
 $labels['replysamefolder'] = 'وضع الردود في المجلد الذي يحوي الرسالةالمردود عليها';
+$labels['defaultabook'] = 'دفتر العناوين الافتراضي';
 $labels['autocompletesingle'] = 'تجاهل عنوان البريد الإلكتروني البديل فيالتكملة التلقائية';
+$labels['listnamedisplay'] = 'عرض جهات الاتصال كـ ';
 $labels['spellcheckbeforesend'] = 'تحقق من الإملاء قبل إرسال الرسائل';
 $labels['spellcheckoptions'] = 'خيارات التدقيق الإملاءي';
 $labels['spellcheckignoresyms'] = 'تجاهل الكلمات التي تحتوي رموز';
 $labels['spellcheckignorenums'] = 'تجاهل الكلمات التي تحتوي أرقام';
 $labels['spellcheckignorecaps'] = 'تجاهل الكلمات التي بها أحرف كبيرة';
 $labels['addtodict'] = 'إضافة إلى القامس';
+$labels['mailtoprotohandler'] = 'تسجيل متحكم بروتوكول  mailto: رابط';
+$labels['standardwindows'] = 'التعامل مع النوافذ المنبثقة كـ نوافذ قياسية';
+$labels['forwardmode'] = 'اعادة توجية الرسائل';
+$labels['inline'] = 'مضمن';
+$labels['asattachment'] = 'كـ مرفق ';
+$labels['replyallmode'] = 'الاجراء الافتراضي لـ زر [الرد على الجميع]';
+$labels['replyalldefault'] = 'الرد على الجميع';
+$labels['replyalllist'] = 'الرد فقط على القائمة البريدية (اذا كانت موجودة)';
 $labels['folder']  = 'مجلد';
 $labels['folders']  = 'مجلدات';
 $labels['foldername']  = 'اسم المجلد';
@@ -416,6 +465,7 @@ $labels['sortby'] = 'ترتيب بحسب';
 $labels['sortasc']  = 'ترتيب تصاعدي';
 $labels['sortdesc'] = 'ترتيب تنازلي';
 $labels['undo'] = 'تراجع';
+$labels['installedplugins'] = 'اضافات مثبتة';
 $labels['plugin'] = 'إضافة';
 $labels['version'] = 'النسخة';
 $labels['source'] = 'المصدر';
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index 7d9a7ac62..a518fb012 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -15,6 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
+$messages['errortitle']  = 'حدث خطأ!';
 $messages['loginfailed']  = 'فشل تسجيل الدخول';
 $messages['cookiesdisabled'] = 'المتصفح الخاص بك لا يقبل الكوكيز';
 $messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية أو أنها غيرصالحة';
@@ -22,12 +23,18 @@ $messages['storageerror'] = 'فشل الاتصال بخادم IMAP';
 $messages['servererror'] = 'خطأ في الخادم!';
 $messages['servererrormsg'] = 'خطأ خادم: $msg';
 $messages['dberror'] = 'خطأ في قاعدة البيانات!';
+$messages['requesttimedout'] = 'انتهت مهلة الطلب ';
 $messages['errorreadonly'] = 'تعذر تنفيذ العملية. المجلد للقراءة فقط.';
 $messages['errornoperm'] = 'تعذر تنفيذ العملية. ليست لديك الصلاحية.';
+$messages['erroroverquota'] = 'تعذر تنفيذ العملية. لايوجد مساحة كافية.';
+$messages['erroroverquotadelete'] = 'لا يوجد مساحة كافية. استخدم SHIFT+DEL لحذف الرسالة.';
 $messages['invalidrequest'] = 'طلب غير صالح! لم تحفظ أية بيانات.';
+$messages['invalidhost'] = 'اسم الملقم غير صالح.';
 $messages['nomessagesfound'] = 'لم يعثر على أية رسائل في صندوق البريد هذا';
 $messages['loggedout'] = 'قمت بإنهاء هذه الجلسة بنجاح. إلى اللقاء!';
 $messages['mailboxempty'] = 'صندوق البريد فارغ';
+$messages['nomessages'] = 'لا يوجد رسائل';
+$messages['refreshing'] = 'جاري التحديث...';
 $messages['loading'] = 'جاري العمل...';
 $messages['uploading'] = 'جاري رفع الملف...';
 $messages['uploadingmany'] = 'جاري تحميل الملفات...';
@@ -38,6 +45,8 @@ $messages['messagesent'] = 'تم إرسال الرسالة بنجاح';
 $messages['savingmessage'] = 'حفظ الرسالة...';
 $messages['messagesaved'] = 'تم حفظ الرسالة في المسودات';
 $messages['successfullysaved'] = 'تم الحفظ بنجاح';
+$messages['savingresponse'] = 'جاري حفظ نص الرد...';
+$messages['deleteresponseconfirm'] = 'هل تريد فعلاً حذف نص الرد هذا؟';
 $messages['addedsuccessfully'] = 'تمت إضافة المراسل إلى دفتر العناوينبنجاح';
 $messages['contactexists'] = 'هناك مراسل له نفس هذا البريد الالكترونيموجود مسبقاً';
 $messages['contactnameexists'] = 'هناك مُرسال له نفس الإسم موجود مسبقاً.';
@@ -48,6 +57,8 @@ $messages['contactnotfound'] = 'تعذر العثور على المراسل ال
 $messages['contactsearchonly'] = 'اكتب بعض كلمات البحث للعثور علىالمُراسلين';
 $messages['sendingfailed'] = 'فشل إرسال الرسالة';
 $messages['senttooquickly'] = 'رجاء انتظر $sec ثوان قبل إرسال هذه الرسالة';
+$messages['errorsavingsent'] = 'حدث خطأ أثناء حفظ الرسالة المُرسلة.';
+$messages['errorsaving'] = 'حدث خطأ أثناء الحفظ.';
 $messages['errormoving'] = 'تعذر نقل هذه الرسالة';
 $messages['errorcopying'] = 'تعذر نسخ الرسائل';
 $messages['errordeleting'] = 'تعذر حذف هذه الرسالة';
@@ -72,6 +83,7 @@ $messages['norecipientwarning'] = 'الرجاء إدخال اسم مستقبل �
 $messages['nosubjectwarning']  = 'حقل "الموضوع" فارغ. هل تريد كتابة موضوعللرسالة؟';
 $messages['nobodywarning'] = 'إرسال هذه الرسالة دون نص؟';
 $messages['notsentwarning'] = 'لم يتم إرسال الرسالة. هل تريد تجاهلالرسالة؟';
+$messages['restoresavedcomposedata'] = 'يوجد رسالة سابقة ولاكن غير مرسلة.\n\nالموضوع: $subject\nحفظ: $date\n\n هل تريد بالفعل استعادة هذة الرسالة ؟';
 $messages['noldapserver'] = 'الرجاء اختيار خادم ldap للبحث فيه';
 $messages['nosearchname'] = 'الرجاء إدخال اسم مراسل أو عنوان بريدإلكتروني';
 $messages['notuploadedwarning'] = 'لم يتم رفع جميع المرفقات بعد. رجاءً الانتظار أو إلغاء عملية الرفع.';
@@ -91,26 +103,36 @@ $messages['converting'] = 'إزالة التنسيق من الرسالة...';
 $messages['messageopenerror'] = 'تعذرت قراءة الرسالة من الخادم';
 $messages['fileuploaderror'] = 'فشل رفع الملف';
 $messages['filesizeerror'] = 'حجم الملف الذي تحاول رفعه أكبر من الحجمالأقصى $size';
+$messages['copysuccess'] = 'تم نسخ $nr جهة اتصال بنجاح.';
+$messages['movesuccess'] = 'تم نقل $nr جهة اتصال بنجاح.';
+$messages['copyerror'] = 'لا يمكن نسخ أية جهة اتصال.';
+$messages['moveerror'] = 'لا يمكن نقل أية جهة اتصال.';
 $messages['sourceisreadonly'] = 'لا يمكن تعديل مصدر العنوان هذا';
 $messages['errorsavingcontact'] = 'تعذر حفظ عنوان المراسل';
 $messages['movingmessage'] = 'جاري نقل الرسالة...';
 $messages['copyingmessage'] = 'جاري نسخ الرسالة...';
 $messages['copyingcontact'] = 'جاري نسخ المُراسلين...';
+$messages['movingcontact'] = 'جاري نقل جهات الاتصال...';
 $messages['deletingmessage'] = 'جاري حذف الرسائل...';
 $messages['markingmessage'] = 'جاري تحديد الرسائل...';
 $messages['addingmember'] = 'جاري إضافة المُراسلين إلى المجموعة...';
 $messages['removingmember'] = 'جاري إزالة المراسلين من المجموعة...';
 $messages['receiptsent'] = 'أرسل إيصال الاستلام بنجاح';
 $messages['errorsendingreceipt'] = 'تعذر إرسال إيصال الاستلام';
+$messages['deleteidentityconfirm'] = 'هل تريد فعلاً حذف هذا المعرف؟';
 $messages['nodeletelastidentity'] = 'لا يمكن حذف هذا السجل حيث أنه الوحيدالمتبقي.';
 $messages['forbiddencharacter'] = 'اسم المجلّد يحتوي حروفاً ممنوعة';
 $messages['selectimportfile'] = 'رجاء اختر ملفاً لرفعه';
 $messages['addresswriterror'] = 'دفتر العناوين المحدد غير قابل للكتابة';
 $messages['contactaddedtogroup'] = 'تمت إضافة المراسلين إلى هذه المجموعةبنجاح';
 $messages['contactremovedfromgroup'] = 'تمت إزالة المراسلين من هذه المجموعةبنجاح';
+$messages['nogroupassignmentschanged'] = 'لم يتم تغيير مهام المجموعة.';
 $messages['importwait'] = 'جاري الاستيراد، رجاء انتظر...';
+$messages['importformaterror'] = 'فشل في الاستيراد! الملف الذي تحاول رفعة ليس ملف استيراد صالح. ';
 $messages['importconfirm'] = '<b>تم استيراد $inserted مراسلين بنجاح، وتجاهل$skipped موجودين مسبقاً</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>تم تجاهل $skipped عناصر موجودة</b>';
+$messages['importmessagesuccess'] = 'تم استرداد $nr رسالة بنجاح';
+$messages['importmessageerror'] = 'فشل في الاستيراد! الملف الذي تحاول رفعة ليس رسالة او صندوق بريد صالح. ';
 $messages['opnotpermitted'] = 'العملية ممنوعة!';
 $messages['nofromaddress'] = 'عنوان البريد الالكتروني غير محدد فيالهويّة المنتقاة';
 $messages['editorwarning'] = 'يتسبب الانتقال إلى محرر النص البسيط بضياع جميع التنسيق. هل تريد الاستمرار؟';
@@ -124,6 +146,7 @@ $messages['smtperror'] = 'خطأ SMTP: $msg';
 $messages['emailformaterror'] = 'عنوان بريد إلكتروني غير صالح: $email';
 $messages['toomanyrecipients'] = 'عدد المرسل إليهم كبير. قلص العدد إلى $max.';
 $messages['maxgroupmembersreached'] = 'عدد أعضاء المجموعة أكثر من $max';
+$messages['internalerror'] = 'حدث خطأ داخلي. الرجاء المحاولة مرة أخرى.';
 $messages['contactdelerror'] = 'تعذر حذف أسماء جهات الإتصال';
 $messages['contactdeleted'] = 'تم حذف أسماء جهات الإتصال بنجاح';
 $messages['contactrestoreerror'] = 'تعذر استعادة المُراسل المحذوف.';
@@ -149,4 +172,6 @@ $messages['invalidimageformat'] = 'ليست صيغة صورة صحيحة';
 $messages['mispellingsfound'] = 'عُثر على أخطاء إملائية في الرسالة';
 $messages['parentnotwritable'] = 'تعذر إنشاء/نقل المجلد إلى المجلد المحدد.ليست لديك الصلاحية.';
 $messages['messagetoobig'] = 'جزء الرسالة أكبر بكثير مما يمكن معالجته.';
+$messages['attachmentvalidationerror'] = 'تحذير! المرفق ادناة مشكوك في امره بسبب ان نوع المرفق لا يتناسب مع نوع المرفق المصرح بة في هذه الرسالة.اذا كنت لا تثق في المرسل, يجب عليك ان لا تفتحة في المتصفح لأنها قد تحتوي على محتويات ضارة.<br/><br/><em>متوقع : $expected; موجود : $detected</em>';
+$messages['noscriptwarning'] = 'تحذير: خادم البريد الالكتروني هذا يتطلب جافاسكربت , يرجى تفعيل الـ جافاسكربت في اعدادت المتصفح الخاص بك لتتمكن من استخدامة.';
 ?>
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index 35a850e57..6abf990ae 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,6 @@ $messages['invalidrequest'] = 'Fallu de la solicitú. Nun se guardaron datos.';
 $messages['invalidhost'] = 'Nome de sirvidor inválidu.';
 $messages['nomessagesfound'] = 'Nun s\'atoparon mensaxes na bandexa';
 $messages['loggedout'] = 'Zarraste la sesión. ¡Talluéu!';
-$messages['mailboxempty'] = 'La to cuenta nun tien mensaxes';
 $messages['refreshing'] = 'Anovando...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Xubiendo ficheru';
diff --git a/program/localization/be_BE/labels.inc b/program/localization/be_BE/labels.inc
index 9180b92d7..c08b9c866 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -52,6 +52,7 @@ $labels['fromtoshort'] = '$from—$to з $count';
 $labels['copy']     = 'Капіяваць';
 $labels['move']     = 'Перамясціць';
 $labels['moveto']   = 'Перамясціць у...';
+$labels['copyto']   = 'Скапіяваць у...';
 $labels['download'] = 'Сцягнуць';
 $labels['open']     = 'Адкрыць';
 $labels['showattachment'] = 'Паказаць';
diff --git a/program/localization/be_BE/messages.inc b/program/localization/be_BE/messages.inc
index 6afc34b23..5d17249d6 100644
--- a/program/localization/be_BE/messages.inc
+++ b/program/localization/be_BE/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,8 @@ $messages['invalidrequest'] = 'Невалідны запрос! Дадзеныя
 $messages['invalidhost'] = 'Няслушнае імя сервера.';
 $messages['nomessagesfound'] = 'Паведамленняў у гэтай скрынцы не знойдзена';
 $messages['loggedout'] = 'Сесія скасавана. Да пабачэння!';
-$messages['mailboxempty'] = 'У скрынцы пуста.';
+$messages['mailboxempty'] = 'У паштовай скрынцы пуста';
+$messages['nomessages'] = 'Няма паведамленняў';
 $messages['refreshing'] = 'Абнаўляецца...';
 $messages['loading'] = 'Загружаецца...';
 $messages['uploading'] = 'Файл зацягваецца...';
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index ac744edee..d8fd08b4f 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,6 @@ $messages['sessionerror'] = 'আপনার সেশন শেষ';
 $messages['storageerror'] = 'মেইল সারভার এর সাথে যোগাযোগ করা গেল না';
 $messages['nomessagesfound'] = 'এই মেইলবক্সে কোনো চিঠি নাই';
 $messages['loggedout'] = 'আপনের সেশন ঠিকঠাক মতো শেষ হইছে। শুভবিদায়।';
-$messages['mailboxempty'] = 'মেইলবক্স খালি';
 $messages['loading'] = 'কম্পুটার কাজ করতেছে . .';
 $messages['loadingdata'] = 'কম্পুটার তথ্য আনছে আপনার জন্য..';
 $messages['checkingmail'] = 'নতুন চিঠি আসছে কিনা তা দেখা হচ্ছে';
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index d503d1f4c..c239fe718 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -31,10 +31,12 @@ $labels['trash']  = 'Pod-lastez';
 $labels['junk']   = 'Stroboù';
 $labels['subject'] = 'Sujed';
 $labels['from']    = 'Eus';
+$labels['sender']  = 'Kaser';
 $labels['to']      = 'Da';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Cci';
 $labels['replyto'] = 'Respont-da';
+$labels['followupto'] = 'Treuskas da';
 $labels['date']    = 'Deiz';
 $labels['size']    = 'Ment';
 $labels['priority'] = 'Kentwir';
@@ -103,8 +105,10 @@ $labels['replytomessage']   = 'Respont d\'ar kaser';
 $labels['replytoallmessage'] = 'Respont d\'an holl';
 $labels['replyall']         = 'Respont d\'an holl';
 $labels['replylist']        = 'Respont d\'ar roll';
+$labels['forwardattachment'] = 'Treuskas evel pezh stag';
 $labels['forwardmessage']   = 'Treuzkas ar c\'hemennad';
 $labels['deletemessage']    = 'Dilec\'hiañ ar c\'hemennad er pod-lastez';
+$labels['movemessagetotrash'] = 'lakit er pod lastez';
 $labels['printmessage']     = 'Moulañ ar c\'hemennad-se';
 $labels['previousmessage']  = 'Gwelout ar c"hemennad a-raok';
 $labels['firstmessage']     = 'Gwelout ar c\'hemennad kentañ';
@@ -112,9 +116,18 @@ $labels['nextmessage']      = 'Gwelout ar c\'hemennad da heul';
 $labels['lastmessage']      = 'Gwelout ar c\'hemennad diwezhañ';
 $labels['backtolist']       = 'Distreiñ el listenn kemennadoù';
 $labels['viewsource']       = 'Gwelout an tarzh';
+$labels['mark']             = 'merkañ';
+$labels['markmessages']     = 'Merkañ ar c\'hemennad';
+$labels['markflagged']      = 'spilhennet';
+$labels['markunflagged']    = 'n\'eo ket bet spilhennet';
+$labels['moreactions']      = 'muioc\'h a dibab';
+$labels['more']             = 'muioc\'h';
+$labels['back']             = 'distro';
+$labels['options']          = 'Dibarzhioù';
 $labels['select'] = 'Diuzañ';
 $labels['all'] = 'An holl';
 $labels['none'] = 'Ebet';
+$labels['currpage'] = 'Pajenn';
 $labels['unread'] = 'Na lennet';
 $labels['nonesort'] = 'Ebet';
 $labels['compact'] = 'Stummaat';
@@ -151,10 +164,13 @@ $labels['surname']      = 'Anv';
 $labels['email']        = 'Postel elektronek';
 $labels['addcontact'] = 'Ouzhpennañ an darempred diuzet en hor c\'harned chomlec\'hioù';
 $labels['editcontact'] = 'Cheñch an darempred';
+$labels['contacts'] = 'darempred';
 $labels['edit']   = 'Cheñch';
 $labels['cancel'] = 'Nullañ';
 $labels['save']   = 'Gwarediñ';
 $labels['delete'] = 'Dilemel';
+$labels['rename'] = 'chench anv';
+$labels['replacephoto'] = 'chench';
 $labels['newcontact']     = 'Krouiñ un darempred nevez';
 $labels['deletecontact']  = 'Dilemel an darempredoù diuzet';
 $labels['composeto']      = 'Skrivañ ur c\'hemennad ouzh';
@@ -167,7 +183,14 @@ $labels['nextpage']       = 'Diskouez pajenn da heul';
 $labels['lastpage']       = 'Gwelout ar bajenn diwezhañ';
 $labels['groups'] = 'Strolladoù';
 $labels['personaladrbook'] = 'Chomlec\'h personel';
+$labels['searchsave'] = 'enrollane an enklask';
+$labels['searchdelete'] = 'dilemel an enklask';
+$labels['import'] = 'enporzhiañ';
+$labels['importcontacts'] = 'Enporzhiañ darempredoù';
+$labels['importfromfile'] = 'enporzhiañ eus an teuliad :';
+$labels['done'] = 'Graet eo';
 $labels['settingsfor'] = 'Arventennoù evit';
+$labels['about'] = 'Diwar-benn';
 $labels['preferences'] = 'Dibarzhioù';
 $labels['userpreferences'] = 'Dibarzhioù implijer';
 $labels['editpreferences'] = 'Cheñch dibarzhioù implijer';
diff --git a/program/localization/br/messages.inc b/program/localization/br/messages.inc
index 7f724a24d..bd266d0d4 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -25,7 +25,6 @@ $messages['servererrormsg'] = 'Fazi dafariad : $msg';
 $messages['dberror'] = 'Fazi stlennvon !';
 $messages['nomessagesfound'] = 'Kemennadoù ebet er voest lizhiri';
 $messages['loggedout'] = 'Digevreet hoc\'h eus mat. Kenavo !';
-$messages['mailboxempty'] = 'Boest lizhiri dileun';
 $messages['loading'] = 'O kargañ...';
 $messages['loadingdata'] = 'O kargañ roadennoù...';
 $messages['checkingmail'] = 'O Gwiriañ kemennadoù nevez...';
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 52f865f1e..42f2517b2 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,8 @@ $messages['invalidrequest'] = 'Neispravan zahtjev! Podaci nisu sačuvani.';
 $messages['invalidhost'] = 'Neispravno ime servera.';
 $messages['nomessagesfound'] = 'Nema poruka u ovom sandučetu.';
 $messages['loggedout'] = 'Uspješno ste se odjavili. Doviđenja!';
-$messages['mailboxempty'] = 'Sanduče je prazno.';
+$messages['mailboxempty'] = 'Sanduče je prazno';
+$messages['nomessages'] = 'Nema poruka';
 $messages['refreshing'] = 'Osvježavam...';
 $messages['loading'] = 'Učitavanje...';
 $messages['uploading'] = 'Dodajem datoteku...';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 120e2bc97..15d879bc1 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -60,13 +60,13 @@ $labels['showanyway'] = 'Mostra-ho de totes maneres';
 $labels['filename'] = 'Nom del fitxer';
 $labels['filesize'] = 'Mida del fitxer';
 $labels['addtoaddressbook'] = 'Afegeix a contactes';
-$labels['sun'] = 'Diu';
-$labels['mon'] = 'Dll';
-$labels['tue'] = 'Dmt';
-$labels['wed'] = 'Dmc';
-$labels['thu'] = 'Dij';
-$labels['fri'] = 'Div';
-$labels['sat'] = 'Dis';
+$labels['sun'] = 'dg';
+$labels['mon'] = 'dl';
+$labels['tue'] = 'dm';
+$labels['wed'] = 'dc';
+$labels['thu'] = 'dj';
+$labels['fri'] = 'dv';
+$labels['sat'] = 'ds';
 $labels['sunday']    = 'Diumenge';
 $labels['monday']    = 'Dilluns';
 $labels['tuesday']   = 'Dimarts';
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 5c0ef7e8d..8e0c1c276 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -32,6 +32,8 @@ $messages['invalidrequest'] = 'Cais annilys! Ni chadwyd unrhyw wybodaeth.';
 $messages['invalidhost'] = 'Enw gweinydd annilys.';
 $messages['nomessagesfound'] = 'Dim negeseuon wedi eu canfod yn y blwch hwn';
 $messages['loggedout'] = 'Rydych wedi gorffen y sesiwn yn llwyddianus. Hwyl fawr!';
+$messages['mailboxempty'] = 'Mae\'r blwch yn wag';
+$messages['nomessages'] = 'Dim negeseuon';
 $messages['refreshing'] = 'Yn adnewyddu...';
 $messages['loading'] = 'Yn llwytho...';
 $messages['uploading'] = 'Yn llwytho ffeil i fyny...';
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index 1328ed288..4a567aed8 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -33,6 +33,7 @@ $messages['invalidhost'] = 'Ugyldigt servernavn.';
 $messages['nomessagesfound'] = 'Der blev ikke fundet nogen beskeder i denne postkasse.';
 $messages['loggedout'] = 'Du er nu logget af webmail. Farvel så længe!';
 $messages['mailboxempty'] = 'Postkassen er tom.';
+$messages['nomessages'] = 'Ingen beskeder';
 $messages['refreshing'] = 'Opdaterer...';
 $messages['loading'] = 'Indlæser...';
 $messages['uploading'] = 'Uploader fil...';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index 0362673de..b22b3f3d5 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -52,6 +52,7 @@ $labels['fromtoshort'] = '$from – $to από $count';
 $labels['copy']     = 'Αντιγραφή';
 $labels['move']     = 'Μετακίνηση';
 $labels['moveto']   = 'Μετακίνηση σε...';
+$labels['copyto']   = 'Αντιγραφή σε...';
 $labels['download'] = 'Λήψη';
 $labels['open']     = 'Ανοιγμα';
 $labels['showattachment'] = 'Εμφάνιση';
@@ -198,10 +199,15 @@ $labels['checkspelling'] = 'Έλεγχος ορθογραφίας';
 $labels['resumeediting'] = 'Συνέχεια επεξεργασίας';
 $labels['revertto']      = 'Επαναφορά στο';
 $labels['restore'] = 'Επαναφορά';
+$labels['restoremessage'] = 'Επαναφορά μηνύματος;';
 $labels['responses'] = 'Απαντήσεις';
 $labels['insertresponse'] = 'Εισάγετε μια απάντηση';
 $labels['manageresponses'] = 'Διαχείριση απαντήσεων';
+$labels['savenewresponse'] = 'Αποθήκευση νέας απάντησης';
+$labels['editresponses'] = 'Μεταβολή απαντήσεων';
+$labels['editresponse'] = 'Μεταβολή απάντησης';
 $labels['responsename'] = 'Όνομα';
+$labels['responsetext'] = 'Κείμενο απάντησης';
 $labels['attach'] = 'Επισύναψη';
 $labels['attachments'] = 'Συνημμένα';
 $labels['upload'] = 'Φόρτωση';
@@ -321,7 +327,11 @@ $labels['searchdelete'] = 'Διαγραφή αποθηκευμένης αναζ�
 $labels['import'] = 'Εισαγωγή';
 $labels['importcontacts'] = 'Εισαγωγή επαφών';
 $labels['importfromfile'] = 'Εισαγωγή από το αρχείο:';
+$labels['importtarget'] = 'Προσθήκη επαφών σε';
 $labels['importreplace'] = 'Αντικατάσταση όλου του βιβλίου διευθύνσεων';
+$labels['importgroups'] = 'Εισαγωγή αναθέσεων ομάδων';
+$labels['importgroupsall'] = 'Όλα (δημιουργία ομάδων αν είναι απαραίτητο)';
+$labels['importgroupsexisting'] = 'Μόνο για υπάρχουσες ομάδες';
 $labels['importdesc'] = 'Μπορείτε να ανεβάσετε επαφές από ένα υπάρχον βιβλίο διευθύνσεων.<br/>Υποστηρίζεται η εισαγωγή διευθύνσεων από αρχεία τύπου <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ή CSV (διαχωρισμένα με κόμμα).';
 $labels['done'] = 'Ολοκληρώθηκε';
 $labels['settingsfor'] = 'Ρυθμίσεις για';
@@ -429,7 +439,9 @@ $labels['standardwindows'] = 'Χειριστείτε τα αναδυόμενα �
 $labels['forwardmode'] = 'Προώθηση μηνυμάτων';
 $labels['inline'] = 'με εσνωμάτωση';
 $labels['asattachment'] = 'σαν επισύναψη';
+$labels['replyallmode'] = 'Προεπιλεγμένη ενέργεια του κουμπιού [Απάντηση σε όλους]';
 $labels['replyalldefault'] = 'απάντηση σε όλους';
+$labels['replyalllist'] = 'Απάντηση μόνο σε λίστα e-mail (αν υπάρχει)';
 $labels['folder']  = 'Φάκελος';
 $labels['folders']  = 'Φάκελοι';
 $labels['foldername']  = 'Όνομα φακέλου';
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index 44c69bbb3..2c38f5fff 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -16,24 +16,24 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 $messages['errortitle']  = 'Έχει προκύψει κάποιο σφάλμα!';
-$messages['loginfailed']  = 'Είσοδος απέτυχε.';
-$messages['cookiesdisabled'] = 'Ο περιηγητής σας (browser) δεν αποδέχεται cookies';
+$messages['loginfailed']  = 'Η είσοδος απέτυχε.';
+$messages['cookiesdisabled'] = 'Ο περιηγητής σας (browser) δεν αποδέχεται cookies.';
 $messages['sessionerror'] = 'Η συνεδρία σας είναι άκυρη ή έχει λήξει';
-$messages['storageerror'] = 'Η σύνδεση με το διακομιστή IMAP απέτυχε';
+$messages['storageerror'] = 'Η σύνδεση με το διακομιστή αποθήκευσης απέτυχε.';
 $messages['servererror'] = 'Σφάλμα του εξυπηρετητή!';
 $messages['servererrormsg'] = 'Σφάλμα εξυπηρετητή: $msg';
 $messages['dberror'] = 'Σφάλμα βάσης δεδομένων!';
 $messages['requesttimedout'] = 'Το αίτημα εξέπνευσε χρονικά';
 $messages['errorreadonly'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Ο φάκελος είναι μόνο για ανάγνωση.';
-$messages['errornoperm'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Άρνηση άδειας';
-$messages['erroroverquota'] = 'Δεν είναι δυνατή η εκτέλεση της λειτουργίας. Δεν υπάρχει ελεύθερος χώρος στο δίσκο. ';
-$messages['erroroverquotadelete'] = 'Δεν υπάρχει ελεύθερος χώρος στο δίσκο. Χρησιμοποιήστε το συνδυασμό πλήκτρων SHIFT DEL για να διαγράψετε ένα μήνυμα.';
+$messages['errornoperm'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Άρνηση πρόσβασης.';
+$messages['erroroverquota'] = 'Δεν είναι δυνατή η εκτέλεση της λειτουργίας. Δεν υπάρχει ελεύθερος χώρος στο δίσκο.';
+$messages['erroroverquotadelete'] = 'Δεν υπάρχει ελεύθερος χώρος στο δίσκο. Χρησιμοποιήστε το συνδυασμό πλήκτρων SHIFT+DEL για να διαγράψετε μηνύματα.';
 $messages['invalidrequest'] = 'Λανθασμένο αίτημα! Δεν αποθηκεύτηκαν δεδομένα.';
 $messages['invalidhost'] = 'Άκυρο όνομα εξυπηρετητή.';
-$messages['nomessagesfound'] = 'Δε βρέθηκαν μηνύματα σε αυτή τη θυρίδα';
+$messages['nomessagesfound'] = 'Δεν βρέθηκαν μηνύματα σε αυτή τη θυρίδα.';
 $messages['loggedout'] = 'Έχετε τερματίσει επιτυχώς τη συνεδρία. Αντίο!';
 $messages['mailboxempty'] = 'Η θυρίδα είναι άδεια';
-$messages['nomessages'] = 'Κανένα μήνυμα';
+$messages['nomessages'] = 'Δεν υπάρχουν μηνύματα';
 $messages['refreshing'] = 'Ανανέωση....';
 $messages['loading'] = 'Φόρτωση...';
 $messages['uploading'] = 'Το αρχείο φορτώνεται...';
@@ -41,136 +41,137 @@ $messages['uploadingmany'] = 'Φόρτωση αρχείων...';
 $messages['loadingdata'] = 'Φόρτωση δεδομένων...';
 $messages['checkingmail'] = 'Έλεγχος για νέα μηνύματα...';
 $messages['sendingmessage'] = 'Αποστολή μηνύματος...';
-$messages['messagesent'] = 'Μήνυμα εστάλη επιτυχώς';
+$messages['messagesent'] = 'Μήνυμα εστάλη επιτυχώς.';
 $messages['savingmessage'] = 'Αποθήκευση μηνύματος...';
-$messages['messagesaved'] = 'Μήνυμα αποθηκεύτηκε στα Πρόχειρα';
-$messages['successfullysaved'] = 'Αποθηκεύτηκε επιτυχώς';
-$messages['savingresponse'] = 'Αποθηκεύετε το κείμενο απάντησης...';
-$messages['deleteresponseconfirm'] = 'Σίγουρα θέλετε να διαγράψετε αυτό το κείμενο απάντησης;';
-$messages['addedsuccessfully'] = 'Η επαφή προστέθηκε επιτυχώς στις Επαφές';
-$messages['contactexists'] = 'Υπάρχει ήδη επαφή με αυτή τη διεύθυνση e-mail';
-$messages['contactnameexists'] = 'Μια επαφή με το ίδιο όνομα υπάρχει ήδη.';
+$messages['messagesaved'] = 'Το μήνυμα αποθηκεύτηκε στα Πρόχειρα.';
+$messages['successfullysaved'] = 'Αποθηκεύτηκε επιτυχώς.';
+$messages['savingresponse'] = 'Αποθήκευση του κειμένου απάντησης...';
+$messages['deleteresponseconfirm'] = 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το κείμενο απάντησης;';
+$messages['addedsuccessfully'] = 'Η επαφή προστέθηκε επιτυχώς στο βιβλίο επαφών.';
+$messages['contactexists'] = 'Υπάρχει ήδη επαφή με αυτή τη διεύθυνση e-mail.';
+$messages['contactnameexists'] = 'Υπάρχει ήδη μια επαφή με το ίδιο όνομα.';
 $messages['blockedimages'] = 'Για να προστατευτεί το απόρρητο σας, οι απομακρυσμένες εικόνες έχουν απενεργοποιηθεί σε αυτό το μήνυμα.';
-$messages['encryptedmessage'] = 'Αυτό το μήνυμα είναι κρυπτογραφημένο και δε μπορεί να προβληθεί. Συγνώμη!';
-$messages['nocontactsfound'] = 'Δε βρέθηκαν επαφές';
-$messages['contactnotfound'] = 'Η ζητούμενη επαφή δεν βρέθηκε';
-$messages['contactsearchonly'] = 'Εισάγετε κάποιους όρους προς αναζήτηση';
-$messages['sendingfailed'] = 'Αποστολή μηνύματος απέτυχε';
-$messages['senttooquickly'] = 'Παρακαλώ περιμένετε $sec δευτερόλεπτα, πριν στείλετε το μήνυμα';
-$messages['errorsavingsent'] = 'Προέκυψε σφάλμα κατά την αποθήκευση σταλμένου μηνύματος.';
+$messages['encryptedmessage'] = 'Αυτό το μήνυμα είναι κρυπτογραφημένο και δε μπορεί να προβληθεί. Συγγνώμη!';
+$messages['nocontactsfound'] = 'Δε βρέθηκαν επαφές.';
+$messages['contactnotfound'] = 'Η ζητούμενη επαφή δεν βρέθηκε.';
+$messages['contactsearchonly'] = 'Εισάγετε κάποιους όρους προς αναζήτηση επαφών';
+$messages['sendingfailed'] = 'Η αποστολή του μηνύματος απέτυχε.';
+$messages['senttooquickly'] = 'Παρακαλώ περιμένετε $sec δευτερόλεπτα πριν στείλετε το μήνυμα.';
+$messages['errorsavingsent'] = 'Προέκυψε σφάλμα κατά την αποθήκευση αποσταλμένου μηνύματος.';
 $messages['errorsaving'] = 'Προέκυψε σφάλμα κατά την αποθήκευση.';
-$messages['errormoving'] = 'Το μήνυμα δε μπορούσε να μετακινηθεί';
-$messages['errorcopying'] = 'Δεν είναι δυνατή η αντιγραφή του μηνύματος/των';
-$messages['errordeleting'] = 'Το μήνυμα δε μπορούσε να διαγραφεί';
-$messages['errormarking'] = 'Δεν έγινε επισήμανση στο μύνημα';
+$messages['errormoving'] = 'Τα μηνύματα δεν ήταν δυνατό να μετακινηθούν.';
+$messages['errorcopying'] = 'Δεν ήταν δυνατή η αντιγραφή του μηνύματος/των.';
+$messages['errordeleting'] = 'Το μήνυμα δεν ήταν δυνατό να διαγραφεί.';
+$messages['errormarking'] = 'Δεν έγινε επισήμανση στο μήνυμα.';
 $messages['deletecontactconfirm']  = 'Θέλετε να διαγράψετε τη συγκεκριμένη επαφή/ές;';
 $messages['deletegroupconfirm']  = 'Είστε βέβαιοι πως θέλετε να διαγράψετε την επιλεγμένη ομάδα;';
 $messages['deletemessagesconfirm'] = 'Θέλετε να διαγράψετε το συγκεκριμένο μήνυμα/τα;';
-$messages['deletefolderconfirm']  = 'Θέλετε να διαγράψετε το συγκεκριμένο φάκελο;';
-$messages['purgefolderconfirm']  = 'Θέλετε να διαγράψετε όλα τα μηνύματα στο συγκεκριμένο φάκελο;';
+$messages['deletefolderconfirm']  = 'Θέλετε να διαγράψετε τον συγκεκριμένο φάκελο;';
+$messages['purgefolderconfirm']  = 'Θέλετε να διαγράψετε όλα τα μηνύματα στον συγκεκριμένο φάκελο;';
 $messages['contactdeleting'] = 'Διαγραφή επαφών...';
 $messages['groupdeleting'] = 'Διαγραφή ομάδας...';
-$messages['folderdeleting'] = 'Διαγραφή φακέλου';
-$messages['foldermoving'] = 'Μεταφορά φακέλου';
+$messages['folderdeleting'] = 'Διαγραφή φακέλου...';
+$messages['foldermoving'] = 'Μεταφορά φακέλου...';
 $messages['foldersubscribing'] = 'Εγγραφή φακέλου...';
 $messages['folderunsubscribing'] = 'Απεγγραφή φακέλου...';
-$messages['formincomplete'] = 'Η φόρμα δεν έχει συμπληρωθεί πλήρως';
-$messages['noemailwarning'] = 'Παρακαλώ εισάγετε έγκυρη διεύθυνση email';
-$messages['nonamewarning']  = 'Παρακαλώ εισάγετε όνομα';
-$messages['nopagesizewarning'] = 'Παρακαλώ εισάγετε μέγεθος σελίδας';
-$messages['nosenderwarning'] = 'Παρακαλώ εισάγετε την email διεύθυνση αποστολέα';
-$messages['norecipientwarning'] = 'Παρακαλώ εισάγεται τουλάχιστον έναν παραλήπτη';
-$messages['nosubjectwarning']  = 'Το πεδίο "Θέμα" είναι άδειο. Θέλετε να εισάγεται ένα τώρα;';
+$messages['formincomplete'] = 'Η φόρμα δεν έχει συμπληρωθεί πλήρως.';
+$messages['noemailwarning'] = 'Παρακαλώ εισάγετε έγκυρη διεύθυνση email.';
+$messages['nonamewarning']  = 'Παρακαλώ εισάγετε όνομα.';
+$messages['nopagesizewarning'] = 'Παρακαλώ εισάγετε μέγεθος σελίδας.';
+$messages['nosenderwarning'] = 'Παρακαλώ εισάγετε την e-mail διεύθυνση αποστολέα.';
+$messages['norecipientwarning'] = 'Παρακαλώ εισάγετε τουλάχιστο έναν παραλήπτη.';
+$messages['nosubjectwarning']  = 'Το πεδίο "Θέμα" είναι άδειο. Θέλετε να εισάγετε ένα τώρα;';
 $messages['nobodywarning'] = 'Αποστολή μηνύματος χωρίς κείμενο;';
 $messages['notsentwarning'] = 'Το μήνυμα δεν έχει σταλεί. Θέλετε να το απορρίψετε;';
-$messages['noldapserver'] = 'Παρακαλώ επιλέξτε έναν LDAP διακομιστή για αναζήτηση';
-$messages['nosearchname'] = 'Παρακαλώ εισάγεται όνομα επαφής ή διεύθυνση email';
-$messages['notuploadedwarning'] = 'Δεν έχουν φορτωθεί όλα τα συνημμένα. Παρακαλώ περιμένετε ή ακυρώστε το ανέβασμα.';
-$messages['searchsuccessful'] = '$nr μηνύματα βρέθηκαν';
-$messages['contactsearchsuccessful'] = '$nr επαφές βρέθηκαν.';
-$messages['searchnomatch'] = 'Η αναζήτηση δεν επέστρεψε αποτελέσματα';
+$messages['restoresavedcomposedata'] = 'Υπάρχει ένα προηγούμενο πρόχειρο μήνυμα το οποίο δεν έχει σταλεί.\n\nΘέμα: $subject\Αποθηκεύτηκε: $date\n\nΘέλετε να το ανακτήσετε;';
+$messages['noldapserver'] = 'Παρακαλώ επιλέξτε έναν διακομιστή LDAP για αναζήτηση.';
+$messages['nosearchname'] = 'Παρακαλώ εισάγετε όνομα επαφής ή διεύθυνση e-mail.';
+$messages['notuploadedwarning'] = 'Δεν έχουν φορτωθεί ακόμα όλα τα συνημμένα. Παρακαλώ περιμένετε ή ακυρώστε το ανέβασμα.';
+$messages['searchsuccessful'] = 'Βρέθηκαν $nr μηνύματα.';
+$messages['contactsearchsuccessful'] = 'Βρέθηκαν $nr επαφές.';
+$messages['searchnomatch'] = 'Η αναζήτηση δεν επέστρεψε αποτελέσματα.';
 $messages['searching'] = 'Αναζήτηση...';
 $messages['checking'] = 'Έλεγχος...';
-$messages['nospellerrors'] = 'Δε βρέθηκαν ορθογραφικά λάθη';
-$messages['folderdeleted'] = 'Ο φάκελος διαγράφηκε επιτυχώς';
+$messages['nospellerrors'] = 'Δεν βρέθηκαν ορθογραφικά λάθη.';
+$messages['folderdeleted'] = 'Ο φάκελος διαγράφηκε επιτυχώς.';
 $messages['foldersubscribed'] = 'Ο φάκελος εχει εγγραφεί με επιτυχία.';
-$messages['folderunsubscribed'] = 'Ο φάκελος διαγράφηκε επιτυχώς';
+$messages['folderunsubscribed'] = 'Ο φάκελος απεγγράφηκε επιτυχώς.';
 $messages['folderpurged'] = 'Ο φάκελος καθαρίστηκε με επιτυχία.';
 $messages['folderexpunged'] = 'Ο φάκελος συμπιέστηκε με επιτυχία.';
-$messages['deletedsuccessfully'] = 'Διαγραφή Επιτυχώς';
-$messages['converting'] = 'Μετακίνηση διαμορφώσεων κειμένου...';
-$messages['messageopenerror'] = 'Η φόρτωση μηνυμάτων από τον διακομιστή απέτυχε';
-$messages['fileuploaderror'] = 'Ανέβασμα αρχείου απέτυχε';
-$messages['filesizeerror'] = 'Το ανεβασμένο αρχείο ξεπερνάει το μέγιστο μέγεθος των $size';
-$messages['copysuccess'] = 'Επιτυχής αντιγραφή $ επαφών αριθ..';
-$messages['movesuccess'] = 'Με επιτυχία μεταφέρθηκαν $ αριθ. επαφές.';
+$messages['deletedsuccessfully'] = 'Διαγραφή επιτυχώς.';
+$messages['converting'] = 'Κατάργηση διαμορφώσεων κειμένου...';
+$messages['messageopenerror'] = 'Η φόρτωση μηνυμάτων από τον διακομιστή απέτυχε.';
+$messages['fileuploaderror'] = 'Το ανέβασμα του αρχείου απέτυχε.';
+$messages['filesizeerror'] = 'Το ανεβασμένο αρχείο ξεπερνάει το μέγιστο μέγεθος των $size.';
+$messages['copysuccess'] = 'Επιτυχής αντιγραφή $nr επαφών.';
+$messages['movesuccess'] = 'Μεταφέρθηκαν με επιτυχία $nr επαφές.';
 $messages['copyerror'] = 'Αποτυχία αντιγραφής επαφών.';
-$messages['moveerror'] = 'Δεν μπορούσε να κινηθεί καμία επαφή.';
-$messages['sourceisreadonly'] = 'Η διεύθυνση έχει μόνο δικαίωμα ανάγνωσης';
-$messages['errorsavingcontact'] = 'Αποθήκευση επαφής απέτυχε';
-$messages['movingmessage'] = 'Μετακίνηση μηνύματος...';
+$messages['moveerror'] = 'Η μετακίνηση επαφών ήταν αδύνατη.';
+$messages['sourceisreadonly'] = 'Το πεδίο διεύθυνσης είναι μόνο για ανάγνωση.';
+$messages['errorsavingcontact'] = 'Η αποθήκευση της διεύθυνσης επαφής απέτυχε.';
+$messages['movingmessage'] = 'Μετακίνηση μηνύματος/των...';
 $messages['copyingmessage'] = 'Αντιγραφή μηνυμάτων...';
 $messages['copyingcontact'] = 'Αντιγραφή επαφών...';
-$messages['movingcontact'] = 'Μετακίνηση επαφής(ων)...';
+$messages['movingcontact'] = 'Μετακίνηση επαφής(ών)...';
 $messages['deletingmessage'] = 'Διαγραφή μηνυμάτων...';
 $messages['markingmessage'] = 'Σήμανση μηνυμάτων...';
 $messages['addingmember'] = 'Προσθήκη επαφών στην ομάδα...';
 $messages['removingmember'] = 'Αφαίρεση επαφών από την ομάδα...';
-$messages['receiptsent'] = 'Επιτυχής αποστολή αναφοράς ανάγνωσης';
-$messages['errorsendingreceipt'] = 'Αποστολή αναφοράς απέτυχε';
-$messages['deleteidentityconfirm'] = 'Είστε βέβαιοι πως θέλετε να διαγράψετε την ταυτότητα;';
+$messages['receiptsent'] = 'Επιτυχής αποστολή αναφοράς ανάγνωσης.';
+$messages['errorsendingreceipt'] = 'Αποστολή αναφοράς απέτυχε.';
+$messages['deleteidentityconfirm'] = 'Είστε βέβαιοι πως θέλετε να διαγράψετε αυτή την ταυτότητα;';
 $messages['nodeletelastidentity'] = 'Δε μπορείτε να διαγράψετε αυτήν την ταυτότητα, είναι η τελευταία.';
-$messages['forbiddencharacter'] = 'Η ονομασία φακέλου περιέχει μη επιτρεπτό χαρακτήρα';
-$messages['selectimportfile'] = 'Επιλέξτε αρχείο για ανέβασμα';
-$messages['addresswriterror'] = 'Η επιλεγμένη ατζέντα διευθύνσεων δεν είνα εγγράψιμη';
+$messages['forbiddencharacter'] = 'Η ονομασία φακέλου περιέχει μη επιτρεπτό χαρακτήρα.';
+$messages['selectimportfile'] = 'Επιλέξτε αρχείο για ανέβασμα.';
+$messages['addresswriterror'] = 'Το επιλεγμένο βιβλίο διευθύνσεων δεν είναι εγγράψιμο.';
 $messages['contactaddedtogroup'] = 'Οι επαφές προστέθηκαν στην ομάδα με επιτυχία.';
 $messages['contactremovedfromgroup'] = 'Οι επαφές αφαιρέθηκαν από την ομάδα με επιτυχία.';
-$messages['nogroupassignmentschanged'] = 'Οι αναθεσεις της ομαδας δεν αλλαξαν.';
+$messages['nogroupassignmentschanged'] = 'Δεν αλλαξαν οι αναθεσεις της ομαδας.';
 $messages['importwait'] = 'Εισαγωγή, παρακαλώ περιμένετε...';
-$messages['importformaterror'] = 'Η εισαγωγή απέτυχε! Το αρχείο δεν είναι έγκυρο εισαγωγής δεδομένων.';
+$messages['importformaterror'] = 'Η εισαγωγή απέτυχε! Το ανεβασμένο αρχείο δεν είναι έγκυρο αρχείο εισαγωγής δεδομένων.';
 $messages['importconfirm'] = '<b>Εισήχθησαν $inserted επαφές με επιτυχία</b>';
-$messages['importconfirmskipped'] = '<b>Παραλήφθηκαν $skipped υπάρχοντα αντικείμενα</b>';
+$messages['importconfirmskipped'] = '<b>Παραλείφθηκαν $skipped υπάρχουσες καταχωρήσεις</b>';
 $messages['importmessagesuccess'] = 'Επιτυχής εισαγωγή $nr μηνυμάτων';
-$messages['importmessageerror'] = 'Η εισαγωγή απέτυχε! Το αρχείο δεν είναι έγκυρο εισαγωγής δεδομένων.';
+$messages['importmessageerror'] = 'Η εισαγωγή απέτυχε! Το ανεβασμένο αρχείο δεν είναι έγκυρο αρχείο μηνύματος ή φακέλου μηνυμάτων.';
 $messages['opnotpermitted'] = 'Η λειτουργία δεν επιτρέπεται!';
-$messages['nofromaddress'] = 'Στην επιλεγμένη ταυτότητα, λείπει η email διεύθυνση';
+$messages['nofromaddress'] = 'Άδεια διεύθυνση e-mail στην επιλεγμένη ταυτότητα.';
 $messages['editorwarning'] = 'Η μετάβαση στην επεξεργασία απλού κειμένου θα προκαλέσει κατάργηση της μορφοποίησης. Είστε βέβαιοι πως θέλετε να συνεχίσετε;';
-$messages['httpreceivedencrypterror'] = 'Ούπς! Ανεπανόθωτο σφάλμα. Επικοινωνήστε με το διαχειριστή του εξυπηρετητή. <b>Το μηνυμά σας δεν στάλθηκε.</b>';
-$messages['smtpconnerror'] = 'Σφάλμα SMTP ($code): Απέτυχε η σύνδεση με τον εξυπηρετητή';
-$messages['smtpautherror'] = 'Σφάλμα SMTP ($code): Σφάλμα ταυτοποίησης';
-$messages['smtpfromerror'] = 'Σφάλμα SMTP ($code): Αποτυχία ορισμού αποστολέα "$from" ($msg)';
-$messages['smtptoerror'] = 'Σφάλμα SMTP ($code): Αποτυχία προσθήκης παραλήπτη "$to" ($msg)';
-$messages['smtprecipientserror'] = 'Σφάλμα SMTP: Αδύνατο να προσπελαστεί η λίστα παραληπτών';
+$messages['httpreceivedencrypterror'] = 'Ανεπανόρθωτο σφάλμα. Επικοινωνήστε με το διαχειριστή του εξυπηρετητή. <b>Το μήνυμά σας δεν στάλθηκε.</b>';
+$messages['smtpconnerror'] = 'Σφάλμα SMTP ($code): Απέτυχε η σύνδεση με τον εξυπηρετητή.';
+$messages['smtpautherror'] = 'Σφάλμα SMTP ($code): Σφάλμα ταυτοποίησης.';
+$messages['smtpfromerror'] = 'Σφάλμα SMTP ($code): Αποτυχία ορισμού αποστολέα "$from" ($msg).';
+$messages['smtptoerror'] = 'Σφάλμα SMTP ($code): Αποτυχία προσθήκης παραλήπτη "$to" ($msg).';
+$messages['smtprecipientserror'] = 'Σφάλμα SMTP: Αδύνατο να προσπελαστεί η λίστα παραληπτών.';
 $messages['smtperror'] = 'Σφάλμα SMTP: $msg';
-$messages['emailformaterror'] = 'Λανθασμένη διεύθνση email: $email';
-$messages['toomanyrecipients'] = 'Μεγάλο πλήθος αποδεκτών. Μειώστε τον αριθμό των αποδεκτών σε $max.';
+$messages['emailformaterror'] = 'Λανθασμένη διεύθνση e-mail: $email';
+$messages['toomanyrecipients'] = 'Υπερβολικά μεγάλο πλήθος αποδεκτών. Μειώστε τον αριθμό των αποδεκτών σε $max.';
 $messages['maxgroupmembersreached'] = 'Ο αριθμός των μελών της ομάδας υπερβαίνει τον μέγιστο των $max μελών.';
 $messages['internalerror'] = 'Προέκυψε εσωτερικό σφάλμα. Παρακαλώ δοκιμάστε ξανά.';
-$messages['contactdelerror'] = 'Δεν είναι δυνατή η διαγραφή της επαφής/ων';
+$messages['contactdelerror'] = 'Δεν είναι δυνατή η διαγραφή της επαφής/ων.';
 $messages['contactdeleted'] = 'Η επαφή/ές διαγράφηκαν με επιτυχία.';
-$messages['contactrestoreerror'] = 'Οι διαγραφημενη επαφη(ες) δεν μπορουν να επαναφερθουν.';
-$messages['contactrestored'] = 'Η επαφη(ες) επαναφερθηκαν.';
+$messages['contactrestoreerror'] = 'Η διαγραμμένη επαφή(ές) δεν είναι δυνατό να επαναφερθεί.';
+$messages['contactrestored'] = 'Η επαφή(ές) επαναφέρθηκε.';
 $messages['groupdeleted'] = 'Η ομαδα διαγράφηκε επιτυχώς.';
-$messages['grouprenamed'] = 'Η ομαδα μετονομαστηκε επιτυχως.';
-$messages['groupcreated'] = 'Η ομαδα δημιουργηθηκε επιτυχως.';
-$messages['savedsearchdeleted'] = 'Η αποθηκευμένη αναζήτηση διαγράφηκε επιτυχως. ';
+$messages['grouprenamed'] = 'Η ομάδα μετονομάστηκε επιτυχώς.';
+$messages['groupcreated'] = 'Η ομάδα δημιουργήθηκε επιτυχώς.';
+$messages['savedsearchdeleted'] = 'Η αποθηκευμένη αναζήτηση διαγράφηκε επιτυχώς. ';
 $messages['savedsearchdeleteerror'] = 'Δεν ήταν δυνατή η διαγραφή της αποθηκευμένης αναζήτησης.';
-$messages['savedsearchcreated'] = 'Η αποθηκευμένη αναζητήση δημιουργήθηκε με επιτυχία. ';
-$messages['savedsearchcreateerror'] = 'Η αποθηκευμενη αναζητηση δεν μπορεσε να δημιουργηθει.';
-$messages['messagedeleted'] = 'Το μυνημα(τα) διαγραφηκαν επιτυχως.';
-$messages['messagemoved'] = 'Το μυνημα(τα) μετακινηθηκαν επιτυχως.';
-$messages['messagecopied'] = 'Το μυνημα(τα) αντιγραφθηκαν επιτυχως.';
-$messages['messagemarked'] = 'Το μυνημα(τα) μαρκαρισθηκαν επιτυχως.';
+$messages['savedsearchcreated'] = 'Η αποθηκευμένη αναζητήση δημιουργήθηκε με επιτυχία.';
+$messages['savedsearchcreateerror'] = 'Δεν ήταν δυνατό να δημιουργηθεί η αποθηκευμένη αναζήτηση.';
+$messages['messagedeleted'] = 'Το μήνυμα(τα) διαγράφηκε επιτυχώς.';
+$messages['messagemoved'] = 'Το μήνυμα(τα) μετακινήθηκε επιτυχώς.';
+$messages['messagecopied'] = 'Το μήνυμα(τα) αντιγράφηκε επιτυχώς.';
+$messages['messagemarked'] = 'Το μήνημα(τα) σημάνθηκε επιτυχώς.';
 $messages['autocompletechars'] = 'Εισάγετε τουλάχιστον $min χαρακτήρες για αυτόματη συμπλήρωση.';
-$messages['autocompletemore'] = 'Περισσότερες ταιριάστες καταχωρήσεις βρέθηκαν. Πληκτρολογείστε περισσότερους χαρακτήρες.';
-$messages['namecannotbeempty'] = 'Το ονομα δεν μπορεί να είναι κενό.';
+$messages['autocompletemore'] = 'Βρέθηκαν περισσότερες καταχωρήσεις που ταιριάζουν. Παρακαλώ πληκτρολογήστε περισσότερους χαρακτήρες.';
+$messages['namecannotbeempty'] = 'Το όνομα δεν μπορεί να είναι κενό.';
 $messages['nametoolong'] = 'Το όνομα είναι πολύ μεγάλο.';
-$messages['folderupdated'] = 'Ο φάκελος ανανεωθηκε επιτυχώς.';
-$messages['foldercreated'] = 'Ο φάκελος δημιουργηθηκε επιτυχώς.';
-$messages['invalidimageformat'] = 'Μη έγκυρη μορφή εικόνας. ';
-$messages['mispellingsfound'] = 'Ορθογραφικά λάθη εντοπίστηκαν στο μήνυμα. ';
-$messages['parentnotwritable'] = 'Δεν είναι δυνατή η δημιουργία/μετακινήση φάκελου σε επιλεγμένο φάκελο γονέα. Κανένα δικαίωμα πρόσβασης. ';
-$messages['messagetoobig'] = 'Το τμήμα μήνυματος είναι πολύ μεγάλο για επεξεργασια. ';
-$messages['attachmentvalidationerror'] = 'ΠΡΟΕΙΔΟΠΟΊΗΣΗ! Αυτή η κατάσχεση είναι ύποπτη, επειδή ο τύπος δεν ταιριάζει με τον τύπο που δηλώνεται στο μήνυμα. Εάν δεν εμπιστεύεστε τον αποστολέα, δεν θα πρέπει να το ανοίγετε στο πρόγραμμα περιήγησης επειδή μπορεί να περιέχει κακόβουλο περιεχόμενο.<br/><br/><em>Expected: $expected; found: $detected</em> ';
-$messages['noscriptwarning'] = 'Προειδοποίηση : Αυτή η υπηρεσία webmail απαιτεί Javascript! Για να ΤΟ χρησιμοποιήσετε ενεργοποιήστε τΟ JavaScript στις ρυθμίσεις του browser σας. ';
+$messages['folderupdated'] = 'Ο φάκελος ανανεώθηκε επιτυχώς.';
+$messages['foldercreated'] = 'Ο φάκελος δημιουργήθηκε επιτυχώς.';
+$messages['invalidimageformat'] = 'Μη έγκυρη μορφή εικόνας.';
+$messages['mispellingsfound'] = 'Εντοπίστηκαν ορθογραφικά λάθη στο μήνυμα. ';
+$messages['parentnotwritable'] = 'Δεν είναι δυνατή η δημιουργία/μετακινήση φάκελου στον επιλεγμένο φάκελο γονέα. Δεν υπάρχει δικαίωμα πρόσβασης. ';
+$messages['messagetoobig'] = 'Το τμήμα μηνύματος είναι πολύ μεγάλο για επεξεργασία.';
+$messages['attachmentvalidationerror'] = 'ΠΡΟΕΙΔΟΠΟΊΗΣΗ! Αυτό το συνημμένο είναι ύποπτο, επειδή ο τύπος του δεν ταιριάζει με τον τύπο που δηλώνεται στο μήνυμα. Εάν δεν εμπιστεύεστε τον αποστολέα, δεν θα πρέπει να το ανοίξετε στο πρόγραμμα περιήγησης επειδή μπορεί να περιέχει κακόβουλο περιεχόμενο.<br/><br/><em>Αναμενόμενο: $expected, εντοπίστηκε: $detected</em> ';
+$messages['noscriptwarning'] = 'Προσοχή: Αυτή η υπηρεσία webmail απαιτεί Javascript! Για να την χρησιμοποιήσετε ενεργοποιήστε το JavaScript στις ρυθμίσεις του περιηγητή σας. ';
 ?>
diff --git a/program/localization/en_CA/messages.inc b/program/localization/en_CA/messages.inc
index 169c1c9b1..171e9afb3 100644
--- a/program/localization/en_CA/messages.inc
+++ b/program/localization/en_CA/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,6 @@ $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
 $messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
-$messages['mailboxempty'] = 'Mailbox is empty.';
 $messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Loading...';
 $messages['uploading'] = 'Uploading file...';
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index 17e3f1719..a1d8b3779 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -28,7 +28,6 @@ $messages['errornoperm'] = 'Ne povis fari agon. Ne havas permeson.';
 $messages['invalidrequest'] = 'Nevalida peto';
 $messages['nomessagesfound'] = 'Neniu mesaĝo en ĉi tiu dosierujo';
 $messages['loggedout'] = 'Vi sukcese finis la seancon. Ĝis!';
-$messages['mailboxempty'] = 'Dosierujo estas malplena';
 $messages['loading'] = 'Ŝarganta...';
 $messages['loadingdata'] = 'Ŝarganta datumojn...';
 $messages['checkingmail'] = 'Kontrolanta, ĉu  novaj mesaĝoj...';
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 1c442c189..6f1cd1cb5 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -30,7 +30,6 @@ $messages['invalidrequest'] = 'Peteción invalida! No se guardó nada.';
 $messages['invalidhost'] = 'Nombre de servidor inválido.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
 $messages['loggedout'] = 'Ha cerrado la sesión. ¡Hasta pronto!';
-$messages['mailboxempty'] = 'La casilla está vacía';
 $messages['refreshing'] = 'Actualizando...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Subiendo archivo...';
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 0d2c79b5a..07443d426 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,6 @@ $messages['invalidrequest'] = 'Lubamatu päring! Andmeid ei salvestatud.';
 $messages['invalidhost'] = 'Lubamatu serveri nimi.';
 $messages['nomessagesfound'] = 'Postkast paistab tühi olevat';
 $messages['loggedout'] = 'Sinu seanss on edukalt lõpetatud. Nägemiseni!';
-$messages['mailboxempty'] = 'Postkast on tühi';
 $messages['refreshing'] = 'Värskendamine…';
 $messages['loading'] = 'Laadin...';
 $messages['uploading'] = 'Laadin faili üles...';
diff --git a/program/localization/fa_AF/messages.inc b/program/localization/fa_AF/messages.inc
index 643a9f7db..10bd8f4fe 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -26,7 +26,6 @@ $messages['requesttimedout'] = 'عدم پاسخگویی در زمان مقرر';
 $messages['invalidhost'] = 'نام سرور نامعتبر است';
 $messages['nomessagesfound'] = 'هيچ پيغامی در اين صندوق پستي دريافت نه شد';
 $messages['loggedout'] = 'جلسه شما بصورت مکمل فسخ شده است  خدا حافظ';
-$messages['mailboxempty'] = 'صندوق پستي خالي است';
 $messages['refreshing'] = 'دوباره سازی....';
 $messages['loading'] = 'در حال بارگزاری...';
 $messages['uploading'] = 'در حال بارگزاری فایل...';
diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index 801e0ec5c..a6b978f6e 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -16,17 +16,17 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 $labels['welcome']   = 'به $product خوش آمدید';
-$labels['username']  = 'نام کاربری';
+$labels['username']  = 'نام‌کاربری';
 $labels['password']  = 'گذرواژه';
 $labels['server']    = 'سرور';
 $labels['login']     = 'ورود';
 $labels['logout']   = 'خروج';
-$labels['mail']     = 'نامه';
+$labels['mail']     = 'پست';
 $labels['settings'] = 'تنظیمات';
 $labels['addressbook'] = 'دفتر نشانی';
 $labels['inbox']  = 'صندوق ورودی';
 $labels['drafts'] = 'پیش‌نویس‌ها';
-$labels['sent']   = 'فرستاده شده';
+$labels['sent']   = 'ارسال شده';
 $labels['trash']  = 'زباله‌دان';
 $labels['junk']   = 'بنجل';
 $labels['show_real_foldernames'] = 'نمایش نام واقعی برای پوشه‌های ویژه';
@@ -45,8 +45,8 @@ $labels['organization'] = 'سازمان';
 $labels['readstatus'] = 'وضعیت خوانده شدن';
 $labels['listoptions'] = 'فهرست گزینه‌ها...';
 $labels['mailboxlist'] = 'پوشه‌ها';
-$labels['messagesfromto'] = 'پیغام‌ها $from تا $to از $count';
-$labels['threadsfromto'] = 'رشته‌ها $from تا $to از $count';
+$labels['messagesfromto'] = 'پیغام‌های $from تا $to از $count';
+$labels['threadsfromto'] = 'رشته‌های $from تا $to از $count';
 $labels['messagenrof'] = 'پیغام $nr از $count';
 $labels['fromtoshort'] = '$from - $to از $count';
 $labels['copy']     = 'رونوشت';
@@ -72,7 +72,7 @@ $labels['monday']    = 'دوشنبه';
 $labels['tuesday']   = 'سه‌شنبه';
 $labels['wednesday'] = 'چهارشنبه';
 $labels['thursday']  = 'پنج‌شنبه';
-$labels['friday']    = 'آدینه';
+$labels['friday']    = 'جمعه';
 $labels['saturday']  = 'شنبه';
 $labels['jan']	= 'ژان';
 $labels['feb']	= 'فور';
@@ -90,7 +90,7 @@ $labels['longjan']	= 'ژانویه';
 $labels['longfeb']	= 'فوریه';
 $labels['longmar']	= 'مارس';
 $labels['longapr']	= 'آوریل';
-$labels['longmay']	= 'مه';
+$labels['longmay']	= 'می';
 $labels['longjun']	= 'ژوئن';
 $labels['longjul']	= 'جولای';
 $labels['longaug']	= 'آگوست';
@@ -99,34 +99,34 @@ $labels['longoct']	= 'اکتبر';
 $labels['longnov']	= 'نوامبر';
 $labels['longdec']	= 'دسامبر';
 $labels['today'] = 'امروز';
-$labels['refresh']          = 'بازخوانی';
-$labels['checkmail']        = 'بررسی پیغام‌های جدید';
-$labels['compose']          = 'نوشتن';
+$labels['refresh']          = 'نوسازی';
+$labels['checkmail']        = 'بررسی برای پیغام‌های جدید';
+$labels['compose']          = 'نوشتن پیغام';
 $labels['writenewmessage']  = 'ایجاد پیغام جدید';
 $labels['reply']            = 'پاسخ';
 $labels['replytomessage']   = 'پاسخ به فرستنده';
 $labels['replytoallmessage'] = 'پاسخ به فهرست یا به فرستنده و تمام گیرنده‌ها';
 $labels['replyall']         = 'پاسخ به همه';
 $labels['replylist']        = 'پاسخ به فهرست';
-$labels['forward']          = 'باز ارسال';
-$labels['forwardinline']    = 'باز ارسال خطی';
-$labels['forwardattachment'] = 'باز ارسال به صورت پیوست';
-$labels['forwardmessage']   = 'باز ارسال پیغام';
+$labels['forward']          = 'ارجاع';
+$labels['forwardinline']    = 'ارجاع خطی';
+$labels['forwardattachment'] = 'ارجاع به صورت پیوست';
+$labels['forwardmessage']   = 'ارجاع پیغام';
 $labels['deletemessage']    = 'حذف پیغام';
 $labels['movemessagetotrash'] = 'انتقال پیغام به زباله‌دان';
 $labels['printmessage']     = 'چاپ این پیغام';
 $labels['previousmessage']  = 'نمایش پیغام قبلی';
-$labels['firstmessage']     = 'نمایش اولین  پیغام';
+$labels['firstmessage']     = 'نمایش پیغام اول';
 $labels['nextmessage']      = 'نمایش پیغام بعدی';
-$labels['lastmessage']      = 'نمایش آخرین پیغام';
+$labels['lastmessage']      = 'نمایش پیغام آخر';
 $labels['backtolist']       = 'بازگشت به فهرست پیغام';
 $labels['viewsource']       = 'نمایش منبع';
 $labels['mark']             = 'نشانه‌گذاری';
 $labels['markmessages']     = 'نشانه‌گذاری پیغام‌ها';
 $labels['markread']         = 'به عنوان خوانده‌شده';
 $labels['markunread']       = 'به عنوان خوانده‌نشده';
-$labels['markflagged']      = 'به عنوان نشانه‌گذاری شده';
-$labels['markunflagged']    = 'به عنوان نشانه‌گذاری نشده';
+$labels['markflagged']      = 'به عنوان پرچم‌دار';
+$labels['markunflagged']    = 'به عنوان بدون پرچم';
 $labels['moreactions']      = 'کارهای دیگر...';
 $labels['more']             = 'بيشتر';
 $labels['back']             = 'بازگشت';
@@ -185,7 +185,7 @@ $labels['changeformathtml'] = 'نمایش در قالب اچ‌تی‌ام‌ا�
 $labels['editasnew']      = 'ویرایش به عنوان جدید';
 $labels['send']           = 'ارسال';
 $labels['sendmessage']    = 'ارسال پیغام';
-$labels['savemessage']    = 'ذخیره به عنوان پیش‌نویس';
+$labels['savemessage']    = 'ذخیره پیش‌نویس';
 $labels['addattachment']  = 'پیوست کردن یک پرونده';
 $labels['charset']        = 'مجموعه‌نمایه';
 $labels['editortype']     = 'نوع ویرایش‌گر';
@@ -226,7 +226,7 @@ $labels['isdraft']    = 'این یک پیغام پیش‌نویس است.';
 $labels['andnmore']   = '$nr بیشتر...';
 $labels['togglemoreheaders'] = 'نمایش سربرگ‌های بیشتر پیغام';
 $labels['togglefullheaders'] = 'تعویض سربرگ‌های پیغام خام';
-$labels['htmltoggle'] = 'HTML';
+$labels['htmltoggle'] = 'اچ‌تی‌ام‌ال';
 $labels['plaintoggle'] = 'متن ساده';
 $labels['savesentmessagein'] = 'ذخیره پیغام ارسالی در';
 $labels['dontsave'] = 'ذخیره نکن';
@@ -250,7 +250,7 @@ $labels['jobtitle']     = 'عنوان شغل';
 $labels['department']   = 'بخش';
 $labels['gender']       = 'جنسیت';
 $labels['maidenname']   = 'نام خانوادگی زن قبل از ازدواج';
-$labels['email']        = 'پست‌الکترونیکی';
+$labels['email']        = 'پست‌الکترونیک';
 $labels['phone']        = 'تلفن';
 $labels['address']      = 'نشانی';
 $labels['street']       = 'خیابان';
@@ -273,7 +273,7 @@ $labels['search'] = 'جستجو';
 $labels['advsearch'] = 'جستجوی پیشرفته';
 $labels['advanced'] = 'پیشرفته';
 $labels['other'] = 'سایر';
-$labels['typehome']   = 'منزل';
+$labels['typehome']   = 'خانه';
 $labels['typework']   = 'کار';
 $labels['typeother']  = 'سایر';
 $labels['typemobile']  = 'تلفن همراه';
@@ -303,7 +303,7 @@ $labels['replacephoto'] = 'جایگزینی';
 $labels['uploadphoto'] = 'بارگذاری تصویر';
 $labels['newcontact']     = 'ایجاد کارت تماس جدید';
 $labels['deletecontact']  = 'حذف تماس‌های انتخاب شده';
-$labels['composeto']      = 'نوشتن پیغام به';
+$labels['composeto']      = 'نوشتن پست به';
 $labels['contactsfromto'] = 'تماس‌های $from تا $to از $count';
 $labels['print']          = 'چاپ';
 $labels['export']         = 'صدور';
@@ -365,14 +365,14 @@ $labels['htmleditor'] = 'HTML ‌نوشتن پیغام‌های';
 $labels['htmlonreply'] = 'فقط در پاسخ به پیغام HTML';
 $labels['htmlonreplyandforward'] = 'در بازگردانی یا پاسخ به پیغام‌های HTML';
 $labels['htmlsignature'] = 'HTML امضای';
-$labels['showemail'] = 'نمایش آدرس ایمیل با نام نمایشی';
+$labels['showemail'] = 'نمایش آدرس پست الکترونیک با نام نمایشی';
 $labels['previewpane'] = 'نمایش قاب پیش‌نمایش';
 $labels['skin'] = 'پوسته ظاهری';
 $labels['logoutclear'] = 'تمیز کردن زباله دان هنگام برون‌رفت';
 $labels['logoutcompact'] = 'فشرده‌سازی صندوق در هنگام خروچ';
 $labels['uisettings'] = 'محیط کاربری';
 $labels['serversettings'] = 'تنظیمات سرور';
-$labels['mailboxview'] = 'نمایش صندوق‌پستی';
+$labels['mailboxview'] = 'دیدن صندوق‌پستی';
 $labels['mdnrequests'] = 'تاییدهای فرستنده';
 $labels['askuser'] = 'پرسش از کاربر';
 $labels['autosend'] = 'ارسال رسید';
diff --git a/program/localization/fo_FO/labels.inc b/program/localization/fo_FO/labels.inc
index 5ac452adb..f44854a96 100644
--- a/program/localization/fo_FO/labels.inc
+++ b/program/localization/fo_FO/labels.inc
@@ -29,6 +29,7 @@ $labels['drafts'] = 'Skitsur';
 $labels['sent']   = 'Sent';
 $labels['trash']  = 'Skrell';
 $labels['junk']   = 'Møsn';
+$labels['show_real_foldernames'] = 'Vís verulig nøvn til serligar mappur';
 $labels['subject'] = 'Evni';
 $labels['from']    = 'Frá';
 $labels['sender']  = 'Sendari';
@@ -51,7 +52,9 @@ $labels['fromtoshort'] = '$from - $to ið eru $count';
 $labels['copy']     = 'Avrita';
 $labels['move']     = 'Flyt';
 $labels['moveto']   = 'Flyt til...';
+$labels['copyto']   = 'Avrita til...';
 $labels['download'] = 'Heinta';
+$labels['open']     = 'Opna';
 $labels['showattachment'] = 'Vís';
 $labels['showanyway'] = 'Vís tað avlíkavæl';
 $labels['filename'] = 'Fílu navn';
@@ -135,6 +138,7 @@ $labels['currpage'] = 'Hesa síðu';
 $labels['unread'] = 'Ólisið';
 $labels['flagged'] = 'Viðmerkt';
 $labels['unanswered'] = 'Ikki svara';
+$labels['withattachment'] = 'Við viðhefting';
 $labels['deleted'] = 'Strika';
 $labels['undeleted'] = 'Ikki strika';
 $labels['invert'] = 'Vend við';
@@ -159,9 +163,11 @@ $labels['desc'] = 'lækkandi';
 $labels['listcolumns'] = 'List teigar';
 $labels['listsorting'] = 'Sorterar teiga';
 $labels['listorder'] = 'Sorterar rekkjufylgju';
+$labels['listmode'] = 'Lista vísing';
 $labels['folderactions'] = 'Mappu gerir...';
 $labels['compact'] = 'Trýst saman';
 $labels['empty'] = 'Tøm';
+$labels['importmessages'] = 'Innflyt boð';
 $labels['quota'] = 'Disk nýtsla';
 $labels['unknown']  = 'ókent';
 $labels['unlimited']  = 'óavmarka';
@@ -169,8 +175,13 @@ $labels['quicksearch']  = 'Skjót leiting';
 $labels['resetsearch']  = 'Nulstilla leiting';
 $labels['searchmod']  = 'Leiti minkarir';
 $labels['msgtext']  = 'Øll boðini';
+$labels['body']  = 'Kroppur';
+$labels['type'] = 'Slag';
+$labels['namex'] = 'Navn';
 $labels['openinextwin'] = 'Opna í nýggjum vindeyga';
 $labels['emlsave'] = 'Heinta (.eml)';
+$labels['changeformattext'] = 'Vís í reinun teksti formati';
+$labels['changeformathtml'] = 'Vís í HTML formati';
 $labels['editasnew']      = 'Broyt sum nýtt';
 $labels['send']           = 'Send';
 $labels['sendmessage']    = 'Send boð';
@@ -187,6 +198,16 @@ $labels['spellcheck']    = 'Stava';
 $labels['checkspelling'] = 'Kanna staving';
 $labels['resumeediting'] = 'Taka uppaftur skriving';
 $labels['revertto']      = 'Vend aftur til';
+$labels['restore'] = 'Endurstovna';
+$labels['restoremessage'] = 'Endurstovna boð?';
+$labels['responses'] = 'Svør';
+$labels['insertresponse'] = 'Innset eitt svar';
+$labels['manageresponses'] = 'Umsit svør';
+$labels['savenewresponse'] = 'Goym nýtt svar';
+$labels['editresponses'] = 'Broyt svør';
+$labels['editresponse'] = 'Broyt svar';
+$labels['responsename'] = 'Navn';
+$labels['responsetext'] = 'Svar tekstur';
 $labels['attach'] = 'Viðheft';
 $labels['attachments'] = 'Viðheftingar';
 $labels['upload'] = 'Uppsend';
@@ -217,6 +238,8 @@ $labels['addfollowupto'] = 'Legg aftrat Fylg við-til';
 $labels['mdnrequest'] = 'Sendarin av hesi boð biður um at verða kunngjørdur tá ið tú lesur hesið boð. Vilt tú kunngerða sendaran?';
 $labels['receiptread'] = 'Svara móttakara (les)';
 $labels['yourmessage'] = 'Hetta er ein afturvend kvittan av tíni boð';
+$labels['receiptnote'] = 'Gevið gætur: Hendan kvittan vísir einans á um boðini vóru sýnd á teldu mótakarans. Har er eingin trygging fyri at móttakarin hevur lisið ella skilt tað ið er í boðunum';
+$labels['name']         = 'Fult navn';
 $labels['firstname']    = 'Fornavn';
 $labels['surname']      = 'Eftirnavn';
 $labels['middlename']   = 'Millunnavn';
@@ -284,6 +307,8 @@ $labels['composeto']      = 'Skriva boð til';
 $labels['contactsfromto'] = 'Persónar frá $from til $to ið eru $count';
 $labels['print']          = 'Skriva út';
 $labels['export']         = 'Flyt út';
+$labels['exportall']      = 'Flyt út alt';
+$labels['exportsel']      = 'Flyt út valt';
 $labels['exportvcards']   = 'Út flyt persónar við vCard slagið';
 $labels['newcontactgroup'] = 'Ger nýggja persóns bólk';
 $labels['grouprename']    = 'Umdoyp bólk';
@@ -295,13 +320,18 @@ $labels['nextpage']       = 'Vís næstu síðu';
 $labels['lastpage']       = 'Vís seinastu síðu';
 $labels['group'] = 'Bólkur';
 $labels['groups'] = 'Bólkar';
+$labels['listgroup'] = 'Vís bólka limir';
 $labels['personaladrbook'] = 'Persónligir búðstaðir';
 $labels['searchsave'] = 'Goym leiting';
 $labels['searchdelete'] = 'Strika leiting';
 $labels['import'] = 'Innflyt';
 $labels['importcontacts'] = 'Innflyt persónar';
 $labels['importfromfile'] = 'Innflyt frá fílu';
+$labels['importtarget'] = 'Legg persón til';
 $labels['importreplace'] = 'Skift út alt búðstaðarsavni';
+$labels['importgroups'] = 'Innflyt bólka ásetan';
+$labels['importgroupsall'] = 'Øll (stovna bólkar um neyðugt)';
+$labels['importgroupsexisting'] = 'Einans fyri bólkar ið longu eru til';
 $labels['importdesc'] = 'Tú kanst uppsenda persónar frá einari aðrari búðstaðar bók.<br/>Vit veita vit møguleika at innflyta búðstaðir frá<a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ella CSV (komma uppdeilt) dáta slag.';
 $labels['done'] = 'Liðugt';
 $labels['settingsfor'] = 'Stillingar til';
@@ -317,6 +347,8 @@ $labels['edititem'] = 'Broyt ting';
 $labels['preferhtml'] = 'Vís HTML';
 $labels['defaultcharset'] = 'Sjálvset tekin set';
 $labels['htmlmessage'] = 'HTML boð';
+$labels['messagepart'] = 'Deilur';
+$labels['digitalsig'] = 'Dalgylt Undirskrift';
 $labels['dateformat'] = 'Dato format';
 $labels['timeformat'] = 'Tíðs format';
 $labels['prettydate'] = 'Pen dato';
@@ -333,6 +365,7 @@ $labels['htmleditor'] = 'Stovna HTML boð';
 $labels['htmlonreply'] = 'til svar til HTML boð';
 $labels['htmlonreplyandforward'] = 'til víðari sending ella svar til HTML boð';
 $labels['htmlsignature'] = 'HTML undirskrift';
+$labels['showemail'] = 'Vís teldupostar búðstað við fullum navni';
 $labels['previewpane'] = 'Vís undansýningar rút';
 $labels['skin'] = 'Markamóts skinn';
 $labels['logoutclear'] = 'Strika Skrell tá ið tú út ritar';
@@ -391,4 +424,74 @@ $labels['previewpanemarkread']  = 'Merk undansýnd boð sum lisin';
 $labels['afternseconds']  = 'eftir $n sekund';
 $labels['reqmdn'] = 'Bið altíð um eina kvittan';
 $labels['reqdsn'] = 'Bið altíð um status kunngerð';
+$labels['replysamefolder'] = 'Koyr svar í somu mappuna ið boðini komu frá';
+$labels['defaultabook'] = 'Sjálvset búðstaðar bók';
+$labels['autocompletesingle'] = 'Leyp um aðrar teldupost búðstaðar í sjálvirkandi skrivingini';
+$labels['listnamedisplay'] = 'Vís persónar sum ';
+$labels['spellcheckbeforesend'] = 'Kannað stavuvillur áðrenn boðini verða send';
+$labels['spellcheckoptions'] = 'Stavuvilli kanningar vælmøguleikar';
+$labels['spellcheckignoresyms'] = 'Leyp um orð við teknum';
+$labels['spellcheckignorenums'] = 'Leyp um orð við tølum';
+$labels['spellcheckignorecaps'] = 'Leyp um øll orð við øll bókstavum í stórum';
+$labels['addtodict'] = 'Legg aftrat orðabók';
+$labels['mailtoprotohandler'] = 'Skráset samskiftisreglur handfara til mailto: leinki';
+$labels['standardwindows'] = 'Handfar upplatingarvindeygu sum vanlig vindeygu';
+$labels['forwardmode'] = 'Víðarsending av boðum';
+$labels['inline'] = 'innanreglis';
+$labels['asattachment'] = 'sum viðhefting';
+$labels['replyallmode'] = 'Sjálvset gerð til [Reply all] knap';
+$labels['replyalldefault'] = 'Svara øllum';
+$labels['replyalllist'] = 'svara til teldupostalista einans (um funnin)';
+$labels['folder']  = 'Mappa';
+$labels['folders']  = 'Mappur';
+$labels['foldername']  = 'Mappu navn';
+$labels['subscribed']  = 'Teknaður til';
+$labels['messagecount'] = 'Boð';
+$labels['create']  = 'Stovna';
+$labels['createfolder']  = 'Stovna nýggja mappu';
+$labels['managefolders']  = 'Umsit mappur';
+$labels['specialfolders'] = 'Serligar Mappur';
+$labels['properties'] = 'Vælmøguleikar';
+$labels['folderproperties'] = 'Mappu vælmøguleikar';
+$labels['parentfolder'] = 'Foreldra mappu';
+$labels['location'] = 'Stað';
+$labels['info'] = 'Upplýsing';
+$labels['getfoldersize'] = 'Trýst fyri at seta mappu stødd';
+$labels['changesubscription'] = 'Trýst fyri at broyta tekning';
+$labels['foldertype'] = 'Mappu slag';
+$labels['personalfolder']  = 'Einskild Mappa';
+$labels['otherfolder']  = 'Mappur hjá ørðum brúkarum';
+$labels['sharedfolder']  = 'Almennar mappur';
+$labels['sortby'] = 'Sortera eftir';
+$labels['sortasc']  = 'Sortera hækkandi';
+$labels['sortdesc'] = 'Sortera lækkandi';
+$labels['undo'] = 'Angra';
+$labels['installedplugins'] = 'Innløgd ískoyti';
+$labels['plugin'] = 'Ískoyti';
+$labels['version'] = 'Útgáva';
+$labels['source'] = 'Kelda';
+$labels['license'] = 'Heimildarskjal';
+$labels['support'] = 'Fá hjálp';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Eingilst';
+$labels['westerneuropean'] = 'Vestur Evoropeist';
+$labels['easterneuropean'] = 'Estur Everopeist';
+$labels['southeasterneuropean'] = 'Útsynnings Everopeist';
+$labels['baltic'] = 'Eystursjógvurin';
+$labels['cyrillic'] = 'Cyrillic';
+$labels['arabic'] = 'Arabist';
+$labels['greek'] = 'Grekst';
+$labels['hebrew'] = 'Hebraiskt';
+$labels['turkish'] = 'Turkist';
+$labels['nordic'] = 'Norðurlengst';
+$labels['thai'] = 'Tailenskt';
+$labels['celtic'] = 'Keltiskt';
+$labels['vietnamese'] = 'Vietmanesiskt';
+$labels['japanese'] = 'Japanskt';
+$labels['korean'] = 'Koreanskt';
+$labels['chinese'] = 'Kinesiskt';
 ?>
diff --git a/program/localization/fo_FO/messages.inc b/program/localization/fo_FO/messages.inc
index be54b71d2..7bec7c974 100644
--- a/program/localization/fo_FO/messages.inc
+++ b/program/localization/fo_FO/messages.inc
@@ -32,6 +32,8 @@ $messages['invalidrequest'] = 'Ógyldig umbøn! Einki dáta varð goymt.';
 $messages['invalidhost'] = 'Ógyldigt ambatara navn.';
 $messages['nomessagesfound'] = 'Eingi boð í funnin hesum postkassa,';
 $messages['loggedout'] = 'Tú hevur strika tína setu. Farvæl!';
+$messages['mailboxempty'] = 'Postkassi er tómur';
+$messages['nomessages'] = 'Eingin boð';
 $messages['refreshing'] = 'Endur-innlesur...';
 $messages['loading'] = 'Innlesur...';
 $messages['uploading'] = 'Leggur fílu út...';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 023b7f415..41e642875 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -16,7 +16,7 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 $labels['welcome']   = 'Bienvenue sur $product';
-$labels['username']  = 'Utilisateur';
+$labels['username']  = 'Nom d\'utilisateur';
 $labels['password']  = 'Mot de passe';
 $labels['server']    = 'Serveur';
 $labels['login']     = 'Connexion';
@@ -24,12 +24,12 @@ $labels['logout']   = 'Déconnexion';
 $labels['mail']     = 'Courriel';
 $labels['settings'] = 'Paramètres';
 $labels['addressbook'] = 'Carnet d\'adresses';
-$labels['inbox']  = 'Messages reçus';
+$labels['inbox']  = 'Boîte de réception';
 $labels['drafts'] = 'Brouillons';
-$labels['sent']   = 'Messages envoyés';
+$labels['sent']   = 'Envoyés';
 $labels['trash']  = 'Corbeille';
-$labels['junk']   = 'Indésirables';
-$labels['show_real_foldernames'] = 'Montrer les noms réels pour les dossiers spéciaux';
+$labels['junk']   = 'Pourriels';
+$labels['show_real_foldernames'] = 'Montrer les noms réels des dossiers spéciaux';
 $labels['subject'] = 'Objet';
 $labels['from']    = 'De';
 $labels['sender']  = 'Expéditeur';
@@ -42,11 +42,11 @@ $labels['date']    = 'Date';
 $labels['size']    = 'Taille';
 $labels['priority'] = 'Priorité';
 $labels['organization'] = 'Organisation';
-$labels['readstatus'] = 'Statut de lecture';
+$labels['readstatus'] = 'État de lecture';
 $labels['listoptions'] = 'Lister les options...';
 $labels['mailboxlist'] = 'Dossiers';
 $labels['messagesfromto'] = 'Messages de $from à $to sur $count';
-$labels['threadsfromto'] = 'Fil de $from à $to sur $count';
+$labels['threadsfromto'] = 'Fils de $from à $to sur $count';
 $labels['messagenrof'] = 'Message $nr sur $count';
 $labels['fromtoshort'] = '$from – $to de $count';
 $labels['copy']     = 'Copier';
@@ -99,154 +99,154 @@ $labels['longoct']	= 'Octobre';
 $labels['longnov']	= 'Novembre';
 $labels['longdec']	= 'Décembre';
 $labels['today'] = 'Aujourd\'hui';
-$labels['refresh']          = 'Actualiser';
-$labels['checkmail']        = 'Vérification des nouveaux messages';
-$labels['compose']          = 'Composer un nouveau message';
-$labels['writenewmessage']  = 'Écrire un nouveau message';
+$labels['refresh']          = 'Rafraîchir';
+$labels['checkmail']        = 'Vérifier les nouveaux messages';
+$labels['compose']          = 'Rédiger';
+$labels['writenewmessage']  = 'Créer un nouveau message';
 $labels['reply']            = 'Répondre';
 $labels['replytomessage']   = 'Répondre à l\'expéditeur';
-$labels['replytoallmessage'] = 'Répondre à tous';
+$labels['replytoallmessage'] = 'Répondre à la liste, ou à l\'expéditeur et à tous les destinataires';
 $labels['replyall']         = 'Répondre à tous';
 $labels['replylist']        = 'Répondre à la liste';
 $labels['forward']          = 'Transférer';
-$labels['forwardinline']    = 'Transférer dans le corps du message';
-$labels['forwardattachment'] = 'Transférer en pièce-jointe';
-$labels['forwardmessage']   = 'Transmettre le message';
+$labels['forwardinline']    = 'Transférer dans le message';
+$labels['forwardattachment'] = 'Transférer en fichier joint';
+$labels['forwardmessage']   = 'Transférer le message';
 $labels['deletemessage']    = 'Supprimer le message';
 $labels['movemessagetotrash'] = 'Déplacer le message dans la corbeille';
 $labels['printmessage']     = 'Imprimer ce message';
-$labels['previousmessage']  = 'Voir le message précédent';
-$labels['firstmessage']     = 'Voir le premier message';
-$labels['nextmessage']      = 'Voir le message suivant';
-$labels['lastmessage']      = 'Voir le dernier message';
+$labels['previousmessage']  = 'Afficher le message précédent';
+$labels['firstmessage']     = 'Afficher le premier message';
+$labels['nextmessage']      = 'Afficher le message suivant';
+$labels['lastmessage']      = 'Afficher le dernier message';
 $labels['backtolist']       = 'Retourner à la liste des messages';
-$labels['viewsource']       = 'Voir la source';
+$labels['viewsource']       = 'Afficher la source';
 $labels['mark']             = 'Marquer';
 $labels['markmessages']     = 'Marquer les messages';
-$labels['markread']         = 'Comme lu(s)';
-$labels['markunread']       = 'Comme non lu(s)';
-$labels['markflagged']      = 'Comme suivi(s)';
-$labels['markunflagged']    = 'Comme non-suivi(s)';
+$labels['markread']         = 'Comme lu';
+$labels['markunread']       = 'Comme non lu';
+$labels['markflagged']      = 'Comme signalé';
+$labels['markunflagged']    = 'Comme non signalé';
 $labels['moreactions']      = 'Plus d\'actions...';
 $labels['more']             = 'Plus';
 $labels['back']             = 'Retour';
-$labels['options']          = 'Paramètres';
-$labels['select'] = 'Sélectionner';
+$labels['options']          = 'Options';
+$labels['select'] = 'Choisir';
 $labels['all'] = 'Tous';
 $labels['none'] = 'Aucun';
 $labels['currpage'] = 'Page courante';
-$labels['unread'] = 'Non lu(s)';
-$labels['flagged'] = 'Marqué(s)';
-$labels['unanswered'] = 'Non répondu(s)';
-$labels['withattachment'] = 'Avec pièce jointe';
-$labels['deleted'] = 'Supprimé(s)';
-$labels['undeleted'] = 'Non supprimé(s)';
+$labels['unread'] = 'Non lu';
+$labels['flagged'] = 'Signalé';
+$labels['unanswered'] = 'Non répondu';
+$labels['withattachment'] = 'Avec fichier joint';
+$labels['deleted'] = 'Supprimé';
+$labels['undeleted'] = 'Non supprimé';
 $labels['invert'] = 'Inverser';
-$labels['filter'] = 'Filtre';
+$labels['filter'] = 'Filtrer';
 $labels['list'] = 'Lister';
 $labels['threads'] = 'Sujets';
 $labels['expand-all'] = 'Tout afficher';
 $labels['expand-unread'] = 'Afficher non-lu(s)';
 $labels['collapse-all'] = 'Fermer tous';
-$labels['threaded'] = 'Par sujet';
-$labels['autoexpand_threads'] = 'Développer les sujets';
-$labels['do_expand'] = 'Tous les sujets';
-$labels['expand_only_unread'] = 'uniquement avec des messages non-lus';
-$labels['fromto'] = 'Expéditeur/Destinataire';
-$labels['flag'] = 'Drapeau';
-$labels['attachment'] = 'Pièce jointe';
+$labels['threaded'] = 'Par fil';
+$labels['autoexpand_threads'] = 'Développer les fils de message';
+$labels['do_expand'] = 'Tous les fils';
+$labels['expand_only_unread'] = 'seulement avec des messages non lus';
+$labels['fromto'] = 'De/à';
+$labels['flag'] = 'Signaler';
+$labels['attachment'] = 'Fichier joint';
 $labels['nonesort'] = 'Aucun';
 $labels['sentdate'] = 'Date d\'envoi';
 $labels['arrival'] = 'Date d\'arrivée';
-$labels['asc'] = 'Ascendant';
-$labels['desc'] = 'Descendant';
+$labels['asc'] = 'ascendant';
+$labels['desc'] = 'descendant';
 $labels['listcolumns'] = 'Lister les colonnes';
 $labels['listsorting'] = 'Colonne de tri';
 $labels['listorder'] = 'Ordre de tri';
-$labels['listmode'] = 'Mode d\'affichage de la liste';
+$labels['listmode'] = 'Mode d\'affichage en liste';
 $labels['folderactions'] = 'Actions du dossier...';
 $labels['compact'] = 'Compacter';
 $labels['empty'] = 'Vider';
 $labels['importmessages'] = 'Importer des messages';
-$labels['quota'] = 'Occupation disque';
+$labels['quota'] = 'Utilisation du disque';
 $labels['unknown']  = 'inconnue';
 $labels['unlimited']  = 'illimitée';
 $labels['quicksearch']  = 'Recherche rapide';
 $labels['resetsearch']  = 'Réinitialiser la recherche';
-$labels['searchmod']  = 'Portée de la recherche';
+$labels['searchmod']  = 'Modificateurs de recherche';
 $labels['msgtext']  = 'Message entier';
 $labels['body']  = 'Corps';
 $labels['type'] = 'Type';
 $labels['namex'] = 'Nom';
 $labels['openinextwin'] = 'Ouvrir dans une nouvelle fenêtre';
 $labels['emlsave'] = 'Télécharger (.eml)';
-$labels['changeformattext'] = 'Afficher au format texte';
+$labels['changeformattext'] = 'Afficher au format texte en clair';
 $labels['changeformathtml'] = 'Afficher au format HTML';
-$labels['editasnew']      = 'Éditer en tant que nouveau message';
+$labels['editasnew']      = 'Éditer comme nouveau';
 $labels['send']           = 'Envoyer';
 $labels['sendmessage']    = 'Envoyer un message';
-$labels['savemessage']    = 'Sauvegarder comme brouillon';
+$labels['savemessage']    = 'Enregistrer comme brouillon';
 $labels['addattachment']  = 'Joindre un fichier';
-$labels['charset']        = 'Encodage';
+$labels['charset']        = 'Jeu de caractères';
 $labels['editortype']     = 'Type d\'éditeur';
 $labels['returnreceipt']  = 'Accusé de réception';
 $labels['dsn']            = 'Notification d\'état de distribution';
 $labels['mailreplyintro'] = 'Le $date, $sender a écrit :';
 $labels['originalmessage'] = 'Message original';
-$labels['editidents']    = 'Modifier les identités';
+$labels['editidents']    = 'Éditer les identités';
 $labels['spellcheck']    = 'Orthographe';
-$labels['checkspelling'] = 'Vérifier l\'orthographe';
+$labels['checkspelling'] = 'Vérification de l\'orthographe';
 $labels['resumeediting'] = 'Retourner à l\'édition';
 $labels['revertto']      = 'Revenir à';
 $labels['restore'] = 'Restaurer';
-$labels['restoremessage'] = 'Restaurer le message ?';
+$labels['restoremessage'] = 'Restaurer le message?';
 $labels['responses'] = 'Réponses';
 $labels['insertresponse'] = 'Insérer une réponse';
 $labels['manageresponses'] = 'Gérer les réponses';
-$labels['savenewresponse'] = 'Sauvegarder une nouvelle réponse';
-$labels['editresponses'] = 'Editer les réponses';
-$labels['editresponse'] = 'Editer la réponse';
+$labels['savenewresponse'] = 'Enregistrer une nouvelle réponse';
+$labels['editresponses'] = 'Éditer les réponses';
+$labels['editresponse'] = 'Éditer la réponse';
 $labels['responsename'] = 'Nom';
 $labels['responsetext'] = 'Texte de la réponse';
 $labels['attach'] = 'Joindre';
 $labels['attachments'] = 'Fichiers joints';
-$labels['upload'] = 'Transférer';
+$labels['upload'] = 'Téléverser';
 $labels['uploadprogress'] = '$percent ($current sur $total)';
 $labels['close']  = 'Fermer';
-$labels['messageoptions']  = 'Options du message';
+$labels['messageoptions']  = 'Options du message...';
 $labels['low']     = 'Basse';
 $labels['lowest']  = 'La plus basse';
 $labels['normal']  = 'Normale';
 $labels['high']    = 'Élevée';
 $labels['highest'] = 'La plus élevée';
-$labels['nosubject']  = '(pas de sujet)';
+$labels['nosubject']  = '(pas d\'objet)';
 $labels['showimages'] = 'Afficher les images';
 $labels['alwaysshow'] = 'Toujours afficher les images de $sender';
 $labels['isdraft']    = 'Ceci est un brouillon.';
-$labels['andnmore']   = 'Plus de $nr...';
-$labels['togglemoreheaders'] = 'Afficher plus d\'en-têtes du message';
-$labels['togglefullheaders'] = 'Afficher/Cacher l\'entête du message';
+$labels['andnmore']   = '$nr de plus...';
+$labels['togglemoreheaders'] = 'Afficher plus d\'en-têtes de messages';
+$labels['togglefullheaders'] = 'Afficher/masquer les en-têtes brutes de messages';
 $labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'Texte brut';
+$labels['plaintoggle'] = 'Texte en clair';
 $labels['savesentmessagein'] = 'Enregistrer le message envoyé dans';
 $labels['dontsave'] = 'ne pas enregistrer';
-$labels['maxuploadsize'] = 'La taille maximum autorisée pour un fichier est $size';
+$labels['maxuploadsize'] = 'La taille de fichier maximum autorisée est $size';
 $labels['addcc'] = 'Ajouter Cc';
 $labels['addbcc'] = 'Ajouter Cci';
 $labels['addreplyto'] = 'Ajouter Répondre à';
-$labels['addfollowupto'] = 'Ajouter Faire suivre à';
-$labels['mdnrequest'] = 'L\'expéditeur de ce message a demandé d\'être prévenu quand vous lirez ce message. Souhaitez-vous prévenir l\'expéditeur ?';
+$labels['addfollowupto'] = 'Ajouter Transférer à';
+$labels['mdnrequest'] = 'L\'expéditeur de ce message a demandé d\'être prévenu quand vous lirez ce message. Souhaitez-vous prévenir l\'expéditeur?';
 $labels['receiptread'] = 'Accusé de réception (lu)';
 $labels['yourmessage'] = 'Ceci est un accusé de réception pour votre message';
-$labels['receiptnote'] = 'Note : Cet accusé de réception indique seulement que le message a été affiché sur l\'ordinateur du destinataire. Il n\'y a aucune garantie que le destinataire ait lu ou compris le contenu du message.';
+$labels['receiptnote'] = 'Note : cet accusé indique seulement que le message a été affiché sur l\'ordinateur du destinataire. Il n\'y a aucune garantie que le destinataire ait lu ou compris le contenu du message.';
 $labels['name']         = 'Nom à afficher';
 $labels['firstname']    = 'Prénom';
-$labels['surname']      = 'Nom';
-$labels['middlename']   = 'Nom du milieu (US)';
+$labels['surname']      = 'Nom de famille';
+$labels['middlename']   = 'Second prénom';
 $labels['nameprefix']   = 'Préfixe';
 $labels['namesuffix']   = 'Suffixe';
 $labels['nickname']     = 'Surnom';
-$labels['jobtitle']     = 'Fonction';
+$labels['jobtitle']     = 'Appellation d\'emploi';
 $labels['department']   = 'Service';
 $labels['gender']       = 'Sexe';
 $labels['maidenname']   = 'Nom de jeune fille';
@@ -256,39 +256,39 @@ $labels['address']      = 'Adresse';
 $labels['street']       = 'Rue';
 $labels['locality']     = 'Ville';
 $labels['zipcode']      = 'Code postal';
-$labels['region']       = 'Région';
+$labels['region']       = 'État/province/région';
 $labels['country']      = 'Pays';
 $labels['birthday']     = 'Date de naissance';
 $labels['anniversary']  = 'Anniversaire';
 $labels['website']      = 'Site Web';
-$labels['instantmessenger'] = 'Messagerie instantanée';
+$labels['instantmessenger'] = 'MI';
 $labels['notes'] = 'Notes';
-$labels['male']   = 'Homme';
-$labels['female'] = 'Femme';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistante';
-$labels['spouse'] = 'Épouse';
+$labels['male']   = 'homme';
+$labels['female'] = 'femme';
+$labels['manager'] = 'Gestionnaire';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Époux/épouse';
 $labels['allfields'] = 'Tous les champs';
-$labels['search'] = 'Rechercher';
+$labels['search'] = 'Recherche';
 $labels['advsearch'] = 'Recherche avancée';
 $labels['advanced'] = 'Détails';
 $labels['other'] = 'Autre';
 $labels['typehome']   = 'Domicile';
 $labels['typework']   = 'Travail';
 $labels['typeother']  = 'Autre';
-$labels['typemobile']  = 'Mobile';
+$labels['typemobile']  = 'Téléphone mobile';
 $labels['typemain']  = 'Principale';
 $labels['typehomefax']  = 'Fax personnel';
 $labels['typeworkfax']  = 'Fax professionnel';
 $labels['typecar']  = 'Voiture';
-$labels['typepager']  = 'Pager';
+$labels['typepager']  = 'Téléavertisseur';
 $labels['typevideo']  = 'Vidéo';
-$labels['typeassistant']  = 'Assistante';
-$labels['typehomepage']  = 'Accueil';
-$labels['typeblog'] = 'Blog';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Page d\'accueil';
+$labels['typeblog'] = 'Blogue';
 $labels['typeprofile'] = 'Profil';
 $labels['addfield'] = 'Ajouter un champ...';
-$labels['addcontact'] = 'Ajouter le contact sélectionné à votre carnet d\'adresses';
+$labels['addcontact'] = 'Ajouter comme nouveau contact';
 $labels['editcontact'] = 'Modifier le contact';
 $labels['contacts'] = 'Contacts';
 $labels['contactproperties'] = 'Propriétés du contact';
@@ -300,27 +300,27 @@ $labels['delete'] = 'Supprimer';
 $labels['rename'] = 'Renommer';
 $labels['addphoto'] = 'Ajouter';
 $labels['replacephoto'] = 'Remplacer';
-$labels['uploadphoto'] = 'Transférer une photo';
-$labels['newcontact']     = 'Créer un nouveau contact';
+$labels['uploadphoto'] = 'Téléverser une photo';
+$labels['newcontact']     = 'Créer une nouvelle carte de contact';
 $labels['deletecontact']  = 'Supprimer les contacts sélectionnés';
-$labels['composeto']      = 'Écrire un message à';
+$labels['composeto']      = 'Rédiger un message à';
 $labels['contactsfromto'] = 'Contacts de $from à $to sur $count';
 $labels['print']          = 'Imprimer';
 $labels['export']         = 'Exporter';
-$labels['exportall']      = 'Exporter tout';
+$labels['exportall']      = 'Tout exporter';
 $labels['exportsel']      = 'Exporter la sélection';
 $labels['exportvcards']   = 'Exporter les contacts au format vCard';
 $labels['newcontactgroup'] = 'Créer un nouveau groupe de contacts';
 $labels['grouprename']    = 'Renommer le groupe';
 $labels['groupdelete']    = 'Supprimer le groupe';
 $labels['groupremoveselected'] = 'Retirer les contacts sélectionnés du groupe';
-$labels['previouspage']   = 'Montrer page précédente';
-$labels['firstpage']      = 'Voir la première page';
-$labels['nextpage']       = 'Montrer page suivante';
-$labels['lastpage']       = 'Voir la dernière page';
+$labels['previouspage']   = 'Afficher page précédente';
+$labels['firstpage']      = 'Afficher la première page';
+$labels['nextpage']       = 'Afficher la page suivante';
+$labels['lastpage']       = 'Afficher la dernière page';
 $labels['group'] = 'Groupe';
 $labels['groups'] = 'Groupes';
-$labels['listgroup'] = 'Liste des membres du groupe';
+$labels['listgroup'] = 'Lister les membres du groupe';
 $labels['personaladrbook'] = 'Adresses personnelles';
 $labels['searchsave'] = 'Enregistrer la recherche';
 $labels['searchdelete'] = 'Supprimer la recherche';
@@ -329,13 +329,13 @@ $labels['importcontacts'] = 'Importer les contacts';
 $labels['importfromfile'] = 'Importer depuis un fichier :';
 $labels['importtarget'] = 'Ajouter les contacts à';
 $labels['importreplace'] = 'Remplacer le carnet d\'adresses entier';
-$labels['importgroups'] = 'Importer les affectations de groupe';
+$labels['importgroups'] = 'Importer les affectations de groupes';
 $labels['importgroupsall'] = 'Tous (créer les groupes si nécessaire)';
-$labels['importgroupsexisting'] = 'Uniquement pour les groupes existants';
-$labels['importdesc'] = 'Vous pouvez transférer des contacts à partir d\'un carnet d\'adresses existant.<br/>Nous supportons actuellement l\'importation d\'adresses à partir des format de données <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (champs séparés par une virgule).';
+$labels['importgroupsexisting'] = 'Seulement pour les groupes existants';
+$labels['importdesc'] = 'Vous pouvez téléverser des contacts à partir d\'un carnet d\'adresses existant.<br/>Nous prenons en charge présentement l\'importation d\'adresses à partir des format de données <a href="http://fr.wikipedia.org/wiki/VCard">vCard</a> ou CSV (séparé par une virgule).';
 $labels['done'] = 'Terminé';
 $labels['settingsfor'] = 'Paramètres pour';
-$labels['about'] = 'A propos';
+$labels['about'] = 'À propos de';
 $labels['preferences'] = 'Préférences';
 $labels['userpreferences'] = 'Préférences utilisateur';
 $labels['editpreferences'] = 'Modifier les préférences utilisateur';
@@ -345,103 +345,103 @@ $labels['newidentity'] = 'Nouvelle identité';
 $labels['newitem'] = 'Nouvel élément';
 $labels['edititem'] = 'Modifier l\'élément';
 $labels['preferhtml'] = 'Afficher en HTML';
-$labels['defaultcharset'] = 'Encodage par défaut';
+$labels['defaultcharset'] = 'Jeu de caractère par défaut';
 $labels['htmlmessage'] = 'Message en HTML';
 $labels['messagepart'] = 'Partie';
 $labels['digitalsig'] = 'Signature numérique';
 $labels['dateformat'] = 'Format de la date';
 $labels['timeformat'] = 'Format de l\'heure';
 $labels['prettydate'] = 'Affichage court des dates';
-$labels['setdefault']  = 'Paramètres par défaut';
+$labels['setdefault']  = 'Définir les paramètres par défaut';
 $labels['autodetect']  = 'Automatique';
 $labels['language']  = 'Langue';
 $labels['timezone']  = 'Fuseau horaire';
-$labels['pagesize']  = 'Nombre de lignes par page';
+$labels['pagesize']  = 'Lignes par page';
 $labels['signature'] = 'Signature';
-$labels['dstactive']  = 'Heure d\'été';
+$labels['dstactive']  = 'Heure avancée';
 $labels['showinextwin'] = 'Ouvrir le message dans une nouvelle fenêtre';
-$labels['composeextwin'] = 'Écrire dans une nouvelle fenêtre';
-$labels['htmleditor'] = 'Composer un message au format HTML';
-$labels['htmlonreply'] = 'en réponse aux messages HTML uniquement';
-$labels['htmlonreplyandforward'] = 'Transférer ou répondre au message HTML';
+$labels['composeextwin'] = 'Rédiger dans une nouvelle fenêtre';
+$labels['htmleditor'] = 'Rédiger un message au format HTML';
+$labels['htmlonreply'] = 'en réponse à un message en HTML';
+$labels['htmlonreplyandforward'] = 'lors d\'un transfert ou en réponse à un message en HTML';
 $labels['htmlsignature'] = 'Signature HTML';
-$labels['showemail'] = 'Montrer l\'adresse de courriel avec le nom complet';
+$labels['showemail'] = 'Montrer l\'adresse courriel avec le nom d\'affichage';
 $labels['previewpane'] = 'Afficher le panneau d\'aperçu';
-$labels['skin'] = 'Thème de l\'interface';
+$labels['skin'] = 'Habillage de l\'interface';
 $labels['logoutclear'] = 'Vider la corbeille à la déconnexion';
 $labels['logoutcompact'] = 'Compacter la boite de réception à la déconnexion';
 $labels['uisettings'] = 'Interface utilisateur';
 $labels['serversettings'] = 'Paramètres du serveur';
-$labels['mailboxview'] = 'Vue du courrier';
-$labels['mdnrequests'] = 'Notifications à l\'expéditeur';
-$labels['askuser'] = 'demander à l\'utilisateur';
-$labels['autosend'] = 'envoyer automatiquement';
-$labels['autosendknown'] = 'Envoyer un avis de réception uniquement à mes contacts';
-$labels['autosendknownignore'] = 'envoie un accusé à mes contacts, sinon ignorer';
+$labels['mailboxview'] = 'Affichage de la boîte de courrier';
+$labels['mdnrequests'] = 'À la demande d\'un accusé de réception';
+$labels['askuser'] = 'me demander';
+$labels['autosend'] = 'envoyer l\'accusé';
+$labels['autosendknown'] = 'envoyer un accusé de réception à mes contacts, autrement me demander';
+$labels['autosendknownignore'] = 'envoyer un accusé à mes contacts, sinon ignorer';
 $labels['ignore'] = 'ignorer';
 $labels['readwhendeleted'] = 'Marquer le message comme lu à la suppression';
-$labels['flagfordeletion'] = 'Mettre le drapeau de suppression au lieu de supprimer';
+$labels['flagfordeletion'] = 'Signaler le message pour la suppression au lieu de le supprimer';
 $labels['skipdeleted'] = 'Ne pas montrer les messages supprimés';
-$labels['deletealways'] = 'Lorsque le déplacement des messages à la corbeille échoue, supprimez-les';
+$labels['deletealways'] = 'Si le déplacement des messages à la corbeille échoue, les supprimer';
 $labels['deletejunk'] = 'Supprimer directement les pourriels';
-$labels['showremoteimages'] = 'Afficher les images distantes';
-$labels['fromknownsenders'] = 'venant d\'expéditeurs connus';
+$labels['showremoteimages'] = 'Afficher les images distantes des messages';
+$labels['fromknownsenders'] = 'provenant d\'expéditeurs connus';
 $labels['always'] = 'toujours';
-$labels['showinlineimages'] = 'Afficher les images attachées après le message';
-$labels['autosavedraft']  = 'Enregistrement automatique des brouillons';
+$labels['showinlineimages'] = 'Afficher les images jointes sous le message';
+$labels['autosavedraft']  = 'Enregistrer automatiquement le brouillon';
 $labels['everynminutes']  = 'toutes les $n minute(s)';
-$labels['refreshinterval']  = 'Rafraîchir (Vérifier les nouveaux messages, etc.)';
+$labels['refreshinterval']  = 'Rafraîchir (vérifier les nouveaux messages, etc...)';
 $labels['never']  = 'jamais';
 $labels['immediately']  = 'Immédiatement';
 $labels['messagesdisplaying'] = 'Affichage des messages';
-$labels['messagescomposition'] = 'Écriture des messages';
-$labels['mimeparamfolding'] = 'Nom du fichier attaché';
-$labels['2231folding'] = 'RFC 2231 complète (Thunderbird)';
+$labels['messagescomposition'] = 'Rédaction des messages';
+$labels['mimeparamfolding'] = 'Noms des fichiers joints';
+$labels['2231folding'] = 'RFC 2231 complet (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'RFC 2047 complète (autre)';
-$labels['force7bit'] = 'Encoder les caractères 8 bits au format MIME';
+$labels['2047folding'] = 'RFC 2047 complet (autre)';
+$labels['force7bit'] = 'Utiliser l\'encodage MIME pour les caractères 8 bits';
 $labels['advancedoptions'] = 'Options avancées';
-$labels['focusonnewmessage'] = 'Placer le focus sur la fenêtre quand un nouveau message arrive';
-$labels['checkallfolders'] = 'Vérifier tous les dossiers pour les nouveaux messages';
-$labels['displaynext'] = 'Après suppression/déplacement du message, afficher le message suivant';
+$labels['focusonnewmessage'] = 'Cibler la fenêtre du navigateur quand un nouveau message arrive';
+$labels['checkallfolders'] = 'Vérifier les nouveaux messages dans tous les dossiers';
+$labels['displaynext'] = 'Après avoir supprimé/déplacé un message, afficher le suivant';
 $labels['defaultfont'] = 'Police par défaut des messages en HTML';
 $labels['mainoptions'] = 'Options principales';
 $labels['browseroptions'] = 'Options du navigateur';
 $labels['section'] = 'Section';
 $labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'Nouveau Message';
-$labels['signatureoptions'] = 'Options pour la signature';
-$labels['whenreplying'] = 'En répondant';
-$labels['replyempty'] = 'Ne pas citer le message original';
-$labels['replytopposting'] = 'commencer le nouveau message au-dessus de l\'original';
-$labels['replybottomposting'] = 'commencer le nouveau message en-dessous de l\'original';
-$labels['replyremovesignature'] = 'Supprimer la signature d\'origine du message lors de la réponse';
-$labels['autoaddsignature'] = 'Ajouter la signature automatiquement';
-$labels['newmessageonly'] = 'nouveau message uniquement';
-$labels['replyandforwardonly'] = 'réponses et transferts uniquement';
+$labels['newmessage'] = 'Nouveau message';
+$labels['signatureoptions'] = 'Options de signature';
+$labels['whenreplying'] = 'Lors d\'une réponse';
+$labels['replyempty'] = 'ne pas citer le message original';
+$labels['replytopposting'] = 'commencer le nouveau message au-dessus de la citation';
+$labels['replybottomposting'] = 'commencer le nouveau message en-dessous de la citation';
+$labels['replyremovesignature'] = 'Lors de la réponse, supprimer la signature originale du message ';
+$labels['autoaddsignature'] = 'Ajouter automatiquement la signature';
+$labels['newmessageonly'] = 'nouveau message seulement';
+$labels['replyandforwardonly'] = 'réponses et transferts seulement';
 $labels['insertsignature'] = 'Insérer la signature';
 $labels['previewpanemarkread']  = 'Marquer les messages prévisualisés comme lus';
 $labels['afternseconds']  = 'après $n secondes';
-$labels['reqmdn'] = 'Toujours demander un avis de réception';
+$labels['reqmdn'] = 'Toujours demander un accusé de réception';
 $labels['reqdsn'] = 'Toujours demander une notification d\'état de distribution';
 $labels['replysamefolder'] = 'Placer les réponses dans le dossier du message auquel il est répondu';
 $labels['defaultabook'] = 'Carnet d\'adresses par défaut';
-$labels['autocompletesingle'] = 'Ne pas tenir compte des adresses de courriel alternatives dans l\'autoremplissage';
+$labels['autocompletesingle'] = 'Ignorer les adresses de courriel alternatives du remplissage automatique';
 $labels['listnamedisplay'] = 'Lister les contacts comme';
-$labels['spellcheckbeforesend'] = 'Vérifier l’orthographe avant l’envoi d’un message';
+$labels['spellcheckbeforesend'] = 'Vérifier l’orthographe avant d\'envoyer un message';
 $labels['spellcheckoptions'] = 'Options du vérificateur d\'orthographe';
 $labels['spellcheckignoresyms'] = 'Ignorer les mots avec des symboles';
 $labels['spellcheckignorenums'] = 'Ignorer les mots avec des nombres';
 $labels['spellcheckignorecaps'] = 'Ignorer les mots entièrement en majuscule';
 $labels['addtodict'] = 'Ajouter au dictionnaire';
 $labels['mailtoprotohandler'] = 'Enregistrer le gestionnaire de protocole pour les liens mailto:';
-$labels['standardwindows'] = 'Manipuler les menus surgissants comme des fenêtres standards';
+$labels['standardwindows'] = 'Considérer les fenêtres intempestives comme des fenêtres habituelles';
 $labels['forwardmode'] = 'Transfert des messages';
-$labels['inline'] = 'dans le corps';
-$labels['asattachment'] = 'en pièce jointe';
+$labels['inline'] = 'dans le message';
+$labels['asattachment'] = 'en fichier joint';
 $labels['replyallmode'] = 'Action par défaut du bouton [Répondre à tous]';
-$labels['replyalldefault'] = 'Répondre à tous';
-$labels['replyalllist'] = 'Répondre uniquement à la liste de diffusion (si trouvée)';
+$labels['replyalldefault'] = 'répondre à tous';
+$labels['replyalllist'] = 'répondre seulement à la liste de diffusion (si trouvée)';
 $labels['folder']  = 'Dossier';
 $labels['folders']  = 'Dossiers';
 $labels['foldername']  = 'Nom du dossier';
@@ -449,29 +449,29 @@ $labels['subscribed']  = 'Abonné';
 $labels['messagecount'] = 'Messages';
 $labels['create']  = 'Créer';
 $labels['createfolder']  = 'Créer un nouveau dossier';
-$labels['managefolders']  = 'Organiser les dossiers';
+$labels['managefolders']  = 'Gérer les dossiers';
 $labels['specialfolders'] = 'Dossiers spéciaux';
 $labels['properties'] = 'Propriétés';
 $labels['folderproperties'] = 'Propriétés du dossier';
 $labels['parentfolder'] = 'Dossier parent';
-$labels['location'] = 'Localisation';
-$labels['info'] = 'Information';
+$labels['location'] = 'Emplacement';
+$labels['info'] = 'Informations';
 $labels['getfoldersize'] = 'Cliquer pour obtenir la taille de dossier';
-$labels['changesubscription'] = 'Cliquer pour modifier l\'inscription';
-$labels['foldertype'] = 'Type de répertoire';
-$labels['personalfolder']  = 'Répertoire privé';
-$labels['otherfolder']  = 'Répertoire d\'autres utilisateurs';
-$labels['sharedfolder']  = 'Répertoire public';
+$labels['changesubscription'] = 'Cliquer pour modifier l\'abonnement';
+$labels['foldertype'] = 'Type de dossier';
+$labels['personalfolder']  = 'Dossier privé';
+$labels['otherfolder']  = 'Dossier d\'autres utilisateurs';
+$labels['sharedfolder']  = 'Dossier public';
 $labels['sortby'] = 'Trier par';
 $labels['sortasc']  = 'Tri ascendant';
 $labels['sortdesc'] = 'Tri descendant';
 $labels['undo'] = 'Annuler';
-$labels['installedplugins'] = 'Extensions installées';
-$labels['plugin'] = 'Plugin';
+$labels['installedplugins'] = 'Plugiciels installés';
+$labels['plugin'] = 'Plugiciel';
 $labels['version'] = 'Version';
 $labels['source'] = 'Source';
 $labels['license'] = 'Licence';
-$labels['support'] = 'Obtenir un support technique';
+$labels['support'] = 'Obtenir du soutien';
 $labels['B'] = 'o';
 $labels['KB'] = 'ko';
 $labels['MB'] = 'Mo';
@@ -480,15 +480,15 @@ $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Anglais';
 $labels['westerneuropean'] = 'Europe de l\'Ouest';
 $labels['easterneuropean'] = 'Europe de l\'Est';
-$labels['southeasterneuropean'] = 'Europe du Sud Est';
+$labels['southeasterneuropean'] = 'Europe du Sud-Est';
 $labels['baltic'] = 'Baltique';
 $labels['cyrillic'] = 'Cyrillique';
 $labels['arabic'] = 'Arabe';
 $labels['greek'] = 'Grec';
 $labels['hebrew'] = 'Hébreu';
-$labels['turkish'] = 'Turque';
+$labels['turkish'] = 'Turc';
 $labels['nordic'] = 'Nordique';
-$labels['thai'] = 'Thaïlandais';
+$labels['thai'] = 'Thaï';
 $labels['celtic'] = 'Celtique';
 $labels['vietnamese'] = 'Vietnamien';
 $labels['japanese'] = 'Japonais';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index fcf9eaf92..82d883c34 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -15,159 +15,163 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-$messages['errortitle']  = 'Une erreur est survenue !';
-$messages['loginfailed']  = 'L\'authentification a échoué.';
-$messages['cookiesdisabled'] = 'Votre navigateur n\'accepte pas les cookies.';
+$messages['errortitle']  = 'Une erreur est survenue!';
+$messages['loginfailed']  = 'La connexion a échoué.';
+$messages['cookiesdisabled'] = 'Votre navigateur n\'accepte pas les fichiers témoins.';
 $messages['sessionerror'] = 'Votre session est invalide ou a expiré.';
-$messages['storageerror'] = 'Erreur de connexion au serveur IMAP.';
-$messages['servererror'] = 'Erreur Serveur !';
-$messages['servererrormsg'] = 'Erreur du serveur : $msg';
-$messages['dberror'] = 'Erreur avec la base de données !';
+$messages['storageerror'] = 'Erreur de connexion au serveur de stockage.';
+$messages['servererror'] = 'Erreur de serveur!';
+$messages['servererrormsg'] = 'Erreur de serveur : $msg';
+$messages['dberror'] = 'Erreur de base de données!';
 $messages['requesttimedout'] = 'Délai de la requête expiré';
-$messages['errorreadonly'] = 'Impossible d\'effectuer cette opération. Le dossier est en lecture seule.';
-$messages['errornoperm'] = 'Impossible d\'effectuer cette opération. Permission refusée.';
-$messages['erroroverquota'] = 'Impossible d\'effectuer cette opération. Plus d\'espace libre.';
-$messages['erroroverquotadelete'] = 'Plus d\'espace libre. Utilisez SHIFT+DEL pour supprimer un message.';
-$messages['invalidrequest'] = 'Requête invalide ! Aucune donnée n\'a été sauvegardée.';
+$messages['errorreadonly'] = 'Impossible d\'effectuer l\'opération. Le dossier est en lecture seule.';
+$messages['errornoperm'] = 'Impossible d\'effectuer l\'opération. Permission refusée.';
+$messages['erroroverquota'] = 'Impossible d\'effectuer l\'opération. Aucun espace disque libre.';
+$messages['erroroverquotadelete'] = 'Aucun espace disque libre. Utiliser Maj+Suppr pour supprimer un message.';
+$messages['invalidrequest'] = 'Requête invalide! Aucune donnée n\'a été enregistrée.';
 $messages['invalidhost'] = 'Nom du serveur invalide.';
-$messages['nomessagesfound'] = 'Cette boîte aux lettres ne contient aucun message.';
-$messages['loggedout'] = 'Vous vous êtes correctement déconnecté. Au revoir !';
-$messages['mailboxempty'] = 'La boîte aux lettres est vide.';
-$messages['refreshing'] = 'Rafraîchissement en cours...';
-$messages['loading'] = 'Chargement en cours...';
-$messages['uploading'] = 'Transfert du fichier en cours...';
-$messages['uploadingmany'] = 'Transfert des fichiers en cours...';
-$messages['loadingdata'] = 'Chargement des données en cours...';
+$messages['nomessagesfound'] = 'Aucun message trouvé dans cette boîte de coourriel';
+$messages['loggedout'] = 'Vous avez correctement terminé cette session. Au revoir!';
+$messages['mailboxempty'] = 'La boîte de courriel est vide';
+$messages['nomessages'] = 'Aucun message';
+$messages['refreshing'] = 'Rafraîchissement...';
+$messages['loading'] = 'Chargement...';
+$messages['uploading'] = 'Téléversement du fichier...';
+$messages['uploadingmany'] = 'Téléversement des fichiers...';
+$messages['loadingdata'] = 'Chargement des données...';
 $messages['checkingmail'] = 'Vérification des nouveaux messages...';
-$messages['sendingmessage'] = 'Envoi du message en cours...';
-$messages['messagesent'] = 'Le message a bien été expédié.';
-$messages['savingmessage'] = 'Sauvegarde du message en cours...';
+$messages['sendingmessage'] = 'Envoi du message...';
+$messages['messagesent'] = 'Le message a été envoyé avec succès.';
+$messages['savingmessage'] = 'Enregistrement du message...';
 $messages['messagesaved'] = 'Message sauvegardé dans Brouillons.';
-$messages['successfullysaved'] = 'La sauvegarde a bien été effectuée.';
-$messages['addedsuccessfully'] = 'Le contact a bien été ajouté dans le carnet d\'adresses.';
-$messages['contactexists'] = 'Cette adresse courriel est utilisée par un autre contact.';
-$messages['contactnameexists'] = 'Il existe déjà un contact nommé ainsi.';
-$messages['blockedimages'] = 'Les images distantes sont bloquées pour protéger votre vie privée.';
-$messages['encryptedmessage'] = 'Désolé, ce message est chiffré et ne peut être affiché.';
-$messages['nocontactsfound'] = 'Aucun contact n\'a pu être trouvé.';
+$messages['successfullysaved'] = 'Enregistré avec succès.';
+$messages['savingresponse'] = 'Enregistrement du texte de réponse...';
+$messages['deleteresponseconfirm'] = 'Voulez-vous vraiment supprimer ce texte de réponse?';
+$messages['addedsuccessfully'] = 'Le contact a été ajouté avec succès au carnet d\'adresses.';
+$messages['contactexists'] = 'Un contact avec la même adresse courriel existe déjà.';
+$messages['contactnameexists'] = 'Un contact avec le même nom existe déjà.';
+$messages['blockedimages'] = 'Pour protéger votre confidentialité, les images distantes sont bloquées dans ce message.';
+$messages['encryptedmessage'] = 'Ce message est chiffré et ne peut pas être affiché. Désolé!';
+$messages['nocontactsfound'] = 'Aucun contact n\'a été trouvé.';
 $messages['contactnotfound'] = 'Le contact demandé n\'a pas été trouvé.';
-$messages['contactsearchonly'] = 'Entrez un ou plusieurs mots clés pour trouver des contacts.';
-$messages['sendingfailed'] = 'L\'envoi du message a échoué.';
-$messages['senttooquickly'] = 'Veuillez patienter $sec s. pour envoyer ce message.';
-$messages['errorsavingsent'] = 'Une erreur est apparue durant l\'enregistrement du message envoyé.';
-$messages['errorsaving'] = 'Une erreur est apparue durant l\'enregistrement.';
+$messages['contactsearchonly'] = 'Saisir des termes d\'interrogation pour trouver des contacts.';
+$messages['sendingfailed'] = 'Échec lors de l\'envoi du message.';
+$messages['senttooquickly'] = 'Veuillez patienter $sec s avant d\'envoyer ce message.';
+$messages['errorsavingsent'] = 'Une erreur est survenue durant l\'enregistrement du message envoyé.';
+$messages['errorsaving'] = 'Une erreur est survenue durant l\'enregistrement.';
 $messages['errormoving'] = 'Impossible de déplacer le(s) message(s).';
 $messages['errorcopying'] = 'Impossible de copier le(s) message(s).';
 $messages['errordeleting'] = 'Impossible de supprimer le(s) message(s).';
 $messages['errormarking'] = 'Impossible de marquer le(s) message(s).';
-$messages['deletecontactconfirm']  = 'Êtes-vous sûr de vouloir supprimer le(s) contact(s) sélectionné(s) ?';
-$messages['deletegroupconfirm']  = 'Êtes-vous sûr de vouloir supprimer le groupe sélectionné ?';
-$messages['deletemessagesconfirm'] = 'Êtes-vous sûr de vouloir supprimer le(s) message(s) sélectionné(s) ?';
-$messages['deletefolderconfirm']  = 'Êtes-vous sûr de vouloir supprimer ce dossier ?';
-$messages['purgefolderconfirm']  = 'Êtes-vous sûr de vouloir supprimer tous les messages de ce dossier ?';
-$messages['contactdeleting'] = 'Suppression de contact(s) en cours...';
+$messages['deletecontactconfirm']  = 'Vouiez-vous vraiment supprimer le(s) contact(s) sélectionné(s)?';
+$messages['deletegroupconfirm']  = 'Vouiez-vous vraiment supprimer le groupe sélectionné?';
+$messages['deletemessagesconfirm'] = 'Vouiez-vous vraiment supprimer le(s) message(s) sélectionné(s)?';
+$messages['deletefolderconfirm']  = 'Vouiez-vous vraiment supprimer ce dossier?';
+$messages['purgefolderconfirm']  = 'Vouiez-vous vraiment supprimer tous les messages dans ce dossier?';
+$messages['contactdeleting'] = 'Suppression des contacts...';
 $messages['groupdeleting'] = 'Suppression du groupe...';
 $messages['folderdeleting'] = 'Suppression du dossier...';
 $messages['foldermoving'] = 'Déplacement du dossier...';
-$messages['foldersubscribing'] = 'Inscription du dossier...';
-$messages['folderunsubscribing'] = 'Désinscription du dossier...';
+$messages['foldersubscribing'] = 'Abonnement au dossier...';
+$messages['folderunsubscribing'] = 'Désabonnement au dossier...';
 $messages['formincomplete'] = 'Le formulaire n\'a pas été entièrement rempli.';
-$messages['noemailwarning'] = 'Veuillez spécifier un courriel valide.';
-$messages['nonamewarning']  = 'Veuillez fournir un nom.';
-$messages['nopagesizewarning'] = 'Veuillez indiquer une taille de page.';
-$messages['nosenderwarning'] = 'Veuillez renseigner l\'adresse d\'expéditeur.';
-$messages['norecipientwarning'] = 'Veuillez ajouter au moins un destinataire.';
-$messages['nosubjectwarning']  = 'Le champ «Objet» est vide. Souhaitez-vous le renseigner maintenant ?';
-$messages['nobodywarning'] = 'Envoyer ce message sans texte ?';
-$messages['notsentwarning'] = 'Le message n\'a pas été envoyé. Voulez-vous abandonner ce message ?';
-$messages['noldapserver'] = 'Choisissez un serveur LDAP pour la recherche.';
-$messages['nosearchname'] = 'Entrez un nom de contact ou un courriel.';
-$messages['notuploadedwarning'] = 'Toutes les pièces jointes n\'ont pas encore été transférées. Veuillez patienter ou annuler cette opération.';
-$messages['searchsuccessful'] = '$nr message(s) trouvé(s).';
-$messages['contactsearchsuccessful'] = '$nr contact(s) trouvé(s).';
-$messages['searchnomatch'] = 'La recherche n\'a donné aucun résultat.';
-$messages['searching'] = 'Recherche en cours...';
-$messages['checking'] = 'Vérification en cours...';
+$messages['noemailwarning'] = 'Veuillez saisir une adresse courriel valide.';
+$messages['nonamewarning']  = 'Veuillez saisir un nom.';
+$messages['nopagesizewarning'] = 'Veuillez sasisir une taille de page.';
+$messages['nosenderwarning'] = 'Veuillez saisir l\'adresse courriel de l\'expéditeur.';
+$messages['norecipientwarning'] = 'Veuillez saisir au moins un destinataire.';
+$messages['nosubjectwarning']  = 'Le champ « Objet » est vide. Voudriez-vous le saisir maintenant?';
+$messages['nobodywarning'] = 'Envoyer ce message sans texte?';
+$messages['notsentwarning'] = 'Le message n\'a pas été envoyé. Voulez-vous abandonner ce message?';
+$messages['restoresavedcomposedata'] = 'Un message précédemment rédigé mais non envoyé a été trouvé.\n\nObjet : $subject\nEnregistré le : $date\n\nVoulez-vous restaurer ce message?';
+$messages['noldapserver'] = 'Veuillez choisir un serveur ldap à rechercher.';
+$messages['nosearchname'] = 'Veuillez saisir un nom de contact ou une adresse de courriel.';
+$messages['notuploadedwarning'] = 'Toutes les fichiers joints n\'ont pas encore été téléversés. Veuillez patienter ou annuler le téléversement.';
+$messages['searchsuccessful'] = '$nr messages trouvés.';
+$messages['contactsearchsuccessful'] = '$nr contacts trouvés.';
+$messages['searchnomatch'] = 'La recherche n\'a retourné aucune concordance.';
+$messages['searching'] = 'Recherche...';
+$messages['checking'] = 'Vérification...';
 $messages['nospellerrors'] = 'Aucune faute d\'orthographe trouvée.';
-$messages['folderdeleted'] = 'Le dossier a bien été effacé.';
-$messages['foldersubscribed'] = 'Le dossier a bien été inscrit.';
-$messages['folderunsubscribed'] = 'Le dossier a bien été désinscrit.';
-$messages['folderpurged'] = 'Le dossier a bien été vidé.';
-$messages['folderexpunged'] = 'Le dossier a bien été compacté.';
-$messages['deletedsuccessfully'] = 'Correctement supprimé(s).';
+$messages['folderdeleted'] = 'Le dossier a été effacé avec succès.';
+$messages['foldersubscribed'] = 'L\'abonnement au dossier a réussi.';
+$messages['folderunsubscribed'] = 'Le désabonnement au dossier a réussi.';
+$messages['folderpurged'] = 'Le dossier a été vidé avec succès.';
+$messages['folderexpunged'] = 'Le dossier a été compacté avec succès.';
+$messages['deletedsuccessfully'] = 'Supprimé avec succès.';
 $messages['converting'] = 'Suppression de la mise en forme...';
-$messages['messageopenerror'] = 'Impossible de charger le message depuis serveur.';
-$messages['fileuploaderror'] = 'Transfert du fichier échoué';
-$messages['filesizeerror'] = 'Le fichier transféré dépasse la taille maximale de $size.';
-$messages['copysuccess'] = '$nr contacts correctement copiés.';
-$messages['movesuccess'] = '$nr contacts correctement  déplacés.';
+$messages['messageopenerror'] = 'Impossible de charger le message depuis le serveur.';
+$messages['fileuploaderror'] = 'Échec lors du téléversement du fichier';
+$messages['filesizeerror'] = 'Le fichier téléversé dépasse la taille maximale de $size.';
+$messages['copysuccess'] = '$nr contacts copiés avec succès.';
+$messages['movesuccess'] = '$nr contacts déplacés avec succès.';
 $messages['copyerror'] = 'Aucun contact n\'a pu être copié.';
 $messages['moveerror'] = 'Aucun contact n\'a pu être déplacé.';
 $messages['sourceisreadonly'] = 'Cette source d\'adresse est en lecture seule.';
-$messages['errorsavingcontact'] = 'Impossible de sauvegarder l\'adresse du contact.';
-$messages['movingmessage'] = 'Message(s) en cours de déplacement...';
-$messages['copyingmessage'] = 'Message(s) en cours de copie...';
-$messages['copyingcontact'] = 'Contact(s) en cours de copie...';
-$messages['movingcontact'] = 'Contact(s) en cours de déplacement...';
-$messages['deletingmessage'] = 'Message(s) en cours de suppression...';
-$messages['markingmessage'] = 'Message(s) en cours de marquage...';
-$messages['addingmember'] = 'Contact(s) en cours d\'ajout dans le groupe...';
-$messages['removingmember'] = 'Contact(s) en cours de suppression du groupe...';
-$messages['receiptsent'] = 'L\'accusé de réception a bien été envoyé.';
-$messages['errorsendingreceipt'] = 'Impossible d\'envoyer l\'accusé de réception.';
-$messages['deleteidentityconfirm'] = 'Voulez vous vraiment supprimer cette identité ?';
-$messages['nodeletelastidentity'] = 'Vous ne pouvez pas effacer votre seule identité.';
+$messages['errorsavingcontact'] = 'Impossible de enregistrer l\'adresse du contact.';
+$messages['movingmessage'] = 'Déplacement des messages...';
+$messages['copyingmessage'] = 'Copie des messages...';
+$messages['copyingcontact'] = 'Copie des contacts...';
+$messages['movingcontact'] = 'Déplacement des contacts...';
+$messages['deletingmessage'] = 'Suppression des messages...';
+$messages['markingmessage'] = 'Marquage des messages...';
+$messages['addingmember'] = 'Ajout des contacts au groupe...';
+$messages['removingmember'] = 'Suppression des contacts du groupe...';
+$messages['receiptsent'] = 'L\'accusé de lecture a été avec succès.';
+$messages['errorsendingreceipt'] = 'Impossible d\'envoyer l\'accusé de lecture.';
+$messages['deleteidentityconfirm'] = 'Voulez-vous vraiment supprimer cette identité?';
+$messages['nodeletelastidentity'] = 'Vous ne pouvez pas effacer cette identité, c\'est votre dernière.';
 $messages['forbiddencharacter'] = 'Le nom du dossier contient un caractère interdit.';
-$messages['selectimportfile'] = 'Veuillez sélectionner un fichier à transférer.';
-$messages['addresswriterror'] = 'Impossible d\'écrire dans le carnet d\'adresse sélectionné.';
-$messages['contactaddedtogroup'] = 'Les contacts ont bien été ajoutés à ce groupe.';
-$messages['contactremovedfromgroup'] = 'Les contacts ont bien été supprimés de ce groupe.';
-$messages['nogroupassignmentschanged'] = 'Appartenance aux groupes inchangée.';
-$messages['importwait'] = 'Import en cours, veuillez patienter...';
-$messages['importformaterror'] = 'L\'import a échoué ! Le fichier transféré n\'est pas un fichier d\'import de données valide.';
-$messages['importconfirm'] = '<b>Les $inserted contacts ont bien été importés</b>';
-$messages['importconfirmskipped'] = '<b>$skipped entrée(s) déjà existante(s)</b>';
-$messages['importmessagesuccess'] = 'Importation de $nr messages avec succès';
-$messages['importmessageerror'] = 'L\'importation a échoué! Le fichier envoyé n\'est pas un message valide ou un fichier au format mailbox';
-$messages['opnotpermitted'] = 'Cette opération n\'est pas permise !';
-$messages['nofromaddress'] = 'Courriel manquant dans l\'identité sélectionnée.';
-$messages['editorwarning'] = 'Passer à l\'éditeur de texte brut causera la perte du formatage du texte. Souhaitez-vous continuer ?';
-$messages['httpreceivedencrypterror'] = 'Une erreur fatale de configuration est survenue. Veuillez contacter votre administrateur immédiatement. <b>Votre message n\'a pas pu être envoyé.</b>';
-$messages['smtpconnerror'] = 'Erreur SMTP ($code) : Échec de la connexion au serveur.';
-$messages['smtpautherror'] = 'Erreur SMTP ($code) : Échec de l\'authentification.';
-$messages['smtpfromerror'] = 'Erreur SMTP ($code) : Impossible de définir l\'expéditeur "$from" ($msg)';
-$messages['smtptoerror'] = 'Erreur SMTP ($code) : Impossible d\'ajouter le destinataire "$to" ($msg)';
-$messages['smtprecipientserror'] = 'Erreur SMTP : Impossible de lire la liste des destinataires.';
+$messages['selectimportfile'] = 'Veuillez choisir un fichier à téléverser.';
+$messages['addresswriterror'] = 'Impossible d\'écrire dans le carnet d\'adresse choisi.';
+$messages['contactaddedtogroup'] = 'Les contacts ont été ajoutés à ce groupe avec succès.';
+$messages['contactremovedfromgroup'] = 'Les contacts ont été supprimés de ce groupe avec succès.';
+$messages['nogroupassignmentschanged'] = 'Aucune affection de groupes n\'a été changée.';
+$messages['importwait'] = 'Importation, veuillez patienter...';
+$messages['importformaterror'] = 'Échec lors de l\'importation! Le fichier téléversé n\'est pas un fichier d\'importation de données valide.';
+$messages['importconfirm'] = '<b>Les $inserted contacts ont été importés avec succès</b>';
+$messages['importconfirmskipped'] = '<b>Les $skipped entrées existantes ont été ignorées</b>';
+$messages['importmessagesuccess'] = '$nr messages importés avec succès';
+$messages['importmessageerror'] = 'L\'importation a échoué! Le fichier téléversé n\'est pas un message valide ou un fichier de boîte de courriel.';
+$messages['opnotpermitted'] = 'Opération non permise!';
+$messages['nofromaddress'] = 'Adresse courriel manquante dans l\'identité choisie.';
+$messages['editorwarning'] = 'Passer à l\'éditeur de texte en clair causera la perte de toute la mise en forme du texte. Souhaitez-vous continuer?';
+$messages['httpreceivedencrypterror'] = 'Une erreur fatale de configuration est survenue. Contactez votre administrateur immédiatement. <b>Votre message ne peut pas être envoyé.</b>';
+$messages['smtpconnerror'] = 'Erreur SMTP ($code) : échec lors de la connexion au serveur.';
+$messages['smtpautherror'] = 'Erreur SMTP ($code) : échec lors de l\'authentification.';
+$messages['smtpfromerror'] = 'Erreur SMTP ($code) : impossible de définir l\'expéditeur « $from » ($msg)';
+$messages['smtptoerror'] = 'Erreur SMTP ($code) : échec lors de l\'ajout du destinataire « $to » ($msg)';
+$messages['smtprecipientserror'] = 'Erreur SMTP : impossible d\'analyser la liste des destinataires.';
 $messages['smtperror'] = 'Erreur SMTP : $msg';
-$messages['emailformaterror'] = 'Courriel incorrect : $email';
-$messages['toomanyrecipients'] = 'Trop de destinataires. Réduisez leur nombre à $max maximum.';
+$messages['emailformaterror'] = 'Adresse courriel invalide : $email';
+$messages['toomanyrecipients'] = 'Trop de destinataires. Réduire leur nombre à $max.';
 $messages['maxgroupmembersreached'] = 'Le nombre de membres du groupe dépasse le maximum de $max.';
-$messages['internalerror'] = 'Une erreur interne est apparue. Merci de ré-essayer.';
-$messages['contactdelerror'] = 'Impossible de supprimer le(s) contact(s).';
-$messages['contactdeleted'] = 'Contact(s) correctement supprimé(s).';
-$messages['contactrestoreerror'] = 'Impossible de restaurer le(s) contact(s) supprimé(s).';
-$messages['contactrestored'] = 'Contact(s) correctement restauré(s).';
-$messages['groupdeleted'] = 'Le groupe a bien été supprimé.';
-$messages['grouprenamed'] = 'Le groupe a bien été renommé.';
-$messages['groupcreated'] = 'Le groupe a bien été créé.';
-$messages['savedsearchdeleted'] = 'La recherche enregistrée a bien été supprimée.';
+$messages['internalerror'] = 'Une erreur interne est survenue. Veuillez ressayer.';
+$messages['contactdelerror'] = 'Impossible de supprimer les contacts.';
+$messages['contactdeleted'] = 'Contacts supprimés avec succès.';
+$messages['contactrestoreerror'] = 'Impossible de restaurer les contacts supprimés.';
+$messages['contactrestored'] = 'Contacts restaurés avec succès.';
+$messages['groupdeleted'] = 'Groupe supprimé avec succès.';
+$messages['grouprenamed'] = 'Groupe renommé avec succès.';
+$messages['groupcreated'] = 'Groupe créé avec succès.';
+$messages['savedsearchdeleted'] = 'Recherche enregistrée supprimée avec succès.';
 $messages['savedsearchdeleteerror'] = 'Impossible de supprimer la recherche enregistrée.';
-$messages['savedsearchcreated'] = 'La recherche enregistrée a bien été créée.';
+$messages['savedsearchcreated'] = 'Recherche enregistrée créée avec succès.';
 $messages['savedsearchcreateerror'] = 'Impossible de créer la recherche enregistrée.';
-$messages['messagedeleted'] = 'Message(s) correctement supprimé(s).';
-$messages['messagemoved'] = 'Message(s) correctement déplacé(s).';
-$messages['messagecopied'] = 'Message(s) correctement copié(s).';
-$messages['messagemarked'] = 'Message(s) correctement marqué(s).';
-$messages['autocompletechars'] = 'Entrez au moins $min caractères pour l\'auto-complétion.';
-$messages['autocompletemore'] = 'Plusieurs entrées trouvées. Veuillez taper plus de caractères.';
+$messages['messagedeleted'] = 'Messages supprimés avec succès.';
+$messages['messagemoved'] = 'Messages déplacés avec succès.';
+$messages['messagecopied'] = 'Messages copiés avec succès.';
+$messages['messagemarked'] = 'Messages marqués avec succès.';
+$messages['autocompletechars'] = 'Saisir au moins $min caractères pour le remplissage automatique.';
+$messages['autocompletemore'] = 'Plusieurs entrées concordantes trouvées. Veuillez taper plus de caractères.';
 $messages['namecannotbeempty'] = 'Le nom ne peut pas être vide.';
 $messages['nametoolong'] = 'Le nom est trop long.';
-$messages['folderupdated'] = 'Le dossier a bien été mis à jour.';
-$messages['foldercreated'] = 'Le dossier a bien été créé.';
-$messages['invalidimageformat'] = 'Format d\'image invalide.';
-$messages['mispellingsfound'] = 'Des fautes d\'orthographe ont été détectées dans le message.';
-$messages['parentnotwritable'] = 'Impossible de créer/déplacer le dossier dans le dossier parent sélectionné. Aucun droit d\'accès.';
-$messages['messagetoobig'] = 'Le message est trop gros pour être traité.';
-$messages['attachmentvalidationerror'] = 'ATTENTION ! Cette pièce jointe est suspecte car son type ne correspond pas au type déclaré dans ce message. Si vous ne faites pas confiance à l\'expéditeur, vous ne devriez pas l\'ouvrir dans le navigateur, car il peut contenir des contenus malveillants.<br/><br/><em>Attendu : $expected; trouvé : $detected</em>';
-$messages['noscriptwarning'] = 'Atention : Ce service de webmail nécessite Javascript ! Pour pouvoir l\'utiliser, merci d\'activer Javascript dans les préférences de votre navigateur.';
+$messages['folderupdated'] = 'Dossier mis à jour avec succès.';
+$messages['foldercreated'] = 'Dossier créé avec succès.';
+$messages['invalidimageformat'] = 'N\'est pas un format d\'image valide.';
+$messages['mispellingsfound'] = 'Fautes d\'orthographe détectées dans le message.';
+$messages['parentnotwritable'] = 'Impossible de créer/déplacer le dossier dans le dossier parent choisi. Aucun droit d\'accès.';
+$messages['messagetoobig'] = 'La partie message est trop grosse pour être traité.';
+$messages['attachmentvalidationerror'] = 'AVERTISSEMENT! Ce fichier joint est suspect parce que son type ne correspond pas au type déclaré dans le message. Si vous ne faites pas confiance à l\'expéditeur, vous ne devriez pas l\'ouvrir dans le navigateur, car son contenu peut être malveillant.<br/><br/><em>Attendu : $expected; trouvé : $detected</em>';
+$messages['noscriptwarning'] = 'Avertissement : Ce service de courriel Web exige Javascript! Afin de l\'utiliser, veuillez activer Javascript dans les paramètres de votre navigateur.';
 ?>
diff --git a/program/localization/ga_IE/messages.inc b/program/localization/ga_IE/messages.inc
index b52fbe657..3ae5cae57 100644
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,6 @@ $messages['sessionerror'] = 'Tá an seisiúin neamhbhailí nó as feidhm';
 $messages['storageerror'] = 'Theip an iarraidh chun nasc go dtí an freastalaí Prótacal Rochtana Teachtaireachtaí Idirlín (IMAP)';
 $messages['nomessagesfound'] = 'Ní bhfuair mé aon teachtaireacht i bosca postas seo';
 $messages['loggedout'] = 'D\'éirigh tú logáil amach. Slán Leat!';
-$messages['mailboxempty'] = 'Tá an bosca postas folamh';
 $messages['loading'] = 'Fan nóiméad, ag lódáil...';
 $messages['loadingdata'] = 'Ag lódáil sonraí...';
 $messages['checkingmail'] = 'Ag seiceáil chun teachtaireacht nua...';
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 069ff5d42..2e9fc338d 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,6 @@ $messages['invalidrequest'] = 'Petición non válida! Non se gardou ningún dato
 $messages['invalidhost'] = 'O nome do servidor non é válido.';
 $messages['nomessagesfound'] = 'Non se atoparon mensaxes nesta caixa de correo.';
 $messages['loggedout'] = 'Rematou correctamente a tú sesión. Até logo!';
-$messages['mailboxempty'] = 'A caixa de correo está baleira.';
 $messages['refreshing'] = 'A refrescar...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Cargando ficheiro...';
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index a2af10081..e6d95aa6d 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -32,6 +32,8 @@ $messages['invalidrequest'] = 'בקשה לא חוקית. המידע לא נשמ�
 $messages['invalidhost'] = 'שם שרת לא חוקי';
 $messages['nomessagesfound'] = 'לא נמצאו הודעות בתיבה זו';
 $messages['loggedout'] = 'הקשר הסתיים. להתראות!';
+$messages['mailboxempty'] = 'רשימת ההודעות ריקה';
+$messages['nomessages'] = 'אין הודעות';
 $messages['refreshing'] = 'מרענן...';
 $messages['loading'] = 'טעינה...';
 $messages['uploading'] = 'קובץ עולה...';
diff --git a/program/localization/hi_IN/messages.inc b/program/localization/hi_IN/messages.inc
index 9cf02696a..801909b06 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,6 @@ $messages['sessionerror'] = 'सत्र समाप्त या अवैद
 $messages['storageerror'] = 'आईमैप (IMAP) सर्वर से सम्पर्क नहीं हो पाया';
 $messages['nomessagesfound'] = 'इस मेलबॉक्स में कोई मेल नहीं है';
 $messages['loggedout'] = 'सत्र समाप्त. टा टा!';
-$messages['mailboxempty'] = 'मेलबॉक्स खाली है';
 $messages['loading'] = 'लोड हो रहा है';
 $messages['loadingdata'] = 'डाटा लोड हो रहा है...';
 $messages['checkingmail'] = 'क्या नया मेल है?...';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index f7eaa1394..859f3c6ea 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,8 @@ $messages['invalidrequest'] = 'Érvénytelen kérés! Az adatok nem lettek elmen
 $messages['invalidhost'] = 'Hibás szerver hoszt név';
 $messages['nomessagesfound'] = 'A fiók nem tartalmaz leveleket';
 $messages['loggedout'] = 'Sikeres kijelentkezés. Viszontlátásra!';
-$messages['mailboxempty'] = 'A fiók üres';
+$messages['mailboxempty'] = 'A postafiók üres';
+$messages['nomessages'] = 'Nincsenek üzenetek';
 $messages['refreshing'] = 'Frissítés...';
 $messages['loading'] = 'Betöltés...';
 $messages['uploading'] = 'Fájl feltöltése...';
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index c5d167acf..ba851c5d2 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -29,7 +29,6 @@ $messages['errornoperm'] = 'Գործողության կատարման իրավո
 $messages['invalidrequest'] = 'Սխալ հարցում, ապարդյուն։';
 $messages['nomessagesfound'] = 'Այս փոստարկղում նամակներ չկան';
 $messages['loggedout'] = 'Դուք բարեհաջող ավարտեցիք աշխատանքը։ Ցտեսություն…';
-$messages['mailboxempty'] = 'Փոստարկղը դատարկ է';
 $messages['loading'] = 'Բեռնում...';
 $messages['uploading'] = 'Ֆայլի վերբեռնում…';
 $messages['uploadingmany'] = 'Վերբեռնվում են ֆայլերը…';
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index 020b03f8a..a78054a20 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,6 @@ $messages['invalidrequest'] = 'Permintaan tidak valid! Tidak ada data yang tersi
 $messages['invalidhost'] = 'Nama server invalid.';
 $messages['nomessagesfound'] = 'Surat tidak ditemukan di kotak masuk ini';
 $messages['loggedout'] = 'Anda berhasil mengakhiri session. Selamat Tinggal!';
-$messages['mailboxempty'] = 'Kotak masuk kosong.';
 $messages['refreshing'] = 'Menyegarkan...';
 $messages['loading'] = 'Memuat...';
 $messages['uploading'] = 'Menggungah berkas ...';
diff --git a/program/localization/is_IS/messages.inc b/program/localization/is_IS/messages.inc
index 06b707389..6e5c7a8b0 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,6 @@ $messages['sessionerror'] = 'Innskráningin þín ógild eða útrunnin';
 $messages['storageerror'] = 'Tengin við IMAP-miðlara mistókst';
 $messages['nomessagesfound'] = 'Engin skeyti eru í þessu pósthólfi';
 $messages['loggedout'] = 'Þú hefur útskráðst. Bless!';
-$messages['mailboxempty'] = 'Pósthólfið er tómt';
 $messages['loading'] = 'Hleð...';
 $messages['loadingdata'] = 'Hleð gögn...';
 $messages['checkingmail'] = 'Gái að nýjum skeytum...';
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 2c544e17d..b0ef05373 100644
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -26,7 +26,6 @@ $messages['errornoperm'] = 'მოქმედების შესრულე
 $messages['invalidrequest'] = 'არასწორი მოთხოვნა! მონაცემების შენახვა არ მოხერხდა.';
 $messages['nomessagesfound'] = 'არ არის ახალი შეტყობინება';
 $messages['loggedout'] = 'წარმატებით დაიხურა თქვენი სესია';
-$messages['mailboxempty'] = 'საფოსტო ყუთი ცარიელია';
 $messages['loading'] = 'იტვირთება...';
 $messages['uploading'] = 'ფაილი იტვირთება...';
 $messages['uploadingmany'] = 'ფაილების ატვირთვა...';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index bccd42163..fdb43166d 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -52,6 +52,7 @@ $labels['fromtoshort'] = '총 $count개 중 $from 번째 - $to 번째';
 $labels['copy']     = '복사';
 $labels['move']     = '이동';
 $labels['moveto']   = '이동할 위치...';
+$labels['copyto']   = '복사 위치...';
 $labels['download'] = '다운로드';
 $labels['open']     = '열기';
 $labels['showattachment'] = '보기';
@@ -104,7 +105,7 @@ $labels['compose']          = '메시지 작성';
 $labels['writenewmessage']  = '새 메시지 생성';
 $labels['reply']            = '회신';
 $labels['replytomessage']   = '발신인에게 회신';
-$labels['replytoallmessage'] = '보낸 사람과 모든 수신인에게 회신';
+$labels['replytoallmessage'] = '목록 또는 발신인 및 모든 수신인에게 회신';
 $labels['replyall']         = '전체 회신';
 $labels['replylist']        = '회신 목록';
 $labels['forward']          = '전달';
@@ -197,6 +198,16 @@ $labels['spellcheck']    = '맞춤법';
 $labels['checkspelling'] = '맞춤법 검사하기';
 $labels['resumeediting'] = '편집 계속하기';
 $labels['revertto']      = '돌아가기';
+$labels['restore'] = '복구';
+$labels['restoremessage'] = '메시지를 복구할까요?';
+$labels['responses'] = '응답';
+$labels['insertresponse'] = '응답 삽입';
+$labels['manageresponses'] = '응답 관리';
+$labels['savenewresponse'] = '새로운 응답 저장';
+$labels['editresponses'] = '응답 편집';
+$labels['editresponse'] = '응답 편집';
+$labels['responsename'] = '이름';
+$labels['responsetext'] = '응답 텍스트';
 $labels['attach'] = '첨부';
 $labels['attachments'] = '첨부파일';
 $labels['upload'] = '업로드';
@@ -224,10 +235,10 @@ $labels['addcc'] = '참조 추가';
 $labels['addbcc'] = '숨은 참조 추가';
 $labels['addreplyto'] = '회신 주소 추가';
 $labels['addfollowupto'] = '전달 추가';
-$labels['mdnrequest'] = '이 메시지를 보낸 사람이 사용자가 이 메시지를 읽었을 때 읽음 확인을 요청했습니다. 보낸 사람에게 알리시겠습니까?';
-$labels['receiptread'] = '수신 확인 (읽음)';
+$labels['mdnrequest'] = '이 메시지의 발신인이 사용자가 이 메시지를 읽었을 때 읽음 확인을 요청했습니다. 발신인에게 알리시겠습니까?';
+$labels['receiptread'] = '수신 확인(읽음)';
 $labels['yourmessage'] = '이것은 사용자의 메시지에 대한 수신 확인입니다.';
-$labels['receiptnote'] = '참고: 이 수신 확인은 이 메시지가 받는 사람의 컴퓨터에 표시되었다는 것만을 의미합니다. 받는 사람이 메시지 내용을 읽거나 이해했다는 보장은 없습니다.';
+$labels['receiptnote'] = '참고: 이 수신 확인은 이 메시지가 수신인의 컴퓨터에 표시되었다는 것만을 의미합니다. 수신인이 메시지 내용을 읽었거나 이해했다는 보장은 없습니다.';
 $labels['name']         = '표시명';
 $labels['firstname']    = '이름';
 $labels['surname']      = '성';
@@ -361,7 +372,7 @@ $labels['logoutclear'] = '로그아웃할 때 휴지통 비우기';
 $labels['logoutcompact'] = '로그아웃할 때 받은 편지함 압축하기';
 $labels['uisettings'] = '사용자 인터페이스';
 $labels['serversettings'] = '서버 설정';
-$labels['mailboxview'] = '메일함 화면';
+$labels['mailboxview'] = '편지함 화면';
 $labels['mdnrequests'] = '수신 확인 요청 시';
 $labels['askuser'] = '사용자에게 물어봄';
 $labels['autosend'] = '수신 확인 보내기';
@@ -428,6 +439,9 @@ $labels['standardwindows'] = '팝업을 일반 창같이 취급';
 $labels['forwardmode'] = '메시지 전달';
 $labels['inline'] = '본문 내용으로';
 $labels['asattachment'] = '첨부파일로';
+$labels['replyallmode'] = '[전체 회신] 버튼의 기본 동작';
+$labels['replyalldefault'] = '전체 회신';
+$labels['replyalllist'] = '발송목록에만 회신(찾았을 경우)';
 $labels['folder']  = '폴더';
 $labels['folders']  = '폴더';
 $labels['foldername']  = '폴더명';
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index f6f274c43..3c7060c59 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -15,7 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-$messages['errortitle']  = '오류 발생!';
+$messages['errortitle']  = '오류가 발생하였음!';
 $messages['loginfailed']  = '로그인이 실패하였습니다.';
 $messages['cookiesdisabled'] = '브라우저가 쿠키를 지원하지 않습니다.';
 $messages['sessionerror'] = '세션이 유효하지 않거나 종료되었습니다.';
@@ -26,13 +26,14 @@ $messages['dberror'] = '데이터베이스 오류!';
 $messages['requesttimedout'] = '요청 시간 초과';
 $messages['errorreadonly'] = '명령을 수행할 수 없습니다. 읽기 전용 폴더임.';
 $messages['errornoperm'] = '명령을 수행할 수 없습니다. 권한이 거부됨.';
-$messages['erroroverquota'] = '작업을 수행할 수 없음. 여유 공간이 없음.';
-$messages['erroroverquotadelete'] = '여유 공간이 없음. SHIFT-DEL을 이용하여 메시지를 삭제하세요.';
+$messages['erroroverquota'] = '작업을 수행할 수 없음. 여유 디스크 공간이 없음.';
+$messages['erroroverquotadelete'] = '여유 디스크 공간이 없음. SHIFT-DEL을 이용하여 메시지를 삭제하십시오.';
 $messages['invalidrequest'] = '잘못된 요청! 데이터가 저장되지 않았음.';
 $messages['invalidhost'] = '잘못된 서버 이름입니다.';
-$messages['nomessagesfound'] = '이 메일함에 메일이 없습니다.';
+$messages['nomessagesfound'] = '이 메일함에서 메일을 찾지 못했음.';
 $messages['loggedout'] = '세션을 성공적으로 종료하였습니다. 안녕히 가세요!';
-$messages['mailboxempty'] = '메일함이 비어있습니다.';
+$messages['mailboxempty'] = '메일함이 비어있음';
+$messages['nomessages'] = '메시지가 없음';
 $messages['refreshing'] = '새로 고치는 중 ...';
 $messages['loading'] = '불러오는 중...';
 $messages['uploading'] = '파일을 업로드하는 중...';
@@ -44,16 +45,20 @@ $messages['messagesent'] = '메시지를 성공적으로 보냈습니다.';
 $messages['savingmessage'] = '메시지를 저장하는 중...';
 $messages['messagesaved'] = '메시지가 임시 보관함에 저장되었습니다.';
 $messages['successfullysaved'] = '성공적으로 저장됨.';
+$messages['savingresponse'] = '응답 문구를 저장하는 중...';
+$messages['deleteresponseconfirm'] = '정말로 이 응답 문구를 삭제하시겠습니까?';
 $messages['addedsuccessfully'] = '연락처가 주소록에 성공적으로 추가되었습니다.';
 $messages['contactexists'] = '연락처에 동일한 이메일 주소가 이미 존재합니다.';
 $messages['contactnameexists'] = '연락처에 동일한 이름이 이미 존재합니다.';
 $messages['blockedimages'] = '보안을 위해, 이 메시지의 외부 이미지를 차단하였습니다.';
 $messages['encryptedmessage'] = '이것은 암호화된 메시지며 표시할 수 없습니다. 죄송합니다!';
-$messages['nocontactsfound'] = '연락처를 찾을 수 없음.';
+$messages['nocontactsfound'] = '연락처를 찾을 수 없었음.';
 $messages['contactnotfound'] = '요청한 연락처를 찾을 수 없었습니다.';
 $messages['contactsearchonly'] = '연락처를 찾기 위해 일부 검색용어를 입력하세요.';
 $messages['sendingfailed'] = '메시지 보내기를 실패하였음.';
 $messages['senttooquickly'] = '이 메시지를 보내기 전에 $sec초 동안 기다리세요.';
+$messages['errorsavingsent'] = '보낸 메시지를 저장하는 중 오류가 발생하였음.';
+$messages['errorsaving'] = '저장하는 중 오류가 발생하였음.';
 $messages['errormoving'] = '메시지를 이동할 수 없었음.';
 $messages['errorcopying'] = '메시지를 복사할 수 없었음.';
 $messages['errordeleting'] = '메시지를 삭제할 수 없었음.';
@@ -74,19 +79,20 @@ $messages['noemailwarning'] = '유효한 이메일 주소를 입력하시기 바
 $messages['nonamewarning']  = '이름을 입력하시기 바랍니다.';
 $messages['nopagesizewarning'] = '페이지 크기를 입력하시기 바랍니다.';
 $messages['nosenderwarning'] = '발신인 이메일 주소를 입력하시기 바랍니다.';
-$messages['norecipientwarning'] = '적어도 한 개 이상의 수신인 주소를 입력하시기 바랍니다.';
+$messages['norecipientwarning'] = '최소 한 명 이상의 수신인을 입력하시기 바랍니다.';
 $messages['nosubjectwarning']  = '"제목" 필드가 비어있습니다. 지금 입력하시겠습니까?';
 $messages['nobodywarning'] = '텍스트가 없는 메시지를 보내시겠습니까?';
 $messages['notsentwarning'] = '메시지를 보내지 못했습니다. 메시지를 폐기하시겠습니까?';
+$messages['restoresavedcomposedata'] = '이전에 작성했지만 보내지 않은 메시지를 찾았습니다.\n\nSubject: $subject\nSaved: $date\n\n이 메시지를 복구하시겠습니까?';
 $messages['noldapserver'] = '검색할 LDAP 서버를 선택하시기 바랍니다.';
 $messages['nosearchname'] = '연락처명이나 이메일 주소를 입력하시기 바랍니다.';
 $messages['notuploadedwarning'] = '아직 모든 첨부가 업로드되지 않았습니다. 기다리거나 업로드를 취소하시기 바랍니다.';
-$messages['searchsuccessful'] = '$nr개의 메시지를 찾음.';
-$messages['contactsearchsuccessful'] = '$nr개의 연락처를 찾음.';
+$messages['searchsuccessful'] = '$nr개의 메시지를 찾았음.';
+$messages['contactsearchsuccessful'] = '$nr개의 연락처를 찾았음.';
 $messages['searchnomatch'] = '검색이 일치 항목을 찾지 못함.';
 $messages['searching'] = '검색 중...';
 $messages['checking'] = '확인 중...';
-$messages['nospellerrors'] = '맞춤법 오류를 찾지 못함.';
+$messages['nospellerrors'] = '맞춤법 오류를 찾지 못했음.';
 $messages['folderdeleted'] = '폴더를 성공적으로 삭제함.';
 $messages['foldersubscribed'] = '폴더를 성공적으로 구독함.';
 $messages['folderunsubscribed'] = '폴더를 성공적으로 구독 취소함.';
@@ -94,15 +100,15 @@ $messages['folderpurged'] = '폴더를 성공적으로 비웠습니다.';
 $messages['folderexpunged'] = '폴더를 성공적으로 압축하였습니다.';
 $messages['deletedsuccessfully'] = '성공적으로 삭제함.';
 $messages['converting'] = '서식 설정 삭제 중...';
-$messages['messageopenerror'] = '서버에서 메시지를 불러올 수 없음.';
+$messages['messageopenerror'] = '서버에서 메시지를 불러올 수 없었음.';
 $messages['fileuploaderror'] = '파일 업로드를 실패함.';
 $messages['filesizeerror'] = '업로드된 파일이 최대 크기인 $size를 초과하였습니다.';
 $messages['copysuccess'] = '$nr개의 연락처를 성공적으로 복사함';
 $messages['movesuccess'] = '$nr개의 연락처를 성공적으로 이동함';
 $messages['copyerror'] = '전체 연락처를 복사할 수 없없음';
-$messages['moveerror'] = '전체 연락처를 이동할 수 없없음';
+$messages['moveerror'] = '전체 연락처를 이동할 수 없었음';
 $messages['sourceisreadonly'] = '이 주소의 소스는 읽기 전용입니다.';
-$messages['errorsavingcontact'] = '연락처의 주소를 저장할 수 없음.';
+$messages['errorsavingcontact'] = '연락처의 주소를 저장할 수 없었음.';
 $messages['movingmessage'] = '메시지를 이동하는 중...';
 $messages['copyingmessage'] = '메시지 복사하는 중...';
 $messages['copyingcontact'] = '연락처 복사하는 중...';
@@ -111,8 +117,8 @@ $messages['deletingmessage'] = '메시지 삭제하는 중...';
 $messages['markingmessage'] = '메시지에 표시하는 중...';
 $messages['addingmember'] = '그룹에 연락처를 추가하는 중...';
 $messages['removingmember'] = '그룹에서 연락처를 삭제하는 중...';
-$messages['receiptsent'] = '읽음 확인을 보냄.';
-$messages['errorsendingreceipt'] = '읽음 확인을 보낼 수 없음.';
+$messages['receiptsent'] = '읽음 확인을 성공적으로 보냈음.';
+$messages['errorsendingreceipt'] = '읽음 확인을 보낼 수 없었음.';
 $messages['deleteidentityconfirm'] = '이 항목을 정말로 삭제 하시겠습니까?';
 $messages['nodeletelastidentity'] = '이 신원은 마지막 하나이므로 삭제할 수 없습니다.';
 $messages['forbiddencharacter'] = '폴더명에 금지된 문자가 포함되어 있습니다.';
@@ -120,14 +126,14 @@ $messages['selectimportfile'] = '업로드할 파일을 선택해주시기 바�
 $messages['addresswriterror'] = '선택된 주소록은 쓰기가 불가능합니다.';
 $messages['contactaddedtogroup'] = '이 그룹에 연락처를 성공적으로 추가함.';
 $messages['contactremovedfromgroup'] = '이 그룹에서 연락처를 성공적으로 제거함.';
-$messages['nogroupassignmentschanged'] = '그룹 할당이 변경되지 않음.';
+$messages['nogroupassignmentschanged'] = '그룹 할당이 변경되지 않았음.';
 $messages['importwait'] = '가져오는 중, 기다려주시기 바랍니다...';
 $messages['importformaterror'] = '가져오기를 실패함! 업로드된 파일은 유효하지 않은 가져오기 데이터 파일입니다.';
 $messages['importconfirm'] = '<b>$inserted 연락처를 성공적으로 가져옴<b>';
 $messages['importconfirmskipped'] = '<b>기존 기재사항인 $skipped을(를) 건너뜀</b>';
 $messages['importmessagesuccess'] = '$nr개의 메시지를 성공적으로 가져옴';
 $messages['importmessageerror'] = '가져오기 실패! 업로드된 파일은 유효하지 않은 메시지 또는 메일함 파일임';
-$messages['opnotpermitted'] = '작업이 허가되지 않음!';
+$messages['opnotpermitted'] = '작업이 허가되지 않았음!';
 $messages['nofromaddress'] = '선택된 신원에 이메일 주소 가 누락됨.';
 $messages['editorwarning'] = '일반 텍스트 편집기로 바꾸면 모든 텍스트 서식이 사라집니다. 계속하시겠습니까?';
 $messages['httpreceivedencrypterror'] = '치명적인 구성 오류가 발생하였습니다. 즉시 관리자에게 연락하세요.
@@ -139,17 +145,18 @@ $messages['smtptoerror'] = 'SMTP 오류 ($code): 수신인을 "$to" ($msg)에 �
 $messages['smtprecipientserror'] = 'SMTP 오류: 수신인 목록을 분석(parse)할 수 없음.';
 $messages['smtperror'] = 'SMTP 오류: $msg';
 $messages['emailformaterror'] = '유효하지 않은 이메일 주소: $email';
-$messages['toomanyrecipients'] = '수신인이 너무 많음. 수신인 수를 $max명으로 줄이세요.';
+$messages['toomanyrecipients'] = '수신인이 너무 많음. 수신인 수를 $max명으로 줄이십시오.';
 $messages['maxgroupmembersreached'] = '그룹 구성원의 수가 최대 인원인 $max명을 초과합니다.';
-$messages['contactdelerror'] = '연락처를 삭제할 수 없음.';
+$messages['internalerror'] = '내부 오류가 발생하였음. 다시 시도하십시오.';
+$messages['contactdelerror'] = '연락처를 삭제할 수 없었음.';
 $messages['contactdeleted'] = '연락처가 성공적으로 삭제됨.';
-$messages['contactrestoreerror'] = '삭제된 연락처를 복구할 수 없음.';
+$messages['contactrestoreerror'] = '삭제된 연락처를 복구할 수 없었음.';
 $messages['contactrestored'] = '연락처가 성공적으로 복구됨.';
 $messages['groupdeleted'] = '그룹이 성공적으로 삭제됨.';
 $messages['grouprenamed'] = '그룹명이 성공적으로 변경됨.';
 $messages['groupcreated'] = '그룹이 성공적으로 생성됨.';
 $messages['savedsearchdeleted'] = '저장된 검색이 성공적으로 삭제됨.';
-$messages['savedsearchdeleteerror'] = '저장된 정보를 삭제할 수 없었음.';
+$messages['savedsearchdeleteerror'] = '저장된 검색을 삭제할 수 없었음.';
 $messages['savedsearchcreated'] = '저장된 검색이 성공적으로 생성됨.';
 $messages['savedsearchcreateerror'] = '저장된 검색을 생성할 수 없었음.';
 $messages['messagedeleted'] = '메시지가 성공적으로 삭제됨.';
@@ -157,7 +164,7 @@ $messages['messagemoved'] = '메시지가 성공적으로 이동됨.';
 $messages['messagecopied'] = '메시지가 성공적으로 복사됨.';
 $messages['messagemarked'] = '메시지에 성공적으로 표시됨.';
 $messages['autocompletechars'] = '자동 완성을 위해서 적어도 $min개의 문자를 입력하세요.';
-$messages['autocompletemore'] = '더 많은 일치 항목이 발견됨. 더 많은 문자를 입력해주시기 바랍니다.';
+$messages['autocompletemore'] = '더 많은 일치하는 항목을 찾았음. 더 많은 문자를 입력해주십시오.';
 $messages['namecannotbeempty'] = '이름을 비워둘 수 없습니다.';
 $messages['nametoolong'] = '이름이 너무 깁니다.';
 $messages['folderupdated'] = '폴더가 성공적으로 업데이트됨.';
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index 6000aacb0..95d33d78f 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,6 @@ $messages['sessionerror'] = 'Danişîna te çewt e an jî bi dawî bûye';
 $messages['storageerror'] = 'Girêdana pêşkêşkara IMAP têk çû';
 $messages['nomessagesfound'] = 'Di vê peyamdankê de tu peyam nehat dîtin';
 $messages['loggedout'] = 'Te danişînî bi dawî anî. Oxir be!';
-$messages['mailboxempty'] = 'Peyamdank vala ye';
 $messages['loading'] = 'Tê barkirin...';
 $messages['loadingdata'] = 'Dane tên barkirin...';
 $messages['checkingmail'] = 'Li peyamên nû vedinihêre...';
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index d9c83f873..d45bdeb5e 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,6 @@ $messages['invalidrequest'] = 'Netinkama užklausa! Duomenys neišsaugoti.';
 $messages['invalidhost'] = 'Negalimas serverio vardas.';
 $messages['nomessagesfound'] = 'Šioje pašto dėžutėje laiškų nėra.';
 $messages['loggedout'] = 'Jūs sėkmingai atsijungėte. Iki kito karto!';
-$messages['mailboxempty'] = 'Pašto dėžutė tuščia.';
 $messages['refreshing'] = 'Atnaujinama…';
 $messages['loading'] = 'Įkeliama…';
 $messages['uploading'] = 'Įkeliamas failas…';
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index d123bada9..c8e29dfe9 100644
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,7 +23,6 @@ $messages['servererror'] = 'Грешка во серверот!';
 $messages['invalidrequest'] = 'Неважечко барање! Податоците не се зачувани.';
 $messages['nomessagesfound'] = 'Немате писма во ова сандаче';
 $messages['loggedout'] = 'Успешно се одјавивте. Ви благодариме и довидување!';
-$messages['mailboxempty'] = 'Поштенското сандаче е празно.';
 $messages['loading'] = 'Вчитувам...';
 $messages['uploading'] = 'Ја подигам податотеката...';
 $messages['loadingdata'] = 'Ги вчитувам податоците...';
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index 36eb8dc04..2685f4826 100644
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -28,7 +28,6 @@ $messages['errornoperm'] = 'कृती करण्यास असमर्�
 $messages['invalidrequest'] = 'अवैध विनंती! माहिती साठवलेली नाही.';
 $messages['nomessagesfound'] = 'या खात्यामधे कोणताही संदेश आलेला नाही';
 $messages['loggedout'] = 'तुम्ही यशस्वीरित्या खाते बंद केले आहे . राम राम !';
-$messages['mailboxempty'] = 'खात्यात कोणताही संदेश नाही';
 $messages['loading'] = 'संदेश आणत आहे';
 $messages['uploading'] = 'फाईल चढवली जात आहे...';
 $messages['loadingdata'] = 'माहिती आणत आहे';
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index c2140e216..99b35310a 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,6 @@ $messages['sessionerror'] = 'Sesi anda tidak sah atau telah tamat';
 $messages['storageerror'] = 'Sambungan ke pelayan IMAP gagal';
 $messages['nomessagesfound'] = 'Tiada mesej dijumpai dalam kotak mel ini';
 $messages['loggedout'] = 'Sesi anda telah tamat. Selamat tinggal!';
-$messages['mailboxempty'] = 'Kotak mail kosong';
 $messages['loading'] = 'Memuat...';
 $messages['loadingdata'] = 'Memuat data...';
 $messages['checkingmail'] = 'Menyemak mesej baru...';
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 20bbd1383..4590e516e 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -29,6 +29,7 @@ $labels['drafts'] = 'Kladd';
 $labels['sent']   = 'Sendt';
 $labels['trash']  = 'Slettet';
 $labels['junk']   = 'Spam';
+$labels['show_real_foldernames'] = 'Vis orginale navn for spesielle mapper';
 $labels['subject'] = 'Emne';
 $labels['from']    = 'Avsender';
 $labels['sender']  = 'Avsender';
@@ -51,6 +52,7 @@ $labels['fromtoshort'] = '$from – $to av $count';
 $labels['copy']     = 'Kopier';
 $labels['move']     = 'Flytt';
 $labels['moveto']   = 'flytt til...';
+$labels['copyto']   = 'Kopier til...';
 $labels['download'] = 'last ned';
 $labels['open']     = 'Åpen';
 $labels['showattachment'] = 'Vis';
@@ -165,6 +167,7 @@ $labels['listmode'] = 'Listevisningsmodus';
 $labels['folderactions'] = 'Mappehandlinger...';
 $labels['compact'] = 'Rydd opp';
 $labels['empty'] = 'Tøm';
+$labels['importmessages'] = 'Importer meldinger';
 $labels['quota'] = 'Plassforbruk';
 $labels['unknown']  = 'ukjent';
 $labels['unlimited']  = 'ubegrenset';
@@ -173,6 +176,8 @@ $labels['resetsearch']  = 'Nullstill søk';
 $labels['searchmod']  = 'Søke felt';
 $labels['msgtext']  = 'Hele meldingen';
 $labels['body']  = 'Meldingstekst';
+$labels['type'] = 'Type';
+$labels['namex'] = 'Navn';
 $labels['openinextwin'] = 'Åpne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
 $labels['changeformattext'] = 'Vis i ren tekst';
@@ -185,7 +190,7 @@ $labels['addattachment']  = 'Vedlegg';
 $labels['charset']        = 'Tegnsett';
 $labels['editortype']     = 'Format';
 $labels['returnreceipt']  = 'Be om kvittering';
-$labels['dsn']            = 'Leveringsstatus notifikasjon';
+$labels['dsn']            = 'Leveringsstatus varsling';
 $labels['mailreplyintro'] = 'Den $date, skrev $sender:';
 $labels['originalmessage'] = 'Opprinnelig melding';
 $labels['editidents']    = 'Endre identiteter';
@@ -193,6 +198,16 @@ $labels['spellcheck']    = 'Stavekontroll';
 $labels['checkspelling'] = 'Stavekontroll';
 $labels['resumeediting'] = 'Fortsett redigering';
 $labels['revertto']      = 'Tilbake til';
+$labels['restore'] = 'Gjenopprett';
+$labels['restoremessage'] = 'Gjenopprett melding?';
+$labels['responses'] = 'Svar';
+$labels['insertresponse'] = 'Sett inn et svar';
+$labels['manageresponses'] = 'Rediger svar';
+$labels['savenewresponse'] = 'Lagre nytt svar';
+$labels['editresponses'] = 'Rediger svar';
+$labels['editresponse'] = 'Rediger svar';
+$labels['responsename'] = 'Navn';
+$labels['responsetext'] = 'Svar tekst';
 $labels['attach'] = 'Legg ved';
 $labels['attachments'] = 'Vedlegg';
 $labels['upload'] = 'Last opp';
@@ -305,13 +320,18 @@ $labels['nextpage']       = 'Vis neste sett';
 $labels['lastpage']       = 'Vis siste sett';
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
+$labels['listgroup'] = 'Vis gruppemedlemmer';
 $labels['personaladrbook'] = 'Egne adresser';
 $labels['searchsave'] = 'Lagre søk';
 $labels['searchdelete'] = 'Slett søk';
 $labels['import'] = 'Importer';
 $labels['importcontacts'] = 'Importer kontakter';
 $labels['importfromfile'] = 'Importer fra fil:';
+$labels['importtarget'] = 'Legg kontakter til';
 $labels['importreplace'] = 'Erstatt hele adresseboken';
+$labels['importgroups'] = 'Importer gruppetilordninger';
+$labels['importgroupsall'] = 'Alle (opprett grupper hvis nødvendig)';
+$labels['importgroupsexisting'] = 'Bare for eksisterende grupper';
 $labels['importdesc'] = 'Du kan laste opp kontakter fra en eksisterende adressebok.<br/>Vi støtter adressebøker i <a href="http://no.wikipedia.org/wiki/VCard">vCard</a> eller CSV (kommaseparert) .';
 $labels['done'] = 'Fullført';
 $labels['settingsfor'] = 'Innstillinger for';
@@ -415,9 +435,13 @@ $labels['spellcheckignorenums'] = 'Ignorer ord med tall';
 $labels['spellcheckignorecaps'] = 'Ignorer ord med kun store bokstaver';
 $labels['addtodict'] = 'Legg til i ordbok';
 $labels['mailtoprotohandler'] = 'Registrer protokollhåndtering for mailto-lenker';
+$labels['standardwindows'] = 'Håndter sprettoppvinduer som vanlige vinduer';
 $labels['forwardmode'] = 'Meldinger videresendes';
 $labels['inline'] = 'i teksten';
 $labels['asattachment'] = 'som vedlegg';
+$labels['replyallmode'] = 'Standard valg for [Svar alle] knapp';
+$labels['replyalldefault'] = 'svar til alle';
+$labels['replyalllist'] = 'svar kun til epostliste (hvis funnet)';
 $labels['folder']  = 'Mappe';
 $labels['folders']  = 'Mapper';
 $labels['foldername']  = 'Mappenavn';
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index 1d51017fb..c2a489714 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -32,7 +32,8 @@ $messages['invalidrequest'] = 'Ugyldig forespørsel! Ingen data ble lagret.';
 $messages['invalidhost'] = 'Ugyldig servernavn.';
 $messages['nomessagesfound'] = 'Det ble ikke funnet noen meldinger i denne mappen';
 $messages['loggedout'] = 'Du er logget av webmail. Ha det bra!';
-$messages['mailboxempty'] = 'Mappen er tom!';
+$messages['mailboxempty'] = 'Mappen er tom';
+$messages['nomessages'] = 'Ingen meldinger';
 $messages['refreshing'] = 'Oppdaterer …';
 $messages['loading'] = 'Laster...';
 $messages['uploading'] = 'Laster opp fil...';
@@ -44,6 +45,8 @@ $messages['messagesent'] = 'Meldingen ble sendt';
 $messages['savingmessage'] = 'Lagrer melding...';
 $messages['messagesaved'] = 'Melding er lagret som kladd';
 $messages['successfullysaved'] = 'Lagret';
+$messages['savingresponse'] = 'Lagrer svartekst...';
+$messages['deleteresponseconfirm'] = 'Vil du virkelig å slette denne svarteksten?';
 $messages['addedsuccessfully'] = 'Kontakten ble lagt til i adresseboken';
 $messages['contactexists'] = 'Det finnes allerede en kontakt med denne e-postadressen';
 $messages['contactnameexists'] = 'Det finnes allerede en kontakt med dette navnet';
@@ -54,6 +57,8 @@ $messages['contactnotfound'] = 'Den ønskede kontakten ble ikke funnet';
 $messages['contactsearchonly'] = 'Skriv inn noen søkeord for å finne kontakter.';
 $messages['sendingfailed'] = 'Kunne ikke sende e-posten';
 $messages['senttooquickly'] = 'Vennligst vent $sec sekund(er) før du sender denne meldingen';
+$messages['errorsavingsent'] = 'En feil oppsto under lagring av sendt melding.';
+$messages['errorsaving'] = 'En feil oppsto under lagring.';
 $messages['errormoving'] = 'Kunne ikke flytte meldingen(e)';
 $messages['errorcopying'] = 'Kunne ikke kopiere meldingen(e)';
 $messages['errordeleting'] = 'Kunne ikke slette meldingen(e)';
@@ -78,6 +83,7 @@ $messages['norecipientwarning'] = 'Skriv inn minst én mottaker';
 $messages['nosubjectwarning']  = 'Emnefeltet er tomt. Vil du skrive det inn nå?';
 $messages['nobodywarning'] = 'Send denne meldingen uten tekst?';
 $messages['notsentwarning'] = 'E-posten er ikke sendt. Er du sikker på at du vil avbryte skrivingen?';
+$messages['restoresavedcomposedata'] = 'Et tidligere usendt svar ble funnet.\n\nEmne: $subject\nLagret: $date\n\nVil du gjenopprette denne meldingen?';
 $messages['noldapserver'] = 'Velg LDAP-tjener å søke i';
 $messages['nosearchname'] = 'Venligst skriv inn kontaktens navn eller e-postadresse';
 $messages['notuploadedwarning'] = 'Ikke alle vedlegg er ferdig opplastet. Vennligst vent eller avbryt opplastingen.';
@@ -97,11 +103,16 @@ $messages['converting'] = 'Fjerner formatering fra meldingen ...';
 $messages['messageopenerror'] = 'Kunne ikke hente meldingen fra server';
 $messages['fileuploaderror'] = 'Feil under opplastning.';
 $messages['filesizeerror'] = 'Filen overstiger maksimum tillatt filstørrelse ($size)';
+$messages['copysuccess'] = 'Kopierte $nr kontakter.';
+$messages['movesuccess'] = 'Flyttet $nr kontakter.';
+$messages['copyerror'] = 'Kunne ikke kopiere noen kontakter.';
+$messages['moveerror'] = 'Kunne ikke flytte noen kontakter.';
 $messages['sourceisreadonly'] = 'Denne adressekilden er skrivebeskyttet';
 $messages['errorsavingcontact'] = 'Kunne ikke lagre kontaktadressen.';
 $messages['movingmessage'] = 'Flytter e-post ...';
 $messages['copyingmessage'] = 'Kopierer e-post...';
 $messages['copyingcontact'] = 'Kopierer kontakt(er) …';
+$messages['movingcontact'] = 'Flytter kontakt(er)...';
 $messages['deletingmessage'] = 'Sletter melding(er) …';
 $messages['markingmessage'] = 'Markerer melding(er) ...';
 $messages['addingmember'] = 'Legger til kontakt(er) i gruppa ...';
@@ -135,6 +146,7 @@ $messages['smtperror'] = 'SMTP-feil ($code): $msg';
 $messages['emailformaterror'] = 'Ukorrekt e-postadresse: $email';
 $messages['toomanyrecipients'] = 'For mange mottakere. Reduser antall mottakere til $max.';
 $messages['maxgroupmembersreached'] = 'Antall gruppemedlemmer overskrider maksgrensen på $max';
+$messages['internalerror'] = 'En intern feil har oppstått, prøv igjen senere.';
 $messages['contactdelerror'] = 'Kunne ikke slette kontakt(er)';
 $messages['contactdeleted'] = 'Kontakt(er) slettet uten feil.';
 $messages['contactrestoreerror'] = 'Kunne ikke gjenopprette kontakt(er).';
diff --git a/program/localization/ne_NP/messages.inc b/program/localization/ne_NP/messages.inc
index 7873f5715..e8dcd091a 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,6 @@ $messages['sessionerror'] = 'सत्र समाप्त वा अवैद
 $messages['storageerror'] = 'सर्वर संग सम्पर्क हुन पाएन';
 $messages['nomessagesfound'] = 'यो मेलबक्स मा कुनै मेल छैन';
 $messages['loggedout'] = 'सत्र समाप्त । नमास्कार!';
-$messages['mailboxempty'] = 'मेल बक्स खाली छ';
 $messages['loading'] = 'लोड भईरहेको छ...';
 $messages['loadingdata'] = 'डाटा लोड भईरहेको छै...';
 $messages['checkingmail'] = 'नया मेलको खोजी भईरहेको छ...';
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index a90e250d9..ac6c17b6e 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -30,7 +30,6 @@ $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgesla
 $messages['invalidhost'] = 'Ongeldige server.';
 $messages['nomessagesfound'] = 'Er zijn geen berichten in deze map...';
 $messages['loggedout'] = 'U bent nu afgemeld. Tot ziens!';
-$messages['mailboxempty'] = 'Mailbox is leeg...';
 $messages['refreshing'] = 'Bezig met vernieuwen...';
 $messages['loading'] = 'Bezig met ophalen gegevens...';
 $messages['uploading'] = 'Bezig met uploaden...';
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index 5c8386c64..867c73887 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -30,7 +30,6 @@ $messages['invalidrequest'] = 'Eg forstår ingen ting! Ingen data lagra.';
 $messages['invalidhost'] = 'Ugyldig tenarnamn.';
 $messages['nomessagesfound'] = 'Ingen meldingar i denne postkassa.';
 $messages['loggedout'] = 'Du har avslutta økta. Ha det bra!';
-$messages['mailboxempty'] = 'Postkassa er tom.';
 $messages['refreshing'] = 'Oppdaterer …';
 $messages['loading'] = 'Hentar …';
 $messages['uploading'] = 'Lastar opp fil …';
diff --git a/program/localization/ps/messages.inc b/program/localization/ps/messages.inc
index a900d328f..606e59c0f 100644
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,6 @@ $messages['sessionerror'] = 'ستاسې ناسته ناباوري يا له مي
 $messages['storageerror'] = 'له ای ميپ سرور سره پيوستون په بري سره ترسره نه شو';
 $messages['nomessagesfound'] = 'ليکبکس کې هېڅ استوزي ونه مونده';
 $messages['loggedout'] = 'تاسې له ناستې څخه په بشپړه توګه وويستل شوئ الله په امان';
-$messages['mailboxempty'] = 'ليکبکس تش دی';
 $messages['loading'] = 'د کار په حال کې';
 $messages['loadingdata'] = 'اومتوک د کار په حال کې';
 $messages['checkingmail'] = 'نوي استوزي ګوري';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 953cfe8da..af85c358c 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -52,6 +52,7 @@ $labels['fromtoshort'] = '$from - $to din $count';
 $labels['copy']     = 'Copiază';
 $labels['move']     = 'Mută';
 $labels['moveto']   = 'Mută in...';
+$labels['copyto']   = 'Copiază în...';
 $labels['download'] = 'Descarcă';
 $labels['open']     = 'Deschide';
 $labels['showattachment'] = 'Arată';
@@ -197,6 +198,16 @@ $labels['spellcheck']    = 'Ortografie';
 $labels['checkspelling'] = 'Verifică ortografie';
 $labels['resumeediting'] = 'Reia editarea';
 $labels['revertto']      = 'Revino la';
+$labels['restore'] = 'Restaurează';
+$labels['restoremessage'] = 'Restaurezi mesajul?';
+$labels['responses'] = 'Răspunsuri';
+$labels['insertresponse'] = 'Adaugă un răspuns';
+$labels['manageresponses'] = 'Administrează răspunsurile';
+$labels['savenewresponse'] = 'Salvează noul răspuns';
+$labels['editresponses'] = 'Modifică răspunsurile';
+$labels['editresponse'] = 'Modifică răspunsul';
+$labels['responsename'] = 'Nume';
+$labels['responsetext'] = 'Textul răspunsului';
 $labels['attach'] = 'Ataşează';
 $labels['attachments'] = 'Ataşamente';
 $labels['upload'] = 'Încarcă';
@@ -428,6 +439,9 @@ $labels['standardwindows'] = 'Trateaza popupsurile ca ferestre standard';
 $labels['forwardmode'] = 'Trimitere mai departe mesaj';
 $labels['inline'] = 'într-e linii';
 $labels['asattachment'] = 'ca atașament';
+$labels['replyallmode'] = 'Acțiunea implicită pentru butonul [Răspunde la toți]';
+$labels['replyalldefault'] = 'răspunde la toți';
+$labels['replyalllist'] = 'răspunde listei (dacă este găsită)';
 $labels['folder']  = 'Dosar';
 $labels['folders']  = 'Dosare';
 $labels['foldername']  = 'Nume dosar';
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index fb555ad47..d17364d95 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -33,6 +33,7 @@ $messages['invalidhost'] = 'Nume server invalid.';
 $messages['nomessagesfound'] = 'Nu a fost găsit nici un mesaj în această căsuţă poştală';
 $messages['loggedout'] = 'Sesiune încheiată cu succes. La revedere!';
 $messages['mailboxempty'] = 'Căsuţa poştală este goală';
+$messages['nomessages'] = 'Nici un mesaj';
 $messages['refreshing'] = 'Reîmprospătare...';
 $messages['loading'] = 'Se încarcă...';
 $messages['uploading'] = 'Fişierul se încarcă...';
@@ -82,6 +83,7 @@ $messages['norecipientwarning'] = 'Vă rugăm să introduceţi cel puţin un des
 $messages['nosubjectwarning']  = 'Mesajul nu are subiect. Vreţi să introduceţi unul acum?';
 $messages['nobodywarning'] = 'Trimiteţi acest mesaj fără text?';
 $messages['notsentwarning'] = 'Mesajul nu a fost trimis. Vreţi să renunţaţi la el?';
+$messages['restoresavedcomposedata'] = 'Un mesaj compus anterior a fost găsit.\n\nSubiect:$subject\nSalvat: $date\n\nDoriţi restaurarea acestuia ?';
 $messages['noldapserver'] = 'Vă rugăm să alegeţi un server ldap pentru căutare';
 $messages['nosearchname'] = 'Vă rugăm să introduceţi un nume de contact sau adresă de e-mail';
 $messages['notuploadedwarning'] = 'Nu toate fişierele au fost ataşate. Vă rugăm să aşteptaţi sau să anulaţi încărcarea acestora.';
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index 0c6fa1156..9a49e17f7 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -22,7 +22,6 @@ $messages['sessionerror'] = 'ඔබේ වාරය අවලංගු හෝ �
 $messages['dberror'] = 'දත්ත ගබඩාවේ දෝෂය!';
 $messages['nomessagesfound'] = 'ලියුම් පෙට්ටියේ පනිවුඩ නැත';
 $messages['loggedout'] = 'ඔබගේ වාරය සාර්ථකව අවසන් විය. අයුබොවන්!';
-$messages['mailboxempty'] = 'ලියුම් පෙට්ටිය හිස්';
 $messages['loading'] = 'පූරනය...';
 $messages['loadingdata'] = 'දත්ත පූරනය...';
 $messages['checkingmail'] = 'අලුත් පණිවිඩ පරීක්ෂා කරමින්...';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index cdba04170..b8d9d98ee 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -434,7 +434,7 @@ $labels['spellcheckignoresyms'] = 'Ne upoštevaj besed, ki vsebujejo simbole';
 $labels['spellcheckignorenums'] = 'Ne upoštevaj besed, ki vsebujejo številke';
 $labels['spellcheckignorecaps'] = 'Ne upoštevaj besed, ki vsebujejo samo velike črke';
 $labels['addtodict'] = 'Dodaj v slovar';
-$labels['mailtoprotohandler'] = 'Registriraj upravljavca protokola za e-naslov: povezave';
+$labels['mailtoprotohandler'] = 'Določi Arnes Spletno pošto kot privzeti poštni odjemalec.';
 $labels['standardwindows'] = 'Prikaži pojavna okna kot običajna';
 $labels['forwardmode'] = 'Posredovanje sporočil';
 $labels['inline'] = 'medvrstično';
diff --git a/program/localization/sq_AL/messages.inc b/program/localization/sq_AL/messages.inc
index d4b981318..f14e42e52 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,6 @@ $messages['sessionerror'] = 'Sesioni juaj është i pavlefshëm ose i ka kaluar
 $messages['storageerror'] = 'Lidhja me serverin IMAP dështoi';
 $messages['nomessagesfound'] = 'Nuk ka mesazhe në këtë kuti postare';
 $messages['loggedout'] = 'Sesionin e mbyllët me sukses. Mirupafshim!';
-$messages['mailboxempty'] = 'Kutia postare është bosh';
 $messages['loading'] = 'Po ngarkohet...';
 $messages['loadingdata'] = 'Po ngarkohen të dhëna...';
 $messages['checkingmail'] = 'Po shoh për mesazhe të reja...';
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 7a4c89356..2d4efc408 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -30,7 +30,6 @@ $messages['invalidrequest'] = 'Погрешан захтев! Подаци ни�
 $messages['invalidhost'] = 'Погрешно име сервера.';
 $messages['nomessagesfound'] = 'Немате порука у сандучету.';
 $messages['loggedout'] = 'Успешно сте се одјавили.';
-$messages['mailboxempty'] = 'Сандуче је празно.';
 $messages['refreshing'] = 'Освежавам...';
 $messages['loading'] = 'Учитавам...';
 $messages['uploading'] = 'Шаљем датотеку...';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 546147606..7efc08013 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -32,6 +32,8 @@ $messages['invalidrequest'] = 'Ogiltig begäran! Informationen sparades inte.';
 $messages['invalidhost'] = 'Ogiltigt servernamn.';
 $messages['nomessagesfound'] = 'Inga meddelanden.';
 $messages['loggedout'] = 'Du är utloggad. Välkommen åter!';
+$messages['mailboxempty'] = 'Katalogen är tom';
+$messages['nomessages'] = 'Inga meddelanden';
 $messages['refreshing'] = 'Uppdaterar...';
 $messages['loading'] = 'Laddar...';
 $messages['uploading'] = 'Överför fil...';
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index d496b3836..0da63d2af 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,7 +23,6 @@ $messages['servererror'] = 'சேவையக பிழை!';
 $messages['invalidrequest'] = 'செல்லாத வேண்டுகோள்! எந்த தரவும் சேமிக்கப்படவில்லை.';
 $messages['nomessagesfound'] = 'இந்த தபால் பெட்டியில் எந்த தரவும் சேமிக்கப்படவில்லை';
 $messages['loggedout'] = 'நீங்கள் அமர்வை வெற்றிகரமாக முடித்தீர்கள். வணக்கம்';
-$messages['mailboxempty'] = 'தபால் பெட்டி காலியாக உள்ளது';
 $messages['loading'] = 'ஏற்றுகிறது...';
 $messages['uploading'] = 'கோப்பை ஏற்றுகிறது...';
 $messages['loadingdata'] = 'தரவை ஏற்றுகிறது...';
diff --git a/program/localization/th_TH/messages.inc b/program/localization/th_TH/messages.inc
index 46d960aff..2ad95fc94 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -25,7 +25,6 @@ $messages['dberror'] = 'เกิดข้อผิดพลาดเกี่�
 $messages['invalidhost'] = 'ชื่อเซิร์ฟเวอร์ไม่ถูกต้อง';
 $messages['nomessagesfound'] = 'ไม่มีจดหมายในกล่องจดหมายนี้';
 $messages['loggedout'] = 'ทำการออกจากระบบเรียบร้อย';
-$messages['mailboxempty'] = 'กล่องจดหมายนี้ว่างเปล่า';
 $messages['refreshing'] = 'กำลังรีเฟรช...';
 $messages['loading'] = 'Loading...';
 $messages['uploading'] = 'กำลังอัพโหลดไฟล์...';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 430ad16d1..23c951a8b 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -32,6 +32,8 @@ $messages['invalidrequest'] = '要求無效！未儲存任何資料。';
 $messages['invalidhost'] = '無效的伺服器名稱';
 $messages['nomessagesfound'] = '此郵件匣沒有任何郵件';
 $messages['loggedout'] = '你已成功地登出並結束工作階段了。再見！';
+$messages['mailboxempty'] = '郵件匣是空的';
+$messages['nomessages'] = '沒有郵件';
 $messages['refreshing'] = '重新整理中...';
 $messages['loading'] = '載入中...';
 $messages['uploading'] = '上傳檔案中...';