Updated translations from launchpad

115 files changed, 1493 insertions, 347 deletions

diff --git a/plugins/acl/localization/da_DK.inc b/plugins/acl/localization/da_DK.inc
index c3006743c..d37e7c410 100644
--- a/plugins/acl/localization/da_DK.inc
+++ b/plugins/acl/localization/da_DK.inc
@@ -19,6 +19,7 @@ $labels['myrights'] = 'Adgangrettigheder';
 $labels['username'] = 'Bruger:';
 $labels['advanced'] = 'avanceret mode';
 $labels['newuser'] = 'Tilføj indgang';
+$labels['actions'] = 'Tilgangsrettigheder...';
 $labels['anyone'] = 'Alle brugere';
 $labels['anonymous'] = 'Gæst (anonym)';
 $labels['identifier'] = 'Identifikator';
@@ -61,6 +62,7 @@ $labels['longacll'] = 'Mappen er synlig på listen og kan abonneres på';
 $labels['longaclr'] = 'Mappen kan åbnes for læsning';
 $labels['longaclread'] = 'Mappen kan åbnes for læsning';
 $labels['longacls'] = 'Beskeders Læst-flag kan ændres';
+$labels['longaclw'] = 'Beskeders flag og nøgleord kan ændres med undtagelse af Læst og Slettet';
 $labels['longacli'] = 'Beskeder kan blive skrevet eller kopieret til mappen';
 $labels['longaclp'] = 'Beskeder kan sendes til denne mappe';
 $labels['longaclc'] = 'Mapper kan blive oprettet (eller omdøbt) direkte under denne mappe';
@@ -70,4 +72,18 @@ $labels['longaclt'] = 'Beskeders Slet-flag kan ændres';
 $labels['longacle'] = 'Beskeder kan slettes';
 $labels['longaclx'] = 'Mappen kan blive slettet eller omdøbt';
 $labels['longacla'] = 'Mappen adgangsrettigheder kan ændres';
+$labels['longaclfull'] = 'Fuld kontrol inklusiv mappeadministration';
+$labels['longaclwrite'] = 'Beskeder kan blive markeret, skrevet eller kopieret til mappen';
+$labels['longacldelete'] = 'Beskeder kan slettes';
+$labels['deleting'] = 'Slette rettigheder...';
+$labels['saving'] = 'Gemme rettigheder...';
+$labels['updatesuccess'] = 'Tilgangsrettighederne blev ændret';
+$labels['deletesuccess'] = 'Sletterettigheder blev ændret';
+$labels['createsuccess'] = 'Tilgangsrettigheder blev tilføjet';
+$labels['updateerror'] = 'Kunne ikke opdatere tilgangsrettigheder';
+$labels['deleteerror'] = 'Kunne ikke slette tilgangsrettigheder';
+$labels['createerror'] = 'Kunne ikke tilføje tilgangsrettigheder';
+$labels['deleteconfirm'] = 'Er du sikker på, at du vil slette tilgangsrettigheder fra de(n) valgte bruger(e)?';
+$labels['norights'] = 'Der er ikke specificeret nogle rettigheder!';
+$labels['nouser'] = 'Der er ikke angiver et brugernavn!';
 
diff --git a/plugins/acl/localization/eo.inc b/plugins/acl/localization/eo.inc
new file mode 100644
index 000000000..b24ebcc9f
--- /dev/null
+++ b/plugins/acl/localization/eo.inc
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/eo/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$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)';
+$labels['anonymous'] = 'Gasto (sennome)';
+$labels['identifier'] = 'Identigilo';
+$labels['acll'] = 'Elserĉo';
+$labels['shortacll'] = 'Elserĉo';
+$labels['aclr'] = 'Legi mesaĝojn';
+$labels['acls'] = 'Manteni legitan staton';
+$labels['acli'] = 'Enmeti (alglui)';
+$labels['aclp'] = 'Afiŝi';
+$labels['shortaclp'] = 'Afiŝi';
+$labels['aclc'] = 'Krei subdosierujojn';
+$labels['aclk'] = 'Krei subdosierujojn';
+$labels['acld'] = 'Forigi mesaĝojn';
+$labels['aclt'] = 'Forigi mesaĝojn';
+$labels['aclx'] = 'Forigi dosierujon';
+$labels['acla'] = 'Administri';
+$labels['shortacla'] = 'Administri';
+$labels['aclfull'] = 'Plena kontrolo';
+$labels['aclother'] = 'Alia';
+$labels['shortaclother'] = 'Alia';
+$labels['aclread'] = 'Legi';
+$labels['shortaclr'] = 'Legi';
+$labels['shortaclread'] = 'Legi';
+$labels['aclwrite'] = 'Skribi';
+$labels['shortaclw'] = 'Skribi';
+$labels['shortaclwrite'] = 'Skribi';
+$labels['acldelete'] = 'Forigi';
+$labels['shortacld'] = 'Forigi';
+$labels['shortaclt'] = 'Forigi';
+$labels['shortacldelete'] = 'Forigi';
+$labels['shortacls'] = 'Manteni';
+$labels['shortacli'] = 'Enmeti';
+$labels['shortaclc'] = 'Krei';
+$labels['shortaclk'] = 'Krei';
+$labels['shortaclx'] = 'Forigo de dosierujo';
+$labels['longacll'] = 'La dosierujo videblas en listoj kaj oni povas aboni al ĝi';
+$labels['longaclr'] = 'La dosierujo malfermeblas por legado';
+$labels['longaclread'] = 'La dosierujo malfermeblas por legado';
+$labels['longacli'] = 'Mesaĝoj skribeblas aŭ kopieblas en la dosierujo';
+$labels['longaclp'] = 'Mesaĝoj afiŝeblas en ĉi tiu dosierujo';
+
diff --git a/plugins/acl/localization/et_EE.inc b/plugins/acl/localization/et_EE.inc
new file mode 100644
index 000000000..d8edc1996
--- /dev/null
+++ b/plugins/acl/localization/et_EE.inc
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/et_EE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: yllar                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Jagamine';
+$labels['myrights'] = 'Ligipääsuõigused';
+$labels['username'] = 'Kasutaja:';
+$labels['newuser'] = 'Lisa sissekanne';
+$labels['anonymous'] = 'Külalised (anonüümsed)';
+$labels['aclr'] = 'Lugeda kirju';
+$labels['aclc'] = 'Luua alamkaustu';
+$labels['aclk'] = 'Luua alamkaustu';
+$labels['acld'] = 'Kustutada kirju';
+$labels['aclt'] = 'Kustutada kirju';
+$labels['aclx'] = 'Kustutada kausta';
+$labels['acla'] = 'Administreerida';
+$labels['shortacla'] = 'Administreerida';
+$labels['shortaclc'] = 'Loo';
+$labels['shortaclk'] = 'Loo';
+
diff --git a/plugins/acl/localization/fa_IR.inc b/plugins/acl/localization/fa_IR.inc
index a13102300..db2c496eb 100644
--- a/plugins/acl/localization/fa_IR.inc
+++ b/plugins/acl/localization/fa_IR.inc
@@ -18,10 +18,25 @@ $labels['sharing'] = 'اشتراک‌گذاری';
 $labels['myrights'] = 'مجوزهای دسترسی';
 $labels['username'] = 'کاربر:';
 $labels['advanced'] = 'حالت پیشرفته';
+$labels['newuser'] = 'افزودن مدخل';
+$labels['actions'] = 'فعالیت‌های مجوز دسترسی...';
+$labels['anyone'] = 'همه کاربران (هر کسی)';
+$labels['anonymous'] = 'مهمان‌ها (ناشناس‌ها)';
 $labels['identifier'] = 'شناساگر';
+$labels['acll'] = 'یافتن';
+$labels['shortacll'] = 'یافتن';
 $labels['aclr'] = 'پیام های خوانده شده';
+$labels['acls'] = 'نگه داشتن حالت بازدید';
+$labels['aclw'] = 'پرچم‌های نوشتن';
+$labels['acli'] = 'وارد کردن (کپی کردن در)';
 $labels['aclp'] = 'نوشته';
 $labels['shortaclp'] = 'نوشته';
+$labels['aclc'] = 'ایجاد زیرپوشه‌ها';
+$labels['aclk'] = 'ایجاد زیرپوشه‌ها';
+$labels['acld'] = 'پاک کردن پیغام‌ها';
+$labels['aclt'] = 'پاک کردن پیغام‌ها';
+$labels['acle'] = 'پاک کردن';
+$labels['shortacle'] = 'پاک کردن';
 $labels['aclx'] = 'حذف پوشه';
 $labels['acla'] = 'مدیر';
 $labels['shortacla'] = 'مدیر';
@@ -42,4 +57,33 @@ $labels['shortacls'] = 'نگه داشتن';
 $labels['shortacli'] = 'جاگذارى';
 $labels['shortaclc'] = 'ایجاد';
 $labels['shortaclk'] = 'ایجاد';
+$labels['shortaclx'] = 'حذف کردن پوشه';
+$labels['longacll'] = 'پوشه در فهرست‌ها قابل مشاهده است و می‌تواند مشترک به';
+$labels['longaclr'] = 'پوشه می‌تواند برای خواندن باز شود';
+$labels['longaclread'] = 'پوشه می‌تواند برای خواندن باز شود';
+$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['longaclwrite'] = 'پیغام‌ها می‌توانند علامتگذاری، نوشته و یا کپی شوند در پوشه';
+$labels['longacldelete'] = 'پیغام‌ها می‌توانند حذف شوند';
+$labels['deleting'] = 'حذف کردن قوانین دسترسی...';
+$labels['saving'] = 'ذخیره قوانین دسترسی...';
+$labels['updatesuccess'] = 'قوانین دسترسی با موفقیت تغییر کردند';
+$labels['deletesuccess'] = 'قوانین دسترسی با موفقیت حذف شدند';
+$labels['createsuccess'] = 'قوانین دسترسی با موفقیت اضافه شدند';
+$labels['updateerror'] = 'ناتوانی در بروزرسانی قوانین دسترسی';
+$labels['deleteerror'] = 'ناتوانی در حذف قوانین دسترسی';
+$labels['createerror'] = 'ناتوانی در اضافه کردن قوانین دسترسی';
+$labels['deleteconfirm'] = 'آیا شما مطمئن هستید که می‌خواهید قوانین دسترسی را برای کاربر(ان) انتخاب شده حذف نمایید؟';
+$labels['norights'] = 'هیچ قانونی مشخص نشده است!';
+$labels['nouser'] = 'هیج نام‌کاربری‌ای مشخص نشده است!';
 
diff --git a/plugins/acl/localization/it_IT.inc b/plugins/acl/localization/it_IT.inc
new file mode 100644
index 000000000..ce3751c8b
--- /dev/null
+++ b/plugins/acl/localization/it_IT.inc
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/it_IT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Condivisione';
+$labels['myrights'] = 'Diritti d\'accesso';
+$labels['username'] = 'Utente:';
+$labels['advanced'] = 'modalità avanzata';
+$labels['newuser'] = 'Aggiungi voce';
+$labels['anyone'] = 'Tutti gli utenti';
+$labels['anonymous'] = 'Osptiti (anonimi)';
+$labels['identifier'] = 'Identificatore';
+$labels['acll'] = 'Ricerca';
+$labels['shortacll'] = 'Ricerca';
+$labels['aclr'] = 'Leggi messaggi';
+$labels['acls'] = 'Mantieni lo stato Visto';
+$labels['aclw'] = 'Flag di scrittura';
+$labels['acli'] = 'Inserisci (Copia in)';
+$labels['aclc'] = 'Crea sottocartelle';
+$labels['aclk'] = 'Crea sottocartelle';
+$labels['acld'] = 'Elimina messaggi';
+$labels['aclt'] = 'Elimina messaggi';
+$labels['aclx'] = 'Elimina cartella';
+$labels['acla'] = 'Amministra';
+$labels['shortacla'] = 'Amministra';
+$labels['aclfull'] = 'Controllo completo';
+$labels['aclother'] = 'Altri';
+$labels['shortaclother'] = 'Altri';
+$labels['aclread'] = 'Lettura';
+$labels['shortaclr'] = 'Lettura';
+$labels['shortaclread'] = 'Lettura';
+$labels['aclwrite'] = 'Scrittura';
+$labels['shortaclw'] = 'Scrittura';
+$labels['shortaclwrite'] = 'Scrittura';
+$labels['acldelete'] = 'Elimina';
+$labels['shortacld'] = 'Elimina';
+$labels['shortaclt'] = 'Elimina';
+$labels['shortacldelete'] = 'Elimina';
+$labels['shortacls'] = 'Mantieni';
+$labels['shortacli'] = 'Inserisci';
+$labels['shortaclc'] = 'Crea';
+$labels['shortaclk'] = 'Crea';
+$labels['shortaclx'] = 'Cancella cartella';
+$labels['longacll'] = 'La cartella è visibile sulle liste e può essere sottoscritta';
+$labels['longaclr'] = 'Questa cartella può essere aperta in lettura';
+$labels['longaclread'] = 'Questa cartella può essere aperta in lettura';
+$labels['longacls'] = 'Il flag Messaggio Visto può essere cambiato';
+$labels['longaclw'] = 'I flag dei messaggi e le keywords possono essere cambiati, ad esclusione di Visto ed Eliminato';
+$labels['longacli'] = 'I messaggi possono essere scritti o copiati nella cartella';
+$labels['longacld'] = 'Il flag Messaggio Eliminato può essere cambiato';
+$labels['longaclt'] = 'Il flag Messaggio Eliminato può essere cambiato';
+$labels['longaclx'] = 'La cartella può essere eliminata o rinominata';
+$labels['longacla'] = 'I diritti di accesso della cartella possono essere cambiati';
+$labels['longaclfull'] = 'Controllo completo incluso cartella di amministrazione';
+$labels['longaclwrite'] = 'I messaggi possono essere marcati, scritti o copiati nella cartella';
+$labels['longacldelete'] = 'I messaggi possono essere eliminati';
+$labels['deleting'] = 'Sto eliminando i diritti di accesso...';
+$labels['saving'] = 'Sto salvando i diritti di accesso...';
+$labels['updatesuccess'] = 'I diritti d\'accesso sono stati cambiati';
+$labels['deletesuccess'] = 'I diritti d\'accesso sono stati eliminati';
+$labels['createsuccess'] = 'I diritti d\'accesso sono stati aggiunti';
+$labels['updateerror'] = 'Impossibile aggiornare i diritti d\'accesso';
+$labels['deleteerror'] = 'Impossibile eliminare i diritti d\'accesso';
+$labels['createerror'] = 'Impossibile aggiungere i diritti d\'accesso';
+$labels['deleteconfirm'] = 'Sei sicuro, vuoi rimuovere i diritti d\'accesso degli utenti selezionati?';
+$labels['norights'] = 'Nessun diritto specificato!';
+$labels['nouser'] = 'Lo username non è stato specificato!';
+
diff --git a/plugins/acl/localization/ja_JP.inc b/plugins/acl/localization/ja_JP.inc
index 68be68021..3f915e291 100644
--- a/plugins/acl/localization/ja_JP.inc
+++ b/plugins/acl/localization/ja_JP.inc
@@ -19,17 +19,30 @@ $labels['myrights'] = 'アクセス権';
 $labels['username'] = 'ユーザー:';
 $labels['advanced'] = '詳細なモード';
 $labels['newuser'] = '項目を追加';
+$labels['actions'] = 'アクセス権の動作...';
 $labels['anyone'] = '(誰でも)すべてのユーザー';
 $labels['anonymous'] = 'ゲスト(匿名)';
+$labels['identifier'] = '識別子';
 $labels['acll'] = '検索';
 $labels['shortacll'] = '検索';
 $labels['aclr'] = 'メッセージを読む';
+$labels['acls'] = '既読の状態を保持';
 $labels['aclw'] = '書き込みフラッグ';
+$labels['acli'] = '挿入(中に複製)';
+$labels['aclp'] = '投稿';
+$labels['shortaclp'] = '投稿';
 $labels['aclc'] = 'サブフォルダを作成';
 $labels['aclk'] = 'サブフォルダを作成';
 $labels['acld'] = 'メッセージを削除';
 $labels['aclt'] = 'メッセージを削除';
+$labels['acle'] = '抹消';
+$labels['shortacle'] = '抹消';
 $labels['aclx'] = 'フォルダーを削除';
+$labels['acla'] = '管理';
+$labels['shortacla'] = '管理';
+$labels['aclfull'] = '完全な制御';
+$labels['aclother'] = 'その他';
+$labels['shortaclother'] = 'その他';
 $labels['aclread'] = '読み込み';
 $labels['shortaclr'] = '読み込み';
 $labels['shortaclread'] = '読み込み';
@@ -40,16 +53,37 @@ $labels['acldelete'] = '削除';
 $labels['shortacld'] = '削除';
 $labels['shortaclt'] = '削除';
 $labels['shortacldelete'] = '削除';
+$labels['shortacls'] = '保持';
 $labels['shortacli'] = '挿入';
 $labels['shortaclc'] = '作成';
 $labels['shortaclk'] = '作成';
 $labels['shortaclx'] = 'フォルダーの削除';
+$labels['longacll'] = 'フォルダーをリストに見えるようにして登録可能:';
+$labels['longaclr'] = 'フォルダーを読むことを可能';
+$labels['longaclread'] = 'フォルダーを読むことを可能';
+$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['longaclwrite'] = 'メッセージにマークの設定、書き込み、フォルダーに複製を可能';
+$labels['longacldelete'] = 'メッセージの削除を可能';
 $labels['deleting'] = 'アクセス権を削除中...';
 $labels['saving'] = 'アクセス権を保存中...';
-$labels['updatesuccess'] = 'アクセス権を変更しました';
-$labels['deletesuccess'] = 'アクセス権を削除しました';
-$labels['createsuccess'] = 'アクセス権を追加しました';
-$labels['updateerror'] = 'アクセス権を更新できません';
-$labels['deleteerror'] = 'アクセス権を削除できません';
-$labels['createerror'] = 'アクセス権を追加できません';
+$labels['updatesuccess'] = 'アクセス権を変更しました。';
+$labels['deletesuccess'] = 'アクセス権を削除しました。';
+$labels['createsuccess'] = 'アクセス権を追加しました。';
+$labels['updateerror'] = 'アクセス権を更新できません。';
+$labels['deleteerror'] = 'アクセス権を削除できません。';
+$labels['createerror'] = 'アクセス権を追加できません。';
+$labels['deleteconfirm'] = '選択したユーザーのアクセス件を本当に削除したいですか?';
+$labels['norights'] = '何の権限も指定されていません!';
+$labels['nouser'] = 'ユーザー名を指定していません!';
 
diff --git a/plugins/acl/localization/nb_NB.inc b/plugins/acl/localization/nb_NB.inc
new file mode 100644
index 000000000..7b660b737
--- /dev/null
+++ b/plugins/acl/localization/nb_NB.inc
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nb_NB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Peter Grindem <peter@grindem.no>                              |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = 'Deling';
+$labels['myrights'] = 'Tilgangsrettigheter';
+$labels['username'] = 'Bruker:';
+$labels['advanced'] = 'Avansert modus';
+$labels['newuser'] = 'Legg til oppføring';
+$labels['anyone'] = 'Alle brukere (alle)';
+$labels['anonymous'] = 'Gjester (anononyme)';
+$labels['identifier'] = 'Identifikator';
+$labels['acll'] = 'Oppslag';
+$labels['shortacll'] = 'Oppslag';
+$labels['aclr'] = 'Les meldinger';
+$labels['acli'] = 'Lim inn';
+$labels['aclp'] = 'Post';
+$labels['shortaclp'] = 'Post';
+$labels['aclc'] = 'Opprett undermapper';
+$labels['aclk'] = 'Opprett undermapper';
+$labels['acld'] = 'Slett meldinger';
+$labels['aclt'] = 'Slett meldinger';
+$labels['acle'] = 'Slett fullstendig';
+$labels['shortacle'] = 'Slett fullstendig';
+$labels['aclx'] = 'Slett mappe';
+$labels['acla'] = 'Administrer';
+$labels['shortacla'] = 'Administrer';
+
diff --git a/plugins/acl/localization/vi_VN.inc b/plugins/acl/localization/vi_VN.inc
index 66dc1eb50..65dc96dd3 100644
--- a/plugins/acl/localization/vi_VN.inc
+++ b/plugins/acl/localization/vi_VN.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
+ | Author: Kenny Tran <kennethanh@gmail.com>                             |
  +-----------------------------------------------------------------------+
 */
 
@@ -17,20 +17,27 @@ $labels = array();
 $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ách ứng xử quyền truy cập';
 $labels['anyone'] = 'Tất cả người dùng (bất kỳ ai)';
-$labels['anonymous'] = 'Khách (vô hình)';
+$labels['anonymous'] = 'Khách (nặc danh)';
+$labels['identifier'] = 'Định danh';
 $labels['acll'] = 'Tìm kiếm';
 $labels['shortacll'] = 'Tìm kiếm';
 $labels['aclr'] = 'Đọc thư';
+$labels['acls'] = 'Giữ trạng thái đã xem qua';
+$labels['aclw'] = 'Cờ đánh dấu cho mục viết';
 $labels['acli'] = 'Chèn thêm (sao chép vào)';
 $labels['aclp'] = 'Đăng bài';
 $labels['shortaclp'] = 'Đăng bài';
-$labels['aclc'] = 'Khởi tạo thư mục con';
-$labels['aclk'] = 'Khởi tạo thư mục con';
+$labels['aclc'] = 'Tạo giữ liệu con';
+$labels['aclk'] = 'Tạo giữ liệu con';
 $labels['acld'] = 'Xóa thư';
 $labels['aclt'] = 'Xóa thư';
-$labels['aclx'] = 'Xóa folder';
+$labels['acle'] = 'Thải bỏ';
+$labels['shortacle'] = 'Thải bỏ';
+$labels['aclx'] = 'Xóa giữ liệu';
 $labels['acla'] = 'Quản lý';
 $labels['shortacla'] = 'Quản lý';
 $labels['aclfull'] = 'Quản lý toàn bộ';
@@ -50,23 +57,33 @@ $labels['shortacls'] = 'Giữ';
 $labels['shortacli'] = 'Chèn';
 $labels['shortaclc'] = 'Tạo mới';
 $labels['shortaclk'] = 'Tạo mới';
-$labels['longacll'] = 'Thư mục có sẵn trong danh sách và có thể gửi tới';
-$labels['longaclr'] = 'Folder có thể được mở để đọc';
-$labels['longaclread'] = 'Folder có thể được mở để đọc';
-$labels['longacli'] = 'Thư có thể được ghi hoặc sao chép tới thư mục';
-$labels['longaclp'] = 'Thư có thể';
-$labels['longaclc'] = 'Cácthư mục có thể được tạo (hoặc đặt lại tên) trực tiếp dưới thư mục này';
-$labels['longaclk'] = 'Cácthư mục có thể được tạo (hoặc đặt lại tên) trực tiếp dưới thư mục này';
-$labels['longaclx'] = 'Folder có thể xóa được hoặc đặt lại tên';
-$labels['longacla'] = 'Quyênf truy cập folder có thể thay đổi';
-$labels['longaclfull'] = 'Quản lý toàn bộ bao gồm cả thư mục hành chính';
-$labels['longaclwrite'] = 'Thư có thể được đánh dấu, ghi hoăc sao chép tới thư mục';
+$labels['shortaclx'] = 'Giữ liệu được xóa';
+$labels['longacll'] = 'Giữ liệu đã được liệt kê và có thể đóng góp';
+$labels['longaclr'] = 'Giữ liệu có thể được mở để đọc';
+$labels['longaclread'] = 'Giữ liệu có thể được mở để đọc';
+$labels['longacls'] = 'Cờ đánh dấu thư đã xem qua có thể thay đổi';
+$labels['longaclw'] = 'Cờ thư và từ khóa có thể thay đổi, ngoại trừ đã xem qua và bị xóa';
+$labels['longacli'] = 'Thư có thể được ghi hoặc sao chép vào giữ liệu';
+$labels['longaclp'] = 'Thư có thể bỏ vào trong giữ liệu này';
+$labels['longaclc'] = 'Các giữ liệu có thể được tạo (hoặc đặt lại tên) trực tiếp dưới giữ liệu này';
+$labels['longaclk'] = 'Các giữ liệu có thể được tạo (hoặc đặt lại tên) trực tiếp dưới giữ liệu này';
+$labels['longacld'] = 'Cờ đánh dấu thư xóa có thể thay đổi';
+$labels['longaclt'] = 'Cờ đánh dấu thư xóa có thể thay đổi';
+$labels['longacle'] = 'Thư có thể thải bỏ';
+$labels['longaclx'] = 'Giữ liệu có thể xóa được hoặc đặt lại tên';
+$labels['longacla'] = 'Quyên truy cập giữ liệu có thể thay đổi';
+$labels['longaclfull'] = 'Quản lý toàn bộ bao gồm cả sự thi hành giữ liệu';
+$labels['longaclwrite'] = 'Thư có thể được đánh dấu, ghi hoăc sao chép vào giữ liệu';
 $labels['longacldelete'] = 'Thư có thể bị xóa';
 $labels['deleting'] = 'Xóa quyền truy cập...';
 $labels['saving'] = 'Lưu quyền truy cập...';
 $labels['updatesuccess'] = 'Thay đổi quyền truy cập thành công...';
 $labels['deletesuccess'] = 'Xóa quyền truy cập thành công...';
 $labels['createsuccess'] = 'Thêm quyền truy cập thành công...';
+$labels['updateerror'] = 'Không thể cập nhật quyền truy cập';
 $labels['deleteerror'] = 'Khôngthể xóa quyền truy cập';
+$labels['createerror'] = 'Không thể thêm quyền truy cập';
 $labels['deleteconfirm'] = 'Bạn có chắc là muốn xóa bỏ quyền truy cập của người dùng được chọn?';
+$labels['norights'] = 'Chưa có quyền nào được chỉ định!';
+$labels['nouser'] = 'Chưa có tên truy nhập được chỉ định!';
 
diff --git a/plugins/acl/localization/zh_CN.inc b/plugins/acl/localization/zh_CN.inc
new file mode 100644
index 000000000..3cde07aa8
--- /dev/null
+++ b/plugins/acl/localization/zh_CN.inc
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_CN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: WeiHua.Deng <mcp2000@gmail.com>                               |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['sharing'] = '共享中';
+$labels['myrights'] = '访问权限';
+$labels['username'] = '用户名：';
+$labels['advanced'] = '高级模式';
+$labels['newuser'] = '添加条目';
+$labels['anyone'] = '所有用户(任何人)';
+$labels['anonymous'] = '来宾(匿名)';
+$labels['identifier'] = '标识符';
+$labels['acll'] = '查找';
+$labels['shortacll'] = '查找';
+$labels['aclr'] = '读取消息';
+$labels['acls'] = '保存已读状态';
+$labels['acli'] = '插入(复制至)';
+$labels['aclp'] = '发送';
+$labels['shortaclp'] = '发送';
+$labels['aclc'] = '创建子文件夹';
+$labels['aclk'] = '创建子文件夹';
+$labels['acld'] = '删除消息';
+$labels['aclt'] = '删除消息';
+$labels['aclx'] = '删除文件夹';
+$labels['acla'] = '管理';
+$labels['shortacla'] = '管理';
+$labels['aclother'] = '其他';
+$labels['shortaclother'] = '其他';
+$labels['aclwrite'] = '撰写';
+$labels['shortaclw'] = '撰写';
+$labels['shortaclwrite'] = '撰写';
+$labels['acldelete'] = '删除';
+$labels['shortacld'] = '删除';
+$labels['shortaclt'] = '删除';
+$labels['shortacldelete'] = '删除';
+$labels['shortacls'] = '保留';
+$labels['shortacli'] = '插入';
+$labels['shortaclc'] = '新建';
+$labels['shortaclk'] = '新建';
+$labels['shortaclx'] = '删除文件夹';
+$labels['longacll'] = '该文件夹在列表上可见且可被订阅';
+$labels['longaclr'] = '该文件夹可被打开阅读';
+$labels['longaclread'] = '该文件夹可被打开阅读';
+$labels['longaclx'] = '该文件夹可悲删除或重命名';
+$labels['deleting'] = '删除访问权限中…';
+$labels['saving'] = '保存访问权限中…';
+$labels['updatesuccess'] = '成功修改访问权限';
+$labels['deletesuccess'] = '成功删除访问权限';
+$labels['createsuccess'] = '成功添加访问权限';
+$labels['updateerror'] = '无法更新访问权限';
+$labels['deleteerror'] = '无法删除访问权限';
+$labels['createerror'] = '无法添加访问权限';
+$labels['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';
+$labels['norights'] = '没有已指定的权限!';
+$labels['nouser'] = '没有已指定的用户名!';
+
diff --git a/plugins/archive/localization/ar_SA.inc b/plugins/archive/localization/ar_SA.inc
index 1d213926b..053891f2e 100644
--- a/plugins/archive/localization/ar_SA.inc
+++ b/plugins/archive/localization/ar_SA.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Ossama M. Khayat <okhayat@yahoo.com>                          |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'الأرشيف';
+$labels['archivefolder'] = 'الأرشيف';
 $labels['buttontitle'] = 'أرشف هذه الرسالة';
 $labels['archived'] = 'أُرشفت بنجاح';
-$labels['archivefolder'] = 'الأرشيف';
 
diff --git a/plugins/archive/localization/be_BE.inc b/plugins/archive/localization/be_BE.inc
index b46d0d6c0..7e56c3bb2 100644
--- a/plugins/archive/localization/be_BE.inc
+++ b/plugins/archive/localization/be_BE.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by>                                  |
+ | Author: Alex Nehaichik <alex.nehaichik@gmail.com>                     |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Архіў';
+$labels['archivefolder'] = 'Архіў';
 $labels['buttontitle'] = 'Перанесці ў Архіў';
 $labels['archived'] = 'Паспяхова перанесены ў Архіў';
-$labels['archivefolder'] = 'Архіў';
 
diff --git a/plugins/archive/localization/bs_BA.inc b/plugins/archive/localization/bs_BA.inc
index 96c29d46b..ec795e23b 100644
--- a/plugins/archive/localization/bs_BA.inc
+++ b/plugins/archive/localization/bs_BA.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arhiva';
+$labels['archivefolder'] = 'Arhiva';
 $labels['buttontitle'] = 'Arhiviraj ovu poruku';
 $labels['archived'] = 'Arhiviranje uspješno';
-$labels['archivefolder'] = 'Arhiva';
 
diff --git a/plugins/archive/localization/ca_ES.inc b/plugins/archive/localization/ca_ES.inc
index 51f6d9598..22502f008 100644
--- a/plugins/archive/localization/ca_ES.inc
+++ b/plugins/archive/localization/ca_ES.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emi Bcn <Unknown>                                             |
+ | Author: Emi Bcn                                                       |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arxiva';
+$labels['archivefolder'] = 'Arxiva';
 $labels['buttontitle'] = 'Arxiva aquest missatge';
 $labels['archived'] = 'Arxivat correctament';
-$labels['archivefolder'] = 'Arxiva';
 
diff --git a/plugins/archive/localization/cy_GB.inc b/plugins/archive/localization/cy_GB.inc
index 8a57103a5..579c5b16e 100644
--- a/plugins/archive/localization/cy_GB.inc
+++ b/plugins/archive/localization/cy_GB.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos <Unknown>                                        |
+ | Author: Dafydd Tomos                                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Archif';
+$labels['archivefolder'] = 'Archif';
 $labels['buttontitle'] = 'Archifo\'r neges hwn';
 $labels['archived'] = 'Archifwyd yn llwyddiannus';
-$labels['archivefolder'] = 'Archif';
 
diff --git a/plugins/archive/localization/da_DK.inc b/plugins/archive/localization/da_DK.inc
index 15f9e52c6..936c05cbe 100644
--- a/plugins/archive/localization/da_DK.inc
+++ b/plugins/archive/localization/da_DK.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Johannes Hessellund <osos@openeyes.dk>                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arkiv';
+$labels['archivefolder'] = 'Arkiv';
 $labels['buttontitle'] = 'Arkivér denne besked';
 $labels['archived'] = 'Succesfuldt arkiveret.';
-$labels['archivefolder'] = 'Arkiv';
 
diff --git a/plugins/archive/localization/el_GR.inc b/plugins/archive/localization/el_GR.inc
index b3ad1cf71..a06372c00 100644
--- a/plugins/archive/localization/el_GR.inc
+++ b/plugins/archive/localization/el_GR.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Nikos Keramidis <info@torus.gr>                               |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Αρχειοθέτηση';
+$labels['archivefolder'] = 'Αρχειοθέτηση';
 $labels['buttontitle'] = 'Αρχειοθέτηση μηνύματος';
 $labels['archived'] = 'Αρχειοθετήθηκε με επιτυχία';
-$labels['archivefolder'] = 'Αρχειοθέτηση';
 
diff --git a/plugins/archive/localization/en_GB.inc b/plugins/archive/localization/en_GB.inc
index b60c3d64d..c65672e6e 100644
--- a/plugins/archive/localization/en_GB.inc
+++ b/plugins/archive/localization/en_GB.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Chris January <Unknown>                                       |
+ | Author: Chris January                                                 |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Archive';
+$labels['archivefolder'] = 'Archive';
 $labels['buttontitle'] = 'Archive this message';
 $labels['archived'] = 'Successfully archived';
-$labels['archivefolder'] = 'Archive';
 
diff --git a/plugins/archive/localization/eo.inc b/plugins/archive/localization/eo.inc
index d4a6a0ab5..e878635ee 100644
--- a/plugins/archive/localization/eo.inc
+++ b/plugins/archive/localization/eo.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arkivo';
+$labels['archivefolder'] = 'Arkivo';
 $labels['buttontitle'] = 'Arkivigi ĉi tiun mesaĝon';
 $labels['archived'] = 'Sukcese arkivigita';
-$labels['archivefolder'] = 'Arkivo';
 
diff --git a/plugins/archive/localization/fa_IR.inc b/plugins/archive/localization/fa_IR.inc
index e7c6dd932..c3f236837 100644
--- a/plugins/archive/localization/fa_IR.inc
+++ b/plugins/archive/localization/fa_IR.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Hamid <abbaszadeh.h@gmail.com>                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'بایگانی';
+$labels['archivefolder'] = 'بایگانی';
 $labels['buttontitle'] = 'بایگانی این پیغام';
 $labels['archived'] = 'با موفقیت بایگانی شد';
-$labels['archivefolder'] = 'بایگانی';
 
diff --git a/plugins/archive/localization/fi_FI.inc b/plugins/archive/localization/fi_FI.inc
index bfb467519..f2b693283 100644
--- a/plugins/archive/localization/fi_FI.inc
+++ b/plugins/archive/localization/fi_FI.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos <Unknown>                                      |
+ | Author: Jiri Grönroos                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arkistoi';
+$labels['archivefolder'] = 'Arkistoi';
 $labels['buttontitle'] = 'Arkistoi viesti';
 $labels['archived'] = 'Arkistoitu onnistuneesti';
-$labels['archivefolder'] = 'Arkistoi';
 
diff --git a/plugins/archive/localization/he_IL.inc b/plugins/archive/localization/he_IL.inc
index f82f40cdf..2243bea93 100644
--- a/plugins/archive/localization/he_IL.inc
+++ b/plugins/archive/localization/he_IL.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Moshe Leibovitch <moish@mln.co.il>                            |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'ארכיון';
+$labels['archivefolder'] = 'ארכיון';
 $labels['buttontitle'] = 'משלוח ההודעה לארכיב';
 $labels['archived'] = 'עדכון הארכיון הצליח';
-$labels['archivefolder'] = 'ארכיון';
 
diff --git a/plugins/archive/localization/hr_HR.inc b/plugins/archive/localization/hr_HR.inc
index bca3399da..3ef79d4dd 100644
--- a/plugins/archive/localization/hr_HR.inc
+++ b/plugins/archive/localization/hr_HR.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Svebor Prstačić <svebor.prstacic@gmail.com>                 |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arhiva';
+$labels['archivefolder'] = 'Arhiva';
 $labels['buttontitle'] = 'Arhiviraj poruku';
 $labels['archived'] = 'Uspješno arhivirana';
-$labels['archivefolder'] = 'Arhiva';
 
diff --git a/plugins/archive/localization/hu_HU.inc b/plugins/archive/localization/hu_HU.inc
index 42bfad256..edc915191 100644
--- a/plugins/archive/localization/hu_HU.inc
+++ b/plugins/archive/localization/hu_HU.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Droszler Gabor <droszler@datatrans.hu>                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Archiválás';
+$labels['archivefolder'] = 'Archiválás';
 $labels['buttontitle'] = 'Üzenet archiválása';
 $labels['archived'] = 'Sikeres archiválás';
-$labels['archivefolder'] = 'Archiválás';
 
diff --git a/plugins/archive/localization/id_ID.inc b/plugins/archive/localization/id_ID.inc
index 366bfac1c..aee53a564 100644
--- a/plugins/archive/localization/id_ID.inc
+++ b/plugins/archive/localization/id_ID.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya <Unknown>                              |
+ | Author: Putu Arya Sabda Wijaya                                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arsip';
+$labels['archivefolder'] = 'Arsip';
 $labels['buttontitle'] = 'Arsipkan pesan ini';
 $labels['archived'] = 'Berhasil mengarsipkan';
-$labels['archivefolder'] = 'Arsip';
 
diff --git a/plugins/archive/localization/it_IT.inc b/plugins/archive/localization/it_IT.inc
index ead498c98..636965df7 100644
--- a/plugins/archive/localization/it_IT.inc
+++ b/plugins/archive/localization/it_IT.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: emilio brambilla <Unknown>                                    |
+ | Author: emilio brambilla                                              |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Archivio';
+$labels['archivefolder'] = 'Archivio';
 $labels['buttontitle'] = 'Archivia questo messaggio';
 $labels['archived'] = 'Archiviato correttamente';
-$labels['archivefolder'] = 'Archivio';
 
diff --git a/plugins/archive/localization/ku.inc b/plugins/archive/localization/ku.inc
index 6a2b3fc6e..235eedf39 100644
--- a/plugins/archive/localization/ku.inc
+++ b/plugins/archive/localization/ku.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: david absalan <absalan@live.com>                              |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arşîv';
+$labels['archivefolder'] = 'Arşîv';
 $labels['buttontitle'] = 'am masaja bxa arşiv';
 $labels['archived'] = 'ba gşti Arşiv kra';
-$labels['archivefolder'] = 'Arşîv';
 
diff --git a/plugins/archive/localization/lt_LT.inc b/plugins/archive/localization/lt_LT.inc
index 6f9ed9ada..2beb03136 100644
--- a/plugins/archive/localization/lt_LT.inc
+++ b/plugins/archive/localization/lt_LT.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Rimas Kudelis <rq@akl.lt>                                     |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Archyvuoti';
+$labels['archivefolder'] = 'Archyvuoti';
 $labels['buttontitle'] = 'Perkelti šį laišką į archyvą';
 $labels['archived'] = 'Laiškas sėkmingai perkeltas į archyvą';
-$labels['archivefolder'] = 'Archyvuoti';
 
diff --git a/plugins/archive/localization/lv_LV.inc b/plugins/archive/localization/lv_LV.inc
index d8fec4d7b..d806fcf65 100644
--- a/plugins/archive/localization/lv_LV.inc
+++ b/plugins/archive/localization/lv_LV.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Ivars Strazdiņš <Unknown>                                   |
+ | Author: Ivars Strazdiņš                                             |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arhīvs';
+$labels['archivefolder'] = 'Arhīvs';
 $labels['buttontitle'] = 'Arhivēt vēstuli';
 $labels['archived'] = 'Vēstule sekmīgi arhivēta';
-$labels['archivefolder'] = 'Arhīvs';
 
diff --git a/plugins/archive/localization/ml_IN.inc b/plugins/archive/localization/ml_IN.inc
new file mode 100644
index 000000000..13569bf12
--- /dev/null
+++ b/plugins/archive/localization/ml_IN.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ml_IN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Anish A <aneesh.nl@gmail.com>                                 |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = 'ശേഖരം';
+$labels['archivefolder'] = 'ശേഖരം';
+$labels['buttontitle'] = 'ഈ മെസ്സേജ് ശേഖരിക്കുക';
+$labels['archived'] = 'വിജയകരമായി ശേഖരിച്ചു';
+
diff --git a/plugins/archive/localization/mr_IN.inc b/plugins/archive/localization/mr_IN.inc
index 33db12629..5b66f43a3 100644
--- a/plugins/archive/localization/mr_IN.inc
+++ b/plugins/archive/localization/mr_IN.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Devendra Buddhikot <devendradb@rediffmail.com>                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'जतन केलेला';
+$labels['archivefolder'] = 'जतन केलेला';
 $labels['buttontitle'] = 'हा संदेश जतन करा';
 $labels['archived'] = 'यशस्वीरीत्या जतन केला';
-$labels['archivefolder'] = 'जतन केलेला';
 
diff --git a/plugins/archive/localization/nb_NB.inc b/plugins/archive/localization/nb_NB.inc
index 52f9fd95d..46e49aba0 100644
--- a/plugins/archive/localization/nb_NB.inc
+++ b/plugins/archive/localization/nb_NB.inc
@@ -9,12 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Martin Bore <Unknown>                                         |
+ | Author: Tobias V. Langhoff <spug@thespug.net>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['buttontitle'] = 'Arkiver meldingen';
+$labels['buttontext'] = 'Arkiv';
 $labels['archivefolder'] = 'Arkiv';
+$labels['buttontitle'] = 'Arkiver meldingen';
+$labels['archived'] = 'Arkivert';
 
diff --git a/plugins/archive/localization/pt_PT.inc b/plugins/archive/localization/pt_PT.inc
index b653d337b..712e05b5f 100644
--- a/plugins/archive/localization/pt_PT.inc
+++ b/plugins/archive/localization/pt_PT.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David <Unknown>                                               |
+ | Author: David                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arquivo';
+$labels['archivefolder'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensagem';
 $labels['archived'] = 'Arquivada com sucesso';
-$labels['archivefolder'] = 'Arquivo';
 
diff --git a/plugins/archive/localization/ro_RO.inc b/plugins/archive/localization/ro_RO.inc
index a863b13fd..1d3c6e4c8 100644
--- a/plugins/archive/localization/ro_RO.inc
+++ b/plugins/archive/localization/ro_RO.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: tudor <tudor@starnet-alba.ro>                                 |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arhivă';
+$labels['archivefolder'] = 'Arhivă';
 $labels['buttontitle'] = 'Arhivează acest mesaj.';
 $labels['archived'] = 'Arhivare reuşită.';
-$labels['archivefolder'] = 'Arhivă';
 
diff --git a/plugins/archive/localization/si_LK.inc b/plugins/archive/localization/si_LK.inc
index b73a7e5ed..46acc199e 100644
--- a/plugins/archive/localization/si_LK.inc
+++ b/plugins/archive/localization/si_LK.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Mohamed Rizmi <Unknown>                                       |
+ | Author: Mohamed Rizmi                                                 |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'සංරක්‍ෂණය';
+$labels['archivefolder'] = 'සංරක්‍ෂණය';
 $labels['buttontitle'] = 'මෙම පණිවිඩය සංරක්‍ෂණය කරන්න';
 $labels['archived'] = 'සංරක්‍ෂණය සාර්ථකයි';
-$labels['archivefolder'] = 'සංරක්‍ෂණය';
 
diff --git a/plugins/archive/localization/sk_SK.inc b/plugins/archive/localization/sk_SK.inc
index 94116b1cb..d5310795c 100644
--- a/plugins/archive/localization/sk_SK.inc
+++ b/plugins/archive/localization/sk_SK.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda <Unknown>                                               |
+ | Author: panda                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Archivovať';
+$labels['archivefolder'] = 'Archivovať';
 $labels['buttontitle'] = 'Archivovať túto správu';
 $labels['archived'] = 'Úspešne archivované';
-$labels['archivefolder'] = 'Archivovať';
 
diff --git a/plugins/archive/localization/sl_SI.inc b/plugins/archive/localization/sl_SI.inc
index f11f3eb66..9a50bb59a 100644
--- a/plugins/archive/localization/sl_SI.inc
+++ b/plugins/archive/localization/sl_SI.inc
@@ -11,11 +11,11 @@
  +-----------------------------------------------------------------------+
  | Author: Barbara Krasovec <barbarak@arnes.si>                          |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arhiv';
+$labels['archivefolder'] = 'Arhiv';
 $labels['buttontitle'] = 'Arhiviraj to sporočilo';
 $labels['archived'] = 'Sporočilo je bilo uspešno arhivirano';
-$labels['archivefolder'] = 'Arhiv';
 
diff --git a/plugins/archive/localization/tr_TR.inc b/plugins/archive/localization/tr_TR.inc
index 55180addf..6b63dc87c 100644
--- a/plugins/archive/localization/tr_TR.inc
+++ b/plugins/archive/localization/tr_TR.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul <Unknown>                                      |
+ | Author: ismail yenigul                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Arşiv';
+$labels['archivefolder'] = 'Arşiv';
 $labels['buttontitle'] = 'Bu postayı arşivle';
 $labels['archived'] = 'Başarıyla arşivlendi';
-$labels['archivefolder'] = 'Arşiv';
 
diff --git a/plugins/archive/localization/uk_UA.inc b/plugins/archive/localization/uk_UA.inc
index a4dc1468f..18d5f9344 100644
--- a/plugins/archive/localization/uk_UA.inc
+++ b/plugins/archive/localization/uk_UA.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anton Gladky <Unknown>                                        |
+ | Author: Anton Gladky                                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Архів';
+$labels['archivefolder'] = 'Архів';
 $labels['buttontitle'] = 'Архівувати це повідомлення';
 $labels['archived'] = 'Перенесено в архів';
-$labels['archivefolder'] = 'Архів';
 
diff --git a/plugins/archive/localization/vi_VN.inc b/plugins/archive/localization/vi_VN.inc
index f16af6df1..07775c9b0 100644
--- a/plugins/archive/localization/vi_VN.inc
+++ b/plugins/archive/localization/vi_VN.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
+ | Author: Kenny Tran <kennethanh@gmail.com>                             |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Lưu trữ';
+$labels['archivefolder'] = 'Lưu trữ';
 $labels['buttontitle'] = 'Lưu lại bức thư này';
 $labels['archived'] = 'Lưu lại thành công';
-$labels['archivefolder'] = 'Danh sách thư cũ';
 
diff --git a/plugins/archive/localization/zh_CN.inc b/plugins/archive/localization/zh_CN.inc
index 2dc250a6c..a9eca45ae 100644
--- a/plugins/archive/localization/zh_CN.inc
+++ b/plugins/archive/localization/zh_CN.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: waring_id <Unknown>                                           |
+ | Author: waring_id                                                     |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = '存档';
+$labels['archivefolder'] = '存档';
 $labels['buttontitle'] = '将该信息存档';
 $labels['archived'] = '存档成功';
-$labels['archivefolder'] = '存档';
 
diff --git a/plugins/help/localization/en_GB.inc b/plugins/help/localization/en_GB.inc
index 8c2d1517c..206856af7 100644
--- a/plugins/help/localization/en_GB.inc
+++ b/plugins/help/localization/en_GB.inc
@@ -1,8 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | localization/en_GB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Anthony Harrington <untaintableangel@ubuntu.com>              |
+ +-----------------------------------------------------------------------+
+*/
+
 $labels = array();
 $labels['help'] = 'Help';
 $labels['about'] = 'About';
-$labels['license'] = 'License';
+$labels['license'] = 'Licence';
 
-?>
diff --git a/plugins/help/localization/eo.inc b/plugins/help/localization/eo.inc
new file mode 100644
index 000000000..0347b770f
--- /dev/null
+++ b/plugins/help/localization/eo.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/eo/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Helpo';
+$labels['about'] = 'Pri';
+$labels['license'] = 'Permesilo';
+
diff --git a/plugins/help/localization/it_IT.inc b/plugins/help/localization/it_IT.inc
new file mode 100644
index 000000000..b81904da5
--- /dev/null
+++ b/plugins/help/localization/it_IT.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/it_IT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Aiuto';
+$labels['about'] = 'Informazioni';
+$labels['license'] = 'Licenza';
+
diff --git a/plugins/help/localization/nb_NB.inc b/plugins/help/localization/nb_NB.inc
new file mode 100644
index 000000000..34881d61d
--- /dev/null
+++ b/plugins/help/localization/nb_NB.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nb_NB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Tobias V. Langhoff <spug@thespug.net>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['help'] = 'Hjelp';
+$labels['about'] = 'Om';
+$labels['license'] = 'Lisensvilkår';
+
diff --git a/plugins/help/localization/vi_VN.inc b/plugins/help/localization/vi_VN.inc
index 9c737464e..9d0f1e4aa 100644
--- a/plugins/help/localization/vi_VN.inc
+++ b/plugins/help/localization/vi_VN.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
+ | Author: Kenny Tran <kennethanh@gmail.com>                             |
  +-----------------------------------------------------------------------+
 */
 
 $labels = array();
 $labels['help'] = 'Trợ giúp';
-$labels['about'] = 'Giới thiệu';
+$labels['about'] = 'Lời ngõ';
 $labels['license'] = 'Bản quyền';
 
diff --git a/plugins/hide_blockquote/localization/eo.inc b/plugins/hide_blockquote/localization/eo.inc
new file mode 100644
index 000000000..81628a388
--- /dev/null
+++ b/plugins/hide_blockquote/localization/eo.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/eo/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Kaŝi';
+$labels['show'] = 'Montri';
+$labels['quotelimit'] = 'Kaŝi citaĵon kiam la nombro de linioj estas pligranda ol';
+
diff --git a/plugins/hide_blockquote/localization/et_EE.inc b/plugins/hide_blockquote/localization/et_EE.inc
new file mode 100644
index 000000000..ae426f915
--- /dev/null
+++ b/plugins/hide_blockquote/localization/et_EE.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/et_EE/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: yllar                                                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Peida';
+$labels['show'] = 'Näita';
+$labels['quotelimit'] = 'Peida tsitaat kui ridade arv on suurem kui';
+
diff --git a/plugins/hide_blockquote/localization/fa_IR.inc b/plugins/hide_blockquote/localization/fa_IR.inc
new file mode 100644
index 000000000..02934f1e3
--- /dev/null
+++ b/plugins/hide_blockquote/localization/fa_IR.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fa_IR/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Hamid <abbaszadeh.h@gmail.com>                                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'مخفی کردن';
+$labels['show'] = 'نشان دادن';
+$labels['quotelimit'] = 'مخفی کردن نقل‌قول وقتی تعداد خطوط بیشتر است از';
+
diff --git a/plugins/hide_blockquote/localization/it_IT.inc b/plugins/hide_blockquote/localization/it_IT.inc
new file mode 100644
index 000000000..6ae2b6ec4
--- /dev/null
+++ b/plugins/hide_blockquote/localization/it_IT.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/it_IT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Nascondi';
+$labels['show'] = 'Mostra';
+$labels['quotelimit'] = 'Nascondi la citazione quando il numero di righe è maggiore di';
+
diff --git a/plugins/hide_blockquote/localization/nb_NB.inc b/plugins/hide_blockquote/localization/nb_NB.inc
new file mode 100644
index 000000000..da50e8560
--- /dev/null
+++ b/plugins/hide_blockquote/localization/nb_NB.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nb_NB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Tobias V. Langhoff <spug@thespug.net>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = 'Skjul';
+$labels['show'] = 'Vis';
+$labels['quotelimit'] = 'Skjul sitat når antall linjer er flere enn';
+
diff --git a/plugins/hide_blockquote/localization/zh_CN.inc b/plugins/hide_blockquote/localization/zh_CN.inc
new file mode 100644
index 000000000..5d66f4dcf
--- /dev/null
+++ b/plugins/hide_blockquote/localization/zh_CN.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_CN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Christopher Meng <cickumqt@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['hide'] = '隐藏';
+$labels['show'] = '显示';
+$labels['quotelimit'] = '隐藏引用当行数大于';
+
diff --git a/plugins/managesieve/localization/bs_BA.inc b/plugins/managesieve/localization/bs_BA.inc
index 83d27cb0b..438d99e9c 100644
--- a/plugins/managesieve/localization/bs_BA.inc
+++ b/plugins/managesieve/localization/bs_BA.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -53,7 +52,7 @@ $labels['add'] = 'Dodaj';
 $labels['del'] = 'Obriši';
 $labels['sender'] = 'Pošiljaoc';
 $labels['recipient'] = 'Primaoc';
-$labels['vacationaddresses'] = 'Dodatna lista emailova primaoca (odvojenih zarezima):';
+$labels['vacationaddresses'] = 'Moje dodatne email adrese (odvojite zarezima):';
 $labels['vacationdays'] = 'Frekvencija slanja poruka (u danima):';
 $labels['vacationreason'] = 'Tijelo poruke (razlog za odmor):';
 $labels['vacationsubject'] = 'Naslov poruke:';
diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc
index 077a9d437..d7e8b67be 100644
--- a/plugins/managesieve/localization/ca_ES.inc
+++ b/plugins/managesieve/localization/ca_ES.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: LordRoger <launchpad@rogerpueyo.com>                          |
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -20,7 +19,7 @@ $labels['managefilters'] = 'Gestiona els filtres dels missatges d\'entrada';
 $labels['filtername'] = 'Nom del filtre';
 $labels['newfilter'] = 'Filtre Nou';
 $labels['filteradd'] = 'Afegeix un filtre';
-$labels['filterdel'] = 'Esborra el filtre';
+$labels['filterdel'] = 'Suprimeix el filtre';
 $labels['moveup'] = 'Mou amunt';
 $labels['movedown'] = 'Mou avall';
 $labels['filterallof'] = 'que coincideixi amb totes les regles següents';
@@ -39,9 +38,9 @@ $labels['filternotregex'] = 'no coincideix amb l\'expressió regular';
 $labels['filterunder'] = 'sota';
 $labels['filterover'] = 'sobre';
 $labels['addrule'] = 'Afegeix una regla';
-$labels['delrule'] = 'Esborra regla';
+$labels['delrule'] = 'Suprimeix regla';
 $labels['messagemoveto'] = 'Mou el missatge a';
-$labels['messageredirect'] = 'Redirecciona el missatge a';
+$labels['messageredirect'] = 'Redirigeix el missatge cap a';
 $labels['messagecopyto'] = 'Copia el missatge a';
 $labels['messagesendcopy'] = 'Envia una còpia del missatge a';
 $labels['messagereply'] = 'Respon amb un missatge';
@@ -53,7 +52,7 @@ $labels['add'] = 'Afegeix';
 $labels['del'] = 'Suprimeix';
 $labels['sender'] = 'Remitent';
 $labels['recipient'] = 'Destinatari/a';
-$labels['vacationaddresses'] = 'Llista addicional de correus destinataris (separats per coma):';
+$labels['vacationaddresses'] = 'Altres adreces electròniques meves (separades per coma)';
 $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):';
 $labels['vacationreason'] = 'Cos del missatge (raó de les vacances):';
 $labels['vacationsubject'] = 'Assumpte del missatge:';
@@ -62,7 +61,7 @@ $labels['enable'] = 'Habilita/deshabilita';
 $labels['filterset'] = 'Conjunt de filtres';
 $labels['filtersets'] = 'Conjunts de filtres';
 $labels['filtersetadd'] = 'Afegeix conjunts de filtres';
-$labels['filtersetdel'] = 'Esborra el conjunt de filtres actual';
+$labels['filtersetdel'] = 'Suprimeix el conjunt de filtres actual';
 $labels['filtersetact'] = 'Activa el conjunt de filtres actual';
 $labels['filtersetdeact'] = 'Desactiva el conjunt de filtres actual';
 $labels['filterdef'] = 'Definició del filtre';
@@ -70,7 +69,8 @@ $labels['filtersetname'] = 'Nom del conjunt de filtres';
 $labels['newfilterset'] = 'Nou conjunt de filtres';
 $labels['active'] = 'actiu';
 $labels['none'] = 'cap';
-$labels['fromfile'] = 'des d\'un fitxer';
+$labels['fromset'] = 'des del conjunt';
+$labels['fromfile'] = 'des del fitxer';
 $labels['filterdisabled'] = 'Filtre deshabilitat';
 $labels['countisgreaterthan'] = 'el recompte és major que';
 $labels['countisgreaterthanequal'] = 'el recompte és major o igual que';
@@ -86,14 +86,14 @@ $labels['valueequals'] = 'el valor és igual que';
 $labels['valuenotequals'] = 'el valor és diferent de';
 $labels['setflags'] = 'Posa indicadors al missatge';
 $labels['addflags'] = 'Afegeix indicadors al missatge';
-$labels['removeflags'] = 'Esborra indicadors del missatge';
-$labels['flagread'] = 'Llegir';
-$labels['flagdeleted'] = 'Esborrat';
+$labels['removeflags'] = 'Suprimeix indicadors del missatge';
+$labels['flagread'] = 'Llegit';
+$labels['flagdeleted'] = 'Suprimit';
 $labels['flaganswered'] = 'Respost';
 $labels['flagflagged'] = 'Marcat';
 $labels['flagdraft'] = 'Esborrany';
 $labels['filtercreate'] = 'Crea filtre';
-$labels['usedata'] = 'Usa la següent data al filtre:';
+$labels['usedata'] = 'Fes servir les següents dades al filtre:';
 $labels['nextstep'] = 'Següent pas';
 $labels['...'] = '...';
 $labels['advancedopts'] = 'Opcions avançades';
@@ -113,31 +113,37 @@ $labels['detail'] = 'detall';
 $labels['comparator'] = 'comparador:';
 $labels['default'] = 'per omissió';
 $labels['octet'] = 'estricte (octet)';
-$labels['asciicasemap'] = 'majúscules i minúscules (ascii-casemap)';
+$labels['asciicasemap'] = 'No distingeix entre majúscules i minúscules  (ascii-casemap)';
 $labels['asciinumeric'] = 'numèric (ascii-numeric)';
 $labels['filterunknownerror'] = 'Error desconegut al servidor.';
 $labels['filterconnerror'] = 'No s\'ha pogut connectar al servidor.';
-$labels['filterdeleteerror'] = 'No s\'ha pogut esborrar el filtre. Hi ha hagut un error al servidor.';
-$labels['filterdeleted'] = 'El filtre s\'ha esborrat correctament.';
+$labels['filterdeleteerror'] = 'No s\'ha pogut suprimir el filtre. Hi ha hagut un error al servidor.';
+$labels['filterdeleted'] = 'El filtre s\'ha suprimit correctament.';
 $labels['filtersaved'] = 'Filtre desat correctament.';
 $labels['filtersaveerror'] = 'No s\'ha pogut desar el filtre. Hi ha hagut un error al servidor.';
-$labels['filterdeleteconfirm'] = 'Realment voleu esborrar el filtre seleccionat?';
-$labels['ruledeleteconfirm'] = 'Esteu segur que voleu eliminar la norma seleccionada?';
-$labels['actiondeleteconfirm'] = 'Esteu segur que voleu esborrar l\'acció seleccionada?';
+$labels['filterdeleteconfirm'] = 'Realment voleu suprimit el filtre seleccionat?';
+$labels['ruledeleteconfirm'] = 'Esteu segur que voleu suprimir la norma seleccionada?';
+$labels['actiondeleteconfirm'] = 'Esteu segur que voleu suprimir l\'acció seleccionada?';
 $labels['forbiddenchars'] = 'El camp conté caràcters prohibits.';
 $labels['cannotbeempty'] = 'El camp no pot estar buit.';
 $labels['ruleexist'] = 'Ja existeix un filtre amb aquest nom';
 $labels['setactivateerror'] = 'No s\'ha pogut activar el fitlre seleccionat. Hi ha hagut un error al servidor.';
 $labels['setdeactivateerror'] = 'No s\'ha pogut desactivar el fitlre seleccionat. Hi ha hagut un error al servidor.';
-$labels['setdeleteerror'] = 'No s\'ha pogut esborrar el conjunt de filtres seleccionats. Hi ha hagut un error al servidor.';
+$labels['setdeleteerror'] = 'No s\'ha pogut suprimir el conjunt de filtres seleccionats. Hi ha hagut un error al servidor.';
 $labels['setactivated'] = 'El conjunt de filtres s\'ha activat correctament.';
 $labels['setdeactivated'] = 'El conjunt de filtres s\'ha desactivat correctament.';
-$labels['setdeleted'] = 'El conjunt de filtres s\'ha esborrat correctament.';
-$labels['setdeleteconfirm'] = 'Esteu segurs que voleu esborrar el conjunt de filtres seleccionats?';
+$labels['setdeleted'] = 'El conjunt de filtres s\'ha suprimit correctament.';
+$labels['setdeleteconfirm'] = 'Esteu segurs que voleu suprimir el conjunt de filtres seleccionats?';
 $labels['setcreateerror'] = 'No s\'ha pogut crear el conjunt de filtres. Hi ha hagut un error al servidor.';
 $labels['setcreated'] = 'S\'ha creat correctament el conjunt de filtres.';
+$labels['activateerror'] = 'No s\'ha pogut habilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
+$labels['deactivateerror'] = 'No s\'ha pogut deshabilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
+$labels['activated'] = 'Filtre(s) deshabilitat(s) correctament.';
+$labels['deactivated'] = 'Filtre(s) habilitat(s) correctament.';
 $labels['moved'] = 'S\'ha mogut correctament el filtre.';
+$labels['moveerror'] = 'No s\'ha pogut moure el filtre seleccionat. Hi ha hagut un error al servidor.';
 $labels['nametoolong'] = 'El nom és massa llarg.';
 $labels['namereserved'] = 'Nom reservat.';
 $labels['setexist'] = 'El conjunt ja existeix.';
+$labels['nodata'] = 'S\'ha de seleccionar com a mínim una posició!';
 
diff --git a/plugins/managesieve/localization/cy_GB.inc b/plugins/managesieve/localization/cy_GB.inc
index 542ecd1ac..bace9be6e 100644
--- a/plugins/managesieve/localization/cy_GB.inc
+++ b/plugins/managesieve/localization/cy_GB.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos <Unknown>                                        |
+ | Author: Dafydd Tomos                                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -53,7 +52,7 @@ $labels['add'] = 'Ychwanegu';
 $labels['del'] = 'Dileu';
 $labels['sender'] = 'Anfonwr';
 $labels['recipient'] = 'Derbynnwr';
-$labels['vacationaddresses'] = 'Rhestr ychwanegol o ebost derbynnwyr (gwahanwyd a coma):';
+$labels['vacationaddresses'] = 'Fy chyfeiriadau ebost ychwanegol (gwahanir gyda coma):';
 $labels['vacationdays'] = 'Pa mor aml i ddanfon negeseuon (mewn dyddiau):';
 $labels['vacationreason'] = 'Corff neges (rheswm ar wyliau):';
 $labels['vacationsubject'] = 'Pwnc neges:';
@@ -114,4 +113,37 @@ $labels['detail'] = 'manylion';
 $labels['comparator'] = 'cymharydd';
 $labels['default'] = 'rhagosodiad';
 $labels['octet'] = 'llym (octet)';
+$labels['asciicasemap'] = 'maint llythrennau (ascii-casemap)';
+$labels['asciinumeric'] = 'rhifau (ascii-numeric)';
+$labels['filterunknownerror'] = 'Gwall gweinydd anhysbys.';
+$labels['filterconnerror'] = 'Methwyd cysylltu a\'r gweinydd.';
+$labels['filterdeleteerror'] = 'Methwyd dileu hidlydd. Cafwydd gwall gweinydd.';
+$labels['filterdeleted'] = 'Dilëuwyd hidlydd yn llwyddiannus.';
+$labels['filtersaved'] = 'Cadwyd hidlydd yn llwyddiannus.';
+$labels['filtersaveerror'] = 'Methwyd cadw hidlydd. Cafwyd gwall gweinydd.';
+$labels['filterdeleteconfirm'] = 'Ydych chi wir am ddileu yr hidlydd ddewiswyd?';
+$labels['ruledeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r rheol ddewiswyd?';
+$labels['actiondeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r weithred ddewiswyd?';
+$labels['forbiddenchars'] = 'Llythrennau gwaharddedig yn y maes.';
+$labels['cannotbeempty'] = 'Ni all y maes fod yn wag.';
+$labels['ruleexist'] = 'Mae hidlydd gyda\'r enw yma yn bodoli\'n barod.';
+$labels['setactivateerror'] = 'Methwyd bywiogi y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
+$labels['setdeactivateerror'] = 'Methwyd dadfywiogi y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
+$labels['setdeleteerror'] = 'Methwyd dileu y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
+$labels['setactivated'] = 'Bywiogwyd y set hidlydd yn llwyddiannus.';
+$labels['setdeactivated'] = 'Dadfywiogwyd y set hidlydd yn llwyddiannus.';
+$labels['setdeleted'] = 'Dilëuwyd y set hidlydd yn llwyddiannus.';
+$labels['setdeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r set hidlydd ddewiswyd?';
+$labels['setcreateerror'] = 'Methwyd creu set hidlydd. Cafwyd gwall gweinydd.';
+$labels['setcreated'] = 'Crëuwyd y set hidlydd yn llwyddiannus.';
+$labels['activateerror'] = 'Methwyd galluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
+$labels['deactivateerror'] = 'Methwyd analluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
+$labels['activated'] = 'Analluogwyd y hidlydd(ion) yn llwyddiannus.';
+$labels['deactivated'] = 'Galluogwyd y hidlydd(ion) yn llwyddiannus.';
+$labels['moved'] = 'Symudwyd y hidlydd yn llwyddiannus.';
+$labels['moveerror'] = 'Methwyd symud y hidlydd dewiswyd. Cafwyd gwall gweinydd.';
+$labels['nametoolong'] = 'Enw yn rhy hir.';
+$labels['namereserved'] = 'Enw neilltuedig.';
+$labels['setexist'] = 'Mae\'r set yn bodoli\'n barod.';
+$labels['nodata'] = 'Rhaid dewis o leia un safle!';
 
diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc
index c93451b8b..91bc18dd7 100644
--- a/plugins/managesieve/localization/da_DK.inc
+++ b/plugins/managesieve/localization/da_DK.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: John Loft Christiansen <Unknown>                              |
+ | Author: Johannes Hessellund <osos@openeyes.dk>                        |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -53,7 +52,7 @@ $labels['add'] = 'Tilføje';
 $labels['del'] = 'Fjern';
 $labels['sender'] = 'Afsender';
 $labels['recipient'] = 'Modtager';
-$labels['vacationaddresses'] = 'Ekstra liste af modtager email adresser (komma separeret):';
+$labels['vacationaddresses'] = 'Mine alternative e-mailadresser (kommasepareret):';
 $labels['vacationdays'] = 'Hvor tit skal besked sendes (i dage):';
 $labels['vacationreason'] = 'Besked (ved ferie):';
 $labels['vacationsubject'] = 'Besked emne:';
diff --git a/plugins/managesieve/localization/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
index cd1bfb228..8a16d1490 100644
--- a/plugins/managesieve/localization/de_DE.inc
+++ b/plugins/managesieve/localization/de_DE.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christoph Wickert <Unknown>                                   |
+ | Author: Sebastian Schweizer                                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -135,12 +134,11 @@ $labels['setactivated'] = 'Filtersatz wurde erfolgreich aktiviert';
 $labels['setdeactivated'] = 'Filtersatz wurde erfolgreich deaktiviert';
 $labels['setdeleted'] = 'Filtersatz wurde erfolgreich gelöscht';
 $labels['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
-$labels['setcreateerror'] = 'Kann Filtersatz nicht erstellen. Serverfehler';
 $labels['setcreated'] = 'Filtersatz wurde erfolgreich erstellt';
 $labels['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
 $labels['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
-$labels['activated'] = 'Filter erfolgreich deaktiviert.';
-$labels['deactivated'] = 'Filter erfolgreich aktiviert.';
+$labels['activated'] = 'Filter erfolgreich aktiviert.';
+$labels['deactivated'] = 'Filter erfolgreich deaktiviert.';
 $labels['moved'] = 'Filter erfolgreich verschoben.';
 $labels['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
 $labels['nametoolong'] = 'Kann Filtersatz nicht erstellen. Name zu lang';
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
index 6859f5fff..73882200b 100644
--- a/plugins/managesieve/localization/en_GB.inc
+++ b/plugins/managesieve/localization/en_GB.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vibhav Pant <vibhavp@gmail.com>                               |
+ | Author: Sebastian Schweizer                                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -93,10 +92,6 @@ $labels['flagdeleted'] = 'Deleted';
 $labels['flaganswered'] = 'Answered';
 $labels['flagflagged'] = 'Flagged';
 $labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
 $labels['filtercreate'] = 'Create filter';
 $labels['usedata'] = 'Use following data in the filter:';
 $labels['nextstep'] = 'Next Step';
@@ -139,12 +134,11 @@ $labels['setactivated'] = 'Filters set activated successfully.';
 $labels['setdeactivated'] = 'Filters set deactivated successfully.';
 $labels['setdeleted'] = 'Filters set deleted successfully.';
 $labels['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$labels['setcreateerror'] = 'Unable to create filters set. Server error occured.';
 $labels['setcreated'] = 'Filters set created successfully.';
 $labels['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
 $labels['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$labels['activated'] = 'Filter(s) disabled successfully.';
-$labels['deactivated'] = 'Filter(s) enabled successfully.';
+$labels['activated'] = 'Filter(s) enabled successfully.';
+$labels['deactivated'] = 'Filter(s) disabled successfully.';
 $labels['moved'] = 'Filter moved successfully.';
 $labels['moveerror'] = 'Unable to move selected filter. Server error occured.';
 $labels['nametoolong'] = 'Name too long.';
diff --git a/plugins/managesieve/localization/fa_IR.inc b/plugins/managesieve/localization/fa_IR.inc
index 9b5f64161..e4abb3f2a 100644
--- a/plugins/managesieve/localization/fa_IR.inc
+++ b/plugins/managesieve/localization/fa_IR.inc
@@ -11,7 +11,6 @@
  +-----------------------------------------------------------------------+
  | Author: Hamid <abbaszadeh.h@gmail.com>                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -53,7 +52,7 @@ $labels['add'] = 'افزودن';
 $labels['del'] = 'حذف';
 $labels['sender'] = 'فرستنده';
 $labels['recipient'] = 'گیرنده';
-$labels['vacationaddresses'] = 'فهرست اضافی آدرس پست الکترونیکی های گیرنده (جداشده با کاما):';
+$labels['vacationaddresses'] = 'آدرس‌های ایمیل دیگر من (جدا شده با ویرگول):';
 $labels['vacationdays'] = 'پیغام ها در چه مواقعی فرستاده شدند (در روزهای):';
 $labels['vacationreason'] = 'بدنه پیغام (علت مسافرت):';
 $labels['vacationsubject'] = 'موضوع پیغام:';
diff --git a/plugins/managesieve/localization/he_IL.inc b/plugins/managesieve/localization/he_IL.inc
index e7afa7090..b44088bcb 100644
--- a/plugins/managesieve/localization/he_IL.inc
+++ b/plugins/managesieve/localization/he_IL.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Yaron <sh.yaron@gmail.com>                                    |
+ | Author: Moshe Leibovitch <moish@mln.co.il>                            |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -53,7 +52,7 @@ $labels['add'] = 'הוספה';
 $labels['del'] = 'מחיקה';
 $labels['sender'] = 'השולח';
 $labels['recipient'] = 'הנמען';
-$labels['vacationaddresses'] = 'רשימה של כתובות דוא"ל של נמענים נוספים ( מופרדים על ידי פסיק ):';
+$labels['vacationaddresses'] = 'כתובות דוא"ל נוספות שלי (מופרדות ע"י פסיקים)';
 $labels['vacationdays'] = 'באיזו תדירות ( בימים ) לשלוח הודעות:';
 $labels['vacationreason'] = 'גוף ההודעה (סיבת החופשה):';
 $labels['vacationsubject'] = 'נושא ההודעה:';
diff --git a/plugins/managesieve/localization/ia.inc b/plugins/managesieve/localization/ia.inc
new file mode 100644
index 000000000..f403f4d3d
--- /dev/null
+++ b/plugins/managesieve/localization/ia.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ia/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['filters'] = 'Filtros';
+$labels['filteradd'] = 'Adder filtro';
+$labels['filterdel'] = 'Deler filtro';
+
diff --git a/plugins/managesieve/localization/ml_IN.inc b/plugins/managesieve/localization/ml_IN.inc
new file mode 100644
index 000000000..ed3d7675c
--- /dev/null
+++ b/plugins/managesieve/localization/ml_IN.inc
@@ -0,0 +1,149 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ml_IN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas                                                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$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['messagesrules'] = 'ആഗമന സന്ദേശങ്ങള്‍ക്ക്:';
+$labels['messagesactions'] = '...ഈ പ്രവര്‍ത്തനങ്ങള്‍ ചെയ്യുക:';
+$labels['add'] = 'ചേര്‍ക്കു';
+$labels['del'] = 'നീക്കം ചെയ്യുക';
+$labels['sender'] = 'അയചയാള്‍';
+$labels['recipient'] = 'സ്വീകര്‍ത്താവ്';
+$labels['vacationaddresses'] = 'സ്വീകര്‍ത്താവിന്റെ ഇമെയില്‍ വിലാസങ്ങളുടെ അധികമുള്ള പട്ടിക (കോമയിട്ട് തിരിച്ച)';
+$labels['vacationdays'] = 'എത്ര ഭിവസം കൂടുമ്പോള്‍ സന്ദേശം അയക്കണം:';
+$labels['vacationreason'] = 'സന്ദേശത്തിന്റെ ഉള്ളടക്കം (അവധിയുടെ കാരണം):';
+$labels['vacationsubject'] = 'സന്ദേശത്തിന്റെ വിഷയം:';
+$labels['rulestop'] = 'നിയമങ്ങള്‍ വിലയിരുത്തുന്നത് നിര്‍ത്തുക';
+$labels['enable'] = 'പ്രവര്‍ത്തനസജ്ജം/രഹിതം';
+$labels['filterset'] = 'അരിപ്പകളുടെ കൂട്ടം';
+$labels['filtersets'] = 'അരിപ്പകളുടെ കൂട്ടങ്ങള്‍';
+$labels['filtersetadd'] = 'അരിപ്പകളുടെ കൂട്ടം ചേര്‍ക്കുക';
+$labels['filtersetdel'] = 'ഇപ്പോഴത്തെ അരിപ്പകളുടെ കൂട്ടം മായ്ക്കുക';
+$labels['filtersetact'] = 'ഇപ്പോഴത്തെ അരിപ്പകളുടെ കൂട്ടം പ്രവര്‍ത്തിപ്പിക്കുക';
+$labels['filtersetdeact'] = 'ഇപ്പോഴത്തെ അരിപ്പകളുടെ കൂട്ടം പ്രവര്‍ത്തനം അവസാനിപ്പിക്കുക';
+$labels['filterdef'] = 'അരിപ്പയുടെ നിര്‍വ്വചനം';
+$labels['filtersetname'] = 'അരിപ്പകളുടെ കൂട്ടത്തിന്റെ പേര്';
+$labels['newfilterset'] = 'പുതിയ അരിപ്പയുട കൂട്ടം';
+$labels['active'] = 'സജീവം';
+$labels['none'] = 'ഒന്നുമില്ല';
+$labels['fromset'] = 'സെറ്റില്‍ നിന്ന്';
+$labels['fromfile'] = 'ഫയലില്‍ നിന്ന്';
+$labels['filterdisabled'] = 'അരിപ്പ പ്രവര്‍ത്തനരഹിതമാക്കി';
+$labels['countisgreaterthan'] = 'എണ്ണം ഇതിനെക്കാള്‍ കുടുതല്‍';
+$labels['countisgreaterthanequal'] = 'എണ്ണം ഇതിനെക്കാള്‍ കൂടുതല്‍ ഇല്ലെങ്കില്‍ സമം';
+$labels['countislessthan'] = 'എണ്ണം ഇതിനെക്കാള്‍ കുറവ്';
+$labels['countislessthanequal'] = 'എണ്ണം ഇതിനെക്കാള്‍ കൂറവ് ഇല്ലെങ്കില്‍ സമം';
+$labels['countequals'] = 'എണ്ണം ഇതിനോട് സമം';
+$labels['countnotequals'] = 'എണ്ണം ഇതിനോട് സമമല്ല';
+$labels['valueisgreaterthan'] = 'മൂല്യം ഇതിനെക്കാള്‍ കുടുതല്‍';
+$labels['valueisgreaterthanequal'] = 'മുല്യം ഇതിനെക്കാള്‍ കൂടുതല്‍ ഇല്ലെങ്കില്‍ സമം';
+$labels['valueislessthan'] = 'മൂല്യം ഇതിനെക്കാള്‍ കുറവ്';
+$labels['valueislessthanequal'] = 'മൂല്യം ഇതിനെക്കാള്‍ കൂറവ് ഇല്ലെങ്കില്‍ തുല്യം';
+$labels['valueequals'] = 'മൂല്യം ഇതിനോട് സമം';
+$labels['valuenotequals'] = 'മൂല്യം ഇതിനോട് സമമല്ല';
+$labels['setflags'] = 'സന്ദേശത്തില്‍ അടയാളമിടുക';
+$labels['addflags'] = 'സന്ദേശത്തില്‍ അടയാളം ചേര്‍ക്കുക';
+$labels['removeflags'] = 'സന്ദേശത്തില്‍ നിന്നും അടയാളം മാറ്റുക';
+$labels['flagread'] = 'വായിച്ചവ';
+$labels['flagdeleted'] = 'നീക്കം ചെയ്തവ';
+$labels['flaganswered'] = 'മറുപടി നല്‍കിയവ';
+$labels['flagflagged'] = 'അടയാളപ്പെടുത്തിയവ';
+$labels['flagdraft'] = 'കരട്';
+$labels['filtercreate'] = 'അരിപ്പ ഉണ്ടാക്കുക';
+$labels['usedata'] = 'ഈ വിവരങ്ങള്‍ അരിപ്പയില്‍ ഉപയോഗിക്കുക:';
+$labels['nextstep'] = 'അടുത്ത പടി';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'വിപുലീക്രിതമായ ക്രമീകരണങ്ങള്‍';
+$labels['body'] = 'ഉള്ളടക്കം';
+$labels['address'] = 'മേല്‍വിലാസം';
+$labels['envelope'] = 'എന്‍വലപ്പ്';
+$labels['modifier'] = 'മോഡിഫയര്‍:';
+$labels['text'] = 'വാചകം';
+$labels['undecoded'] = 'ഡീക്കോഡ് ചെയ്യാത്തത് (റോ)';
+$labels['contenttype'] = 'ഉള്ളടക്കത്തിന്റെ തരം';
+$labels['modtype'] = 'തരം:';
+$labels['allparts'] = 'എല്ലാം';
+$labels['domain'] = 'ഡൊമൈന്‍';
+$labels['localpart'] = 'പ്രാദേശിക ഭാഗം';
+$labels['user'] = 'ഉപയോക്താവു്';
+$labels['detail'] = 'വിശദാംശം';
+$labels['comparator'] = 'താരതമ്യകന്‍:';
+$labels['default'] = 'സഹജമായ';
+$labels['octet'] = 'കര്‍ശനം (octet)';
+$labels['asciicasemap'] = 'വലിയ-ചെറിയക്ഷരങ്ങള്‍ തമ്മില്‍ വ്യത്യാസമില്ലാത്ത (ascii-casemap)';
+$labels['asciinumeric'] = 'സംഖ്യകള്‍ (ascii-numeric)';
+$labels['filterunknownerror'] = 'അജ്ഞാതമായ സെര്‍വ്വര്‍ പിശക്.';
+$labels['filterconnerror'] = 'സെര്‍വ്വറുമായി ബന്ധപ്പെടാന്‍ സാധിക്കുന്നില്ല.';
+$labels['filterdeleteerror'] = 'അരിപ്പ മായ്ക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
+$labels['filterdeleted'] = 'അരിപ്പ വിജകരമായി മായ്ച്ചു.';
+$labels['filtersaved'] = 'അരിപ്പ വിജകരമായി സൂക്ഷിച്ചു.';
+$labels['filtersaveerror'] = 'അരിപ്പ സൂക്ഷിക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
+$labels['filterdeleteconfirm'] = 'തെരഞ്ഞെടുത്ത അരിപ്പ നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
+$labels['ruledeleteconfirm'] = 'തെരഞ്ഞെടുത്ത നിയമം നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
+$labels['actiondeleteconfirm'] = 'തെരഞ്ഞെടുത്ത പ്രവര്‍ത്തി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
+$labels['forbiddenchars'] = 'ഫില്‍ഡില്‍ സാധുവല്ലാത്ത അക്ഷരങ്ങള്‍.';
+$labels['cannotbeempty'] = 'ഫീല്‍ഡ് ശൂന്യമാകാന്‍ പാടില്ല.';
+$labels['ruleexist'] = 'ഈ പേരിലുള്ള അരിപ്പ ഇപ്പോള്‍ തന്നെ ഉണ്ട്.';
+$labels['setactivateerror'] = 'അരിപ്പയുടെ കൂട്ടത്തെ പ്രവര്‍ത്തനസജ്ജമാക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
+$labels['setdeactivateerror'] = 'അരിപ്പയുടെ കൂട്ടത്തെ പ്രവര്‍ത്തനരഹിതമാക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
+$labels['setdeleteerror'] = 'തെരഞ്ഞെടുത്ത അരിപ്പയുടെ കൂട്ടത്തെ മായ്ക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
+$labels['setactivated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി പ്രവര്‍ത്തനസജ്ജമാക്കി.';
+$labels['setdeactivated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി പ്രവര്‍ത്തനരഹിതമാക്കി.';
+$labels['setdeleted'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി മായ്ച്ചു.';
+$labels['setdeleteconfirm'] = 'തെരഞ്ഞെടുത്ത അരിപ്പകളുടെ കൂട്ടത്തെ നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
+$labels['setcreateerror'] = 'അരിപ്പയുടെ കൂട്ടത്തെ നിര്‍മ്മിക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
+$labels['setcreated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി നിര്‍മ്മിച്ചു.';
+$labels['activateerror'] = 'അരിപ്പ (കള്‍) പ്രവര്‍ത്തനസജ്ജം ആക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം!';
+$labels['deactivateerror'] = 'അരിപ്പ (കള്‍) നിര്‍വീര്യം ആക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം!';
+$labels['activated'] = 'അരിപ്പകള്‍ നിര്‍വീര്യം ആക്കപ്പെട്ടിരിക്കുന്നു';
+$labels['deactivated'] = 'അരിപ്പ വിജകരമായി പ്രവര്‍ത്തനസജ്ജമാക്കി.';
+$labels['moved'] = 'അരിപ്പ വിജകരമായി മാറ്റി.';
+$labels['moveerror'] = 'തെരഞ്ഞെടുത്ത അരിപ്പ മാറ്റാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
+$labels['nametoolong'] = 'പേരിന് നീളം കൂടുതല്‍.';
+$labels['namereserved'] = 'നീക്കിവെച്ച വാക്ക്.';
+$labels['setexist'] = 'കൂട്ടം നേരത്തെ തന്നെ ഉണ്ട്.';
+$labels['nodata'] = 'ഒരു സ്ഥാനമെങ്കിലും തെരഞ്ഞെടുക്കണം!';
+
diff --git a/plugins/managesieve/localization/nb_NO.inc b/plugins/managesieve/localization/nb_NO.inc
index cd51ff753..b172685a2 100644
--- a/plugins/managesieve/localization/nb_NO.inc
+++ b/plugins/managesieve/localization/nb_NO.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Martin Bore <Unknown>                                         |
+ | Author: Tobias V. Langhoff <spug@thespug.net>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -29,9 +28,13 @@ $labels['filterany'] = 'alle meldinger';
 $labels['filtercontains'] = 'inneholder';
 $labels['filternotcontains'] = 'ikke inneholder';
 $labels['filteris'] = 'er lik';
-$labels['filterisnot'] = 'ikke er';
+$labels['filterisnot'] = 'er ulik';
 $labels['filterexists'] = 'eksisterer';
 $labels['filternotexists'] = 'ikke eksisterer';
+$labels['filtermatches'] = 'treffer uttrykk';
+$labels['filternotmatches'] = 'ikke treffer uttrykk';
+$labels['filterregex'] = 'treffer regulært uttrykk';
+$labels['filternotregex'] = 'ikke treffer regulært uttrykk';
 $labels['filterunder'] = 'under';
 $labels['filterover'] = 'over';
 $labels['addrule'] = 'Legg til regel';
@@ -52,34 +55,95 @@ $labels['recipient'] = 'Mottaker';
 $labels['vacationaddresses'] = 'Liste med mottakeradresser (adskilt med komma):';
 $labels['vacationdays'] = 'Periode mellom meldinger (i dager):';
 $labels['vacationreason'] = 'Innhold (begrunnelse for fravær)';
+$labels['vacationsubject'] = 'Meldingsemne:';
 $labels['rulestop'] = 'Stopp evaluering av regler';
 $labels['enable'] = 'Aktiver / deaktiver';
+$labels['filterset'] = 'Filtersett';
+$labels['filtersets'] = 'Filtersett';
+$labels['filtersetadd'] = 'Nytt filtersett';
+$labels['filtersetdel'] = 'Slett gjeldende filtersett';
+$labels['filtersetact'] = 'Aktiver gjeldende filtersett';
+$labels['filtersetdeact'] = 'Deaktiver gjeldende filtersett';
+$labels['filterdef'] = 'Filterdefinisjon';
+$labels['filtersetname'] = 'Navn på filtersett';
+$labels['newfilterset'] = 'Nytt filtersett';
 $labels['active'] = 'aktiv';
 $labels['none'] = 'ingen';
+$labels['fromset'] = 'fra sett';
 $labels['fromfile'] = 'fra fil';
-$labels['filterdisabled'] = 'Filter deaktiver';
+$labels['filterdisabled'] = 'Filter deaktivert';
+$labels['countisgreaterthan'] = 'antall er flere enn';
+$labels['countisgreaterthanequal'] = 'antall er flere enn eller lik';
+$labels['countislessthan'] = 'antall er færre enn';
+$labels['countislessthanequal'] = 'antall er færre enn eller lik';
+$labels['countequals'] = 'antall er lik';
+$labels['countnotequals'] = 'antall er ulik';
 $labels['valueisgreaterthan'] = 'verdien er høyrere enn';
 $labels['valueisgreaterthanequal'] = 'verdien er høyere eller lik';
 $labels['valueislessthan'] = 'verdien er lavere enn';
 $labels['valueislessthanequal'] = 'verdien er lavere eller lik';
 $labels['valueequals'] = 'verdien er';
 $labels['valuenotequals'] = 'verdien er ikke';
+$labels['setflags'] = 'Sett meldingsflagg';
+$labels['addflags'] = 'Legg til flagg på meldingen';
+$labels['removeflags'] = 'Fjern flagg fra meldingen';
 $labels['flagread'] = 'Lese';
+$labels['flagdeleted'] = 'Slettet';
 $labels['flaganswered'] = 'Besvart';
 $labels['flagflagged'] = 'Flagget';
 $labels['flagdraft'] = 'Utkast';
 $labels['filtercreate'] = 'Opprett filter';
+$labels['usedata'] = 'Bruk følgende data i filteret:';
+$labels['nextstep'] = 'Neste steg';
+$labels['...'] = '…';
+$labels['advancedopts'] = 'Avanserte alternativer';
+$labels['body'] = 'Meldingstekst';
 $labels['address'] = 'adresse';
+$labels['envelope'] = 'konvolutt';
+$labels['modifier'] = 'modifikator';
 $labels['text'] = 'tekst';
+$labels['undecoded'] = 'ikke dekodet (rå)';
+$labels['contenttype'] = 'innholdstype';
+$labels['modtype'] = 'type:';
+$labels['allparts'] = 'alle';
 $labels['domain'] = 'domene';
+$labels['localpart'] = 'lokal del (localpart)';
+$labels['user'] = 'bruker';
+$labels['detail'] = 'detalj';
+$labels['comparator'] = 'sammenligning:';
+$labels['default'] = 'standard';
+$labels['octet'] = 'streng (octet)';
+$labels['asciicasemap'] = 'ikke skill store og små bokstaver (ascii-casemap)';
+$labels['asciinumeric'] = 'numerisk (ascii-numeric)';
 $labels['filterunknownerror'] = 'Ukjent problem med tjener';
 $labels['filterconnerror'] = 'Kunne ikke koble til MANAGESIEVE-tjener';
 $labels['filterdeleteerror'] = 'Kunne ikke slette filter. Det dukket opp en feil på tjeneren.';
 $labels['filterdeleted'] = 'Filteret er blitt slettet';
 $labels['filtersaved'] = 'Filter er blitt lagret';
 $labels['filtersaveerror'] = 'Kunne ikke lagre filteret. Det dukket opp en feil på tjeneren.';
+$labels['filterdeleteconfirm'] = 'Vil du virkelig slette det valgte filteret?';
 $labels['ruledeleteconfirm'] = 'Er du sikker på at du vil slette valgte regel?';
 $labels['actiondeleteconfirm'] = 'Er du sikker på at du vil slette valgte hendelse?';
 $labels['forbiddenchars'] = 'Ugyldige tegn i felt';
 $labels['cannotbeempty'] = 'Feltet kan ikke stå tomt';
+$labels['ruleexist'] = 'Det finnes allerede et filter med dette navnet.';
+$labels['setactivateerror'] = 'Kunne ikke aktivere det valgte filtersettet. Det oppsto en tjenerfeil.';
+$labels['setdeactivateerror'] = 'Kunne ikke deaktivere det valgte filtersettet. Det oppsto en tjenerfeil.';
+$labels['setdeleteerror'] = 'Kunne ikke slette det valgte filtersettet. Det oppsto en tjenerfeil.';
+$labels['setactivated'] = 'Filtersett aktivert.';
+$labels['setdeactivated'] = 'Filtersett deaktivert.';
+$labels['setdeleted'] = 'Filtersett slettet.';
+$labels['setdeleteconfirm'] = 'Er du sikker på at du vil slette det valgte filtersettet?';
+$labels['setcreateerror'] = 'Kunne ikke opprette filtersettet. Det oppsto en tjenerfeil.';
+$labels['setcreated'] = 'Filtersett opprettet.';
+$labels['activateerror'] = 'Kunne ikke skru på valgte filter. Det oppsto en tjenerfeil.';
+$labels['deactivateerror'] = 'Kunne ikke skru av valgte filter. Det oppsto en tjenerfeil.';
+$labels['activated'] = 'Filter skrudd av.';
+$labels['deactivated'] = 'Filter ble skrudd på.';
+$labels['moved'] = 'Filter ble flyttet.';
+$labels['moveerror'] = 'Kunne ikke flytte valgte filter. Det oppsto en tjenerfeil.';
+$labels['nametoolong'] = 'Navnet er for langt.';
+$labels['namereserved'] = 'Navnet er reservert.';
+$labels['setexist'] = 'Settet eksisterer allerede.';
+$labels['nodata'] = 'Du må velge minst én posisjon!';
 
diff --git a/plugins/managesieve/localization/tr_TR.inc b/plugins/managesieve/localization/tr_TR.inc
index faf669e36..14dd44b19 100644
--- a/plugins/managesieve/localization/tr_TR.inc
+++ b/plugins/managesieve/localization/tr_TR.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul <Unknown>                                      |
+ | Author: ismail yenigul                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -53,7 +52,7 @@ $labels['add'] = 'Ekle';
 $labels['del'] = 'Sil';
 $labels['sender'] = 'Gönderici';
 $labels['recipient'] = 'Alıcı';
-$labels['vacationaddresses'] = 'İlave e-posta alıcıları listesi(virgüllü ayrılmış)';
+$labels['vacationaddresses'] = 'İlave e-posta adreslerim(virgül ile ayrılmış)';
 $labels['vacationdays'] = 'Ne sıklıkla mesajlar gönderilir(gün)';
 $labels['vacationreason'] = 'Mesaj gövdesi(tatil sebebi):';
 $labels['vacationsubject'] = 'Mesaj konusu:';
diff --git a/plugins/managesieve/localization/vi_VN.inc b/plugins/managesieve/localization/vi_VN.inc
index e5c9dac71..d358960ad 100644
--- a/plugins/managesieve/localization/vi_VN.inc
+++ b/plugins/managesieve/localization/vi_VN.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
+ | Author: Kenny Tran <kennethanh@gmail.com>                             |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -26,44 +25,52 @@ $labels['movedown'] = 'Chuyển xuống';
 $labels['filterallof'] = 'Phù hợp với tất cả các qui luật sau đây';
 $labels['filteranyof'] = 'Phù hợp với bất kỳ qui luật nào sau đây';
 $labels['filterany'] = 'Tất cả tin nhắn';
-$labels['filtercontains'] = 'bao gồm';
-$labels['filternotcontains'] = 'không bao gồm';
-$labels['filteris'] = 'bằng với';
+$labels['filtercontains'] = 'Bao gồm';
+$labels['filternotcontains'] = 'Không bao gồm';
+$labels['filteris'] = 'Bằng với';
+$labels['filterisnot'] = 'Không bằng với';
 $labels['filterexists'] = 'Tồn tại';
-$labels['filternotexists'] = 'không tồn tại';
-$labels['filtermatches'] = 'tương ứng với cách diễn đạt';
-$labels['filternotmatches'] = 'không tương ứng với cách diễn đạt';
-$labels['filterregex'] = 'ứng với cách diễn đạt thông thường';
-$labels['filternotregex'] = 'không phù  hợp với cách diễn đạt thông thường';
-$labels['filterunder'] = 'dưới';
-$labels['addrule'] = 'thêm qui luật';
-$labels['delrule'] = 'xóa qui luật';
-$labels['messagemoveto'] = 'chuyển tin nhắn tới';
-$labels['messageredirect'] = 'gửi lại tin nhắn tới';
-$labels['messagecopyto'] = 'sao chép tin nhắn tới';
-$labels['messagesendcopy'] = 'gửi bản sao chép tin nhắn tới';
-$labels['messagereply'] = 'trả lời tin nhắn';
+$labels['filternotexists'] = 'Không tồn tại';
+$labels['filtermatches'] = 'Tương ứng với cách diễn đạt';
+$labels['filternotmatches'] = 'Không tương ứng với cách diễn đạt';
+$labels['filterregex'] = 'Tương ứng với cách diễn đạt thông thường';
+$labels['filternotregex'] = 'Không phù  hợp với cách diễn đạt thông thường';
+$labels['filterunder'] = 'Dưới';
+$labels['filterover'] = 'Hơn';
+$labels['addrule'] = 'Thêm qui luật';
+$labels['delrule'] = 'Xóa qui luật';
+$labels['messagemoveto'] = 'Chuyển tin nhắn tới';
+$labels['messageredirect'] = 'Gửi lại tin nhắn tới';
+$labels['messagecopyto'] = 'Sao chép tin nhắn tới';
+$labels['messagesendcopy'] = 'Gửi bản sao chép tin nhắn tới';
+$labels['messagereply'] = 'Trả lời tin nhắn';
 $labels['messagedelete'] = 'Xóa thư';
+$labels['messagediscard'] = 'Loại bỏ với tin nhắn';
 $labels['messagesrules'] = 'Với thư đến';
-$labels['messagesactions'] = 'thực hiện các hành động sau:';
+$labels['messagesactions'] = 'Thực hiện các hành động sau:';
 $labels['add'] = 'Thêm';
 $labels['del'] = 'Xoá';
 $labels['sender'] = 'Người gửi';
 $labels['recipient'] = 'Người nhận';
-$labels['vacationaddresses'] = 'danh sách thêm e-mail người nhận (cách nhau bằng dấu phẩy)';
-$labels['vacationdays'] = 'số lần gửi thư (trong ngày)';
+$labels['vacationaddresses'] = 'Địa chỉ email bổ sung của tôi ( phân cách bằng dấu phẩy)';
+$labels['vacationdays'] = 'Số lần gửi thư (trong ngày)';
 $labels['vacationreason'] = 'Nội dung chính';
-$labels['vacationsubject'] = 'tiêu đề thư';
-$labels['rulestop'] = 'ngừng đánh giá qui luật';
-$labels['enable'] = 'kích hoạt/không kích hoạt';
+$labels['vacationsubject'] = 'Tiêu đề thư';
+$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';
-$labels['filtersetdel'] = 'Xóa bộ lọc hiện thời';
-$labels['filtersetact'] = 'Kích hoạt bộ lọc hiện thời';
-$labels['filtersetdeact'] = 'Ngừng kích hoạt bộ lọc hiện thời';
+$labels['filtersets'] = 'Thiết lập bộ lọc';
+$labels['filtersetadd'] = 'Thêm bộ lọc';
+$labels['filtersetdel'] = 'Xóa bộ lọc hiện tại';
+$labels['filtersetact'] = 'Kích hoạt bộ lọc hiện tại';
+$labels['filtersetdeact'] = 'Ngừng kích hoạt bộ lọc hiện tai';
 $labels['filterdef'] = 'Định nghĩa bộ lọc';
+$labels['filtersetname'] = 'Tên bộ lọc';
+$labels['newfilterset'] = 'Thiết lập bộ lọc mới';
 $labels['active'] = 'Kích hoạt';
 $labels['none'] = 'Không có';
-$labels['fromfile'] = 'từ file';
+$labels['fromset'] = 'Từ thiết lập';
+$labels['fromfile'] = 'Từ hồ sơ';
 $labels['filterdisabled'] = 'Bộ lọc được ngừng hoạt động';
 $labels['countisgreaterthan'] = 'Đếm lớn hơn';
 $labels['countisgreaterthanequal'] = 'Đếm lớn hơn hoặc bằng';
@@ -71,40 +78,47 @@ $labels['countislessthan'] = 'Đếm ít hơn';
 $labels['countislessthanequal'] = 'Đếm ít hơn hoặc bằng';
 $labels['countequals'] = 'Đếm bằng';
 $labels['countnotequals'] = 'Đếm không bằng';
-$labels['valueisgreaterthan'] = 'giá trị lớn hơn';
-$labels['valueisgreaterthanequal'] = 'giá trị lớn hơn hoặc bằng';
-$labels['valueislessthan'] = 'giá trị nhỏ hơn';
-$labels['valueislessthanequal'] = 'giá trị nhỏ hơn hoặc bằng';
-$labels['valueequals'] = 'giá trị bằng';
-$labels['valuenotequals'] = 'giá trị không bằng';
+$labels['valueisgreaterthan'] = 'Giá trị lớn hơn';
+$labels['valueisgreaterthanequal'] = 'Giá trị lớn hơn hoặc bằng';
+$labels['valueislessthan'] = 'Giá trị nhỏ hơn';
+$labels['valueislessthanequal'] = 'Giá trị nhỏ hơn hoặc bằng';
+$labels['valueequals'] = 'Giá trị bằng';
+$labels['valuenotequals'] = 'Giá trị không bằng';
 $labels['setflags'] = 'Thiết lập đánh dấu cho thư';
-$labels['removeflags'] = 'bỏ đánh dấu khỏi thư';
+$labels['addflags'] = 'Thêm đánh dấu cho thư';
+$labels['removeflags'] = 'Bỏ đánh dấu khỏi thư';
+$labels['flagread'] = 'Đọc';
 $labels['flagdeleted'] = 'Đã được xóa';
 $labels['flaganswered'] = 'Đã trả lời';
 $labels['flagflagged'] = 'Đã đánh dấu';
-$labels['filtercreate'] = 'tạo bộ lọc';
-$labels['usedata'] = 'dùng dữ liệu trong bộ lọc sau:';
-$labels['nextstep'] = 'bước tiếp theo';
+$labels['flagdraft'] = 'Nháp';
+$labels['filtercreate'] = 'Tạo bộ lọc';
+$labels['usedata'] = 'Dùng dữ liệu trong bộ lọc sau:';
+$labels['nextstep'] = 'Bước tiếp theo';
 $labels['...'] = '…';
-$labels['advancedopts'] = 'Tùy chọn nâng cao';
+$labels['advancedopts'] = 'Tùy chọn tính năng cao hơn';
 $labels['body'] = 'Nội dung';
-$labels['address'] = 'địa chỉ';
-$labels['envelope'] = 'phong bì';
-$labels['modifier'] = 'bổ nghĩa';
-$labels['text'] = 'văn bản';
-$labels['undecoded'] = 'chưa được giải mã (nguyên bản)';
-$labels['contenttype'] = 'gõ nội dung';
-$labels['modtype'] = 'kiểu:';
+$labels['address'] = 'Địa chỉ';
+$labels['envelope'] = 'Phong bì';
+$labels['modifier'] = 'Bổ nghĩa';
+$labels['text'] = 'Văn bản';
+$labels['undecoded'] = 'Chưa được giải mã (nguyên bản)';
+$labels['contenttype'] = 'Kiểu mẫu nội dung';
+$labels['modtype'] = 'Kiểu:';
 $labels['allparts'] = 'Tất cả';
 $labels['domain'] = 'Phạm vi';
-$labels['user'] = 'người dùng';
-$labels['detail'] = 'chi tiết';
+$labels['localpart'] = 'Phần nội bộ';
+$labels['user'] = 'Người dùng';
+$labels['detail'] = 'Chi tiết';
+$labels['comparator'] = 'Vật so sánh';
 $labels['default'] = 'Mặc định';
+$labels['octet'] = 'Khắt khe';
 $labels['asciicasemap'] = 'Không phân biệt chữ hoa chữ thường';
-$labels['filterunknownerror'] = 'không tìm được lỗi máy chủ';
+$labels['asciinumeric'] = 'Bảng mã ASCII';
+$labels['filterunknownerror'] = 'Không tìm được lỗi máy chủ';
 $labels['filterconnerror'] = 'Không kết nối được với máy chủ.';
 $labels['filterdeleteerror'] = 'Không thể xóa bộ lọc. Xuất hiện lỗi ở máy chủ';
-$labels['filterdeleted'] = 'xóa bộ lọc thành công';
+$labels['filterdeleted'] = 'Xóa bộ lọc thành công';
 $labels['filtersaved'] = 'Lưu bộ lọc thành công';
 $labels['filtersaveerror'] = 'Không thể lưu bộ lọc. Xuất hiện lỗi ở máy chủ';
 $labels['filterdeleteconfirm'] = 'Bạn có thực sự muốn xóa bộ lọc được chọn?';
@@ -119,7 +133,17 @@ $labels['setdeleteerror'] = 'Không thể xóa bộ lọc được lựa chọn.
 $labels['setactivated'] = 'Bộ lọc được khởi động thành công';
 $labels['setdeactivated'] = 'Ngừng kích hoạt bộ lọc thành công';
 $labels['setdeleted'] = 'Xóa bộ lọc thành công';
+$labels['setdeleteconfirm'] = 'Bạn có chắc bạn muốn xóa thiết lập bộ lọc được chọn?';
+$labels['setcreateerror'] = 'Không thể tạo thiết lập bộ lọc. Có lỗi xuất hiện ở máy chủ';
+$labels['setcreated'] = 'Thiết lập bộ lọc được tạo thành công';
+$labels['activateerror'] = 'Không thể khởi động bộ lọc được chọn. Có lỗi xuất hiện ở máy chủ';
+$labels['deactivateerror'] = 'Không thể tắt bộ lọc đã chọn. Có lỗi xuất hiện ở máy chủ';
+$labels['activated'] = 'Bộ lọc được tắt thành công';
+$labels['deactivated'] = 'Bộ lọc được khởi động thành công';
+$labels['moved'] = 'Bộ lọc được chuyển đi thành công';
+$labels['moveerror'] = 'Không thể chuyển bộc lọc đã chọn. Có lỗi xuất hiện ở máy chủ';
 $labels['nametoolong'] = 'Tên quá dài';
 $labels['namereserved'] = 'Tên đã được bảo vệ';
+$labels['setexist'] = 'Thiết lập đã tồn tại';
 $labels['nodata'] = 'Ít nhất một vị trí phải được chọn';
 
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index 31bdc1ecd..8cbe48778 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -15,11 +15,11 @@
 
 $labels = array();
 $labels['filters'] = '过滤器';
-$labels['managefilters'] = '管理邮件过滤器';
-$labels['filtername'] = '过滤器名称';
-$labels['newfilter'] = '新建过滤器';
-$labels['filteradd'] = '添加过滤器';
-$labels['filterdel'] = '删除过滤器';
+$labels['managefilters'] = '管理邮件过滤规则';
+$labels['filtername'] = '过滤规则名称';
+$labels['newfilter'] = '新建过滤规则';
+$labels['filteradd'] = '添加过滤规则';
+$labels['filterdel'] = '删除过滤规则';
 $labels['moveup'] = '上移';
 $labels['movedown'] = '下移';
 $labels['filterallof'] = '匹配所有规则';
@@ -39,13 +39,13 @@ $labels['filterunder'] = '小于';
 $labels['filterover'] = '大于';
 $labels['addrule'] = '添加规则';
 $labels['delrule'] = '删除规则';
-$labels['messagemoveto'] = '将邮件移动到';
-$labels['messageredirect'] = '将邮件转发到';
+$labels['messagemoveto'] = '将邮件移至';
+$labels['messageredirect'] = '将邮件转发至';
 $labels['messagecopyto'] = '复制邮件至';
 $labels['messagesendcopy'] = '发送复制邮件至';
 $labels['messagereply'] = '回复以下信息';
 $labels['messagedelete'] = '删除邮件';
-$labels['messagediscard'] = '丢弃邮件并回复以下信息';
+$labels['messagediscard'] = '舍弃邮件并回复以下信息';
 $labels['messagesrules'] = '对收取的邮件应用规则：';
 $labels['messagesactions'] = '...执行以下动作：';
 $labels['add'] = '添加';
@@ -53,8 +53,8 @@ $labels['del'] = '删除';
 $labels['sender'] = '发件人';
 $labels['recipient'] = '收件人';
 $labels['vacationaddresses'] = '收件人地址的附加名单（以逗号分隔）';
-$labels['vacationdays'] = '平常如何发送邮件（天数）：';
-$labels['vacationreason'] = '邮件主体（休假原因）';
+$labels['vacationdays'] = '发送邮件频率(天数):';
+$labels['vacationreason'] = '邮件正文(休假原因)';
 $labels['vacationsubject'] = '邮件主题';
 $labels['rulestop'] = '停止评价规则';
 $labels['enable'] = '启用/禁用';
@@ -142,4 +142,6 @@ $labels['activated'] = '禁用过滤器成功。';
 $labels['deactivated'] = '启用过滤器成功。';
 $labels['moved'] = '过滤器移动成功。';
 $labels['moveerror'] = '无法移动选中的过滤器，因为服务器发生错误。';
+$labels['nametoolong'] = '名称太长。';
+$labels['setexist'] = '设置已存在。';
 
diff --git a/plugins/markasjunk/localization/bs_BA.inc b/plugins/markasjunk/localization/bs_BA.inc
index 139793e01..81c9b1bca 100644
--- a/plugins/markasjunk/localization/bs_BA.inc
+++ b/plugins/markasjunk/localization/bs_BA.inc
@@ -11,10 +11,10 @@
  +-----------------------------------------------------------------------+
  | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Označi kao spam';
 $labels['reportedasjunk'] = 'Uspješno označeno kao spam';
 
diff --git a/plugins/markasjunk/localization/ca_ES.inc b/plugins/markasjunk/localization/ca_ES.inc
index f21640595..16a5e3e3c 100644
--- a/plugins/markasjunk/localization/ca_ES.inc
+++ b/plugins/markasjunk/localization/ca_ES.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emi Bcn <Unknown>                                             |
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Correu brossa';
 $labels['buttontitle'] = 'Marca com a Spam';
 $labels['reportedasjunk'] = 'S\'ha reportat correctament com a Spam';
 
diff --git a/plugins/markasjunk/localization/cy_GB.inc b/plugins/markasjunk/localization/cy_GB.inc
index 1e2c95412..cc9a07058 100644
--- a/plugins/markasjunk/localization/cy_GB.inc
+++ b/plugins/markasjunk/localization/cy_GB.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos <Unknown>                                        |
+ | Author: Dafydd Tomos                                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Sothach';
 $labels['buttontitle'] = 'Nodi fel Sbwriel';
 $labels['reportedasjunk'] = 'Adroddwyd yn llwyddiannus fel Sbwriel';
 
diff --git a/plugins/markasjunk/localization/en_GB.inc b/plugins/markasjunk/localization/en_GB.inc
index 5a185c3f2..0ecbf7aec 100644
--- a/plugins/markasjunk/localization/en_GB.inc
+++ b/plugins/markasjunk/localization/en_GB.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tony Whitmore <Unknown>                                       |
+ | Author: Christian Foellmann <foellmann@foe-services.de>               |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Mark as Junk';
 $labels['reportedasjunk'] = 'Successfully reported as Junk';
 
diff --git a/plugins/markasjunk/localization/eo.inc b/plugins/markasjunk/localization/eo.inc
index b8b6f3651..0d90ee87c 100644
--- a/plugins/markasjunk/localization/eo.inc
+++ b/plugins/markasjunk/localization/eo.inc
@@ -11,10 +11,10 @@
  +-----------------------------------------------------------------------+
  | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Rubaĵo';
 $labels['buttontitle'] = 'Marki kiel rubaĵo';
 $labels['reportedasjunk'] = 'Sukcese raportita kiel rubaĵo';
 
diff --git a/plugins/markasjunk/localization/et_EE.inc b/plugins/markasjunk/localization/et_EE.inc
index 3523f17d8..d9b28918d 100644
--- a/plugins/markasjunk/localization/et_EE.inc
+++ b/plugins/markasjunk/localization/et_EE.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: yllar                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Rämps';
 $labels['buttontitle'] = 'Märgista Rämpsuks';
 $labels['reportedasjunk'] = 'Edukalt Rämpsuks märgitud';
 
diff --git a/plugins/markasjunk/localization/fa_IR.inc b/plugins/markasjunk/localization/fa_IR.inc
index cde0ae600..72511e0f9 100644
--- a/plugins/markasjunk/localization/fa_IR.inc
+++ b/plugins/markasjunk/localization/fa_IR.inc
@@ -11,10 +11,10 @@
  +-----------------------------------------------------------------------+
  | Author: Hamid <abbaszadeh.h@gmail.com>                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'بنجل';
 $labels['buttontitle'] = 'علامت گذاری به عنوان بنجل';
 $labels['reportedasjunk'] = 'با موفقیت به عنوان بنجل گزارش شد';
 
diff --git a/plugins/markasjunk/localization/fi_FI.inc b/plugins/markasjunk/localization/fi_FI.inc
index 921883b74..622b33915 100644
--- a/plugins/markasjunk/localization/fi_FI.inc
+++ b/plugins/markasjunk/localization/fi_FI.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos <Unknown>                                      |
+ | Author: Jiri Grönroos                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Roskaposti';
 $labels['buttontitle'] = 'Merkitse roskapostiksi';
 $labels['reportedasjunk'] = 'Ilmoitettu onnistuneesti roskapostista';
 
diff --git a/plugins/markasjunk/localization/fr_FR.inc b/plugins/markasjunk/localization/fr_FR.inc
index 992d18237..e310c541a 100644
--- a/plugins/markasjunk/localization/fr_FR.inc
+++ b/plugins/markasjunk/localization/fr_FR.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Edouard Moreau <Unknown>                                      |
+ | Author: Nicolas Delvaux                                               |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Indésirables';
 $labels['buttontitle'] = 'Marquer comme indésirable';
 $labels['reportedasjunk'] = 'Notification de message indésirable envoyée';
 
diff --git a/plugins/markasjunk/localization/he_IL.inc b/plugins/markasjunk/localization/he_IL.inc
index 52d32cbb0..0dbc31520 100644
--- a/plugins/markasjunk/localization/he_IL.inc
+++ b/plugins/markasjunk/localization/he_IL.inc
@@ -11,10 +11,10 @@
  +-----------------------------------------------------------------------+
  | Author: Moshe Leibovitch <moish@mln.co.il>                            |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['buttontitle'] = 'סימון כדואר זבל';
-$labels['reportedasjunk'] = 'סומן בהצלחה כדואר זבל';
+$labels['buttontext'] = 'זבל';
+$labels['buttontitle'] = 'סמן כדואר זבל';
+$labels['reportedasjunk'] = 'דואר הזבל דווח בהצלחה';
 
diff --git a/plugins/markasjunk/localization/hu_HU.inc b/plugins/markasjunk/localization/hu_HU.inc
index 230c1bc75..a96f88f7a 100644
--- a/plugins/markasjunk/localization/hu_HU.inc
+++ b/plugins/markasjunk/localization/hu_HU.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Droszler Gabor <droszler@datatrans.hu>                        |
+ | Author: Németh András <narzym@hotmail.com>                          |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Levélszemét';
 $labels['buttontitle'] = 'Szemétnek jelölés';
 $labels['reportedasjunk'] = 'Sikeresen szemétnek jelentve';
 
diff --git a/plugins/markasjunk/localization/it_IT.inc b/plugins/markasjunk/localization/it_IT.inc
index cba88d396..3c26a10d0 100644
--- a/plugins/markasjunk/localization/it_IT.inc
+++ b/plugins/markasjunk/localization/it_IT.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
+ | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Marca come Spam';
 $labels['reportedasjunk'] = 'Messaggio marcato come Spam';
 
diff --git a/plugins/markasjunk/localization/lt_LT.inc b/plugins/markasjunk/localization/lt_LT.inc
index b79d92cc2..bd2e0e7c8 100644
--- a/plugins/markasjunk/localization/lt_LT.inc
+++ b/plugins/markasjunk/localization/lt_LT.inc
@@ -11,10 +11,10 @@
  +-----------------------------------------------------------------------+
  | Author: Rimas Kudelis <rq@akl.lt>                                     |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Brukalas';
 $labels['buttontitle'] = 'Žymėti kaip brukalą';
 $labels['reportedasjunk'] = 'Sėkmingai pranešta, jog laiškas yra brukalas';
 
diff --git a/plugins/markasjunk/localization/ml_IN.inc b/plugins/markasjunk/localization/ml_IN.inc
new file mode 100644
index 000000000..780a53d7b
--- /dev/null
+++ b/plugins/markasjunk/localization/ml_IN.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ml_IN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Anish A <aneesh.nl@gmail.com>                                 |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontitle'] = 'സ്പാം ആയി അടയാളപ്പെടുത്തുക';
+$labels['reportedasjunk'] = 'സ്പാം ആയി അടയാളപ്പെടുത്തി';
+
diff --git a/plugins/markasjunk/localization/nb_NB.inc b/plugins/markasjunk/localization/nb_NB.inc
new file mode 100644
index 000000000..7dce36cb8
--- /dev/null
+++ b/plugins/markasjunk/localization/nb_NB.inc
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nb_NB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Patrick Kvaksrud <patrick@idrettsforbundet.no>                |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['buttontext'] = 'Useriøs e-post';
+$labels['buttontitle'] = 'Marker som useriøs e-post';
+$labels['reportedasjunk'] = 'Rapportering av useriøs e-post var vellykket';
+
diff --git a/plugins/markasjunk/localization/nl_NL.inc b/plugins/markasjunk/localization/nl_NL.inc
index 837d64e47..1f82298ef 100644
--- a/plugins/markasjunk/localization/nl_NL.inc
+++ b/plugins/markasjunk/localization/nl_NL.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Justin van Beusekom <Unknown>                                 |
+ | Author: Geert Wirken                                                  |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Markeer als spam';
 $labels['reportedasjunk'] = 'Succesvol gemarkeerd als spam';
 
diff --git a/plugins/markasjunk/localization/pt_BR.inc b/plugins/markasjunk/localization/pt_BR.inc
index b99e60117..b93bfc20a 100644
--- a/plugins/markasjunk/localization/pt_BR.inc
+++ b/plugins/markasjunk/localization/pt_BR.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Claudio F Filho <filhocf@gmail.com>                           |
+ | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Marcar como Spam';
 $labels['reportedasjunk'] = 'Marcado como Spam com sucesso';
 
diff --git a/plugins/markasjunk/localization/pt_PT.inc b/plugins/markasjunk/localization/pt_PT.inc
index 083c7245f..45c9202f8 100644
--- a/plugins/markasjunk/localization/pt_PT.inc
+++ b/plugins/markasjunk/localization/pt_PT.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David <Unknown>                                               |
+ | Author: David                                                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Lixo';
 $labels['buttontitle'] = 'Marcar como Lixo';
 $labels['reportedasjunk'] = 'Reportado como Lixo com sucesso';
 
diff --git a/plugins/markasjunk/localization/sl_SI.inc b/plugins/markasjunk/localization/sl_SI.inc
index 216444db1..ab7832430 100644
--- a/plugins/markasjunk/localization/sl_SI.inc
+++ b/plugins/markasjunk/localization/sl_SI.inc
@@ -11,10 +11,10 @@
  +-----------------------------------------------------------------------+
  | Author: Barbara Krasovec <barbarak@arnes.si>                          |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'Nezaželena sporočila';
 $labels['buttontitle'] = 'Označi kot spam';
 $labels['reportedasjunk'] = 'Uspešno označeno kot spam';
 
diff --git a/plugins/markasjunk/localization/tr_TR.inc b/plugins/markasjunk/localization/tr_TR.inc
index fcfd55cc0..42a0de236 100644
--- a/plugins/markasjunk/localization/tr_TR.inc
+++ b/plugins/markasjunk/localization/tr_TR.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul <Unknown>                                      |
+ | Author: ismail yenigul                                                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = 'İstenmeyen';
 $labels['buttontitle'] = 'Çöp olarak işaretle';
 $labels['reportedasjunk'] = 'Spam olarak rapor edildi';
 
diff --git a/plugins/markasjunk/localization/vi_VN.inc b/plugins/markasjunk/localization/vi_VN.inc
index 10cf1235f..3d00d923b 100644
--- a/plugins/markasjunk/localization/vi_VN.inc
+++ b/plugins/markasjunk/localization/vi_VN.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
+ | Author: Kenny Tran <kennethanh@gmail.com>                             |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['buttontitle'] = 'Đánh dấu thư rác';
-$labels['reportedasjunk'] = 'Đánh dấu thành công';
+$labels['buttontext'] = 'Thư rác';
+$labels['buttontitle'] = 'Đánh dấu để được xem là thư rác';
+$labels['reportedasjunk'] = 'Đánh dấu để được xem là thư rác thành công';
 
diff --git a/plugins/markasjunk/localization/zh_CN.inc b/plugins/markasjunk/localization/zh_CN.inc
index 7b5d9467b..c5d50362b 100644
--- a/plugins/markasjunk/localization/zh_CN.inc
+++ b/plugins/markasjunk/localization/zh_CN.inc
@@ -9,12 +9,12 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: waring_id <Unknown>                                           |
+ | Author: Christopher Meng <cickumqt@gmail.com>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
+$labels['buttontext'] = '垃圾邮件';
 $labels['buttontitle'] = '标记为垃圾邮件';
-$labels['reportedasjunk'] = '成功报告为垃圾邮件';
+$labels['reportedasjunk'] = '成功报告该邮件为垃圾邮件';
 
diff --git a/plugins/new_user_dialog/localization/ca_ES.inc b/plugins/new_user_dialog/localization/ca_ES.inc
index a4c14b95a..970d1c3b7 100644
--- a/plugins/new_user_dialog/localization/ca_ES.inc
+++ b/plugins/new_user_dialog/localization/ca_ES.inc
@@ -9,12 +9,11 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emi Bcn <Unknown>                                             |
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = 'Si us plau, completa la teva identitat del remitent';
-$labels['identitydialoghint'] = 'Aquesta caixa només apareix un cop a la primera entrada.';
+$labels['identitydialogtitle'] = 'Si us plau, completeu la identitat del vostre remitent';
+$labels['identitydialoghint'] = 'Aquest quadre només apareix un cop a la primera entrada.';
 
diff --git a/plugins/new_user_dialog/localization/eo.inc b/plugins/new_user_dialog/localization/eo.inc
index d2f6db46d..b66fec67c 100644
--- a/plugins/new_user_dialog/localization/eo.inc
+++ b/plugins/new_user_dialog/localization/eo.inc
@@ -11,10 +11,9 @@
  +-----------------------------------------------------------------------+
  | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = 'Bonvolu plenumi vian identon pri sendanto';
+$labels['identitydialogtitle'] = 'Bonvole plenumu vian identon pri sendanto';
 $labels['identitydialoghint'] = 'Ĉi tiu kesto aperas nur unufoje je la unua ensaluto.';
 
diff --git a/plugins/new_user_dialog/localization/ml_IN.inc b/plugins/new_user_dialog/localization/ml_IN.inc
new file mode 100644
index 000000000..4009da4f4
--- /dev/null
+++ b/plugins/new_user_dialog/localization/ml_IN.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ml_IN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Anish A <aneesh.nl@gmail.com>                                 |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['identitydialogtitle'] = 'സ്വീകര്‍ത്താവിന്റെ വ്യക്തിത്വം പൂര്‍ത്തീകരിക്കുക';
+$labels['identitydialoghint'] = 'ആദ്യത്തെ പ്രവേശനത്തില്‍ മാത്രമേ ഈ പെട്ടി വരികയുള്ളു';
+
diff --git a/plugins/new_user_dialog/localization/nb_NB.inc b/plugins/new_user_dialog/localization/nb_NB.inc
new file mode 100644
index 000000000..f4594378c
--- /dev/null
+++ b/plugins/new_user_dialog/localization/nb_NB.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nb_NB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Peter Grindem <peter@grindem.no>                              |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['identitydialogtitle'] = 'Vennligst fullfør din avvsender identitet.';
+$labels['identitydialoghint'] = 'Denne boksen kommer kun ved første pålogging.';
+
diff --git a/plugins/new_user_dialog/localization/vi_VN.inc b/plugins/new_user_dialog/localization/vi_VN.inc
index 9c53fe2df..fe617e597 100644
--- a/plugins/new_user_dialog/localization/vi_VN.inc
+++ b/plugins/new_user_dialog/localization/vi_VN.inc
@@ -9,12 +9,11 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
+ | Author: Kenny Tran <kennethanh@gmail.com>                             |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = 'Hãy điền nhận diện người gửi của bạn';
+$labels['identitydialogtitle'] = 'Xin điền nhận diện người gửi của bạn';
 $labels['identitydialoghint'] = 'Hộp này chỉ xuất hiện 1 lần khi đăng nhập lần đầu tiên';
 
diff --git a/plugins/new_user_dialog/localization/zh_CN.inc b/plugins/new_user_dialog/localization/zh_CN.inc
index 42ea1a2fe..1a757c6d6 100644
--- a/plugins/new_user_dialog/localization/zh_CN.inc
+++ b/plugins/new_user_dialog/localization/zh_CN.inc
@@ -9,12 +9,11 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: waring_id <Unknown>                                           |
+ | Author: Christopher Meng <cickumqt@gmail.com>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = '请填写发送者的标识';
-$labels['identitydialoghint'] = '本提示框只在第一次登陆时显示';
+$labels['identitydialogtitle'] = '请填写发送者标识';
+$labels['identitydialoghint'] = '本提示仅在第一次登录时显示。';
 
diff --git a/plugins/newmail_notifier/localization/ca_ES.inc b/plugins/newmail_notifier/localization/ca_ES.inc
index 0b163d0e1..da9078daa 100644
--- a/plugins/newmail_notifier/localization/ca_ES.inc
+++ b/plugins/newmail_notifier/localization/ca_ES.inc
@@ -9,19 +9,18 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emi Bcn <Unknown>                                             |
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
 $labels['basic'] = 'Mostra notificacions del navegador quan hi hagi un missatge nou';
 $labels['desktop'] = 'Mostra notificacions de l\'escriptori quan hi hagi un missatge nou';
 $labels['sound'] = 'Reprodueix el so quan hi hagi un missatge nou';
-$labels['test'] = 'Prova';
+$labels['test'] = 'Comprova';
 $labels['title'] = 'Missatge nou!';
-$labels['body'] = 'Has rebut un missatge nou.';
-$labels['testbody'] = 'Aquesta és una notificació de prova.';
-$labels['desktopdisabled'] = 'Les notificacions d\'escriptori estan deshabilitades al teu navegador.';
-$labels['desktopunsupported'] = 'El teu navegador no suporta les notificacions d\'escriptori.';
+$labels['body'] = 'Heu rebut un missatge nou.';
+$labels['testbody'] = 'Això és una notificació de prova.';
+$labels['desktopdisabled'] = 'Les notificacions d\'escriptori estan deshabilitades al vostre navegador.';
+$labels['desktopunsupported'] = 'El vostre navegador no permet les notificacions d\'escriptori.';
 
diff --git a/plugins/newmail_notifier/localization/eo.inc b/plugins/newmail_notifier/localization/eo.inc
index 295998521..b8058e48a 100644
--- a/plugins/newmail_notifier/localization/eo.inc
+++ b/plugins/newmail_notifier/localization/eo.inc
@@ -11,17 +11,16 @@
  +-----------------------------------------------------------------------+
  | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['basic'] = 'Montri retumilajn atentigojn pri nova mesaĝo';
-$labels['desktop'] = 'Montri komputilajn atentigojn pri nova mesaĝo';
-$labels['sound'] = 'Ludi sonon dum nova mesaĝo';
+$labels['basic'] = 'Montri atentigojn de retumilo pri nova mesaĝo';
+$labels['desktop'] = 'Montri atentigojn de komputilo pri nova mesaĝo';
+$labels['sound'] = 'Ludi sonon por nova mesaĝo';
 $labels['test'] = 'Testi';
 $labels['title'] = 'Nova retmesaĝo!';
 $labels['body'] = 'Vi ricevis novan mesaĝon.';
-$labels['testbody'] = 'Ĉi tiu estas testo pri atentigo.';
-$labels['desktopdisabled'] = 'Labortablaj atentigoj estas malŝaltitaj en via retumilo.';
-$labels['desktopunsupported'] = 'Via retumilo ne subtenas komputilajn atentigojn.';
+$labels['testbody'] = 'Tio estas testo pri atentigo.';
+$labels['desktopdisabled'] = 'Atentigoj de komputilo estas malŝaltitaj en via retumilo.';
+$labels['desktopunsupported'] = 'Via retumilo ne subtenas atentigojn de komputilo.';
 
diff --git a/plugins/newmail_notifier/localization/ia.inc b/plugins/newmail_notifier/localization/ia.inc
new file mode 100644
index 000000000..df92b95c3
--- /dev/null
+++ b/plugins/newmail_notifier/localization/ia.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ia/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['basic'] = 'Monstrar notificationes de navigator in cata nove message';
+$labels['test'] = 'Prova';
+$labels['title'] = 'Nove message!';
+$labels['testbody'] = 'Iste es un notification de prova.';
+
diff --git a/plugins/newmail_notifier/localization/ml_IN.inc b/plugins/newmail_notifier/localization/ml_IN.inc
new file mode 100644
index 000000000..25dbb3ebc
--- /dev/null
+++ b/plugins/newmail_notifier/localization/ml_IN.inc
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ml_IN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Anish A <aneesh.nl@gmail.com>                                 |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['basic'] = 'ബ്രൌസര്‍ അറിയിപ്പുകള്‍ പുതിയ സന്ദേശത്തില്‍ കാണിക്കുക';
+$labels['desktop'] = 'ഡെസ്ക്ക്ടോപ്പ് അറിയിപ്പുകള്‍ പുതിയ സന്ദേശത്തില്‍ കാണിക്കുക';
+$labels['sound'] = 'പുതിയ സന്ദേശത്തില്‍ സബ്ദം കേള്‍പ്പിക്കുക';
+$labels['test'] = 'പരീക്ഷിക്കുക';
+$labels['title'] = 'പുതിയ സന്ദേശം !';
+$labels['body'] = 'താങ്കള്‍ക്ക് ഒരു പുതിയ സന്ദേശം ലഭിച്ചു';
+$labels['testbody'] = 'ഇത് ഒരു പരീക്ഷണ അറിയിപ്പാണ്.';
+$labels['desktopdisabled'] = 'താങ്കളുടെ ബ്രൌസറില്‍ ഡെസ്ക്ക്ടോപ്പ് നോട്ടിഫിക്കേഷന്‍ പ്രവര്‍ത്തനരഹിതമാണ്.';
+$labels['desktopunsupported'] = 'താങ്കളുടെ ബ്രൌസ്സര്‍ ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകള്‍ പിന്‍തുണയ്ക്കുന്നില്ല.';
+
diff --git a/plugins/newmail_notifier/localization/vi_VN.inc b/plugins/newmail_notifier/localization/vi_VN.inc
index 97d07f3d9..b05726e3d 100644
--- a/plugins/newmail_notifier/localization/vi_VN.inc
+++ b/plugins/newmail_notifier/localization/vi_VN.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
+ | Author: Kenny Tran <kennethanh@gmail.com>                             |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -22,6 +21,6 @@ $labels['test'] = 'Kiểm tra';
 $labels['title'] = 'Có thư mới!';
 $labels['body'] = 'Bạn vừa nhận một thư mới';
 $labels['testbody'] = 'Đây là thông báo kiểm tra';
-$labels['desktopdisabled'] = 'thông báo máy tính bị tắt trên trình duyệt của bạn';
+$labels['desktopdisabled'] = 'Thông báo máy tính bị tắt trên trình duyệt của bạn';
 $labels['desktopunsupported'] = 'Trình duyệt của bạn không hỗ trợ thông báo trên máy tính';
 
diff --git a/plugins/newmail_notifier/localization/zh_CN.inc b/plugins/newmail_notifier/localization/zh_CN.inc
index 1d1cb475c..b131a6c56 100644
--- a/plugins/newmail_notifier/localization/zh_CN.inc
+++ b/plugins/newmail_notifier/localization/zh_CN.inc
@@ -9,9 +9,8 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: waring_id <Unknown>                                           |
+ | Author: Christopher Meng <cickumqt@gmail.com>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
@@ -19,9 +18,9 @@ $labels['basic'] = '在浏览器中显示新邮件提醒';
 $labels['desktop'] = '在桌面显示新邮件提醒';
 $labels['sound'] = '有新的邮件时播放声音';
 $labels['test'] = '测试';
-$labels['title'] = '新邮件！';
-$labels['body'] = '你有新的邮件';
-$labels['testbody'] = '这是一个提醒测试';
-$labels['desktopdisabled'] = '你的浏览器已禁止桌面提醒';
-$labels['desktopunsupported'] = '你的浏览器不支持桌面提醒功能';
+$labels['title'] = '新邮件!';
+$labels['body'] = '您收到一封新邮件。';
+$labels['testbody'] = '这是一个提醒测试。';
+$labels['desktopdisabled'] = '您的浏览器已禁止桌面提醒功能。';
+$labels['desktopunsupported'] = '您的浏览器不支持桌面提醒功能。';
 
diff --git a/plugins/password/localization/eo.inc b/plugins/password/localization/eo.inc
index fe6ef933b..4c218bb13 100644
--- a/plugins/password/localization/eo.inc
+++ b/plugins/password/localization/eo.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Baptiste Darthenay <bapdarth@yahoo.fr>                        |
+ | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
  +-----------------------------------------------------------------------+
 */
 
@@ -18,14 +18,14 @@ $labels['changepasswd'] = 'Ŝanĝi pasvorton';
 $labels['curpasswd'] = 'Nuna pasvorto:';
 $labels['newpasswd'] = 'Nova pasvorto:';
 $labels['confpasswd'] = 'Konfirmi novan pasvorton:';
-$labels['nopassword'] = 'Bonvolu tajpi novan pasvorton.';
-$labels['nocurpassword'] = 'Bonvolu tajpi nunan pasvorton.';
-$labels['passwordincorrect'] = 'Nuna pasvorto nekorakta.';
-$labels['passwordinconsistency'] = 'Pasvortoj ne taŭgas, bonvolu provi denove.';
-$labels['crypterror'] = 'Ne povis konservi la pasvorton: ĉifrada funkcio maltrovita.';
-$labels['connecterror'] = 'Ne povis konservi la pasvorton: konekta eraro.';
-$labels['internalerror'] = 'Ne povis konservi novan pasvorton.';
-$labels['passwordshort'] = 'Pasvorto devas havi almanaŭ $length signojn.';
-$labels['passwordweak'] = 'La pasvorto devus havi almenaŭ unu ciferon kaj unu interpunktan signon.';
-$labels['passwordforbidden'] = 'La pasvorto enhavas malpermesajn signojn.';
+$labels['nopassword'] = 'Bonvole tajpu novan pasvorton.';
+$labels['nocurpassword'] = 'Bonvole tajpu nunan pasvorton.';
+$labels['passwordincorrect'] = 'Nuna pasvorto nekorekta.';
+$labels['passwordinconsistency'] = 'Pasvortoj ne kongruas, bonvole provu denove.';
+$labels['crypterror'] = 'Pasvorto ne konserveblas: funkcio de ĉifrado mankas.';
+$labels['connecterror'] = 'Pasvorto ne konserveblas: eraro de konekto.';
+$labels['internalerror'] = 'Nova pasvorto ne konserveblas.';
+$labels['passwordshort'] = 'Pasvorto longu almenaŭ $length signojn.';
+$labels['passwordweak'] = 'La pasvorto enhavu almenaŭ unu ciferon kaj unu interpunktan signon.';
+$labels['passwordforbidden'] = 'La pasvorto enhavas malpermesitajn signojn.';
 
diff --git a/plugins/password/localization/et_EE.inc b/plugins/password/localization/et_EE.inc
index 8ae7bd4a1..2d71b94d6 100644
--- a/plugins/password/localization/et_EE.inc
+++ b/plugins/password/localization/et_EE.inc
@@ -9,7 +9,7 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
+ | Author: yllar                                                         |
  +-----------------------------------------------------------------------+
 */
 
@@ -23,5 +23,9 @@ $labels['nocurpassword'] = 'Palun sisesta vana parool.';
 $labels['passwordincorrect'] = 'Vana parool on vale.';
 $labels['passwordinconsistency'] = 'Paroolid ei kattu, palun proovi uuesti.';
 $labels['crypterror'] = 'Serveris ei ole parooli krüpteerimiseks vajalikku funktsiooni.';
+$labels['connecterror'] = 'Parooli salvestamine nurjus. Ühenduse tõrge.';
 $labels['internalerror'] = 'Uue parooli andmebaasi salvestamine nurjus.';
+$labels['passwordshort'] = 'Parool peab olema vähemalt $length märki pikk.';
+$labels['passwordweak'] = 'Parool peab sisaldama vähemalt üht numbrit ja märki.';
+$labels['passwordforbidden'] = 'Parool sisaldab keelatud märki.';
 
diff --git a/plugins/password/localization/fa_IR.inc b/plugins/password/localization/fa_IR.inc
index 6e016f992..185ac83c5 100644
--- a/plugins/password/localization/fa_IR.inc
+++ b/plugins/password/localization/fa_IR.inc
@@ -22,5 +22,10 @@ $labels['nopassword'] = 'رمزعبور جدید را وارد نمایید';
 $labels['nocurpassword'] = 'رمزعبور فعلی را وارد نمایید';
 $labels['passwordincorrect'] = 'رمزعبور فعلی اشتباه است';
 $labels['passwordinconsistency'] = 'رمزعبورها با هم مطابقت ندارند، دوباره سعی نمایید.';
+$labels['crypterror'] = 'رمزعبور جدید نمی‌توانست ذخیره شود. نبودن تابع رمزگذاری.';
+$labels['connecterror'] = 'رمزعبور جدید نمی‌توانست ذخیره شود. خطای ارتباط.';
 $labels['internalerror'] = 'رمزعبور جدید ذخیره نشد';
+$labels['passwordshort'] = 'رمزعبور باید حداقل $length کاراکتر طول داشته باشد.';
+$labels['passwordweak'] = 'رمزعبور باید شامل حداقل یک عدد و یک کاراکتر نشانه‌ای باشد.';
+$labels['passwordforbidden'] = 'رمزعبور شما کاراکترهای غیرمجاز است.';
 
diff --git a/plugins/password/localization/it_IT.inc b/plugins/password/localization/it_IT.inc
index 13b4885d7..5b2f98ad3 100644
--- a/plugins/password/localization/it_IT.inc
+++ b/plugins/password/localization/it_IT.inc
@@ -1,21 +1,31 @@
 <?php
 
-$labels = array();
-$labels['changepasswd']  = 'Cambia la Password';
-$labels['curpasswd']  = 'Password corrente:';
-$labels['newpasswd']  = 'Nuova Password:';
-$labels['confpasswd']  = 'Conferma la Nuova Password:';
+/*
+ +-----------------------------------------------------------------------+
+ | localization/it_IT/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
+ +-----------------------------------------------------------------------+
+*/
 
-$messages = array();
-$messages['nopassword'] = 'Per favore inserisci la nuova password.';
-$messages['nocurpassword'] = 'Per favore inserisci la password corrente.';
-$messages['passwordincorrect'] = 'Password corrente sbagliata.';
-$messages['passwordinconsistency'] = 'Le password non coincidono, inserirle di nuovo.';
-$messages['crypterror'] = 'Non posso salvare la password, funzione di cifratura assente.';
-$messages['connecterror'] = 'Non posso salvare la password, errore di connessione.';
-$messages['internalerror'] = 'Non posso salvare la password.';
-$messages['passwordshort'] = 'La nuova password deve essere lunga almeno $length caratteri.';
-$messages['passwordweak'] = 'La nuova password deve contenere almeno una cifra e un segno di punteggiatura.';
-$messages['passwordforbidden'] = 'La password scelta contiene dei caratteri non consentiti.';
+$labels = array();
+$labels['changepasswd'] = 'Modifica la Password';
+$labels['curpasswd'] = 'Password corrente:';
+$labels['newpasswd'] = 'Nuova password:';
+$labels['confpasswd'] = 'Conferma la nuova Password:';
+$labels['nopassword'] = 'Per favore inserire la nuova password.';
+$labels['nocurpassword'] = 'Per favore inserire la password corrente.';
+$labels['passwordincorrect'] = 'La password corrente non è corretta.';
+$labels['passwordinconsistency'] = 'Le password non coincidono, per favore reinserire.';
+$labels['crypterror'] = 'Impossibile salvare la nuova password. Funzione di crittografia mancante.';
+$labels['connecterror'] = 'Imposibile salvare la nuova password. Errore di connessione.';
+$labels['internalerror'] = 'Impossibile salvare la nuova password.';
+$labels['passwordshort'] = 'La password deve essere lunga almeno $length caratteri.';
+$labels['passwordweak'] = 'La password deve includere almeno una cifra decimale e un simbolo di punteggiatura.';
+$labels['passwordforbidden'] = 'La password contiene caratteri proibiti.';
 
-?>
diff --git a/plugins/password/localization/nb_NB.inc b/plugins/password/localization/nb_NB.inc
new file mode 100644
index 000000000..ce4679bb1
--- /dev/null
+++ b/plugins/password/localization/nb_NB.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/nb_NB/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Tobias V. Langhoff <spug@thespug.net>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = 'Bytt passord';
+$labels['curpasswd'] = 'Nåværende passord:';
+$labels['newpasswd'] = 'Nytt passord:';
+$labels['confpasswd'] = 'Bekreft nytt passord';
+$labels['nopassword'] = 'Vennligst skriv inn nytt passord';
+$labels['nocurpassword'] = 'Vennligst skriv inn nåværende passord';
+$labels['passwordincorrect'] = 'Nåværende passord er feil';
+$labels['passwordinconsistency'] = 'Passordene er ikke like, vennligst prøv igjen.';
+$labels['crypterror'] = 'Kunne ikke lagre nytt passord. Krypteringsfunksjonen mangler.';
+$labels['connecterror'] = 'Kunne ikke lagre nytt passord. Tilkoblings feil.';
+$labels['internalerror'] = 'Kunne ikke lagre nytt passord';
+$labels['passwordshort'] = 'Passordet må minumum være $length karakterer langt.';
+$labels['passwordweak'] = 'Passordet må inneholde minst ett tall og ett tegnsettingssymbol.';
+$labels['passwordforbidden'] = 'Passordet inneholder forbudte tegn.';
+
diff --git a/plugins/password/localization/vi_VN.inc b/plugins/password/localization/vi_VN.inc
index 5fd266e27..729749316 100644
--- a/plugins/password/localization/vi_VN.inc
+++ b/plugins/password/localization/vi_VN.inc
@@ -9,13 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
+ | Author: Kenny Tran <kennethanh@gmail.com>                             |
  +-----------------------------------------------------------------------+
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Đổi mật khẩu';
-$labels['curpasswd'] = 'Mật khẩu hiện tại:';
+$labels['changepasswd'] = 'Thay đổi mật khẩu';
+$labels['curpasswd'] = 'Mật khẩu hiện tại';
 $labels['newpasswd'] = 'Mật khẩu mới:';
 $labels['confpasswd'] = 'Xác nhận mật khẩu mới';
 $labels['nopassword'] = 'Mời nhập mật khẩu mới';
@@ -23,9 +23,9 @@ $labels['nocurpassword'] = 'Mời nhập mật khẩu hiện tại';
 $labels['passwordincorrect'] = 'Mật khẩu hiện thời không đúng';
 $labels['passwordinconsistency'] = 'Mật khẩu không khớp, hãy thử lại';
 $labels['crypterror'] = 'Không thể lưu mật khẩu mới. Thiếu chức năng mã hóa';
-$labels['connecterror'] = 'Không thể lưu mật mã mới. Lỗi kết nối';
+$labels['connecterror'] = 'Không thể lưu mật mã mới. Lổi kết nối';
 $labels['internalerror'] = 'Không thể lưu mật khẩu mới';
 $labels['passwordshort'] = 'Mật khẩu phải dài ít nhất $ ký tự';
-$labels['passwordweak'] = 'Mật khẩu phải chứa ít nhất 1 con số và 1 ký tự dấu câu';
-$labels['passwordforbidden'] = 'Mật khẩu chứa ký bị không hợp lệ';
+$labels['passwordweak'] = 'Mật khẩu phải bao gồm ít nhất 1 con số và 1 ký tự dấu câu';
+$labels['passwordforbidden'] = 'Mật khẩu bao gồm ký tự không hợp lệ';
 
diff --git a/plugins/password/localization/zh_CN.inc b/plugins/password/localization/zh_CN.inc
new file mode 100644
index 000000000..5e0af7cd5
--- /dev/null
+++ b/plugins/password/localization/zh_CN.inc
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_CN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Christopher Meng <cickumqt@gmail.com>                         |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['changepasswd'] = '修改密码';
+$labels['curpasswd'] = '当前密码：';
+$labels['newpasswd'] = '新密码：';
+$labels['confpasswd'] = '确认新密码：';
+$labels['nopassword'] = '请输入新密码。';
+$labels['nocurpassword'] = '请输入正确的密码。';
+$labels['passwordincorrect'] = '当前密码不正确。';
+$labels['passwordinconsistency'] = '两次输入的密码不一致，请重试。';
+$labels['crypterror'] = '无法保存新密码，因为加密功能不可用。';
+$labels['connecterror'] = '无法保存新密码，因为连接出错。';
+$labels['internalerror'] = '无法保存新密码。';
+$labels['passwordshort'] = '密码必须至少为 $length 位。';
+$labels['passwordweak'] = '密码必须至少包含一个数字和一个标点符号。';
+$labels['passwordforbidden'] = '密码包含禁止使用的字符。';
+
diff --git a/plugins/userinfo/localization/ca_ES.inc b/plugins/userinfo/localization/ca_ES.inc
index e1a5f4623..84f765ac4 100644
--- a/plugins/userinfo/localization/ca_ES.inc
+++ b/plugins/userinfo/localization/ca_ES.inc
@@ -9,14 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emi Bcn <Unknown>                                             |
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
 $labels['userinfo'] = 'Informació de l\'usuari/a';
 $labels['created'] = 'Creat';
 $labels['lastlogin'] = 'Última connexió';
-$labels['defaultidentity'] = 'Identitat per omissió';
+$labels['defaultidentity'] = 'Identitat per defecte';
 
diff --git a/plugins/userinfo/localization/ia.inc b/plugins/userinfo/localization/ia.inc
new file mode 100644
index 000000000..607ddba4b
--- /dev/null
+++ b/plugins/userinfo/localization/ia.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ia/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['userinfo'] = 'Information de usator';
+$labels['created'] = 'Create';
+$labels['lastlogin'] = 'Ultime initio de session';
+$labels['defaultidentity'] = 'Identitate predeterminate';
+
diff --git a/plugins/userinfo/localization/ml_IN.inc b/plugins/userinfo/localization/ml_IN.inc
new file mode 100644
index 000000000..71996473b
--- /dev/null
+++ b/plugins/userinfo/localization/ml_IN.inc
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ml_IN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Anish A <aneesh.nl@gmail.com>                                 |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['userinfo'] = 'ഉപയോക്താവിന്റെ വിവരം';
+$labels['created'] = 'നിര്‍മ്മിച്ചു';
+$labels['lastlogin'] = 'അവസാന പ്രവേശനം';
+$labels['defaultidentity'] = 'സാധാരണ വ്യക്തിത്വം';
+
diff --git a/plugins/userinfo/localization/nb_NB.inc b/plugins/userinfo/localization/nb_NB.inc
index 55719d21a..7ae2832dd 100644
--- a/plugins/userinfo/localization/nb_NB.inc
+++ b/plugins/userinfo/localization/nb_NB.inc
@@ -9,12 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Martin Bore <Unknown>                                         |
+ | Author: Patrick Kvaksrud <patrick@idrettsforbundet.no>                |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
 $labels['userinfo'] = 'Brukerinformasjon';
 $labels['created'] = 'Opprettet';
+$labels['lastlogin'] = 'Sist logget inn';
+$labels['defaultidentity'] = 'Standard identitet';
 
diff --git a/plugins/userinfo/localization/vi_VN.inc b/plugins/userinfo/localization/vi_VN.inc
index e7e419860..813bd0a56 100644
--- a/plugins/userinfo/localization/vi_VN.inc
+++ b/plugins/userinfo/localization/vi_VN.inc
@@ -9,14 +9,13 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
+ | Author: Kenny Tran <kennethanh@gmail.com>                             |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
 $labels['userinfo'] = 'Thông tin người dùng';
-$labels['created'] = 'đã khởi tạo';
-$labels['lastlogin'] = 'lần đăng nhập cuối';
-$labels['defaultidentity'] = 'nhận dạng mặc định';
+$labels['created'] = 'Được tạo';
+$labels['lastlogin'] = 'Lần đăng nhập cuối';
+$labels['defaultidentity'] = 'Nhận diện mặc định';
 
diff --git a/plugins/vcard_attachments/localization/ca_ES.inc b/plugins/vcard_attachments/localization/ca_ES.inc
index 75c267956..16caca65c 100644
--- a/plugins/vcard_attachments/localization/ca_ES.inc
+++ b/plugins/vcard_attachments/localization/ca_ES.inc
@@ -9,12 +9,11 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emi Bcn <Unknown>                                             |
+ | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['addvcardmsg'] = 'Afegir la vCard a la llibreta d\'adreces';
+$labels['addvcardmsg'] = 'Afegeix la vCard a la llibreta d\'adreces';
 $labels['vcardsavefailed'] = 'No s\'ha pogut desar la vCard';
 
diff --git a/plugins/vcard_attachments/localization/eo.inc b/plugins/vcard_attachments/localization/eo.inc
index d09c6fd6a..1f962bbb4 100644
--- a/plugins/vcard_attachments/localization/eo.inc
+++ b/plugins/vcard_attachments/localization/eo.inc
@@ -11,10 +11,9 @@
  +-----------------------------------------------------------------------+
  | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Aldoni vCard al adresaro';
-$labels['vcardsavefailed'] = 'Neeblas konservi vCard';
+$labels['vcardsavefailed'] = 'vCard ne konserveblas';
 
diff --git a/plugins/vcard_attachments/localization/ml_IN.inc b/plugins/vcard_attachments/localization/ml_IN.inc
new file mode 100644
index 000000000..1b4d98ab7
--- /dev/null
+++ b/plugins/vcard_attachments/localization/ml_IN.inc
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/ml_IN/labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Anish A <aneesh.nl@gmail.com>                                 |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['addvcardmsg'] = 'വിലാസപുസ്തകത്തിലേക്ക് വികാര്‍ഡ് ചേര്‍ക്കുക';
+$labels['vcardsavefailed'] = 'വികാര്‍ഡ് ചേര്‍ക്കാന്‍ പറ്റിയില്ല';
+
diff --git a/plugins/vcard_attachments/localization/zh_CN.inc b/plugins/vcard_attachments/localization/zh_CN.inc
index 67fb902d8..7fe3c8f5f 100644
--- a/plugins/vcard_attachments/localization/zh_CN.inc
+++ b/plugins/vcard_attachments/localization/zh_CN.inc
@@ -9,12 +9,11 @@
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: waring_id <Unknown>                                           |
+ | Author: Christopher Meng <cickumqt@gmail.com>                         |
  +-----------------------------------------------------------------------+
- @version $Id$
 */
 
 $labels = array();
-$labels['addvcardmsg'] = '添加vCard到地址簿中';
-$labels['vcardsavefailed'] = '无法保存vCard';
+$labels['addvcardmsg'] = '添加 vCard 到地址簿中';
+$labels['vcardsavefailed'] = '无法保存 vCard';