From 4136174517d426dcec74304ce004b4c845f075f5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 10 Oct 2013 13:21:14 -0400
Subject: [PATCH] Clean up translations once again, this time remove untranslated strings for all langs

---
 plugins/archive/localization/fi_FI.inc              |   19 
 program/localization/hy_AM/labels.inc               |   37 
 plugins/zipdownload/localization/zh_CN.inc          |    1 
 program/localization/de_CH/messages.inc             |    4 
 plugins/managesieve/localization/uk_UA.inc          |  115 
 plugins/managesieve/localization/ia.inc             |  173 
 plugins/attachment_reminder/localization/ca_ES.inc  |    1 
 plugins/hide_blockquote/localization/hu_HU.inc      |    1 
 plugins/archive/localization/om.inc                 |    2 
 program/localization/ia/labels.inc                  |  193 
 program/localization/ja_JP/labels.inc               |   10 
 plugins/acl/localization/cs_CZ.inc                  |   21 
 plugins/hide_blockquote/localization/hy_AM.inc      |    1 
 plugins/attachment_reminder/localization/nl_BE.inc  |    1 
 plugins/vcard_attachments/localization/pl_PL.inc    |    1 
 plugins/hide_blockquote/localization/bg_BG.inc      |    1 
 program/localization/pt_BR/messages.inc             |    4 
 plugins/acl/localization/ca_ES.inc                  |    1 
 plugins/newmail_notifier/localization/sl_SI.inc     |    2 
 plugins/help/localization/ro_RO.inc                 |    1 
 plugins/userinfo/localization/it_IT.inc             |    1 
 plugins/archive/localization/ku.inc                 |   10 
 plugins/acl/localization/da_DK.inc                  |    3 
 plugins/new_user_dialog/localization/mr_IN.inc      |    1 
 plugins/archive/localization/fr_FR.inc              |    7 
 plugins/zipdownload/localization/cy_GB.inc          |    1 
 plugins/markasjunk/localization/pt_BR.inc           |    1 
 plugins/password/localization/he_IL.inc             |    1 
 plugins/managesieve/localization/et_EE.inc          |   13 
 program/localization/ml_IN/messages.inc             |  147 
 plugins/attachment_reminder/localization/da_DK.inc  |    1 
 plugins/zipdownload/localization/nl_NL.inc          |    1 
 plugins/zipdownload/localization/eo.inc             |    1 
 program/localization/ta_IN/labels.inc               |  208 
 plugins/archive/localization/bs_BA.inc              |    1 
 program/localization/en_GB/labels.inc               |   19 
 program/localization/cy_GB/messages.inc             |    4 
 plugins/help/localization/sk_SK.inc                 |    1 
 plugins/vcard_attachments/localization/sr_CS.inc    |    1 
 plugins/attachment_reminder/localization/lv_LV.inc  |    1 
 program/localization/mr_IN/messages.inc             |   60 
 plugins/newmail_notifier/localization/he_IL.inc     |    2 
 plugins/help/localization/el_GR.inc                 |    1 
 plugins/zipdownload/localization/de_CH.inc          |    1 
 program/localization/mr_IN/labels.inc               |   99 
 program/localization/he_IL/messages.inc             |   11 
 plugins/userinfo/localization/ia.inc                |    1 
 plugins/archive/localization/es_AR.inc              |    1 
 plugins/markasjunk/localization/en_GB.inc           |    1 
 program/localization/pt_PT/labels.inc               |   14 
 plugins/hide_blockquote/localization/sv_SE.inc      |    1 
 plugins/acl/localization/lv_LV.inc                  |    1 
 program/localization/ur_PK/messages.inc             |    2 
 plugins/markasjunk/localization/ru_RU.inc           |    1 
 plugins/help/localization/id_ID.inc                 |    1 
 plugins/new_user_dialog/localization/de_CH.inc      |    1 
 plugins/new_user_dialog/localization/pt_PT.inc      |    1 
 plugins/userinfo/localization/ti.inc                |    1 
 plugins/help/localization/tr_TR.inc                 |    1 
 plugins/managesieve/localization/bs_BA.inc          |   11 
 plugins/attachment_reminder/localization/de_DE.inc  |   17 
 plugins/managesieve/localization/es_AR.inc          |  111 
 plugins/new_user_dialog/localization/cy_GB.inc      |    1 
 plugins/help/localization/ti.inc                    |    1 
 plugins/managesieve/localization/id_ID.inc          |   37 
 plugins/managesieve/localization/vi_VN.inc          |   40 
 plugins/subscriptions_option/localization/el_GR.inc |    1 
 plugins/newmail_notifier/localization/km_KH.inc     |    6 
 plugins/archive/localization/et_EE.inc              |    1 
 plugins/help/localization/nb_NO.inc                 |    1 
 plugins/userinfo/localization/sr_CS.inc             |    1 
 plugins/vcard_attachments/localization/ar_SA.inc    |    1 
 program/localization/sv_SE/labels.inc               |    8 
 plugins/hide_blockquote/localization/ru_RU.inc      |    1 
 plugins/archive/localization/be_BE.inc              |    9 
 plugins/newmail_notifier/localization/si_LK.inc     |   10 
 program/localization/vi_VN/messages.inc             |   13 
 plugins/attachment_reminder/localization/zh_TW.inc  |   17 
 plugins/new_user_dialog/localization/zh_CN.inc      |    1 
 plugins/archive/localization/sv_SE.inc              |    1 
 program/localization/zh_CN/messages.inc             |  145 
 program/localization/bs_BA/labels.inc               |    8 
 plugins/hide_blockquote/localization/lb_LU.inc      |    1 
 program/localization/th_TH/labels.inc               |  186 
 plugins/subscriptions_option/localization/nb_NO.inc |    2 
 program/localization/hi_IN/labels.inc               |  290 -
 plugins/attachment_reminder/localization/es_ES.inc  |   17 
 plugins/attachment_reminder/localization/lt_LT.inc  |    1 
 plugins/help/localization/uk_UA.inc                 |    1 
 plugins/hide_blockquote/localization/ko_KR.inc      |    1 
 program/localization/eo/labels.inc                  |  157 
 plugins/subscriptions_option/localization/sk_SK.inc |    2 
 plugins/managesieve/localization/ro_RO.inc          |   11 
 plugins/managesieve/localization/nb_NO.inc          |   13 
 plugins/acl/localization/ja_JP.inc                  |    1 
 plugins/help/localization/pl_PL.inc                 |    1 
 plugins/newmail_notifier/localization/lv_LV.inc     |    1 
 plugins/newmail_notifier/localization/eo.inc        |    2 
 plugins/markasjunk/localization/zh_CN.inc           |    1 
 plugins/acl/localization/az_AZ.inc                  |    1 
 plugins/subscriptions_option/localization/ro_RO.inc |    1 
 plugins/userinfo/localization/ar_SA.inc             |    1 
 plugins/newmail_notifier/localization/da_DK.inc     |    2 
 plugins/acl/localization/lt_LT.inc                  |    1 
 plugins/new_user_dialog/localization/ar.inc         |    1 
 plugins/password/localization/gl_ES.inc             |    1 
 plugins/newmail_notifier/localization/ml_IN.inc     |    2 
 plugins/help/localization/ia.inc                    |    2 
 plugins/managesieve/localization/tr_TR.inc          |   13 
 plugins/password/localization/sl_SI.inc             |    1 
 plugins/subscriptions_option/localization/id_ID.inc |    1 
 plugins/vcard_attachments/localization/it_IT.inc    |    1 
 plugins/managesieve/localization/fa_IR.inc          |   12 
 plugins/attachment_reminder/localization/ja_JP.inc  |    1 
 plugins/new_user_dialog/localization/nl_NL.inc      |    1 
 plugins/acl/localization/sl_SI.inc                  |    1 
 plugins/password/localization/eu_ES.inc             |    1 
 plugins/attachment_reminder/localization/az_AZ.inc  |    1 
 plugins/hide_blockquote/localization/fr_FR.inc      |    1 
 plugins/subscriptions_option/localization/tr_TR.inc |    2 
 plugins/attachment_reminder/localization/cs_CZ.inc  |    1 
 plugins/new_user_dialog/localization/pt_BR.inc      |    1 
 plugins/acl/localization/zh_TW.inc                  |    1 
 plugins/markasjunk/localization/pt_PT.inc           |    1 
 plugins/help/localization/ar.inc                    |    2 
 plugins/hide_blockquote/localization/es_AR.inc      |    1 
 plugins/hide_blockquote/localization/pt_BR.inc      |    1 
 plugins/new_user_dialog/localization/nn_NO.inc      |    1 
 plugins/hide_blockquote/localization/be_BE.inc      |    1 
 program/localization/bs_BA/messages.inc             |    4 
 plugins/attachment_reminder/localization/sl_SI.inc  |    1 
 plugins/userinfo/localization/eu_ES.inc             |    1 
 plugins/help/localization/ar_SA.inc                 |    1 
 plugins/userinfo/localization/km_KH.inc             |    1 
 plugins/new_user_dialog/localization/de_DE.inc      |    1 
 plugins/acl/localization/he_IL.inc                  |    1 
 plugins/new_user_dialog/localization/zh_TW.inc      |    1 
 plugins/newmail_notifier/localization/hr_HR.inc     |    2 
 plugins/hide_blockquote/localization/vi_VN.inc      |    1 
 plugins/help/localization/be_BE.inc                 |    1 
 plugins/help/localization/vi_VN.inc                 |    1 
 plugins/hide_blockquote/localization/bs_BA.inc      |    1 
 plugins/markasjunk/localization/lb_LU.inc           |    1 
 plugins/acl/localization/nl_NL.inc                  |    1 
 plugins/help/localization/es_AR.inc                 |    1 
 plugins/new_user_dialog/localization/en_GB.inc      |    1 
 plugins/archive/localization/ru_RU.inc              |    1 
 plugins/markasjunk/localization/nl_NL.inc           |    1 
 plugins/help/localization/et_EE.inc                 |    1 
 program/localization/nl_NL/labels.inc               |    8 
 program/localization/lt_LT/labels.inc               |   20 
 plugins/userinfo/localization/id_ID.inc             |    1 
 plugins/new_user_dialog/localization/ast.inc        |    1 
 plugins/password/localization/ar_SA.inc             |    1 
 plugins/new_user_dialog/localization/ru_RU.inc      |    1 
 plugins/password/localization/cs_CZ.inc             |    1 
 plugins/password/localization/it_IT.inc             |    1 
 plugins/newmail_notifier/localization/ast.inc       |    1 
 plugins/newmail_notifier/localization/cs_CZ.inc     |    1 
 plugins/help/localization/it_IT.inc                 |    1 
 program/localization/fr_FR/messages.inc             |  216 
 program/localization/nl_BE/labels.inc               |  110 
 plugins/vcard_attachments/localization/eu_ES.inc    |    1 
 plugins/attachment_reminder/localization/ml_IN.inc  |    1 
 plugins/acl/localization/es_ES.inc                  |    3 
 plugins/hide_blockquote/localization/et_EE.inc      |    1 
 plugins/acl/localization/eo.inc                     |   27 
 plugins/subscriptions_option/localization/gl_ES.inc |    2 
 program/localization/ku/messages.inc                |  101 
 program/localization/ru_RU/labels.inc               |    7 
 plugins/subscriptions_option/localization/fr_FR.inc |    2 
 plugins/hide_blockquote/localization/pt_PT.inc      |    1 
 program/localization/en_GB/messages.inc             |   15 
 plugins/attachment_reminder/localization/nl_NL.inc  |   21 
 plugins/archive/localization/fa_AF.inc              |    1 
 plugins/help/localization/hi_IN.inc                 |    2 
 program/localization/ro_RO/messages.inc             |   73 
 plugins/hide_blockquote/localization/hi_IN.inc      |    2 
 plugins/userinfo/localization/ar.inc                |    1 
 plugins/zipdownload/localization/ru_RU.inc          |    1 
 plugins/markasjunk/localization/nn_NO.inc           |    1 
 program/localization/uk_UA/messages.inc             |   15 
 plugins/vcard_attachments/localization/gl_ES.inc    |    1 
 plugins/markasjunk/localization/hu_HU.inc           |    1 
 program/localization/id_ID/labels.inc               |   13 
 plugins/newmail_notifier/localization/zh_TW.inc     |    1 
 plugins/hide_blockquote/localization/fa_AF.inc      |    2 
 plugins/help/localization/tzm.inc                   |    2 
 plugins/help/localization/bn_BD.inc                 |    2 
 plugins/attachment_reminder/localization/nn_NO.inc  |    1 
 plugins/archive/localization/hu_HU.inc              |    1 
 program/localization/pl_PL/labels.inc               |   14 
 plugins/managesieve/localization/it_IT.inc          |   11 
 plugins/markasjunk/localization/fr_FR.inc           |    1 
 plugins/new_user_dialog/localization/lb_LU.inc      |    1 
 plugins/subscriptions_option/localization/sr_CS.inc |    2 
 plugins/hide_blockquote/localization/fi_FI.inc      |    3 
 plugins/hide_blockquote/localization/zh_CN.inc      |    1 
 plugins/zipdownload/localization/cs_CZ.inc          |    1 
 plugins/zipdownload/localization/pt_BR.inc          |    1 
 plugins/archive/localization/vi_VN.inc              |   10 
 plugins/newmail_notifier/localization/eu_ES.inc     |    1 
 plugins/zipdownload/localization/zh_TW.inc          |    1 
 plugins/archive/localization/pt_PT.inc              |    1 
 plugins/acl/localization/nn_NO.inc                  |    2 
 plugins/managesieve/localization/be_BE.inc          |  170 
 program/localization/es_ES/messages.inc             |   11 
 plugins/new_user_dialog/localization/hu_HU.inc      |    1 
 plugins/managesieve/localization/sv_SE.inc          |   11 
 plugins/archive/localization/hi_IN.inc              |    2 
 plugins/vcard_attachments/localization/sl_SI.inc    |    1 
 plugins/help/localization/fi_FI.inc                 |    1 
 plugins/userinfo/localization/gl_ES.inc             |    1 
 program/localization/sq_AL/labels.inc               |  301 -
 plugins/archive/localization/id_ID.inc              |    1 
 plugins/hide_blockquote/localization/nqo.inc        |    2 
 plugins/vcard_attachments/localization/vi_VN.inc    |    1 
 plugins/archive/localization/tzm.inc                |    2 
 plugins/attachment_reminder/localization/th_TH.inc  |    1 
 plugins/managesieve/localization/fi_FI.inc          |  131 
 plugins/hide_blockquote/localization/om.inc         |    2 
 plugins/zipdownload/localization/de_DE.inc          |    1 
 plugins/vcard_attachments/localization/km_KH.inc    |    1 
 plugins/hide_blockquote/localization/cy_GB.inc      |    1 
 plugins/subscriptions_option/localization/eo.inc    |    2 
 plugins/hide_blockquote/localization/de_CH.inc      |    1 
 plugins/managesieve/localization/ar_SA.inc          |    2 
 plugins/acl/localization/th_TH.inc                  |    1 
 plugins/markasjunk/localization/mr_IN.inc           |    2 
 plugins/archive/localization/lb_LU.inc              |    1 
 plugins/help/localization/fa_AF.inc                 |    1 
 plugins/attachment_reminder/localization/ur_PK.inc  |    1 
 plugins/vcard_attachments/localization/id_ID.inc    |    1 
 plugins/newmail_notifier/localization/gl_ES.inc     |    2 
 plugins/zipdownload/localization/pt_PT.inc          |    1 
 plugins/userinfo/localization/sl_SI.inc             |    1 
 plugins/help/localization/hy_AM.inc                 |    1 
 plugins/new_user_dialog/localization/fa_IR.inc      |    1 
 plugins/userinfo/localization/bs_BA.inc             |    1 
 plugins/help/localization/hu_HU.inc                 |    1 
 plugins/hide_blockquote/localization/th_TH.inc      |    2 
 plugins/subscriptions_option/localization/he_IL.inc |    2 
 program/localization/it_IT/labels.inc               |   18 
 program/localization/ml_IN/labels.inc               |  206 
 program/localization/sr_CS/messages.inc             |   13 
 plugins/archive/localization/mr_IN.inc              |   10 
 plugins/attachment_reminder/localization/pt_PT.inc  |    1 
 plugins/userinfo/localization/es_AR.inc             |    1 
 program/localization/el_GR/messages.inc             |    4 
 plugins/subscriptions_option/localization/sv_SE.inc |    2 
 program/localization/da_DK/labels.inc               |   10 
 plugins/help/localization/ms_MY.inc                 |    2 
 program/localization/cs_CZ/labels.inc               |   10 
 plugins/userinfo/localization/da_DK.inc             |    1 
 plugins/zipdownload/localization/br.inc             |    1 
 plugins/subscriptions_option/localization/bg_BG.inc |    1 
 plugins/hide_blockquote/localization/lt_LT.inc      |    1 
 plugins/new_user_dialog/localization/eo.inc         |    1 
 plugins/newmail_notifier/localization/ro_RO.inc     |    1 
 plugins/help/localization/sl_SI.inc                 |    1 
 plugins/subscriptions_option/localization/eu_ES.inc |    1 
 plugins/vcard_attachments/localization/fa_IR.inc    |    1 
 plugins/newmail_notifier/localization/zh_CN.inc     |    2 
 plugins/password/localization/id_ID.inc             |    1 
 plugins/markasjunk/localization/es_AR.inc           |    1 
 plugins/userinfo/localization/br.inc                |    2 
 plugins/managesieve/localization/gl_ES.inc          |   13 
 plugins/password/localization/nl_NL.inc             |    1 
 program/localization/fa_IR/labels.inc               |   42 
 plugins/new_user_dialog/localization/da_DK.inc      |    1 
 plugins/subscriptions_option/localization/hu_HU.inc |    2 
 plugins/help/localization/eu_ES.inc                 |    1 
 plugins/hide_blockquote/localization/ar.inc         |    2 
 plugins/archive/localization/mn_MN.inc              |    2 
 plugins/archive/localization/zh_CN.inc              |   21 
 plugins/vcard_attachments/localization/bs_BA.inc    |    1 
 plugins/help/localization/km_KH.inc                 |    1 
 plugins/password/localization/sk_SK.inc             |    1 
 plugins/acl/localization/gl_ES.inc                  |    1 
 plugins/attachment_reminder/localization/pt_BR.inc  |    1 
 plugins/acl/localization/ko_KR.inc                  |    1 
 plugins/zipdownload/localization/sl_SI.inc          |    1 
 plugins/attachment_reminder/localization/ru_RU.inc  |    1 
 plugins/vcard_attachments/localization/es_AR.inc    |    1 
 plugins/zipdownload/localization/fr_FR.inc          |    1 
 plugins/newmail_notifier/localization/mr_IN.inc     |    6 
 plugins/hide_blockquote/localization/sk_SK.inc      |    1 
 plugins/password/localization/de_DE.inc             |    1 
 plugins/vcard_attachments/localization/da_DK.inc    |    1 
 plugins/password/localization/el_GR.inc             |    1 
 plugins/password/localization/ti.inc                |    1 
 plugins/hide_blockquote/localization/id_ID.inc      |    1 
 plugins/newmail_notifier/localization/id_ID.inc     |    2 
 program/localization/uk_UA/labels.inc               |   11 
 program/localization/hu_HU/messages.inc             |    4 
 plugins/archive/localization/eo.inc                 |   10 
 plugins/password/localization/zh_CN.inc             |    1 
 plugins/zipdownload/localization/hu_HU.inc          |    1 
 plugins/hide_blockquote/localization/ti.inc         |    2 
 plugins/newmail_notifier/localization/ja_JP.inc     |    3 
 plugins/vcard_attachments/localization/fr_FR.inc    |    1 
 program/localization/hr_HR/labels.inc               |   44 
 plugins/markasjunk/localization/da_DK.inc           |    1 
 plugins/markasjunk/localization/de_DE.inc           |    1 
 plugins/hide_blockquote/localization/ia.inc         |    2 
 plugins/help/localization/ru_RU.inc                 |    1 
 plugins/markasjunk/localization/fa_IR.inc           |    1 
 plugins/password/localization/ar.inc                |    1 
 plugins/managesieve/localization/he_IL.inc          |   12 
 plugins/archive/localization/ar_SA.inc              |    1 
 program/localization/sr_CS/labels.inc               |   62 
 plugins/newmail_notifier/localization/es_ES.inc     |    3 
 plugins/help/localization/ko_KR.inc                 |    1 
 plugins/attachment_reminder/localization/eu_ES.inc  |    1 
 program/localization/sq_AL/messages.inc             |  101 
 plugins/newmail_notifier/localization/de_DE.inc     |    1 
 plugins/subscriptions_option/localization/ru_RU.inc |    2 
 plugins/zipdownload/localization/bs_BA.inc          |    1 
 plugins/subscriptions_option/localization/pt_PT.inc |    2 
 program/localization/ga_IE/messages.inc             |  105 
 plugins/help/localization/fa_IR.inc                 |    1 
 plugins/markasjunk/localization/tr_TR.inc           |    1 
 plugins/hide_blockquote/localization/uk_UA.inc      |    1 
 plugins/zipdownload/localization/es_AR.inc          |    1 
 program/localization/lb_LU/labels.inc               |    3 
 plugins/acl/localization/pl_PL.inc                  |    1 
 plugins/attachment_reminder/localization/el_GR.inc  |    1 
 program/localization/mk_MK/messages.inc             |   76 
 plugins/attachment_reminder/localization/my_MM.inc  |    1 
 plugins/managesieve/localization/bg_BG.inc          |   11 
 plugins/markasjunk/localization/es_ES.inc           |    1 
 plugins/markasjunk/localization/id_ID.inc           |    1 
 program/localization/ur_PK/labels.inc               |    2 
 plugins/subscriptions_option/localization/sl_SI.inc |    2 
 plugins/help/localization/bs_BA.inc                 |    1 
 plugins/hide_blockquote/localization/nl_BE.inc      |    2 
 plugins/markasjunk/localization/az_AZ.inc           |    1 
 plugins/hide_blockquote/localization/nb_NO.inc      |    1 
 plugins/markasjunk/localization/ja_JP.inc           |    1 
 program/localization/eo/messages.inc                |   93 
 program/localization/fy_NL/labels.inc               |  395 -
 program/localization/fi_FI/messages.inc             |   25 
 plugins/acl/localization/ro_RO.inc                  |   25 
 plugins/acl/localization/ti.inc                     |    1 
 plugins/help/localization/fr_FR.inc                 |    1 
 plugins/password/localization/uk_UA.inc             |    1 
 plugins/attachment_reminder/localization/he_IL.inc  |    1 
 plugins/password/localization/nb_NO.inc             |    1 
 plugins/password/localization/lt_LT.inc             |    1 
 program/localization/si_LK/labels.inc               |  164 
 program/localization/tr_TR/labels.inc               |   10 
 plugins/managesieve/localization/lb_LU.inc          |  145 
 plugins/subscriptions_option/localization/be_BE.inc |    1 
 plugins/attachment_reminder/localization/cy_GB.inc  |    1 
 plugins/zipdownload/localization/ko_KR.inc          |    1 
 program/localization/fr_FR/labels.inc               |    2 
 plugins/hide_blockquote/localization/lv_LV.inc      |    1 
 plugins/managesieve/localization/el_GR.inc          |   13 
 plugins/subscriptions_option/localization/pt_BR.inc |    2 
 plugins/subscriptions_option/localization/cs_CZ.inc |    2 
 plugins/password/localization/ku.inc                |   14 
 plugins/password/localization/lv_LV.inc             |    1 
 program/localization/ast/messages.inc               |    4 
 plugins/archive/localization/tr_TR.inc              |    1 
 plugins/attachment_reminder/localization/de_CH.inc  |    1 
 program/localization/eu_ES/messages.inc             |    4 
 plugins/markasjunk/localization/ro_RO.inc           |    7 
 plugins/managesieve/localization/ml_IN.inc          |   56 
 plugins/zipdownload/localization/az_AZ.inc          |    1 
 plugins/new_user_dialog/localization/ja_JP.inc      |    1 
 program/localization/de_DE/messages.inc             |    4 
 plugins/markasjunk/localization/hy_AM.inc           |    1 
 plugins/new_user_dialog/localization/es_ES.inc      |    1 
 plugins/help/localization/da_DK.inc                 |    1 
 plugins/managesieve/localization/sk_SK.inc          |   11 
 plugins/newmail_notifier/localization/ko_KR.inc     |    2 
 plugins/help/localization/br.inc                    |    1 
 plugins/attachment_reminder/localization/te_IN.inc  |    1 
 plugins/archive/localization/ja_JP.inc              |    1 
 plugins/vcard_attachments/localization/es_ES.inc    |    1 
 plugins/subscriptions_option/localization/et_EE.inc |    2 
 plugins/zipdownload/localization/tr_TR.inc          |    1 
 plugins/attachment_reminder/localization/bg_BG.inc  |    1 
 plugins/subscriptions_option/localization/vi_VN.inc |    2 
 plugins/userinfo/localization/ja_JP.inc             |    1 
 program/localization/sk_SK/messages.inc             |   30 
 program/localization/bn_BD/labels.inc               |  228 
 program/localization/sl_SI/messages.inc             |   11 
 plugins/archive/localization/es_ES.inc              |    1 
 plugins/archive/localization/ko_KR.inc              |    1 
 plugins/hide_blockquote/localization/tzm.inc        |    2 
 plugins/newmail_notifier/localization/tr_TR.inc     |    3 
 plugins/hide_blockquote/localization/ca_ES.inc      |    1 
 program/localization/zh_TW/messages.inc             |   20 
 plugins/acl/localization/zh_CN.inc                  |   10 
 plugins/archive/localization/ast.inc                |    1 
 program/localization/ms_MY/labels.inc               |  200 
 plugins/managesieve/localization/nl_NL.inc          |   42 
 program/localization/ga_IE/labels.inc               |  289 -
 plugins/attachment_reminder/localization/ms_MY.inc  |    1 
 plugins/newmail_notifier/localization/ar_SA.inc     |    2 
 program/localization/et_EE/messages.inc             |   11 
 plugins/markasjunk/localization/eo.inc              |    1 
 plugins/hide_blockquote/localization/ur_PK.inc      |    2 
 program/localization/br/labels.inc                  |  277 -
 plugins/newmail_notifier/localization/az_AZ.inc     |    2 
 program/localization/lt_LT/messages.inc             |    4 
 plugins/new_user_dialog/localization/az_AZ.inc      |    1 
 plugins/acl/localization/de_DE.inc                  |    1 
 program/localization/gl_ES/labels.inc               |    5 
 plugins/new_user_dialog/localization/hy_AM.inc      |    1 
 plugins/help/localization/az_AZ.inc                 |    1 
 plugins/userinfo/localization/es_ES.inc             |    1 
 plugins/zipdownload/localization/da_DK.inc          |    1 
 program/localization/be_BE/labels.inc               |  838 +-
 program/localization/bg_BG/messages.inc             |    4 
 program/localization/hy_AM/messages.inc             |   19 
 plugins/new_user_dialog/localization/tr_TR.inc      |    1 
 plugins/password/localization/ca_ES.inc             |    1 
 plugins/zipdownload/localization/es_ES.inc          |    1 
 plugins/subscriptions_option/localization/fa_AF.inc |    1 
 plugins/newmail_notifier/localization/pl_PL.inc     |    1 
 plugins/hide_blockquote/localization/ml_IN.inc      |    2 
 plugins/hide_blockquote/localization/el_GR.inc      |    1 
 program/localization/mk_MK/labels.inc               |  208 
 plugins/newmail_notifier/localization/fa_IR.inc     |    2 
 program/localization/de_DE/labels.inc               |   10 
 plugins/zipdownload/localization/ja_JP.inc          |    1 
 plugins/archive/localization/hy_AM.inc              |   10 
 plugins/hide_blockquote/localization/my_MM.inc      |    2 
 plugins/hide_blockquote/localization/sr_CS.inc      |    1 
 plugins/help/localization/eo.inc                    |    1 
 plugins/new_user_dialog/localization/ro_RO.inc      |    5 
 plugins/zipdownload/localization/fa_IR.inc          |    1 
 plugins/new_user_dialog/localization/ko_KR.inc      |    1 
 plugins/newmail_notifier/localization/bs_BA.inc     |    1 
 plugins/userinfo/localization/tr_TR.inc             |    1 
 plugins/vcard_attachments/localization/hy_AM.inc    |    1 
 plugins/subscriptions_option/localization/fi_FI.inc |    2 
 plugins/managesieve/localization/nn_NO.inc          |   38 
 plugins/markasjunk/localization/bs_BA.inc           |    1 
 plugins/userinfo/localization/az_AZ.inc             |    1 
 plugins/attachment_reminder/localization/fi_FI.inc  |    1 
 plugins/subscriptions_option/localization/de_CH.inc |    2 
 plugins/vcard_attachments/localization/ro_RO.inc    |    1 
 plugins/userinfo/localization/ro_RO.inc             |    9 
 plugins/help/localization/om.inc                    |    2 
 plugins/new_user_dialog/localization/es_AR.inc      |    1 
 plugins/password/localization/nn_NO.inc             |    1 
 plugins/archive/localization/az_AZ.inc              |    1 
 plugins/newmail_notifier/localization/es_AR.inc     |    1 
 plugins/markasjunk/localization/ko_KR.inc           |    1 
 plugins/archive/localization/pl_PL.inc              |    1 
 plugins/managesieve/localization/en_GB.inc          |   56 
 plugins/userinfo/localization/hy_AM.inc             |    1 
 plugins/attachment_reminder/localization/be_BE.inc  |    1 
 plugins/hide_blockquote/localization/en_GB.inc      |    1 
 plugins/hide_blockquote/localization/nn_NO.inc      |    1 
 plugins/vcard_attachments/localization/tr_TR.inc    |    1 
 plugins/userinfo/localization/pl_PL.inc             |    1 
 plugins/attachment_reminder/localization/it_IT.inc  |   17 
 plugins/new_user_dialog/localization/bs_BA.inc      |    1 
 plugins/userinfo/localization/fa_IR.inc             |    1 
 program/localization/hr_HR/messages.inc             |   21 
 plugins/archive/localization/fa_IR.inc              |    1 
 plugins/subscriptions_option/localization/it_IT.inc |    2 
 plugins/attachment_reminder/localization/sv_SE.inc  |    1 
 plugins/hide_blockquote/localization/nl_NL.inc      |    1 
 plugins/password/localization/sr_CS.inc             |    1 
 plugins/markasjunk/localization/br.inc              |    1 
 plugins/password/localization/hr_HR.inc             |    1 
 plugins/password/localization/en_GB.inc             |    1 
 plugins/archive/localization/ro_RO.inc              |    7 
 program/localization/lv_LV/labels.inc               |    7 
 plugins/vcard_attachments/localization/az_AZ.inc    |    1 
 plugins/managesieve/localization/th_TH.inc          |    2 
 plugins/vcard_attachments/localization/ja_JP.inc    |    1 
 plugins/password/localization/sv_SE.inc             |    1 
 plugins/password/localization/hu_HU.inc             |    1 
 program/localization/cy_GB/labels.inc               |    2 
 plugins/newmail_notifier/localization/lb_LU.inc     |    2 
 plugins/password/localization/hy_AM.inc             |    1 
 plugins/help/localization/nl_NL.inc                 |    1 
 plugins/managesieve/localization/az_AZ.inc          |   34 
 plugins/attachment_reminder/localization/et_EE.inc  |    1 
 plugins/hide_blockquote/localization/he_IL.inc      |    1 
 plugins/attachment_reminder/localization/hi_IN.inc  |    1 
 plugins/managesieve/localization/hr_HR.inc          |   56 
 program/localization/is_IS/labels.inc               |   43 
 plugins/userinfo/localization/pt_BR.inc             |    1 
 plugins/hide_blockquote/localization/ms_MY.inc      |    2 
 plugins/help/localization/th_TH.inc                 |    2 
 plugins/vcard_attachments/localization/mr_IN.inc    |    1 
 plugins/help/localization/cy_GB.inc                 |    1 
 program/localization/az_AZ/labels.inc               |   18 
 plugins/archive/localization/ml_IN.inc              |   10 
 plugins/acl/localization/vi_VN.inc                  |    2 
 plugins/subscriptions_option/localization/es_ES.inc |    2 
 plugins/subscriptions_option/localization/lt_LT.inc |    2 
 plugins/acl/localization/et_EE.inc                  |   12 
 program/localization/ka_GE/messages.inc             |   58 
 plugins/hide_blockquote/localization/sl_SI.inc      |    1 
 program/localization/nb_NO/labels.inc               |    8 
 plugins/acl/localization/be_BE.inc                  |    1 
 plugins/hide_blockquote/localization/eu_ES.inc      |    1 
 plugins/subscriptions_option/localization/nn_NO.inc |    1 
 plugins/enigma/localization/ru_RU.inc               |    1 
 plugins/help/localization/es_ES.inc                 |    1 
 plugins/help/localization/lt_LT.inc                 |    1 
 plugins/new_user_dialog/localization/pl_PL.inc      |    1 
 plugins/help/localization/ja_JP.inc                 |    1 
 plugins/newmail_notifier/localization/hy_AM.inc     |    2 
 plugins/attachment_reminder/localization/fa_AF.inc  |    1 
 plugins/help/localization/zh_TW.inc                 |    1 
 plugins/new_user_dialog/localization/el_GR.inc      |    1 
 program/localization/km_KH/labels.inc               |   95 
 plugins/vcard_attachments/localization/pt_BR.inc    |    1 
 plugins/subscriptions_option/localization/de_DE.inc |    2 
 plugins/zipdownload/localization/ro_RO.inc          |    5 
 plugins/markasjunk/localization/gl_ES.inc           |    1 
 plugins/userinfo/localization/pt_PT.inc             |    1 
 plugins/attachment_reminder/localization/bs_BA.inc  |    1 
 plugins/managesieve/localization/ca_ES.inc          |   12 
 plugins/attachment_reminder/localization/es_AR.inc  |    1 
 program/localization/gl_ES/messages.inc             |    6 
 plugins/archive/localization/lv_LV.inc              |    1 
 plugins/userinfo/localization/mr_IN.inc             |    3 
 plugins/acl/localization/es_AR.inc                  |    1 
 plugins/acl/localization/bs_BA.inc                  |    1 
 plugins/subscriptions_option/localization/nl_NL.inc |    2 
 plugins/newmail_notifier/localization/ia.inc        |    7 
 plugins/newmail_notifier/localization/ti.inc        |    1 
 plugins/managesieve/localization/lv_LV.inc          |   13 
 program/localization/eu_ES/labels.inc               |  473 +-
 program/localization/et_EE/labels.inc               |    6 
 plugins/subscriptions_option/localization/cy_GB.inc |    2 
 plugins/zipdownload/localization/pl_PL.inc          |    1 
 plugins/archive/localization/si_LK.inc              |   10 
 plugins/new_user_dialog/localization/it_IT.inc      |    1 
 plugins/newmail_notifier/localization/sv_SE.inc     |    1 
 plugins/userinfo/localization/ko_KR.inc             |    1 
 plugins/new_user_dialog/localization/ar_SA.inc      |    1 
 program/localization/pl_PL/messages.inc             |   10 
 plugins/archive/localization/te_IN.inc              |    2 
 plugins/managesieve/localization/de_DE.inc          |   12 
 plugins/markasjunk/localization/pl_PL.inc           |    1 
 plugins/zipdownload/localization/sr_CS.inc          |    1 
 plugins/userinfo/localization/eo.inc                |    1 
 plugins/acl/localization/tr_TR.inc                  |    1 
 plugins/password/localization/ru_RU.inc             |    1 
 plugins/zipdownload/localization/it_IT.inc          |    1 
 program/localization/ast/labels.inc                 |    2 
 program/localization/br/messages.inc                |  101 
 plugins/managesieve/localization/es_ES.inc          |   13 
 plugins/managesieve/localization/lt_LT.inc          |   13 
 plugins/subscriptions_option/localization/az_AZ.inc |    1 
 program/localization/vi_VN/labels.inc               |   19 
 plugins/attachment_reminder/localization/nb_NO.inc  |    1 
 plugins/vcard_attachments/localization/de_CH.inc    |    1 
 program/localization/ms_MY/messages.inc             |  101 
 plugins/managesieve/localization/cs_CZ.inc          |   10 
 plugins/subscriptions_option/localization/zh_CN.inc |    2 
 bin/transifexpull.sh                                |    2 
 plugins/new_user_dialog/localization/sr_CS.inc      |    1 
 plugins/password/localization/fr_FR.inc             |    1 
 plugins/archive/localization/da_DK.inc              |    1 
 plugins/archive/localization/nqo.inc                |    2 
 plugins/newmail_notifier/localization/fi_FI.inc     |    1 
 plugins/acl/localization/nb_NO.inc                  |    2 
 program/localization/ia/messages.inc                |  133 
 program/localization/fr_FR/csv2vcard.inc            |    1 
 plugins/acl/localization/fr_FR.inc                  |    1 
 plugins/userinfo/localization/ast.inc               |    1 
 plugins/new_user_dialog/localization/sk_SK.inc      |    1 
 plugins/vcard_attachments/localization/ko_KR.inc    |    1 
 plugins/managesieve/localization/ja_JP.inc          |   22 
 plugins/attachment_reminder/localization/fa_IR.inc  |    1 
 plugins/attachment_reminder/localization/uk_UA.inc  |    1 
 plugins/help/localization/ast.inc                   |    1 
 plugins/markasjunk/localization/el_GR.inc           |    1 
 plugins/attachment_reminder/localization/vi_VN.inc  |    1 
 program/localization/lb_LU/messages.inc             |    4 
 plugins/archive/localization/hr_HR.inc              |   10 
 plugins/password/localization/fa_IR.inc             |    1 
 plugins/zipdownload/localization/ar_SA.inc          |    1 
 plugins/subscriptions_option/localization/zh_TW.inc |    2 
 plugins/subscriptions_option/localization/ja_JP.inc |    2 
 plugins/acl/localization/id_ID.inc                  |    1 
 plugins/acl/localization/fa_IR.inc                  |    1 
 program/localization/pt_BR/labels.inc               |    2 
 plugins/password/localization/lb_LU.inc             |    1 
 plugins/userinfo/localization/en_GB.inc             |    1 
 program/localization/it_IT/messages.inc             |    4 
 program/localization/ar_SA/messages.inc             |   22 
 program/localization/ta_IN/messages.inc             |   76 
 plugins/help/localization/nl_BE.inc                 |    2 
 plugins/userinfo/localization/de_CH.inc             |    1 
 plugins/managesieve/localization/zh_TW.inc          |   30 
 program/localization/pl_PL/csv2vcard.inc            |    1 
 plugins/attachment_reminder/localization/tr_TR.inc  |    1 
 plugins/newmail_notifier/localization/en_GB.inc     |    2 
 plugins/managesieve/localization/eo.inc             |  143 
 plugins/password/localization/bg_BG.inc             |    1 
 plugins/acl/localization/lb_LU.inc                  |   22 
 plugins/new_user_dialog/localization/ku.inc         |    1 
 plugins/markasjunk/localization/km_KH.inc           |    1 
 program/localization/hu_HU/labels.inc               |    2 
 plugins/markasjunk/localization/sk_SK.inc           |    1 
 plugins/hide_blockquote/localization/gl_ES.inc      |    1 
 plugins/help/localization/mn_MN.inc                 |    2 
 program/localization/zh_CN/labels.inc               |   72 
 plugins/attachment_reminder/localization/id_ID.inc  |    1 
 plugins/help/localization/nqo.inc                   |    2 
 plugins/markasjunk/localization/sl_SI.inc           |    1 
 plugins/subscriptions_option/localization/lv_LV.inc |    1 
 program/localization/bg_BG/labels.inc               |    2 
 plugins/vcard_attachments/localization/de_DE.inc    |    1 
 plugins/acl/localization/hu_HU.inc                  |    1 
 plugins/help/localization/cs_CZ.inc                 |    1 
 plugins/managesieve/localization/zh_CN.inc          |   24 
 plugins/zipdownload/localization/ar.inc             |    1 
 plugins/hide_blockquote/localization/cs_CZ.inc      |    1 
 plugins/newmail_notifier/localization/pt_PT.inc     |    1 
 plugins/password/localization/ast.inc               |    1 
 plugins/acl/localization/hy_AM.inc                  |    2 
 plugins/hide_blockquote/localization/eo.inc         |    1 
 plugins/password/localization/be_BE.inc             |    1 
 program/localization/es_AR/messages.inc             |   13 
 plugins/attachment_reminder/localization/sk_SK.inc  |    1 
 plugins/zipdownload/localization/gl_ES.inc          |    1 
 plugins/userinfo/localization/hu_HU.inc             |    1 
 plugins/vcard_attachments/localization/zh_TW.inc    |    1 
 plugins/new_user_dialog/localization/eu_ES.inc      |    1 
 plugins/password/localization/bs_BA.inc             |    1 
 plugins/zipdownload/localization/fa_AF.inc          |    1 
 plugins/password/localization/es_AR.inc             |    1 
 plugins/attachment_reminder/localization/lb_LU.inc  |    1 
 plugins/subscriptions_option/localization/ca_ES.inc |    2 
 plugins/subscriptions_option/localization/da_DK.inc |    2 
 plugins/new_user_dialog/localization/km_KH.inc      |    1 
 plugins/password/localization/pt_BR.inc             |    1 
 program/localization/pt_PT/messages.inc             |    5 
 plugins/managesieve/localization/si_LK.inc          |  152 
 program/localization/ko_KR/labels.inc               |   26 
 plugins/userinfo/localization/de_DE.inc             |    1 
 plugins/archive/localization/gl_ES.inc              |    1 
 plugins/userinfo/localization/cy_GB.inc             |    1 
 plugins/managesieve/localization/cy_GB.inc          |   11 
 plugins/password/localization/pt_PT.inc             |    1 
 plugins/acl/localization/sk_SK.inc                  |    1 
 program/localization/es_ES/labels.inc               |    8 
 program/localization/ja_JP/messages.inc             |    3 
 plugins/help/localization/pt_PT.inc                 |    1 
 plugins/markasjunk/localization/eu_ES.inc           |    1 
 plugins/password/localization/ko_KR.inc             |    1 
 plugins/attachment_reminder/localization/hu_HU.inc  |    1 
 plugins/vcard_attachments/localization/ru_RU.inc    |    1 
 plugins/archive/localization/km_KH.inc              |   10 
 plugins/attachment_reminder/localization/sr_CS.inc  |    1 
 plugins/vcard_attachments/localization/hu_HU.inc    |    1 
 plugins/new_user_dialog/localization/id_ID.inc      |    1 
 plugins/password/localization/et_EE.inc             |    1 
 program/localization/zh_TW/csv2vcard.inc            |    1 
 plugins/hide_blockquote/localization/it_IT.inc      |    1 
 plugins/password/localization/vi_VN.inc             |    1 
 plugins/hide_blockquote/localization/ar_SA.inc      |    1 
 plugins/newmail_notifier/localization/vi_VN.inc     |    2 
 plugins/archive/localization/ms_MY.inc              |    2 
 plugins/archive/localization/de_DE.inc              |    1 
 plugins/markasjunk/localization/ml_IN.inc           |    2 
 plugins/markasjunk/localization/sr_CS.inc           |    1 
 plugins/attachment_reminder/localization/fr_FR.inc  |   17 
 plugins/archive/localization/bn_BD.inc              |    2 
 program/localization/ar_SA/labels.inc               |   39 
 plugins/markasjunk/localization/ar.inc              |    1 
 plugins/zipdownload/localization/id_ID.inc          |    1 
 plugins/hide_blockquote/localization/bn_BD.inc      |    2 
 plugins/userinfo/localization/zh_CN.inc             |    1 
 program/localization/hi_IN/messages.inc             |  108 
 plugins/zipdownload/localization/km_KH.inc          |    1 
 plugins/vcard_attachments/localization/cy_GB.inc    |    1 
 plugins/new_user_dialog/localization/sl_SI.inc      |    1 
 program/localization/si_LK/messages.inc             |   86 
 plugins/vcard_attachments/localization/pt_PT.inc    |    1 
 program/localization/tr_TR/messages.inc             |   11 
 plugins/archive/localization/cs_CZ.inc              |    1 
 plugins/new_user_dialog/localization/gl_ES.inc      |    1 
 plugins/managesieve/localization/pt_BR.inc          |   11 
 plugins/userinfo/localization/ru_RU.inc             |    1 
 plugins/zipdownload/localization/eu_ES.inc          |    1 
 plugins/help/localization/de_DE.inc                 |    1 
 plugins/acl/localization/en_GB.inc                  |    2 
 plugins/hide_blockquote/localization/te_IN.inc      |    2 
 plugins/acl/localization/sr_CS.inc                  |   69 
 plugins/help/localization/zh_CN.inc                 |    1 
 plugins/attachment_reminder/localization/ar.inc     |    1 
 plugins/hide_blockquote/localization/de_DE.inc      |    1 
 plugins/password/localization/fa_AF.inc             |    1 
 plugins/subscriptions_option/localization/en_GB.inc |    2 
 plugins/userinfo/localization/fr_FR.inc             |    1 
 plugins/vcard_attachments/localization/lb_LU.inc    |    1 
 plugins/newmail_notifier/localization/ru_RU.inc     |    1 
 plugins/vcard_attachments/localization/ar.inc       |    1 
 plugins/newmail_notifier/localization/hu_HU.inc     |    1 
 plugins/archive/localization/br.inc                 |   10 
 plugins/help/localization/te_IN.inc                 |    2 
 program/localization/nl_BE/messages.inc             |   13 
 plugins/archive/localization/eu_ES.inc              |    1 
 plugins/vcard_attachments/localization/zh_CN.inc    |    1 
 plugins/help/localization/de_CH.inc                 |    1 
 plugins/managesieve/localization/de_CH.inc          |   11 
 plugins/userinfo/localization/zh_TW.inc             |    1 
 plugins/vcard_attachments/localization/cs_CZ.inc    |    1 
 plugins/newmail_notifier/localization/fr_FR.inc     |    1 
 plugins/password/localization/fi_FI.inc             |    1 
 plugins/help/localization/pt_BR.inc                 |    1 
 plugins/archive/localization/sl_SI.inc              |    1 
 program/localization/fi_FI/labels.inc               |    8 
 plugins/password/localization/de_CH.inc             |    1 
 plugins/archive/localization/ia.inc                 |    2 
 plugins/zipdownload/localization/vi_VN.inc          |    1 
 plugins/archive/localization/zh_TW.inc              |    1 
 plugins/userinfo/localization/lb_LU.inc             |    1 
 plugins/help/localization/sv_SE.inc                 |    1 
 plugins/newmail_notifier/localization/sk_SK.inc     |    1 
 plugins/archive/localization/ur_PK.inc              |    2 
 plugins/markasjunk/localization/ca_ES.inc           |    1 
 plugins/newmail_notifier/localization/de_CH.inc     |    1 
 plugins/help/localization/he_IL.inc                 |    1 
 plugins/vcard_attachments/localization/si_LK.inc    |    1 
 program/localization/ka_GE/labels.inc               |  124 
 plugins/userinfo/localization/be_BE.inc             |    3 
 plugins/userinfo/localization/lv_LV.inc             |    1 
 plugins/userinfo/localization/vi_VN.inc             |    1 
 plugins/new_user_dialog/localization/fr_FR.inc      |    1 
 plugins/userinfo/localization/cs_CZ.inc             |    1 
 program/localization/nb_NO/messages.inc             |    9 
 plugins/new_user_dialog/localization/fi_FI.inc      |    1 
 plugins/password/localization/cy_GB.inc             |    1 
 plugins/hide_blockquote/localization/es_ES.inc      |    1 
 plugins/managesieve/localization/ru_RU.inc          |    2 
 plugins/zipdownload/localization/lb_LU.inc          |    1 
 plugins/managesieve/localization/pt_PT.inc          |    6 
 plugins/newmail_notifier/localization/cy_GB.inc     |    1 
 plugins/markasjunk/localization/cs_CZ.inc           |    1 
 program/localization/ne_NP/messages.inc             |  105 
 plugins/archive/localization/el_GR.inc              |    1 
 plugins/hide_blockquote/localization/ro_RO.inc      |    1 
 plugins/acl/localization/pt_PT.inc                  |    3 
 plugins/markasjunk/localization/lv_LV.inc           |    1 
 plugins/vcard_attachments/localization/fi_FI.inc    |    1 
 plugins/help/localization/lb_LU.inc                 |    1 
 plugins/attachment_reminder/localization/ko_KR.inc  |    1 
 plugins/help/localization/bg_BG.inc                 |    1 
 plugins/userinfo/localization/et_EE.inc             |    1 
 plugins/zipdownload/localization/fi_FI.inc          |    1 
 plugins/new_user_dialog/localization/ml_IN.inc      |    1 
 plugins/password/localization/ja_JP.inc             |    1 
 plugins/attachment_reminder/localization/ia.inc     |    1 
 plugins/zipdownload/localization/bg_BG.inc          |    1 
 program/localization/id_ID/messages.inc             |   18 
 plugins/userinfo/localization/ca_ES.inc             |    1 
 program/localization/az_AZ/messages.inc             |    4 
 program/localization/nn_NO/messages.inc             |   13 
 program/localization/sk_SK/labels.inc               |   58 
 plugins/new_user_dialog/localization/cs_CZ.inc      |    1 
 plugins/new_user_dialog/localization/vi_VN.inc      |    1 
 program/localization/ro_RO/labels.inc               |    2 
 plugins/new_user_dialog/localization/be_BE.inc      |    5 
 plugins/hide_blockquote/localization/zh_TW.inc      |    1 
 program/localization/ps/labels.inc                  |  228 
 plugins/vcard_attachments/localization/lv_LV.inc    |    1 
 program/localization/fa_IR/messages.inc             |    4 
 plugins/markasjunk/localization/uk_UA.inc           |    2 
 plugins/archive/localization/pt_BR.inc              |   19 
 plugins/vcard_attachments/localization/ml_IN.inc    |    1 
 plugins/acl/localization/pt_BR.inc                  |    1 
 plugins/attachment_reminder/localization/gl_ES.inc  |    1 
 plugins/attachment_reminder/localization/ti.inc     |    1 
 plugins/markasjunk/localization/hr_HR.inc           |    2 
 plugins/password/localization/es_ES.inc             |    1 
 plugins/vcard_attachments/localization/eo.inc       |    1 
 plugins/archive/localization/cy_GB.inc              |    1 
 plugins/hide_blockquote/localization/ja_JP.inc      |    1 
 plugins/managesieve/localization/ko_KR.inc          |   12 
 plugins/newmail_notifier/localization/el_GR.inc     |    1 
 plugins/attachment_reminder/localization/mn_MN.inc  |    1 
 program/localization/el_GR/labels.inc               |    8 
 program/localization/ru_RU/messages.inc             |    1 
 plugins/password/localization/tr_TR.inc             |    1 
 program/localization/de_CH/labels.inc               |    2 
 plugins/newmail_notifier/localization/nn_NO.inc     |    2 
 plugins/acl/localization/ru_RU.inc                  |    1 
 plugins/markasjunk/localization/si_LK.inc           |    2 
 plugins/managesieve/localization/eu_ES.inc          |    2 
 plugins/userinfo/localization/fa_AF.inc             |    1 
 plugins/hide_blockquote/localization/tr_TR.inc      |    1 
 program/localization/fa_AF/messages.inc             |   76 
 plugins/attachment_reminder/localization/pl_PL.inc  |   15 
 plugins/archive/localization/nl_NL.inc              |    1 
 plugins/userinfo/localization/ml_IN.inc             |    1 
 plugins/newmail_notifier/localization/it_IT.inc     |    1 
 plugins/vcard_attachments/localization/et_EE.inc    |    1 
 plugins/managesieve/localization/pl_PL.inc          |    2 
 plugins/markasjunk/localization/zh_TW.inc           |    1 
 plugins/archive/localization/de_CH.inc              |    1 
 plugins/managesieve/localization/hu_HU.inc          |   11 
 plugins/newmail_notifier/localization/br.inc        |    9 
 program/localization/he_IL/labels.inc               |    8 
 plugins/password/localization/az_AZ.inc             |    1 
 plugins/new_user_dialog/localization/hr_HR.inc      |    1 
 plugins/vcard_attachments/localization/hr_HR.inc    |    1 
 plugins/attachment_reminder/localization/bn_BD.inc  |    1 
 plugins/new_user_dialog/localization/ca_ES.inc      |    1 
 plugins/acl/localization/el_GR.inc                  |    1 
 plugins/password/localization/zh_TW.inc             |    1 
 plugins/password/localization/pl_PL.inc             |    1 
 plugins/managesieve/localization/sl_SI.inc          |   12 
 plugins/help/localization/gl_ES.inc                 |    1 
 plugins/markasjunk/localization/vi_VN.inc           |    1 
 program/localization/be_BE/messages.inc             |  305 
 plugins/new_user_dialog/localization/lv_LV.inc      |    1 
 plugins/archive/localization/sr_CS.inc              |   10 
 program/localization/da_DK/messages.inc             |    4 
 program/localization/fy_NL/messages.inc             |  153 
 plugins/newmail_notifier/localization/pt_BR.inc     |    1 
 plugins/zipdownload/localization/sv_SE.inc          |    1 
 plugins/newmail_notifier/localization/nl_NL.inc     |    1 
 plugins/vcard_attachments/localization/be_BE.inc    |    1 
 plugins/hide_blockquote/localization/pl_PL.inc      |    1 
 plugins/acl/localization/eu_ES.inc                  |    1 
 plugins/subscriptions_option/localization/fa_IR.inc |    2 
 program/localization/fa_AF/labels.inc               |  228 
 plugins/subscriptions_option/localization/lb_LU.inc |    2 
 plugins/userinfo/localization/nn_NO.inc             |    1 
 plugins/archive/localization/it_IT.inc              |    1 
 plugins/zipdownload/localization/be_BE.inc          |    1 
 plugins/attachment_reminder/localization/hy_AM.inc  |    1 
 plugins/managesieve/localization/hy_AM.inc          |   56 
 plugins/attachment_reminder/localization/om.inc     |    1 
 plugins/password/localization/ro_RO.inc             |   11 
 plugins/hide_blockquote/localization/mn_MN.inc      |    2 
 plugins/newmail_notifier/localization/sr_CS.inc     |    2 
 plugins/attachment_reminder/localization/nqo.inc    |    1 
 plugins/userinfo/localization/hr_HR.inc             |    1 
 program/localization/is_IS/messages.inc             |  116 
 plugins/userinfo/localization/fi_FI.inc             |    1 
 plugins/zipdownload/localization/et_EE.inc          |    1 
 plugins/new_user_dialog/localization/fa_AF.inc      |    1 
 plugins/archive/localization/th_TH.inc              |    2 
 plugins/vcard_attachments/localization/sv_SE.inc    |    1 
 plugins/subscriptions_option/localization/hy_AM.inc |    2 
 plugins/subscriptions_option/localization/es_AR.inc |    1 
 plugins/acl/localization/sv_SE.inc                  |    1 
 plugins/vcard_attachments/localization/nb_NO.inc    |    1 
 plugins/attachment_reminder/localization/ro_RO.inc  |    1 
 plugins/markasjunk/localization/cy_GB.inc           |    1 
 plugins/archive/localization/en_GB.inc              |   10 
 plugins/markasjunk/localization/ku.inc              |    2 
 program/localization/ko_KR/messages.inc             |   18 
 plugins/archive/localization/nb_NO.inc              |    3 
 program/localization/ca_ES/labels.inc               |   16 
 plugins/vcard_attachments/localization/en_GB.inc    |    1 
 plugins/vcard_attachments/localization/nn_NO.inc    |    1 
 plugins/hide_blockquote/localization/da_DK.inc      |    1 
 plugins/acl/localization/bg_BG.inc                  |    1 
 plugins/attachment_reminder/localization/eo.inc     |    1 
 plugins/help/localization/lv_LV.inc                 |    1 
 plugins/newmail_notifier/localization/ca_ES.inc     |    2 
 plugins/zipdownload/localization/uk_UA.inc          |    1 
 plugins/help/localization/ca_ES.inc                 |    1 
 plugins/new_user_dialog/localization/lt_LT.inc      |    1 
 plugins/userinfo/localization/he_IL.inc             |    1 
 plugins/markasjunk/localization/he_IL.inc           |    1 
 plugins/archive/localization/nn_NO.inc              |    3 
 plugins/newmail_notifier/localization/uk_UA.inc     |    2 
 plugins/userinfo/localization/nl_NL.inc             |    1 
 program/localization/sv_SE/messages.inc             |    4 
 program/localization/es_AR/labels.inc               |   64 
 plugins/attachment_reminder/localization/zh_CN.inc  |   21 
 plugins/vcard_attachments/localization/lt_LT.inc    |    1 
 plugins/vcard_attachments/localization/uk_UA.inc    |    1 
 plugins/new_user_dialog/localization/nb_NO.inc      |    1 
 plugins/hide_blockquote/localization/fa_IR.inc      |    1 
 plugins/userinfo/localization/sv_SE.inc             |    1 
 plugins/subscriptions_option/localization/pl_PL.inc |    2 
 plugins/zipdownload/localization/en_GB.inc          |    1 
 plugins/managesieve/localization/fr_FR.inc          |   11 
 plugins/new_user_dialog/localization/he_IL.inc      |    1 
 plugins/newmail_notifier/localization/be_BE.inc     |    5 
 plugins/new_user_dialog/localization/sv_SE.inc      |    1 
 plugins/markasjunk/localization/lt_LT.inc           |    1 
 program/localization/ne_NP/labels.inc               |  271 -
 program/localization/cs_CZ/messages.inc             |   10 
 plugins/new_user_dialog/localization/uk_UA.inc      |    1 
 plugins/archive/localization/my_MM.inc              |    2 
 program/localization/nn_NO/labels.inc               |   13 
 plugins/userinfo/localization/sk_SK.inc             |    1 
 program/localization/ca_ES/messages.inc             |    4 
 plugins/managesieve/localization/mr_IN.inc          |  160 
 plugins/acl/localization/cy_GB.inc                  |    1 
 plugins/newmail_notifier/localization/et_EE.inc     |    2 
 plugins/userinfo/localization/ku.inc                |    1 
 plugins/vcard_attachments/localization/nl_NL.inc    |    1 
 plugins/markasjunk/localization/bg_BG.inc           |    1 
 plugins/help/localization/ur_PK.inc                 |    2 
 plugins/subscriptions_option/localization/bs_BA.inc |    2 
 plugins/zipdownload/localization/nn_NO.inc          |    1 
 plugins/hide_blockquote/localization/az_AZ.inc      |    1 
 plugins/markasjunk/localization/de_CH.inc           |    1 
 plugins/zipdownload/localization/nb_NO.inc          |    1 
 plugins/zipdownload/localization/lt_LT.inc          |    1 
 plugins/vcard_attachments/localization/ca_ES.inc    |    1 
 plugins/archive/localization/bg_BG.inc              |    1 
 plugins/markasjunk/localization/nb_NO.inc           |    1 
 plugins/userinfo/localization/el_GR.inc             |    1 
 plugins/password/localization/br.inc                |    2 
 plugins/help/localization/en_GB.inc                 |    1 
 plugins/help/localization/ml_IN.inc                 |    2 
 plugins/markasjunk/localization/fi_FI.inc           |    1 
 program/localization/th_TH/messages.inc             |   89 
 plugins/acl/localization/fi_FI.inc                  |   76 
 plugins/archive/localization/he_IL.inc              |    1 
 plugins/managesieve/localization/da_DK.inc          |   13 
 plugins/vcard_attachments/localization/sk_SK.inc    |    1 
 plugins/archive/localization/ca_ES.inc              |    1 
 plugins/subscriptions_option/localization/ko_KR.inc |    2 
 plugins/zipdownload/localization/lv_LV.inc          |    1 
 plugins/markasjunk/localization/it_IT.inc           |    1 
 plugins/archive/localization/ar.inc                 |    2 
 plugins/archive/localization/nl_BE.inc              |    2 
 plugins/archive/localization/sk_SK.inc              |    1 
 plugins/newmail_notifier/localization/lt_LT.inc     |    2 
 plugins/help/localization/my_MM.inc                 |    2 
 plugins/attachment_reminder/localization/tzm.inc    |    1 
 plugins/new_user_dialog/localization/bg_BG.inc      |    1 
 plugins/zipdownload/localization/he_IL.inc          |    1 
 plugins/vcard_attachments/localization/bg_BG.inc    |    1 
 program/localization/bn_BD/messages.inc             |   89 
 program/localization/sl_SI/labels.inc               |    4 
 program/localization/ku/labels.inc                  |  301 -
 plugins/new_user_dialog/localization/et_EE.inc      |    1 
 program/localization/km_KH/messages.inc             |   47 
 plugins/userinfo/localization/nb_NO.inc             |    1 
 program/localization/ps/messages.inc                |   89 
 plugins/vcard_attachments/localization/el_GR.inc    |    1 
 plugins/acl/localization/it_IT.inc                  |    1 
 plugins/archive/localization/lt_LT.inc              |    1 
 program/localization/nl_NL/messages.inc             |    1 
 plugins/help/localization/sr_CS.inc                 |    1 
 plugins/acl/localization/de_CH.inc                  |    1 
 plugins/help/localization/nn_NO.inc                 |    1 
 plugins/newmail_notifier/localization/bg_BG.inc     |    1 
 program/localization/lv_LV/messages.inc             |   11 
 program/localization/zh_TW/labels.inc               |    7 
 plugins/attachment_reminder/localization/ar_SA.inc  |    1 
 plugins/newmail_notifier/localization/nb_NO.inc     |    2 
 plugins/markasjunk/localization/sv_SE.inc           |    1 
 plugins/vcard_attachments/localization/he_IL.inc    |    1 
 plugins/archive/localization/uk_UA.inc              |   10 
 plugins/zipdownload/localization/ca_ES.inc          |    1 
 plugins/userinfo/localization/bg_BG.inc             |    1 
 plugins/markasjunk/localization/be_BE.inc           |    7 
 plugins/zipdownload/localization/el_GR.inc          |    1 
 plugins/userinfo/localization/uk_UA.inc             |    1 
 plugins/archive/localization/ti.inc                 |    2 
 plugins/userinfo/localization/lt_LT.inc             |    1 
 plugins/password/localization/da_DK.inc             |    1 
 plugins/password/localization/eo.inc                |    1 
 plugins/zipdownload/localization/sk_SK.inc          |    1 
 plugins/markasjunk/localization/et_EE.inc           |    1 
 971 files changed, 1,721 insertions(+), 12,196 deletions(-)

diff --git a/bin/transifexpull.sh b/bin/transifexpull.sh
index 8cd99f4..ce25f6f 100755
--- a/bin/transifexpull.sh
+++ b/bin/transifexpull.sh
@@ -22,7 +22,7 @@
     # remove (one-line) comments
     perl -pi -e "s/^\\/\\/.*//" $1
     # remove empty lines (but not in file header)
-    perl -ne 'print if ($. < 21 || length($_) > 1)' $1 > $1.tmp
+    perl -ne 'print if ($. < 18 || length($_) > 1)' $1 > $1.tmp
     mv $1.tmp $1
 }
 
diff --git a/plugins/acl/localization/az_AZ.inc b/plugins/acl/localization/az_AZ.inc
index 1a2eea4..d1cbb07 100644
--- a/plugins/acl/localization/az_AZ.inc
+++ b/plugins/acl/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Paylaşma';
 $labels['myrights'] = 'Giriş hüququ';
 $labels['username'] = 'İstifadəçi:';
diff --git a/plugins/acl/localization/be_BE.inc b/plugins/acl/localization/be_BE.inc
index 37b984c..bce5915 100644
--- a/plugins/acl/localization/be_BE.inc
+++ b/plugins/acl/localization/be_BE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Сумесны доступ';
 $labels['myrights'] = 'Правы доступа';
 $labels['username'] = 'Карыстальнік:';
diff --git a/plugins/acl/localization/bg_BG.inc b/plugins/acl/localization/bg_BG.inc
index c41d69e..2e3c57d 100644
--- a/plugins/acl/localization/bg_BG.inc
+++ b/plugins/acl/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Споделяне';
 $labels['myrights'] = 'Права за достъп';
 $labels['username'] = 'Потребител:';
diff --git a/plugins/acl/localization/bs_BA.inc b/plugins/acl/localization/bs_BA.inc
index 646600b..7cedc8c 100644
--- a/plugins/acl/localization/bs_BA.inc
+++ b/plugins/acl/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Razmjena';
 $labels['myrights'] = 'Prava pristupa';
 $labels['username'] = 'Korisnik:';
diff --git a/plugins/acl/localization/ca_ES.inc b/plugins/acl/localization/ca_ES.inc
index 5944ae2..d238524 100644
--- a/plugins/acl/localization/ca_ES.inc
+++ b/plugins/acl/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Comparteix';
 $labels['myrights'] = 'Permisos d\'accés';
 $labels['username'] = 'Usuari:';
diff --git a/plugins/acl/localization/cs_CZ.inc b/plugins/acl/localization/cs_CZ.inc
index 8dde160..437b46a 100644
--- a/plugins/acl/localization/cs_CZ.inc
+++ b/plugins/acl/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Sdílení';
 $labels['myrights'] = 'Přístupová práva';
 $labels['username'] = 'Uživatel:';
@@ -64,12 +63,12 @@
 $labels['longaclr'] = 'Složka může být otevřena pro čtení';
 $labels['longacls'] = 'Označená zpráva byla změněna';
 $labels['longaclw'] = 'Značky a klíčová slova u zpráv je možné měnit, kromě příznaku Přečteno a Smazáno';
-$labels['longacli'] = 'Zpŕava může být napsána nebo zkopírována do složky';
-$labels['longaclp'] = 'Zpráva byla odeslána do složky';
+$labels['longacli'] = 'Zpráva může být napsána nebo zkopírována do složky';
+$labels['longaclp'] = 'Zpráva může být odeslána do této složky';
 $labels['longaclc'] = 'Složka může být vytvořena (nebo přejmenována) přimo v této složce';
 $labels['longaclk'] = 'Složka může být vytvořena (nebo přejmenována) přimo v této složce';
-$labels['longacld'] = 'Značka o smazání zprávy může být změněna';
-$labels['longaclt'] = 'Značka o smazání zprávy může být změněna';
+$labels['longacld'] = 'Příznak smazané zprávy může být změněn';
+$labels['longaclt'] = 'Příznak smazané zprávy může být změněn';
 $labels['longacle'] = 'Zpráva může být smazána';
 $labels['longaclx'] = 'Složka může být smazána nebo přejmenována';
 $labels['longacla'] = 'Přístupová práva složky mohou být změněna';
@@ -80,12 +79,12 @@
 $messages['deleting'] = 'Odstraňuji přístupová práva...';
 $messages['saving'] = 'Ukládám přístupová práva...';
 $messages['updatesuccess'] = 'Přístupová práva byla úspěšně změněna';
-$messages['deletesuccess'] = 'Přístupová páva byla úspěšně odstraněna';
-$messages['createsuccess'] = 'Přístupová práva byla úspěšně přídána';
-$messages['updateerror'] = 'Nelze upravit přístupová práva';
-$messages['deleteerror'] = 'Nelze odstranit přístupová práva';
-$messages['createerror'] = 'Nelze přidat přístupová práva';
+$messages['deletesuccess'] = 'Přístupová práva byla úspěšně odstraněna';
+$messages['createsuccess'] = 'Přístupová práva byla úspěšně přidána';
+$messages['updateerror'] = 'Úprava přístupových práv se nezdařila';
+$messages['deleteerror'] = 'Smazání přístupových práv se nezdařilo';
+$messages['createerror'] = 'Přidání přístupových práv se nezdařilo';
 $messages['deleteconfirm'] = 'Opravdu si přejete odstranit přístupová práva pro vybrané(ho) uživatele?';
 $messages['norights'] = 'Nejsou specifikována žádná práva!';
-$messages['nouser'] = 'Není specifikováno uživatelské jméno';
+$messages['nouser'] = 'Není specifikováno uživatelské jméno!';
 ?>
diff --git a/plugins/acl/localization/cy_GB.inc b/plugins/acl/localization/cy_GB.inc
index 78b67b5..30b0aaf 100644
--- a/plugins/acl/localization/cy_GB.inc
+++ b/plugins/acl/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Rhannu';
 $labels['myrights'] = 'Hawliau Mynediad';
 $labels['username'] = 'Defnyddiwr:';
diff --git a/plugins/acl/localization/da_DK.inc b/plugins/acl/localization/da_DK.inc
index bb5ace3..f311376 100644
--- a/plugins/acl/localization/da_DK.inc
+++ b/plugins/acl/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Adgangrettigheder';
 $labels['username'] = 'Bruger:';
@@ -82,7 +81,7 @@
 $messages['updatesuccess'] = 'Tilgangsrettighederne blev ændret';
 $messages['deletesuccess'] = 'Sletterettigheder blev ændret';
 $messages['createsuccess'] = 'Tilgangsrettigheder blev tilføjet';
-$messages['updateerror'] = 'Kunne ikke opdatere tilgangsrettigheder';
+$messages['updateerror'] = 'Kunne ikke opdatere adgangsrettigheder';
 $messages['deleteerror'] = 'Kunne ikke slette tilgangsrettigheder';
 $messages['createerror'] = 'Kunne ikke tilføje tilgangsrettigheder';
 $messages['deleteconfirm'] = 'Er du sikker på, at du vil slette tilgangsrettigheder fra de(n) valgte bruger(e)?';
diff --git a/plugins/acl/localization/de_CH.inc b/plugins/acl/localization/de_CH.inc
index 872baa5..98e555a 100644
--- a/plugins/acl/localization/de_CH.inc
+++ b/plugins/acl/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
diff --git a/plugins/acl/localization/de_DE.inc b/plugins/acl/localization/de_DE.inc
index 864dc77..3df3dc6 100644
--- a/plugins/acl/localization/de_DE.inc
+++ b/plugins/acl/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
diff --git a/plugins/acl/localization/el_GR.inc b/plugins/acl/localization/el_GR.inc
index df317ac..56e1081 100644
--- a/plugins/acl/localization/el_GR.inc
+++ b/plugins/acl/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Μοιρασμα';
 $labels['myrights'] = 'Δικαιώματα Πρόσβασης ';
 $labels['username'] = 'Χρηστης:';
diff --git a/plugins/acl/localization/en_GB.inc b/plugins/acl/localization/en_GB.inc
index 35bbf3f..16616c7 100644
--- a/plugins/acl/localization/en_GB.inc
+++ b/plugins/acl/localization/en_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
@@ -82,7 +81,6 @@
 $messages['updatesuccess'] = 'Successfully changed access rights';
 $messages['deletesuccess'] = 'Successfully deleted access rights';
 $messages['createsuccess'] = 'Successfully added access rights';
-$messages['updateerror'] = 'Ubable to update access rights';
 $messages['deleteerror'] = 'Unable to delete access rights';
 $messages['createerror'] = 'Unable to add access rights';
 $messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
diff --git a/plugins/acl/localization/eo.inc b/plugins/acl/localization/eo.inc
index 6471244..888ea4d 100644
--- a/plugins/acl/localization/eo.inc
+++ b/plugins/acl/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Kunhavigado';
 $labels['myrights'] = 'Atingrajtoj';
 $labels['username'] = 'Uzanto:';
@@ -28,14 +27,12 @@
 $labels['acll'] = 'Elserĉo';
 $labels['aclr'] = 'Legi mesaĝojn';
 $labels['acls'] = 'Manteni legitan staton';
-$labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Enmeti (alglui)';
 $labels['aclp'] = 'Afiŝi';
 $labels['aclc'] = 'Krei subdosierujojn';
 $labels['aclk'] = 'Krei subdosierujojn';
 $labels['acld'] = 'Forigi mesaĝojn';
 $labels['aclt'] = 'Forigi mesaĝojn';
-$labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Forigi dosierujon';
 $labels['acla'] = 'Administri';
 $labels['aclfull'] = 'Plena kontrolo';
@@ -53,7 +50,6 @@
 $labels['shortaclk'] = 'Krei';
 $labels['shortacld'] = 'Forigi';
 $labels['shortaclt'] = 'Forigi';
-$labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Forigo de dosierujo';
 $labels['shortacla'] = 'Administri';
 $labels['shortaclother'] = 'Alia';
@@ -62,30 +58,7 @@
 $labels['shortacldelete'] = 'Forigi';
 $labels['longacll'] = 'La dosierujo videblas en listoj kaj oni povas aboni al ĝi';
 $labels['longaclr'] = 'La dosierujo malfermeblas por legado';
-$labels['longacls'] = 'Messages Seen flag can be changed';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
 $labels['longacli'] = 'Mesaĝoj skribeblas aŭ kopieblas en la dosierujo';
 $labels['longaclp'] = 'Mesaĝoj afiŝeblas en ĉi tiu dosierujo';
-$labels['longaclc'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longaclk'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longacld'] = 'Messages Delete flag can be changed';
-$labels['longaclt'] = 'Messages Delete flag can be changed';
-$labels['longacle'] = 'Messages can be expunged';
-$labels['longaclx'] = 'The folder can be deleted or renamed';
-$labels['longacla'] = 'The folder access rights can be changed';
-$labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = 'La dosierujo malfermeblas por legado';
-$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
-$labels['longacldelete'] = 'Messages can be deleted';
-$messages['deleting'] = 'Deleting access rights...';
-$messages['saving'] = 'Saving access rights...';
-$messages['updatesuccess'] = 'Successfully changed access rights';
-$messages['deletesuccess'] = 'Successfully deleted access rights';
-$messages['createsuccess'] = 'Successfully added access rights';
-$messages['updateerror'] = 'Ubable to update access rights';
-$messages['deleteerror'] = 'Unable to delete access rights';
-$messages['createerror'] = 'Unable to add access rights';
-$messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
-$messages['norights'] = 'No rights has been specified!';
-$messages['nouser'] = 'No username has been specified!';
 ?>
diff --git a/plugins/acl/localization/es_AR.inc b/plugins/acl/localization/es_AR.inc
index 410fa4f..0fa1111 100644
--- a/plugins/acl/localization/es_AR.inc
+++ b/plugins/acl/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Compartiendo';
 $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Usuario:';
diff --git a/plugins/acl/localization/es_ES.inc b/plugins/acl/localization/es_ES.inc
index e578d5e..3e64bfe 100644
--- a/plugins/acl/localization/es_ES.inc
+++ b/plugins/acl/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Compartir';
 $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Usuario:';
@@ -82,7 +81,7 @@
 $messages['updatesuccess'] = 'Se han cambiado los permisos de acceso';
 $messages['deletesuccess'] = 'Se han borrado los permisos de acceso';
 $messages['createsuccess'] = 'Se han añadido los permisos de acceso';
-$messages['updateerror'] = 'No se han podido actualizar los permisos de acceso';
+$messages['updateerror'] = 'No ha sido posible actualizar los derechos de acceso';
 $messages['deleteerror'] = 'No se han podido borrar los permisos de acceso';
 $messages['createerror'] = 'No se han podido añadir los permisos de acceso';
 $messages['deleteconfirm'] = '¿Seguro que quiere borrar los permisos de acceso del usuairo seleccionado?';
diff --git a/plugins/acl/localization/et_EE.inc b/plugins/acl/localization/et_EE.inc
index 531d311..5a64ac8 100644
--- a/plugins/acl/localization/et_EE.inc
+++ b/plugins/acl/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Jagamine';
 $labels['myrights'] = 'Ligipääsuõigused';
 $labels['username'] = 'Kasutaja:';
@@ -25,10 +24,7 @@
 $labels['anyone'] = 'Kõik kasutajad';
 $labels['anonymous'] = 'Külalised (anonüümsed)';
 $labels['identifier'] = 'Tuvastaja';
-$labels['acll'] = 'Lookup';
 $labels['aclr'] = 'Lugeda kirju';
-$labels['acls'] = 'Keep Seen state';
-$labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Sisesta (kopeeri)';
 $labels['aclp'] = 'Postita';
 $labels['aclc'] = 'Luua alamkaustu';
@@ -43,7 +39,6 @@
 $labels['aclread'] = 'Loe';
 $labels['aclwrite'] = 'Kirjuta';
 $labels['acldelete'] = 'Kustuta';
-$labels['shortacll'] = 'Lookup';
 $labels['shortaclr'] = 'Loe';
 $labels['shortacls'] = 'Säilita';
 $labels['shortaclw'] = 'Kirjuta';
@@ -62,12 +57,6 @@
 $labels['shortacldelete'] = 'Kustuta';
 $labels['longacll'] = 'See kaust on nimekirjas nähtav ja seda saab tellida';
 $labels['longaclr'] = 'Kausta saab lugemiseks avada';
-$labels['longacls'] = 'Messages Seen flag can be changed';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
-$labels['longacli'] = 'Messages can be written or copied to the folder';
-$labels['longaclp'] = 'Messages can be posted to this folder';
-$labels['longaclc'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longaclk'] = 'Folders can be created (or renamed) directly under this folder';
 $labels['longacld'] = 'Kirja kustutamis lippu saab muuta';
 $labels['longaclt'] = 'Kirja kustutamis lippu saab muuta';
 $labels['longacle'] = 'Kirju saab eemaldada';
@@ -75,7 +64,6 @@
 $labels['longacla'] = 'Selle kausta ligipääsuõigusi saab muuta';
 $labels['longaclfull'] = 'Täielik kontroll koos kaustade haldamisega';
 $labels['longaclread'] = 'Kausta saab lugemiseks avada';
-$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
 $labels['longacldelete'] = 'Kirju saab kustutada';
 $messages['deleting'] = 'Ligipääsuõiguste kustutamine...';
 $messages['saving'] = 'Ligipääsuõiguste salvestamine...';
diff --git a/plugins/acl/localization/eu_ES.inc b/plugins/acl/localization/eu_ES.inc
index 8f3e319..4fa9f3b 100644
--- a/plugins/acl/localization/eu_ES.inc
+++ b/plugins/acl/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Partekatzen';
 $labels['myrights'] = 'Sarbide-eskubideak';
 $labels['username'] = 'Erabiltzailea:';
diff --git a/plugins/acl/localization/fa_IR.inc b/plugins/acl/localization/fa_IR.inc
index e2859eb..993783f 100644
--- a/plugins/acl/localization/fa_IR.inc
+++ b/plugins/acl/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'اشتراک‌گذاری';
 $labels['myrights'] = 'مجوزهای دسترسی';
 $labels['username'] = 'کاربر:';
diff --git a/plugins/acl/localization/fi_FI.inc b/plugins/acl/localization/fi_FI.inc
index 9de9162..ab32224 100644
--- a/plugins/acl/localization/fi_FI.inc
+++ b/plugins/acl/localization/fi_FI.inc
@@ -15,77 +15,29 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Jakaminen';
 $labels['myrights'] = 'Käyttöoikeudet';
 $labels['username'] = 'Käyttäjä:';
 $labels['advanced'] = 'edistynyt tila';
-$labels['newuser'] = 'Add entry';
-$labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'Kaikki käyttäjät (kuka tahansa)';
 $labels['anonymous'] = 'Vieraat (anonyymit)';
-$labels['identifier'] = 'Identifier';
-$labels['acll'] = 'Lookup';
-$labels['aclr'] = 'Read messages';
-$labels['acls'] = 'Keep Seen state';
-$labels['aclw'] = 'Write flags';
-$labels['acli'] = 'Insert (Copy into)';
-$labels['aclp'] = 'Post';
-$labels['aclc'] = 'Create subfolders';
-$labels['aclk'] = 'Create subfolders';
-$labels['acld'] = 'Delete messages';
-$labels['aclt'] = 'Delete messages';
-$labels['acle'] = 'Expunge';
-$labels['aclx'] = 'Delete folder';
-$labels['acla'] = 'Administer';
-$labels['aclfull'] = 'Full control';
-$labels['aclother'] = 'Other';
-$labels['aclread'] = 'Read';
-$labels['aclwrite'] = 'Write';
-$labels['acldelete'] = 'Delete';
-$labels['shortacll'] = 'Lookup';
-$labels['shortaclr'] = 'Read';
-$labels['shortacls'] = 'Keep';
-$labels['shortaclw'] = 'Write';
-$labels['shortacli'] = 'Insert';
-$labels['shortaclp'] = 'Post';
+$labels['aclother'] = 'Muu';
 $labels['shortaclc'] = 'Luo';
 $labels['shortaclk'] = 'Luo';
 $labels['shortacld'] = 'Poista';
 $labels['shortaclt'] = 'Poista';
-$labels['shortacle'] = 'Expunge';
-$labels['shortaclx'] = 'Folder delete';
-$labels['shortacla'] = 'Administer';
 $labels['shortaclother'] = 'Muu';
-$labels['shortaclread'] = 'Read';
-$labels['shortaclwrite'] = 'Write';
-$labels['shortacldelete'] = 'Delete';
-$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
-$labels['longaclr'] = 'The folder can be opened for reading';
-$labels['longacls'] = 'Messages Seen flag can be changed';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
-$labels['longacli'] = 'Messages can be written or copied to the folder';
-$labels['longaclp'] = 'Messages can be posted to this folder';
-$labels['longaclc'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longaclk'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longacld'] = 'Messages Delete flag can be changed';
-$labels['longaclt'] = 'Messages Delete flag can be changed';
-$labels['longacle'] = 'Messages can be expunged';
-$labels['longaclx'] = 'The folder can be deleted or renamed';
-$labels['longacla'] = 'The folder access rights can be changed';
-$labels['longaclfull'] = 'Full control including folder administration';
-$labels['longaclread'] = 'The folder can be opened for reading';
-$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
-$labels['longacldelete'] = 'Messages can be deleted';
-$messages['deleting'] = 'Deleting access rights...';
-$messages['saving'] = 'Saving access rights...';
-$messages['updatesuccess'] = 'Successfully changed access rights';
-$messages['deletesuccess'] = 'Successfully deleted access rights';
-$messages['createsuccess'] = 'Successfully added access rights';
-$messages['updateerror'] = 'Ubable to update access rights';
-$messages['deleteerror'] = 'Unable to delete access rights';
-$messages['createerror'] = 'Unable to add access rights';
-$messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
-$messages['norights'] = 'No rights has been specified!';
-$messages['nouser'] = 'No username has been specified!';
+$labels['longaclr'] = 'Kansion voi avata lukua varten';
+$labels['longaclx'] = 'Kansio voidaan poistaa tai nimetä uudelleen';
+$labels['longacla'] = 'Kansion käyttöoikeuksia voi muuttaa';
+$messages['deleting'] = 'Poistetaan käyttöoikeuksia...';
+$messages['saving'] = 'Tallennetaan käyttöoikeuksia...';
+$messages['updatesuccess'] = 'Käyttöoikeuksia muutettiin onnistuneesti';
+$messages['deletesuccess'] = 'Käyttöoikeuksia poistettiin onnistuneesti';
+$messages['createsuccess'] = 'Käyttöoikeuksia lisättiin onnistuneesti';
+$messages['updateerror'] = 'Käyttöoikeuksien päivitys epäonnistui';
+$messages['deleteerror'] = 'Käyttöoikeuksien poistaminen epäonnistui';
+$messages['createerror'] = 'Käyttöoikeuksien lisääminen epäonnistui';
+$messages['norights'] = 'Oikeuksia ei ole määritelty!';
+$messages['nouser'] = 'Käyttäjänimeä ei ole määritelty!';
 ?>
diff --git a/plugins/acl/localization/fr_FR.inc b/plugins/acl/localization/fr_FR.inc
index ed26e86..b4e47bb 100644
--- a/plugins/acl/localization/fr_FR.inc
+++ b/plugins/acl/localization/fr_FR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Partage';
 $labels['myrights'] = 'Droits d\'accès';
 $labels['username'] = 'Utilisateur :';
diff --git a/plugins/acl/localization/gl_ES.inc b/plugins/acl/localization/gl_ES.inc
index f2aee34..17aaf25 100644
--- a/plugins/acl/localization/gl_ES.inc
+++ b/plugins/acl/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Compartindo';
 $labels['myrights'] = 'Dereitos de acceso';
 $labels['username'] = 'Usuario:';
diff --git a/plugins/acl/localization/he_IL.inc b/plugins/acl/localization/he_IL.inc
index 2314153..921c6ee 100644
--- a/plugins/acl/localization/he_IL.inc
+++ b/plugins/acl/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'שיתוף';
 $labels['myrights'] = 'זכויות גישה';
 $labels['username'] = 'משתמש:';
diff --git a/plugins/acl/localization/hu_HU.inc b/plugins/acl/localization/hu_HU.inc
index d6905e7..b61a2eb 100644
--- a/plugins/acl/localization/hu_HU.inc
+++ b/plugins/acl/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Megosztás';
 $labels['myrights'] = 'Hozzáférési jogok';
 $labels['username'] = 'Felhasználó:';
diff --git a/plugins/acl/localization/hy_AM.inc b/plugins/acl/localization/hy_AM.inc
index 10fad06..b474f63 100644
--- a/plugins/acl/localization/hy_AM.inc
+++ b/plugins/acl/localization/hy_AM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Կիսվել';
 $labels['myrights'] = 'Մուտքի իրավունքներ';
 $labels['username'] = 'Օգտատեր`';
@@ -82,7 +81,6 @@
 $messages['updatesuccess'] = 'Մուտքի իրավունքները բարեհաջող փոփոխվեցին։';
 $messages['deletesuccess'] = 'Մուտքի իրավունքները բարեհաջող ջնջվեցին։';
 $messages['createsuccess'] = 'Մուտքի իրավունքները բարեհաջող ավելացվեցվին։';
-$messages['updateerror'] = 'Մուտքի իրավունքները թարմացումը ձախողվեց։';
 $messages['deleteerror'] = 'Մուտքի իրավունքները ջնջումը ձախողվեց։';
 $messages['createerror'] = 'Մուտքի իրավունքները ավելացումը ձախողվեց։';
 $messages['deleteconfirm'] = 'Դուք վստա՞հ էք, որ ցանկանում եք նշված օգտվողներին զրկել մուտքի իրավունքներից։';
diff --git a/plugins/acl/localization/id_ID.inc b/plugins/acl/localization/id_ID.inc
index a04a094..d7c4b55 100644
--- a/plugins/acl/localization/id_ID.inc
+++ b/plugins/acl/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Berbagi';
 $labels['myrights'] = 'Hak Akses';
 $labels['username'] = 'Pengguna:';
diff --git a/plugins/acl/localization/it_IT.inc b/plugins/acl/localization/it_IT.inc
index 6475609..f610ac0 100644
--- a/plugins/acl/localization/it_IT.inc
+++ b/plugins/acl/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Condivisione';
 $labels['myrights'] = 'Diritti d\'accesso';
 $labels['username'] = 'Utente:';
diff --git a/plugins/acl/localization/ja_JP.inc b/plugins/acl/localization/ja_JP.inc
index 35cfcc1..15da70b 100644
--- a/plugins/acl/localization/ja_JP.inc
+++ b/plugins/acl/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = '共有';
 $labels['myrights'] = 'アクセス権';
 $labels['username'] = 'ユーザー:';
diff --git a/plugins/acl/localization/ko_KR.inc b/plugins/acl/localization/ko_KR.inc
index dc22fa1..c7c3e46 100644
--- a/plugins/acl/localization/ko_KR.inc
+++ b/plugins/acl/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = '공유';
 $labels['myrights'] = '접근 권한';
 $labels['username'] = '사용자:';
diff --git a/plugins/acl/localization/lb_LU.inc b/plugins/acl/localization/lb_LU.inc
index 31c0139..be03a72 100644
--- a/plugins/acl/localization/lb_LU.inc
+++ b/plugins/acl/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Zougrëffsrechter';
 $labels['username'] = 'Benotzer:';
@@ -28,11 +27,6 @@
 $labels['acll'] = 'Noschloen';
 $labels['aclr'] = 'Messagë liesen';
 $labels['acls'] = 'Lies-Status behalen';
-$labels['aclw'] = 'Write flags';
-$labels['acli'] = 'Insert (Copy into)';
-$labels['aclp'] = 'Post';
-$labels['aclc'] = 'Create subfolders';
-$labels['aclk'] = 'Create subfolders';
 $labels['acld'] = 'Messagë läschen';
 $labels['aclt'] = 'Messagë läschen';
 $labels['acle'] = 'Ausläschen';
@@ -60,22 +54,6 @@
 $labels['shortaclread'] = 'Liesen';
 $labels['shortaclwrite'] = 'Schreiwen';
 $labels['shortacldelete'] = 'Läschen';
-$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
-$labels['longaclr'] = 'The folder can be opened for reading';
-$labels['longacls'] = 'Messages Seen flag can be changed';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
-$labels['longacli'] = 'Messages can be written or copied to the folder';
-$labels['longaclp'] = 'Messages can be posted to this folder';
-$labels['longaclc'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longaclk'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longacld'] = 'Messages Delete flag can be changed';
-$labels['longaclt'] = 'Messages Delete flag can be changed';
-$labels['longacle'] = 'Messages can be expunged';
-$labels['longaclx'] = 'The folder can be deleted or renamed';
-$labels['longacla'] = 'The folder access rights can be changed';
-$labels['longaclfull'] = 'Full control including folder administration';
-$labels['longaclread'] = 'The folder can be opened for reading';
-$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
 $labels['longacldelete'] = 'Messagë kënne geläscht ginn';
 $messages['deleting'] = 'Zougrëffsrechter gi geläscht...';
 $messages['saving'] = 'Zougrëffsrechter gi gespäichert...';
diff --git a/plugins/acl/localization/lt_LT.inc b/plugins/acl/localization/lt_LT.inc
index ad4ae9c..ab4cbba 100644
--- a/plugins/acl/localization/lt_LT.inc
+++ b/plugins/acl/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Dalinimasis';
 $labels['myrights'] = 'Prieigos teisės';
 $labels['username'] = 'Vartotojas:';
diff --git a/plugins/acl/localization/lv_LV.inc b/plugins/acl/localization/lv_LV.inc
index c44269e..83ceec5 100644
--- a/plugins/acl/localization/lv_LV.inc
+++ b/plugins/acl/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['myrights'] = 'Piekļuves tiesības';
 $labels['username'] = 'Lietotājs:';
 $labels['advanced'] = 'paplašinātais režīms';
diff --git a/plugins/acl/localization/nb_NO.inc b/plugins/acl/localization/nb_NO.inc
index 7e78a4b..56a9b20 100644
--- a/plugins/acl/localization/nb_NO.inc
+++ b/plugins/acl/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Tilgangsrettigheter';
 $labels['username'] = 'Bruker:';
@@ -82,7 +81,6 @@
 $messages['updatesuccess'] = 'Tilgangsrettigheter ble endret';
 $messages['deletesuccess'] = 'Tilgangsrettigheter ble slettet';
 $messages['createsuccess'] = 'Tilgangsrettigheter ble lagt til';
-$messages['updateerror'] = 'Kunne ikke oppdatere tilgangsrettigheter';
 $messages['deleteerror'] = 'Kunne ikke fjerne tilgangsrettigheter';
 $messages['createerror'] = 'Kunne ikke legge til tilgangsrettigheter';
 $messages['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valgte brukere';
diff --git a/plugins/acl/localization/nl_NL.inc b/plugins/acl/localization/nl_NL.inc
index 4a29f76..4bf6870 100644
--- a/plugins/acl/localization/nl_NL.inc
+++ b/plugins/acl/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Delen';
 $labels['myrights'] = 'Toegangsrechten';
 $labels['username'] = 'Gebruiker:';
diff --git a/plugins/acl/localization/nn_NO.inc b/plugins/acl/localization/nn_NO.inc
index 5bd0caf..4690a30 100644
--- a/plugins/acl/localization/nn_NO.inc
+++ b/plugins/acl/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Tilgangsrettar';
 $labels['username'] = 'Brukar:';
@@ -82,7 +81,6 @@
 $messages['updatesuccess'] = 'Tilgangsrettiar vart endra';
 $messages['deletesuccess'] = 'Tilgangsretter vart sletta';
 $messages['createsuccess'] = 'Tilgangsrettar vart legne til';
-$messages['updateerror'] = 'Kunne ikkje oppdatere tilgangsrettar';
 $messages['deleteerror'] = 'Kunne ikkje fjerne tilgangsrettar';
 $messages['createerror'] = 'Kunne ikkje leggje til tilgangsrettar';
 $messages['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valde brukarar?';
diff --git a/plugins/acl/localization/pl_PL.inc b/plugins/acl/localization/pl_PL.inc
index 2e6e2cb..d3804ac 100644
--- a/plugins/acl/localization/pl_PL.inc
+++ b/plugins/acl/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Udostępnianie';
 $labels['myrights'] = 'Prawa dostępu';
 $labels['username'] = 'Użytkownik:';
diff --git a/plugins/acl/localization/pt_BR.inc b/plugins/acl/localization/pt_BR.inc
index 0444854..7021762 100644
--- a/plugins/acl/localization/pt_BR.inc
+++ b/plugins/acl/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Compartilhamento';
 $labels['myrights'] = 'Permissões de Acesso';
 $labels['username'] = 'Usuário:';
diff --git a/plugins/acl/localization/pt_PT.inc b/plugins/acl/localization/pt_PT.inc
index 5cc974f..3f1a8f0 100644
--- a/plugins/acl/localization/pt_PT.inc
+++ b/plugins/acl/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Partilhar';
 $labels['myrights'] = 'Permissões de acesso';
 $labels['username'] = 'Utilizador:';
@@ -82,7 +81,7 @@
 $messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
 $messages['deletesuccess'] = 'Permissões de acesso eliminadas com sucesso';
 $messages['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
-$messages['updateerror'] = 'Não foi possível actualizar as permissões de acesso';
+$messages['updateerror'] = 'Não foi possível actualizar os direitos de acesso';
 $messages['deleteerror'] = 'Não foi possível eliminar as permissões de acesso';
 $messages['createerror'] = 'Não foi possível adicionar as permissões de acesso';
 $messages['deleteconfirm'] = 'Tem a certeza que pretende remover as permissões de acesso do(s) utilizador(es) seleccionado(s)?';
diff --git a/plugins/acl/localization/ro_RO.inc b/plugins/acl/localization/ro_RO.inc
index e069b06..571314b 100644
--- a/plugins/acl/localization/ro_RO.inc
+++ b/plugins/acl/localization/ro_RO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Partajare';
 $labels['myrights'] = 'Drepturi de acces';
 $labels['username'] = 'Utilizator:';
@@ -27,7 +26,7 @@
 $labels['identifier'] = 'Identificator';
 $labels['acll'] = 'Caută';
 $labels['aclr'] = 'Citire mesaje';
-$labels['acls'] = 'Menține starea de Vâzut';
+$labels['acls'] = 'Menține starea citirii';
 $labels['aclw'] = 'Indicator scriere';
 $labels['acli'] = 'Inserare (copiere în)';
 $labels['aclp'] = 'Postează';
@@ -60,7 +59,7 @@
 $labels['shortaclread'] = 'Citeşte';
 $labels['shortaclwrite'] = 'Scrie';
 $labels['shortacldelete'] = 'Șterge';
-$labels['longacll'] = 'Dosarul este vizibil pe liste și se poate înscrie pe el';
+$labels['longacll'] = 'Dosarul este vizibil pe liste și se poate subscrie la acesta';
 $labels['longaclr'] = 'Dosarul se poate deschide pentru citire';
 $labels['longacls'] = 'Indicatorul de Văzut a fost schimbat';
 $labels['longaclw'] = 'Indicatoarele și cuvintele cheie ale mesajelor se pot schimba cu excepția Văzut și Șters';
@@ -68,24 +67,24 @@
 $labels['longaclp'] = 'Mesajele se pot trimite către acest dosar';
 $labels['longaclc'] = 'Dosarele se pot crea (sau redenumi) direct sub acest dosar';
 $labels['longaclk'] = 'Dosarele se pot crea (sau redenumi) direct sub acest dosar';
-$labels['longacld'] = 'Indicatorul de Șters al mesajelor se pot modifica';
-$labels['longaclt'] = 'Indicatorul de Șters al mesajelor se pot modifica';
+$labels['longacld'] = 'Indicatorul de Șters al mesajelor se poate modifica';
+$labels['longaclt'] = 'Indicatorul de Șters al mesajelor se poate modifica';
 $labels['longacle'] = 'Mesajele se pot elimina';
 $labels['longaclx'] = 'Dosarul se poate șterge sau redenumi';
 $labels['longacla'] = 'Drepturile de acces la dosar se pot schimba';
 $labels['longaclfull'] = 'Control complet include și administrare dosar';
 $labels['longaclread'] = 'Dosarul se poate deschide pentru citire';
 $labels['longaclwrite'] = 'Mesajul se poate marca, scrie sau copia într-un dosar';
-$labels['longacldelete'] = 'Mesajul se poate șterge';
-$messages['deleting'] = 'Drepturile de acces la ștergere...';
-$messages['saving'] = 'Drepturile de acces la salvare...';
+$labels['longacldelete'] = 'Mesajele se pot șterge';
+$messages['deleting'] = 'Șterg drepturile de access...';
+$messages['saving'] = 'Salvez drepturi accesare...';
 $messages['updatesuccess'] = 'Drepturile de acces au fost schimbate cu succes';
 $messages['deletesuccess'] = 'Drepturile de acces au fost șterse cu succes';
 $messages['createsuccess'] = 'Drepturile de acces au fost adăugate cu succes';
-$messages['updateerror'] = 'Nu sau putut actualiza drepturile de acces';
-$messages['deleteerror'] = 'Nu sau putut șterge drepturile de acces';
-$messages['createerror'] = 'Nu sau putut adăuga drepturi de acces';
-$messages['deleteconfirm'] = 'Sunteți sigur că doriți să ștergeți drepturile de acces la utilizatorul(i) selectați?';
+$messages['updateerror'] = 'Nu s-au putut actualiza drepturile de acces';
+$messages['deleteerror'] = 'Nu s-au putut șterge drepturile de acces';
+$messages['createerror'] = 'Nu s-au putut adăuga drepturi de acces';
+$messages['deleteconfirm'] = 'Sunteți sigur că doriți să ștergeți drepturile de acces la utilizatorul (ii) selectați?';
 $messages['norights'] = 'Nu au fost specificate drepturi!';
-$messages['nouser'] = 'Nu a fost specificat nume de utilizator!';
+$messages['nouser'] = 'Nu a fost specificat niciun utilizator!';
 ?>
diff --git a/plugins/acl/localization/ru_RU.inc b/plugins/acl/localization/ru_RU.inc
index 5688c84..3fcb3f9 100644
--- a/plugins/acl/localization/ru_RU.inc
+++ b/plugins/acl/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Совместный доступ';
 $labels['myrights'] = 'Права доступа';
 $labels['username'] = 'Пользователь:';
diff --git a/plugins/acl/localization/sk_SK.inc b/plugins/acl/localization/sk_SK.inc
index 50fb857..eb410f1 100644
--- a/plugins/acl/localization/sk_SK.inc
+++ b/plugins/acl/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Zdieľanie';
 $labels['myrights'] = 'Prístupové práva';
 $labels['username'] = 'Používateľ:';
diff --git a/plugins/acl/localization/sl_SI.inc b/plugins/acl/localization/sl_SI.inc
index aff7098..fb75af8 100644
--- a/plugins/acl/localization/sl_SI.inc
+++ b/plugins/acl/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Skupna raba';
 $labels['myrights'] = 'Pravice dostopa';
 $labels['username'] = 'Uporabnik:';
diff --git a/plugins/acl/localization/sr_CS.inc b/plugins/acl/localization/sr_CS.inc
index 523e93a..9e9a780 100644
--- a/plugins/acl/localization/sr_CS.inc
+++ b/plugins/acl/localization/sr_CS.inc
@@ -15,77 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Дељење';
 $labels['myrights'] = 'Права приступа';
 $labels['username'] = 'Корисник:';
-$labels['advanced'] = 'advanced mode';
 $labels['newuser'] = 'Додај унос';
-$labels['actions'] = 'Access right actions...';
-$labels['anyone'] = 'All users (anyone)';
-$labels['anonymous'] = 'Guests (anonymous)';
-$labels['identifier'] = 'Identifier';
-$labels['acll'] = 'Lookup';
-$labels['aclr'] = 'Read messages';
-$labels['acls'] = 'Keep Seen state';
-$labels['aclw'] = 'Write flags';
-$labels['acli'] = 'Insert (Copy into)';
-$labels['aclp'] = 'Post';
-$labels['aclc'] = 'Create subfolders';
-$labels['aclk'] = 'Create subfolders';
-$labels['acld'] = 'Delete messages';
-$labels['aclt'] = 'Delete messages';
-$labels['acle'] = 'Expunge';
-$labels['aclx'] = 'Delete folder';
-$labels['acla'] = 'Administer';
-$labels['aclfull'] = 'Full control';
-$labels['aclother'] = 'Other';
-$labels['aclread'] = 'Read';
-$labels['aclwrite'] = 'Write';
-$labels['acldelete'] = 'Delete';
-$labels['shortacll'] = 'Lookup';
-$labels['shortaclr'] = 'Read';
-$labels['shortacls'] = 'Keep';
-$labels['shortaclw'] = 'Write';
-$labels['shortacli'] = 'Insert';
-$labels['shortaclp'] = 'Post';
-$labels['shortaclc'] = 'Create';
-$labels['shortaclk'] = 'Create';
-$labels['shortacld'] = 'Delete';
-$labels['shortaclt'] = 'Delete';
-$labels['shortacle'] = 'Expunge';
-$labels['shortaclx'] = 'Folder delete';
-$labels['shortacla'] = 'Administer';
-$labels['shortaclother'] = 'Other';
-$labels['shortaclread'] = 'Read';
-$labels['shortaclwrite'] = 'Write';
-$labels['shortacldelete'] = 'Delete';
-$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
-$labels['longaclr'] = 'The folder can be opened for reading';
-$labels['longacls'] = 'Messages Seen flag can be changed';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
-$labels['longacli'] = 'Messages can be written or copied to the folder';
-$labels['longaclp'] = 'Messages can be posted to this folder';
-$labels['longaclc'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longaclk'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longacld'] = 'Messages Delete flag can be changed';
-$labels['longaclt'] = 'Messages Delete flag can be changed';
-$labels['longacle'] = 'Messages can be expunged';
-$labels['longaclx'] = 'The folder can be deleted or renamed';
-$labels['longacla'] = 'The folder access rights can be changed';
-$labels['longaclfull'] = 'Full control including folder administration';
-$labels['longaclread'] = 'The folder can be opened for reading';
-$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
-$labels['longacldelete'] = 'Messages can be deleted';
-$messages['deleting'] = 'Deleting access rights...';
-$messages['saving'] = 'Saving access rights...';
-$messages['updatesuccess'] = 'Successfully changed access rights';
-$messages['deletesuccess'] = 'Successfully deleted access rights';
-$messages['createsuccess'] = 'Successfully added access rights';
-$messages['updateerror'] = 'Ubable to update access rights';
-$messages['deleteerror'] = 'Unable to delete access rights';
-$messages['createerror'] = 'Unable to add access rights';
-$messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
-$messages['norights'] = 'No rights has been specified!';
-$messages['nouser'] = 'No username has been specified!';
 ?>
diff --git a/plugins/acl/localization/sv_SE.inc b/plugins/acl/localization/sv_SE.inc
index 6c36462..37c374a 100644
--- a/plugins/acl/localization/sv_SE.inc
+++ b/plugins/acl/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Utdelning';
 $labels['myrights'] = 'Åtkomsträttigheter';
 $labels['username'] = 'Användare:';
diff --git a/plugins/acl/localization/th_TH.inc b/plugins/acl/localization/th_TH.inc
index 3cbcb14..8eb1d27 100644
--- a/plugins/acl/localization/th_TH.inc
+++ b/plugins/acl/localization/th_TH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'การแชร์ข้อมูล';
 $labels['myrights'] = 'สิทธิ์การเข้าใช้';
 $labels['username'] = 'ผู้ใช้งาน:';
diff --git a/plugins/acl/localization/ti.inc b/plugins/acl/localization/ti.inc
index ed769b6..751be87 100644
--- a/plugins/acl/localization/ti.inc
+++ b/plugins/acl/localization/ti.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'ንኻልእ';
 $labels['myrights'] = 'መሰላት በዓል ዋና';
 $labels['username'] = 'በዓል ዋና';
diff --git a/plugins/acl/localization/tr_TR.inc b/plugins/acl/localization/tr_TR.inc
index 499ed78..673403b 100644
--- a/plugins/acl/localization/tr_TR.inc
+++ b/plugins/acl/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Paylaşım';
 $labels['myrights'] = 'Erişim Hakları';
 $labels['username'] = 'Kullanıcı:';
diff --git a/plugins/acl/localization/vi_VN.inc b/plugins/acl/localization/vi_VN.inc
index cde9ec9..a383998 100644
--- a/plugins/acl/localization/vi_VN.inc
+++ b/plugins/acl/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = 'Chia sẻ';
 $labels['myrights'] = 'Quyền truy cập';
 $labels['username'] = 'Người dùng:';
@@ -82,7 +81,6 @@
 $messages['updatesuccess'] = 'Thay đổi quyền truy cập thành công...';
 $messages['deletesuccess'] = 'Xóa quyền truy cập thành công...';
 $messages['createsuccess'] = 'Thêm quyền truy cập thành công...';
-$messages['updateerror'] = 'Không thể cập nhật quyền truy cập';
 $messages['deleteerror'] = 'Khôngthể xóa quyền truy cập';
 $messages['createerror'] = 'Không thể thêm quyền truy cập';
 $messages['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?';
diff --git a/plugins/acl/localization/zh_CN.inc b/plugins/acl/localization/zh_CN.inc
index 55bd7dc..68d2944 100644
--- a/plugins/acl/localization/zh_CN.inc
+++ b/plugins/acl/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = '共享';
 $labels['myrights'] = '访问权限';
 $labels['username'] = '用户:';
@@ -62,18 +61,10 @@
 $labels['shortacldelete'] = '删除';
 $labels['longacll'] = '该文件夹在列表上可见且可被订阅';
 $labels['longaclr'] = '该文件夹可被打开阅读';
-$labels['longacls'] = 'Messages Seen flag can be changed';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
 $labels['longacli'] = '消息可写或可被复制至文件夹中';
-$labels['longaclp'] = 'Messages can be posted to this folder';
-$labels['longaclc'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longaclk'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longacld'] = 'Messages Delete flag can be changed';
-$labels['longaclt'] = 'Messages Delete flag can be changed';
 $labels['longacle'] = '消息可被清除';
 $labels['longaclx'] = '该文件夹可被删除或重命名';
 $labels['longacla'] = '文件夹访问权限可被修改';
-$labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = '该文件夹可被打开阅读';
 $labels['longaclwrite'] = '消息可被标记,撰写或复制至文件夹中';
 $labels['longacldelete'] = '信息可被删除';
@@ -82,7 +73,6 @@
 $messages['updatesuccess'] = '成功修改访问权限';
 $messages['deletesuccess'] = '成功删除访问权限';
 $messages['createsuccess'] = '成功添加访问权限';
-$messages['updateerror'] = '无法更新访问权限';
 $messages['deleteerror'] = '无法删除访问权限';
 $messages['createerror'] = '无法添加访问权限';
 $messages['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';
diff --git a/plugins/acl/localization/zh_TW.inc b/plugins/acl/localization/zh_TW.inc
index 92d633e..e3adc04 100644
--- a/plugins/acl/localization/zh_TW.inc
+++ b/plugins/acl/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = '分享';
 $labels['myrights'] = '存取權限';
 $labels['username'] = '使用者:';
diff --git a/plugins/archive/localization/ar.inc b/plugins/archive/localization/ar.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/ar.inc
+++ b/plugins/archive/localization/ar.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/ar_SA.inc b/plugins/archive/localization/ar_SA.inc
index bc237de..737f745 100644
--- a/plugins/archive/localization/ar_SA.inc
+++ b/plugins/archive/localization/ar_SA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'الأرشيف';
 $labels['buttontitle'] = 'أرشف هذه الرسالة';
 $labels['archived'] = 'أُرشفت بنجاح';
diff --git a/plugins/archive/localization/ast.inc b/plugins/archive/localization/ast.inc
index 1c16f69..546c335 100644
--- a/plugins/archive/localization/ast.inc
+++ b/plugins/archive/localization/ast.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archivu';
 $labels['buttontitle'] = 'Archivar esti mensaxe';
 $labels['archived'] = 'Mensaxe archiváu';
diff --git a/plugins/archive/localization/az_AZ.inc b/plugins/archive/localization/az_AZ.inc
index 24887f2..ab23117 100644
--- a/plugins/archive/localization/az_AZ.inc
+++ b/plugins/archive/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arxiv';
 $labels['buttontitle'] = 'Mesajı arxivə göndər';
 $labels['archived'] = 'Arxivə göndərildi';
diff --git a/plugins/archive/localization/be_BE.inc b/plugins/archive/localization/be_BE.inc
index b1758ea..90e4417 100644
--- a/plugins/archive/localization/be_BE.inc
+++ b/plugins/archive/localization/be_BE.inc
@@ -15,16 +15,15 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Архіў';
 $labels['buttontitle'] = 'Перанесці ў Архіў';
-$labels['archived'] = 'Паспяхова перанесены ў Архіў';
-$labels['archivedreload'] = 'Паспяхова перанесены ў Архіў. Перазагрузіце старонку, каб пабачыць новыя архіўныя папкі.';
-$labels['archiveerror'] = 'Некаторыя лісты не могуць быць перанесены ў архіў';
+$labels['archived'] = 'Перанесена ў Архіў';
+$labels['archivedreload'] = 'Перанесена ў Архіў. Перазагрузіце старонку, каб пабачыць новыя архіўныя папкі.';
+$labels['archiveerror'] = 'Некаторыя паведамленні не могуць быць перанесены ў архіў';
 $labels['archivefolder'] = 'Архіў';
 $labels['settingstitle'] = 'Архіў';
 $labels['archivetype'] = 'Раздзяліць архіў паводле';
-$labels['archivetypeyear'] = 'году (прыкладам, Архіў/2012)';
+$labels['archivetypeyear'] = 'года (прыкладам, Архіў/2012)';
 $labels['archivetypemonth'] = 'месяца (прыкладам, Архіў/2012/06)';
 $labels['archivetypefolder'] = 'Арыгінальная папка';
 $labels['archivetypesender'] = 'Эл. пошта адпраўніка';
diff --git a/plugins/archive/localization/bg_BG.inc b/plugins/archive/localization/bg_BG.inc
index 65323b7..9f9b868 100644
--- a/plugins/archive/localization/bg_BG.inc
+++ b/plugins/archive/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Архивирай';
 $labels['buttontitle'] = 'Архивиране на писмото';
 $labels['archived'] = 'Архивирането премина успешно';
diff --git a/plugins/archive/localization/bn_BD.inc b/plugins/archive/localization/bn_BD.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/bn_BD.inc
+++ b/plugins/archive/localization/bn_BD.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/br.inc b/plugins/archive/localization/br.inc
index 08ff1cd..b3a3229 100644
--- a/plugins/archive/localization/br.inc
+++ b/plugins/archive/localization/br.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Diell';
 $labels['buttontitle'] = 'Dielliñ ar gemenadenn-mañ';
 $labels['archived'] = 'Diellet gant berzh';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'Diell';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/bs_BA.inc b/plugins/archive/localization/bs_BA.inc
index b9d1092..47d138c 100644
--- a/plugins/archive/localization/bs_BA.inc
+++ b/plugins/archive/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arhiva';
 $labels['buttontitle'] = 'Arhiviraj ovu poruku';
 $labels['archived'] = 'Arhiviranje uspješno';
diff --git a/plugins/archive/localization/ca_ES.inc b/plugins/archive/localization/ca_ES.inc
index d012156..bce2c20 100644
--- a/plugins/archive/localization/ca_ES.inc
+++ b/plugins/archive/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arxiva';
 $labels['buttontitle'] = 'Arxiva aquest missatge';
 $labels['archived'] = 'Arxivat correctament';
diff --git a/plugins/archive/localization/cs_CZ.inc b/plugins/archive/localization/cs_CZ.inc
index 988a026..ef26a09 100644
--- a/plugins/archive/localization/cs_CZ.inc
+++ b/plugins/archive/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archiv';
 $labels['buttontitle'] = 'Archivovat zprávu';
 $labels['archived'] = 'Úspěšně vloženo do archivu';
diff --git a/plugins/archive/localization/cy_GB.inc b/plugins/archive/localization/cy_GB.inc
index 7f91c5f..8fa6c65 100644
--- a/plugins/archive/localization/cy_GB.inc
+++ b/plugins/archive/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archif';
 $labels['buttontitle'] = 'Archifo\'r neges hwn';
 $labels['archived'] = 'Archifwyd yn llwyddiannus';
diff --git a/plugins/archive/localization/da_DK.inc b/plugins/archive/localization/da_DK.inc
index 69ead1d..f3dedf8 100644
--- a/plugins/archive/localization/da_DK.inc
+++ b/plugins/archive/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arkiv';
 $labels['buttontitle'] = 'Arkivér denne besked';
 $labels['archived'] = 'Succesfuldt arkiveret.';
diff --git a/plugins/archive/localization/de_CH.inc b/plugins/archive/localization/de_CH.inc
index 72795bd..90ab3ad 100644
--- a/plugins/archive/localization/de_CH.inc
+++ b/plugins/archive/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archiv';
 $labels['buttontitle'] = 'Nachricht(en) archivieren';
 $labels['archived'] = 'Nachricht(en) erfolgreich archiviert';
diff --git a/plugins/archive/localization/de_DE.inc b/plugins/archive/localization/de_DE.inc
index 0aff177..ee39acf 100644
--- a/plugins/archive/localization/de_DE.inc
+++ b/plugins/archive/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archiv';
 $labels['buttontitle'] = 'Nachricht archivieren';
 $labels['archived'] = 'Nachricht erfolgreich archiviert';
diff --git a/plugins/archive/localization/el_GR.inc b/plugins/archive/localization/el_GR.inc
index 1a582b3..17eefab 100644
--- a/plugins/archive/localization/el_GR.inc
+++ b/plugins/archive/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Αρχειοθέτηση';
 $labels['buttontitle'] = 'Αρχειοθέτηση μηνύματος';
 $labels['archived'] = 'Αρχειοθετήθηκε με επιτυχία';
diff --git a/plugins/archive/localization/en_GB.inc b/plugins/archive/localization/en_GB.inc
index b90958c..5c03b82 100644
--- a/plugins/archive/localization/en_GB.inc
+++ b/plugins/archive/localization/en_GB.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archive';
 $labels['buttontitle'] = 'Archive this message';
 $labels['archived'] = 'Successfully archived';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'Archive';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/eo.inc b/plugins/archive/localization/eo.inc
index e0973af..bd0c261 100644
--- a/plugins/archive/localization/eo.inc
+++ b/plugins/archive/localization/eo.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arkivigi';
 $labels['buttontitle'] = 'Arkivigi ĉi tiun mesaĝon';
 $labels['archived'] = 'Sukcese arkivigita';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'Arkivo';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/es_AR.inc b/plugins/archive/localization/es_AR.inc
index 5e4ad37..44e974c 100644
--- a/plugins/archive/localization/es_AR.inc
+++ b/plugins/archive/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archivo';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Mensaje Archivado';
diff --git a/plugins/archive/localization/es_ES.inc b/plugins/archive/localization/es_ES.inc
index 4555f0e..115751f 100644
--- a/plugins/archive/localization/es_ES.inc
+++ b/plugins/archive/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archivo';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Mensaje Archivado';
diff --git a/plugins/archive/localization/et_EE.inc b/plugins/archive/localization/et_EE.inc
index acf6bd9..aec8998 100644
--- a/plugins/archive/localization/et_EE.inc
+++ b/plugins/archive/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arhiveeri';
 $labels['buttontitle'] = 'Arhiveeri see kiri';
 $labels['archived'] = 'Edukalt arhiveeritud';
diff --git a/plugins/archive/localization/eu_ES.inc b/plugins/archive/localization/eu_ES.inc
index 5aa91ee..c4f0e7b 100644
--- a/plugins/archive/localization/eu_ES.inc
+++ b/plugins/archive/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Gorde';
 $labels['buttontitle'] = 'Gorde mezu hau';
 $labels['archived'] = 'Ongi gorde da';
diff --git a/plugins/archive/localization/fa_AF.inc b/plugins/archive/localization/fa_AF.inc
index 4bdc671..fafccb5 100644
--- a/plugins/archive/localization/fa_AF.inc
+++ b/plugins/archive/localization/fa_AF.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'ارشیو';
 $labels['buttontitle'] = 'ارشیو این پیام';
 $labels['archived'] = 'با موفقیت ارشیو شد';
diff --git a/plugins/archive/localization/fa_IR.inc b/plugins/archive/localization/fa_IR.inc
index e707efd..9e9efcf 100644
--- a/plugins/archive/localization/fa_IR.inc
+++ b/plugins/archive/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'بایگانی';
 $labels['buttontitle'] = 'بایگانی این پیغام';
 $labels['archived'] = 'با موفقیت بایگانی شد';
diff --git a/plugins/archive/localization/fi_FI.inc b/plugins/archive/localization/fi_FI.inc
index f671739..0914237 100644
--- a/plugins/archive/localization/fi_FI.inc
+++ b/plugins/archive/localization/fi_FI.inc
@@ -15,18 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arkistoi';
 $labels['buttontitle'] = 'Arkistoi viesti';
 $labels['archived'] = 'Arkistoitu onnistuneesti';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Arkistointi onnistui. Päivitä sivu nähdäksesi uudet arkistokansiot.';
+$labels['archiveerror'] = 'Joidenkin viestien arkistointi epäonnistui';
 $labels['archivefolder'] = 'Arkistoi';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arkistoi';
+$labels['archivetype'] = 'Jaa arkisto';
+$labels['archivetypeyear'] = 'Vuodella (esim. Arkisto/2012)';
+$labels['archivetypemonth'] = 'Kuukaudella (esim. Arkisto/2012/06)';
+$labels['archivetypefolder'] = 'Alkuperäinen kansio';
+$labels['archivetypesender'] = 'Lähettäjän osoite';
+$labels['unkownsender'] = 'tuntematon';
 ?>
diff --git a/plugins/archive/localization/fr_FR.inc b/plugins/archive/localization/fr_FR.inc
index 8cea65b..989abc7 100644
--- a/plugins/archive/localization/fr_FR.inc
+++ b/plugins/archive/localization/fr_FR.inc
@@ -15,18 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archive';
 $labels['buttontitle'] = 'Archiver ce message';
-$labels['archived'] = 'Message archivé avec success';
+$labels['archived'] = 'Message archivé avec succès';
 $labels['archivedreload'] = 'Archivé avec succès. Rechargez la page pour voir les nouveaux dossiers d\'archivage.';
 $labels['archiveerror'] = 'Certains messages n\'ont pas pu être archivés.';
 $labels['archivefolder'] = 'Archive';
 $labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Diviser l\'archive en';
+$labels['archivetype'] = 'Diviser l\'archive par';
 $labels['archivetypeyear'] = 'Année (ex Archives/2012)';
 $labels['archivetypemonth'] = 'Mois (ex Archives/2012/06)';
 $labels['archivetypefolder'] = 'Dossier original';
-$labels['archivetypesender'] = 'Email de l\'émetteur';
+$labels['archivetypesender'] = 'Courriel de l\'émetteur';
 $labels['unkownsender'] = 'inconnu';
 ?>
diff --git a/plugins/archive/localization/gl_ES.inc b/plugins/archive/localization/gl_ES.inc
index a4eb6a0..1eda254 100644
--- a/plugins/archive/localization/gl_ES.inc
+++ b/plugins/archive/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensaxe';
 $labels['archived'] = 'Aquivouse a mensaxe';
diff --git a/plugins/archive/localization/he_IL.inc b/plugins/archive/localization/he_IL.inc
index 609e19a..e4e0426 100644
--- a/plugins/archive/localization/he_IL.inc
+++ b/plugins/archive/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'ארכיון';
 $labels['buttontitle'] = 'משלוח ההודעה לארכיב';
 $labels['archived'] = 'עדכון הארכיון הצליח';
diff --git a/plugins/archive/localization/hi_IN.inc b/plugins/archive/localization/hi_IN.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/hi_IN.inc
+++ b/plugins/archive/localization/hi_IN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/hr_HR.inc b/plugins/archive/localization/hr_HR.inc
index 9bf75d0..2a99cb6 100644
--- a/plugins/archive/localization/hr_HR.inc
+++ b/plugins/archive/localization/hr_HR.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arhiva';
 $labels['buttontitle'] = 'Arhiviraj poruku';
 $labels['archived'] = 'Uspješno arhivirana';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'Arhiva';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/hu_HU.inc b/plugins/archive/localization/hu_HU.inc
index 6c57048..799de16 100644
--- a/plugins/archive/localization/hu_HU.inc
+++ b/plugins/archive/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archiválás';
 $labels['buttontitle'] = 'Üzenet archiválása';
 $labels['archived'] = 'Sikeres archiválás';
diff --git a/plugins/archive/localization/hy_AM.inc b/plugins/archive/localization/hy_AM.inc
index 6ce9686..a380346 100644
--- a/plugins/archive/localization/hy_AM.inc
+++ b/plugins/archive/localization/hy_AM.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Արխիվ';
 $labels['buttontitle'] = 'Արխիվացնել այս հաղորդագրությունը';
 $labels['archived'] = 'Բարեհաջող արխիվացվեց';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'Արխիվ';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/ia.inc b/plugins/archive/localization/ia.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/ia.inc
+++ b/plugins/archive/localization/ia.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/id_ID.inc b/plugins/archive/localization/id_ID.inc
index 1601b54..0fa59ae 100644
--- a/plugins/archive/localization/id_ID.inc
+++ b/plugins/archive/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arsip';
 $labels['buttontitle'] = 'Arsipkan pesan ini';
 $labels['archived'] = 'Berhasil mengarsipkan';
diff --git a/plugins/archive/localization/it_IT.inc b/plugins/archive/localization/it_IT.inc
index bd0f66f..a15d800 100644
--- a/plugins/archive/localization/it_IT.inc
+++ b/plugins/archive/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archivio';
 $labels['buttontitle'] = 'Archivia questo messaggio';
 $labels['archived'] = 'Archiviato correttamente';
diff --git a/plugins/archive/localization/ja_JP.inc b/plugins/archive/localization/ja_JP.inc
index 971839a..c9454be 100644
--- a/plugins/archive/localization/ja_JP.inc
+++ b/plugins/archive/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'アーカイブ';
 $labels['buttontitle'] = 'このメッセージをアーカイブ';
 $labels['archived'] = 'アーカイブしました。';
diff --git a/plugins/archive/localization/km_KH.inc b/plugins/archive/localization/km_KH.inc
index d8b07ed..d4b1c3b 100644
--- a/plugins/archive/localization/km_KH.inc
+++ b/plugins/archive/localization/km_KH.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'ប័ណ្ណសារ';
 $labels['buttontitle'] = 'ប័ណ្ណសារ សារលិខិត នេះ';
 $labels['archived'] = 'ប័ណ្ណសារ បានសំរេច';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'ប័ណ្ណសារ';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/ko_KR.inc b/plugins/archive/localization/ko_KR.inc
index 21b635b..bf23f3a 100644
--- a/plugins/archive/localization/ko_KR.inc
+++ b/plugins/archive/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = '보관';
 $labels['buttontitle'] = '이 메시지를 보관';
 $labels['archived'] = '성공적으로 보관됨';
diff --git a/plugins/archive/localization/ku.inc b/plugins/archive/localization/ku.inc
index 3b5e8cc..4949515 100644
--- a/plugins/archive/localization/ku.inc
+++ b/plugins/archive/localization/ku.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arşîv';
 $labels['buttontitle'] = 'am masaja bxa arşiv';
 $labels['archived'] = 'ba gşti Arşiv kra';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'Arşîv';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/lb_LU.inc b/plugins/archive/localization/lb_LU.inc
index ec33f69..ac16cfe 100644
--- a/plugins/archive/localization/lb_LU.inc
+++ b/plugins/archive/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archivéieren';
 $labels['buttontitle'] = 'Dëse Message archivéieren';
 $labels['archived'] = 'Erfollegräich archivéiert';
diff --git a/plugins/archive/localization/lt_LT.inc b/plugins/archive/localization/lt_LT.inc
index 414c01d..fdcf343 100644
--- a/plugins/archive/localization/lt_LT.inc
+++ b/plugins/archive/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archyvuoti';
 $labels['buttontitle'] = 'Perkelti šį laišką į archyvą';
 $labels['archived'] = 'Laiškas sėkmingai perkeltas į archyvą';
diff --git a/plugins/archive/localization/lv_LV.inc b/plugins/archive/localization/lv_LV.inc
index 0f22ac9..5215786 100644
--- a/plugins/archive/localization/lv_LV.inc
+++ b/plugins/archive/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arhīvs';
 $labels['buttontitle'] = 'Arhivēt šo vēstuli';
 $labels['archived'] = 'Vēstule veiksmīgi arhivēta';
diff --git a/plugins/archive/localization/ml_IN.inc b/plugins/archive/localization/ml_IN.inc
index 3b06330..047223f 100644
--- a/plugins/archive/localization/ml_IN.inc
+++ b/plugins/archive/localization/ml_IN.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'ശേഖരം';
 $labels['buttontitle'] = 'ഈ മെസ്സേജ് ശേഖരിക്കുക';
 $labels['archived'] = 'വിജയകരമായി ശേഖരിച്ചു';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'ശേഖരം';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/mn_MN.inc b/plugins/archive/localization/mn_MN.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/mn_MN.inc
+++ b/plugins/archive/localization/mn_MN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/mr_IN.inc b/plugins/archive/localization/mr_IN.inc
index 46ae7b9..96ecbc2 100644
--- a/plugins/archive/localization/mr_IN.inc
+++ b/plugins/archive/localization/mr_IN.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'जतन केलेला';
 $labels['buttontitle'] = 'हा संदेश जतन करा';
 $labels['archived'] = 'यशस्वीरीत्या जतन केला';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'जतन केलेला';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/ms_MY.inc b/plugins/archive/localization/ms_MY.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/ms_MY.inc
+++ b/plugins/archive/localization/ms_MY.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/my_MM.inc b/plugins/archive/localization/my_MM.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/my_MM.inc
+++ b/plugins/archive/localization/my_MM.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/nb_NO.inc b/plugins/archive/localization/nb_NO.inc
index 6b85b82..c0f193a 100644
--- a/plugins/archive/localization/nb_NO.inc
+++ b/plugins/archive/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arkiv';
 $labels['buttontitle'] = 'Arkiver meldingen';
 $labels['archived'] = 'Arkivert';
@@ -27,6 +26,6 @@
 $labels['archivetypeyear'] = 'År (f.eks. Arkiv/2012)';
 $labels['archivetypemonth'] = 'Måned (f.eks. Arkiv/2012/06)';
 $labels['archivetypefolder'] = 'Opprinnelig mappe';
-$labels['archivetypesender'] = 'Sender email';
+$labels['archivetypesender'] = 'Avsender';
 $labels['unkownsender'] = 'ukjent';
 ?>
diff --git a/plugins/archive/localization/nl_BE.inc b/plugins/archive/localization/nl_BE.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/nl_BE.inc
+++ b/plugins/archive/localization/nl_BE.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/nl_NL.inc b/plugins/archive/localization/nl_NL.inc
index a89b1ba..edec967 100644
--- a/plugins/archive/localization/nl_NL.inc
+++ b/plugins/archive/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archief';
 $labels['buttontitle'] = 'Archiveer dit bericht';
 $labels['archived'] = 'Succesvol gearchiveerd';
diff --git a/plugins/archive/localization/nn_NO.inc b/plugins/archive/localization/nn_NO.inc
index 4934b0b..d4279c7 100644
--- a/plugins/archive/localization/nn_NO.inc
+++ b/plugins/archive/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arkiver';
 $labels['buttontitle'] = 'Arkiver meldinga';
 $labels['archived'] = 'Arkivert';
@@ -27,6 +26,6 @@
 $labels['archivetypeyear'] = 'År (f.eks. Arkiv/2012)';
 $labels['archivetypemonth'] = 'Månad (f.eks. Arkiv/2012/06)';
 $labels['archivetypefolder'] = 'Opprinneleg mappe';
-$labels['archivetypesender'] = 'Sender email';
+$labels['archivetypesender'] = 'Avsendar';
 $labels['unkownsender'] = 'ukjent';
 ?>
diff --git a/plugins/archive/localization/nqo.inc b/plugins/archive/localization/nqo.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/nqo.inc
+++ b/plugins/archive/localization/nqo.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/om.inc b/plugins/archive/localization/om.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/om.inc
+++ b/plugins/archive/localization/om.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/pl_PL.inc b/plugins/archive/localization/pl_PL.inc
index 1320b53..9d066e5 100644
--- a/plugins/archive/localization/pl_PL.inc
+++ b/plugins/archive/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archiwum';
 $labels['buttontitle'] = 'Przenieś do archiwum';
 $labels['archived'] = 'Pomyślnie zarchiwizowano';
diff --git a/plugins/archive/localization/pt_BR.inc b/plugins/archive/localization/pt_BR.inc
index aa72d22..b819ad2 100644
--- a/plugins/archive/localization/pt_BR.inc
+++ b/plugins/archive/localization/pt_BR.inc
@@ -15,18 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensagem';
 $labels['archived'] = 'Arquivada com sucesso';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Arquivado com sucesso. Recarregue a página para ver as novas pastas de arquivo.';
+$labels['archiveerror'] = 'Algumas mensagens não puderam ser arquivadas';
 $labels['archivefolder'] = 'Arquivo';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arquivo';
+$labels['archivetype'] = 'Dividir arquivo por';
+$labels['archivetypeyear'] = 'Ano (isto é, Arquivo/2012)';
+$labels['archivetypemonth'] = 'Mês (isto é, Arquivo/2012/06)';
+$labels['archivetypefolder'] = 'Pasta original';
+$labels['archivetypesender'] = 'E-mail do remetente';
+$labels['unkownsender'] = 'desconhecido';
 ?>
diff --git a/plugins/archive/localization/pt_PT.inc b/plugins/archive/localization/pt_PT.inc
index 95a2494..a2a3e20 100644
--- a/plugins/archive/localization/pt_PT.inc
+++ b/plugins/archive/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensagem';
 $labels['archived'] = 'Arquivada com sucesso';
diff --git a/plugins/archive/localization/ro_RO.inc b/plugins/archive/localization/ro_RO.inc
index 64d1bd5..6cd9df5 100644
--- a/plugins/archive/localization/ro_RO.inc
+++ b/plugins/archive/localization/ro_RO.inc
@@ -15,15 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arhivă';
-$labels['buttontitle'] = 'Arhivează acest mesaj.';
+$labels['buttontitle'] = 'Arhivează mesajul.';
 $labels['archived'] = 'Arhivare reuşită.';
 $labels['archivedreload'] = 'Arhivat cu succes. Reîncărcați pagina pentru a vedea noul dosar de arhivare.';
-$labels['archiveerror'] = 'Câteva mesaje nu au putut fi arhivate';
+$labels['archiveerror'] = 'Unele mesaje nu au putut fi arhivate';
 $labels['archivefolder'] = 'Arhivă';
 $labels['settingstitle'] = 'Arhivă';
-$labels['archivetype'] = 'Divide arhiva pe';
+$labels['archivetype'] = 'Împarte arhiva pe';
 $labels['archivetypeyear'] = 'Ani (ex. Arhiva/2013)';
 $labels['archivetypemonth'] = 'Luni (ex. Arhiva/2013/06)';
 $labels['archivetypefolder'] = 'Dosar original';
diff --git a/plugins/archive/localization/ru_RU.inc b/plugins/archive/localization/ru_RU.inc
index e33edc2..b3058b6 100644
--- a/plugins/archive/localization/ru_RU.inc
+++ b/plugins/archive/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Архив';
 $labels['buttontitle'] = 'Переместить выбранное в архив';
 $labels['archived'] = 'Перенесено в Архив';
diff --git a/plugins/archive/localization/si_LK.inc b/plugins/archive/localization/si_LK.inc
index f803560..24f49ab 100644
--- a/plugins/archive/localization/si_LK.inc
+++ b/plugins/archive/localization/si_LK.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'සංරක්‍ෂණය';
 $labels['buttontitle'] = 'මෙම පණිවිඩය සංරක්‍ෂණය කරන්න';
 $labels['archived'] = 'සංරක්‍ෂණය සාර්ථකයි';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'සංරක්‍ෂණය';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/sk_SK.inc b/plugins/archive/localization/sk_SK.inc
index 0bcdaee..f3f447b 100644
--- a/plugins/archive/localization/sk_SK.inc
+++ b/plugins/archive/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Archivovať';
 $labels['buttontitle'] = 'Archivovať túto správu';
 $labels['archived'] = 'Úspešne archivované';
diff --git a/plugins/archive/localization/sl_SI.inc b/plugins/archive/localization/sl_SI.inc
index 5dbd605..60d7725 100644
--- a/plugins/archive/localization/sl_SI.inc
+++ b/plugins/archive/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arhiv';
 $labels['buttontitle'] = 'Arhiviraj to sporočilo';
 $labels['archived'] = 'Sporočilo je bilo uspešno arhivirano';
diff --git a/plugins/archive/localization/sr_CS.inc b/plugins/archive/localization/sr_CS.inc
index ca04f4b..9d501e9 100644
--- a/plugins/archive/localization/sr_CS.inc
+++ b/plugins/archive/localization/sr_CS.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arhiva';
 $labels['buttontitle'] = 'Arhivirati ovu poruku';
 $labels['archived'] = 'Uspěšno arhivirano';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'Arhiva';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/sv_SE.inc b/plugins/archive/localization/sv_SE.inc
index 82e1808..361b7b6 100644
--- a/plugins/archive/localization/sv_SE.inc
+++ b/plugins/archive/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arkivera';
 $labels['buttontitle'] = 'Arkivera meddelande';
 $labels['archived'] = 'Meddelandet är arkiverat';
diff --git a/plugins/archive/localization/te_IN.inc b/plugins/archive/localization/te_IN.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/te_IN.inc
+++ b/plugins/archive/localization/te_IN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/th_TH.inc b/plugins/archive/localization/th_TH.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/th_TH.inc
+++ b/plugins/archive/localization/th_TH.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/ti.inc b/plugins/archive/localization/ti.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/ti.inc
+++ b/plugins/archive/localization/ti.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/tr_TR.inc b/plugins/archive/localization/tr_TR.inc
index 694643f..bbadfda 100644
--- a/plugins/archive/localization/tr_TR.inc
+++ b/plugins/archive/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Arşiv';
 $labels['buttontitle'] = 'Bu postayı arşivle';
 $labels['archived'] = 'Başarıyla arşivlendi';
diff --git a/plugins/archive/localization/tzm.inc b/plugins/archive/localization/tzm.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/tzm.inc
+++ b/plugins/archive/localization/tzm.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/uk_UA.inc b/plugins/archive/localization/uk_UA.inc
index 1fb8414..d2b461f 100644
--- a/plugins/archive/localization/uk_UA.inc
+++ b/plugins/archive/localization/uk_UA.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = 'Архів';
 $labels['buttontitle'] = 'Архівувати це повідомлення';
 $labels['archived'] = 'Перенесено в архів';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'Архів';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/ur_PK.inc b/plugins/archive/localization/ur_PK.inc
index ce13b2a..8e95162 100644
--- a/plugins/archive/localization/ur_PK.inc
+++ b/plugins/archive/localization/ur_PK.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
-
 ?>
diff --git a/plugins/archive/localization/vi_VN.inc b/plugins/archive/localization/vi_VN.inc
index 493b549..61e0208 100644
--- a/plugins/archive/localization/vi_VN.inc
+++ b/plugins/archive/localization/vi_VN.inc
@@ -15,18 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = '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['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
 $labels['archivefolder'] = 'Lưu trữ';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
 ?>
diff --git a/plugins/archive/localization/zh_CN.inc b/plugins/archive/localization/zh_CN.inc
index 9fc6bd0..89837c1 100644
--- a/plugins/archive/localization/zh_CN.inc
+++ b/plugins/archive/localization/zh_CN.inc
@@ -15,18 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = '存档';
-$labels['buttontitle'] = '将该信息存档';
+$labels['buttontitle'] = '存档该信息';
 $labels['archived'] = '存档成功';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = '存档成功。请刷新本页以查看新的存档文件夹。';
+$labels['archiveerror'] = '部分信息无法存档';
 $labels['archivefolder'] = '存档';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = '存档';
+$labels['archivetype'] = '分类存档按';
+$labels['archivetypeyear'] = '年(例如 存档/2012)';
+$labels['archivetypemonth'] = '月(例如 存档/2012/06)';
+$labels['archivetypefolder'] = '原始文件夹';
+$labels['archivetypesender'] = '发件人邮件';
+$labels['unkownsender'] = '未知';
 ?>
diff --git a/plugins/archive/localization/zh_TW.inc b/plugins/archive/localization/zh_TW.inc
index 30fec55..a50ef28 100644
--- a/plugins/archive/localization/zh_TW.inc
+++ b/plugins/archive/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
-
 $labels['buttontext'] = '封存';
 $labels['buttontitle'] = '封存此信件';
 $labels['archived'] = '已成功封存';
diff --git a/plugins/attachment_reminder/localization/ar.inc b/plugins/attachment_reminder/localization/ar.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/ar.inc
+++ b/plugins/attachment_reminder/localization/ar.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/ar_SA.inc b/plugins/attachment_reminder/localization/ar_SA.inc
index 12b1ffe..bb1ad04 100644
--- a/plugins/attachment_reminder/localization/ar_SA.inc
+++ b/plugins/attachment_reminder/localization/ar_SA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "هل نسيت إرفاق ملف؟";
 $messages['reminderoption'] = "تذكير حول المرفقات المنسية";
 $messages['keywords'] = "المرفقات,الملف,ارفاق,مرفق,ارفاق,مضمون,CV,صفحة المغلف";
diff --git a/plugins/attachment_reminder/localization/az_AZ.inc b/plugins/attachment_reminder/localization/az_AZ.inc
index dccdf5d..5340c91 100644
--- a/plugins/attachment_reminder/localization/az_AZ.inc
+++ b/plugins/attachment_reminder/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Faylı əlavə etməyi unutdunuz?";
 $messages['reminderoption'] = "Unudulmuş qoşmalardan xəbərdar et";
 $messages['keywords'] = "qoşmalar,fayl,qoşma,qoşulub,qoşulur,qapalı,CV,qoşma məktub";
diff --git a/plugins/attachment_reminder/localization/be_BE.inc b/plugins/attachment_reminder/localization/be_BE.inc
index 25c05ad..a920ccf 100644
--- a/plugins/attachment_reminder/localization/be_BE.inc
+++ b/plugins/attachment_reminder/localization/be_BE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Забыліся далучыць файл?";
 $messages['reminderoption'] = "Напамінаць пра забытыя далучэнні";
 $messages['keywords'] = "далучэнне,файл,далучыць,далучаны,далучаецца,укладзены,CV,cover letter";
diff --git a/plugins/attachment_reminder/localization/bg_BG.inc b/plugins/attachment_reminder/localization/bg_BG.inc
index 93d6571..a882d6c 100644
--- a/plugins/attachment_reminder/localization/bg_BG.inc
+++ b/plugins/attachment_reminder/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Забравихте ли да прикрепите файл към съобщението?";
 $messages['reminderoption'] = "Напомняне за забравени прикачени файлове";
 $messages['keywords'] = "прикачен,прикрепен,прикачам,прикачвам,прикрепям,прикрепвам,файл,attachment,file,attach,attached,attaching,enclosed,CV,cover letter";
diff --git a/plugins/attachment_reminder/localization/bn_BD.inc b/plugins/attachment_reminder/localization/bn_BD.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/bn_BD.inc
+++ b/plugins/attachment_reminder/localization/bn_BD.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/bs_BA.inc b/plugins/attachment_reminder/localization/bs_BA.inc
index 388b36c..1ec385d 100644
--- a/plugins/attachment_reminder/localization/bs_BA.inc
+++ b/plugins/attachment_reminder/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Da li ste zaboravili da dodate ovu datoteku?";
 $messages['reminderoption'] = "Napomene o zaboravljenim prilozima";
 $messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter,prilog,biografija,popratno pismo,prilogu,popratnom pismu,datoteka,fajl";
diff --git a/plugins/attachment_reminder/localization/ca_ES.inc b/plugins/attachment_reminder/localization/ca_ES.inc
index 285210a..957548b 100644
--- a/plugins/attachment_reminder/localization/ca_ES.inc
+++ b/plugins/attachment_reminder/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Heu oblidat afegir un fitxer?";
 $messages['reminderoption'] = "Avís de fitxers adjunts oblidats";
 $messages['keywords'] = "adjunt,fitxer,adjuntar,adjuntat,adjuntant,CV,carta";
diff --git a/plugins/attachment_reminder/localization/cs_CZ.inc b/plugins/attachment_reminder/localization/cs_CZ.inc
index 975f2bd..3d21664 100644
--- a/plugins/attachment_reminder/localization/cs_CZ.inc
+++ b/plugins/attachment_reminder/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Nezapomněli jste připojit přílohu?";
 $messages['reminderoption'] = "Upozorňovat na zapomenuté přílohy";
 $messages['keywords'] = "příloha,přílohy,příloze,přílohu,přiloženém,připojeném,CV,životopis";
diff --git a/plugins/attachment_reminder/localization/cy_GB.inc b/plugins/attachment_reminder/localization/cy_GB.inc
index 2590001..0ce8a99 100644
--- a/plugins/attachment_reminder/localization/cy_GB.inc
+++ b/plugins/attachment_reminder/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Wedi anghofio atodi ffeil?";
 $messages['reminderoption'] = "Atgoffa am atodiadau ar goll";
 $messages['keywords'] = "atodiad,atodi,atodaf,atodwyd,atodir,amgaedig,dogfen,llythyr,ffeil,attachment,file,attach,attached,attaching,enclosed,CV,cover letter,";
diff --git a/plugins/attachment_reminder/localization/da_DK.inc b/plugins/attachment_reminder/localization/da_DK.inc
index ac7e6ff..e41eafb 100644
--- a/plugins/attachment_reminder/localization/da_DK.inc
+++ b/plugins/attachment_reminder/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Glemte du at vedhæfte en fil?";
 $messages['reminderoption'] = "Påmind om glemt vedhæftning af filer";
 $messages['keywords'] = "vedhæftet fil,fil,vedhæft,vedhæftet,vedhæfter,lukket,CV,følgebrev";
diff --git a/plugins/attachment_reminder/localization/de_CH.inc b/plugins/attachment_reminder/localization/de_CH.inc
index a093e6c..9aca61e 100644
--- a/plugins/attachment_reminder/localization/de_CH.inc
+++ b/plugins/attachment_reminder/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Haben Sie möglicherweise vergessen eine Datei anzuhängen?";
 $messages['reminderoption'] = "Vor vergessenen Anhängen warnen";
 $messages['keywords'] = "anbei,anhang,angehängt,angefügt,beigefügt,beliegend";
diff --git a/plugins/attachment_reminder/localization/de_DE.inc b/plugins/attachment_reminder/localization/de_DE.inc
index f59f66a..0422e2d 100644
--- a/plugins/attachment_reminder/localization/de_DE.inc
+++ b/plugins/attachment_reminder/localization/de_DE.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
 $messages['forgotattachment'] = "Haben Sie möglicherweise vergessen eine Datei anzuhängen?";
-$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['reminderoption'] = "Erinnern an vergessene Anhänge ";
 $messages['keywords'] = "anbei,im anhang,angehängt,angefügt,beigefügt,beliegend";
diff --git a/plugins/attachment_reminder/localization/el_GR.inc b/plugins/attachment_reminder/localization/el_GR.inc
index 7d696a3..e47995f 100644
--- a/plugins/attachment_reminder/localization/el_GR.inc
+++ b/plugins/attachment_reminder/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Μήπως ξεχάσετε να επισυνάψετε ένα αρχείο; ";
 $messages['reminderoption'] = "Υπενθύμιση ξεχάσmena συνημμένα ";
 $messages['keywords'] = "συνημμένο, αρχείο, συννημενο, επισυναψη, επισυνάπτοντας, κλειστό, βιογραφικό σημείωμα, συνοδευτική επιστολή";
diff --git a/plugins/attachment_reminder/localization/eo.inc b/plugins/attachment_reminder/localization/eo.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/eo.inc
+++ b/plugins/attachment_reminder/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/es_AR.inc b/plugins/attachment_reminder/localization/es_AR.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/es_AR.inc
+++ b/plugins/attachment_reminder/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/es_ES.inc b/plugins/attachment_reminder/localization/es_ES.inc
index db46250..7f6f29e 100644
--- a/plugins/attachment_reminder/localization/es_ES.inc
+++ b/plugins/attachment_reminder/localization/es_ES.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
 $messages['forgotattachment'] = "¿Olvidó adjuntar un fichero al mensaje?";
-$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['reminderoption'] = "Recordatorio sobre adjuntos olvidados";
 $messages['keywords'] = "adjunto";
diff --git a/plugins/attachment_reminder/localization/et_EE.inc b/plugins/attachment_reminder/localization/et_EE.inc
index 3b79e01..c8be2af 100644
--- a/plugins/attachment_reminder/localization/et_EE.inc
+++ b/plugins/attachment_reminder/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Unustasid faili lisada?";
 $messages['reminderoption'] = "Tuleta mulle meelde kui unustasin manuse lisada";
 $messages['keywords'] = "manus,manuses,lisatud,lisasin,fail,file,failis,attachment,file,attach,attached,attaching,enclosed,CV,cover letter";
diff --git a/plugins/attachment_reminder/localization/eu_ES.inc b/plugins/attachment_reminder/localization/eu_ES.inc
index 2faf23c..f658990 100644
--- a/plugins/attachment_reminder/localization/eu_ES.inc
+++ b/plugins/attachment_reminder/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Ahaztu zaizu fitxategia eranstea?";
 $messages['reminderoption'] = "Ohartarazi ahaztutako erankinez";
 $messages['keywords'] = "eranskin,fitxategia,erantzi,erantzita,eransten,atxikita";
diff --git a/plugins/attachment_reminder/localization/fa_AF.inc b/plugins/attachment_reminder/localization/fa_AF.inc
index f7b67ce..1c47737 100644
--- a/plugins/attachment_reminder/localization/fa_AF.inc
+++ b/plugins/attachment_reminder/localization/fa_AF.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "آیا فراموش کردید که فایل را الصاق کرده اید؟";
 $messages['reminderoption'] = "یاد آوری درمورد ضمایم فراموش شده";
 $messages['keywords'] = "ضمیمه،فایل،ضمیمه کردن،ضمیمه شده،در حال ضمیمه کردن، الصاق شده،CV، عنوان نامه";
diff --git a/plugins/attachment_reminder/localization/fa_IR.inc b/plugins/attachment_reminder/localization/fa_IR.inc
index 763ad74..fd1c401 100644
--- a/plugins/attachment_reminder/localization/fa_IR.inc
+++ b/plugins/attachment_reminder/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "آیا شما پیوست کردن پرونده را فراموش کرده‌اید؟";
 $messages['reminderoption'] = "یادآوری فراموشی پیوست‌ها";
 $messages['keywords'] = "پیوست،پرونده،پیوست کردن، پیوست شده، CV";
diff --git a/plugins/attachment_reminder/localization/fi_FI.inc b/plugins/attachment_reminder/localization/fi_FI.inc
index 459b610..53d2a9a 100644
--- a/plugins/attachment_reminder/localization/fi_FI.inc
+++ b/plugins/attachment_reminder/localization/fi_FI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Unohditko liittää tiedoston?";
 $messages['reminderoption'] = "Muistuta mahdollisesti unohtuneista liitteistä";
 $messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter,liite,tiedosto,liitteenä,liitetiedosto";
diff --git a/plugins/attachment_reminder/localization/fr_FR.inc b/plugins/attachment_reminder/localization/fr_FR.inc
index 20d11f2..bda3eba 100644
--- a/plugins/attachment_reminder/localization/fr_FR.inc
+++ b/plugins/attachment_reminder/localization/fr_FR.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
 $messages['forgotattachment'] = "Avez vous oublié d'attacher un fichier ?";
-$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['reminderoption'] = "Rappel à propos des pièces jointes oubliées";
 $messages['keywords'] = "joins,joint,attaché,CV";
diff --git a/plugins/attachment_reminder/localization/gl_ES.inc b/plugins/attachment_reminder/localization/gl_ES.inc
index 978f541..bd126b2 100644
--- a/plugins/attachment_reminder/localization/gl_ES.inc
+++ b/plugins/attachment_reminder/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Esqueceches adxuntar un ficheiro?";
 $messages['reminderoption'] = "Lembrete de adxuntos esquecidos";
 $messages['keywords'] = "adxunto,ficheiro,engádega, engadido,engadindo,anexo,CV,cuberta,carta";
diff --git a/plugins/attachment_reminder/localization/he_IL.inc b/plugins/attachment_reminder/localization/he_IL.inc
index bfe5f69..2c348af 100644
--- a/plugins/attachment_reminder/localization/he_IL.inc
+++ b/plugins/attachment_reminder/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "האם שכחת לצרף קובץ?";
 $messages['reminderoption'] = "להזכיר לצרף נספח";
 $messages['keywords'] = "נספח,קובץ,לצרף,מצורף,מצרף,מצרפת,רצ\"ב,קו\"ח,קורות חיים";
diff --git a/plugins/attachment_reminder/localization/hi_IN.inc b/plugins/attachment_reminder/localization/hi_IN.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/hi_IN.inc
+++ b/plugins/attachment_reminder/localization/hi_IN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/hu_HU.inc b/plugins/attachment_reminder/localization/hu_HU.inc
index 0acca33..b76a8cf 100644
--- a/plugins/attachment_reminder/localization/hu_HU.inc
+++ b/plugins/attachment_reminder/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Nem felejtetted el a csatolandó file-t?";
 $messages['reminderoption'] = "Emlékeztessen a csatolandó csatolmányra";
 $messages['keywords'] = "csatolmány, file, csatolás, csatolt, csatolni, közrezárt, CV, kisérőlevél";
diff --git a/plugins/attachment_reminder/localization/hy_AM.inc b/plugins/attachment_reminder/localization/hy_AM.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/hy_AM.inc
+++ b/plugins/attachment_reminder/localization/hy_AM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/ia.inc b/plugins/attachment_reminder/localization/ia.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/ia.inc
+++ b/plugins/attachment_reminder/localization/ia.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/id_ID.inc b/plugins/attachment_reminder/localization/id_ID.inc
index 08399af..1f0b0bb 100644
--- a/plugins/attachment_reminder/localization/id_ID.inc
+++ b/plugins/attachment_reminder/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Apakah anda lupa menambahkan attachment?";
 $messages['reminderoption'] = "Pengingat attachment yang terlupakan";
 $messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter";
diff --git a/plugins/attachment_reminder/localization/it_IT.inc b/plugins/attachment_reminder/localization/it_IT.inc
index 09dba7f..2a9772d 100644
--- a/plugins/attachment_reminder/localization/it_IT.inc
+++ b/plugins/attachment_reminder/localization/it_IT.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
 $messages['forgotattachment'] = "Sembra che tu abbia dimenticato di allegare un file!\nPremere Annulla per inviare lo stesso.\nOK per tornare al messaggio senza inviare.";
-$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['reminderoption'] = "Ricorda per gli allegati dimenticati";
 $messages['keywords'] = "allegato,allegati,allegata,allegate,allega,allego,alleghi,attaccato,file,attachment,attach";
diff --git a/plugins/attachment_reminder/localization/ja_JP.inc b/plugins/attachment_reminder/localization/ja_JP.inc
index 93b7786..5ba55d4 100644
--- a/plugins/attachment_reminder/localization/ja_JP.inc
+++ b/plugins/attachment_reminder/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "ファイルの添付を忘れていませんか?";
 $messages['reminderoption'] = "添付ファイルの付け忘れを確認";
 $messages['keywords'] = "添付,ファイル,添付ファイル,同封,添え状";
diff --git a/plugins/attachment_reminder/localization/ko_KR.inc b/plugins/attachment_reminder/localization/ko_KR.inc
index a82b070..c80dcc4 100644
--- a/plugins/attachment_reminder/localization/ko_KR.inc
+++ b/plugins/attachment_reminder/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "파일을 첨부하는 것을 잊으셨습니까?";
 $messages['reminderoption'] = "잊었던 첨부파일에 대해 알리기";
 $messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter";
diff --git a/plugins/attachment_reminder/localization/lb_LU.inc b/plugins/attachment_reminder/localization/lb_LU.inc
index 50dcb90..f91f3d1 100644
--- a/plugins/attachment_reminder/localization/lb_LU.inc
+++ b/plugins/attachment_reminder/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Hues du vergiess e Fichier drunzehänken?";
 $messages['reminderoption'] = "U vergiessen Unhäng erënneren";
 $messages['keywords'] = "Attachment,Fichier,Unhank,Unhang,Unhäng,ugehaangen,unhänken,attachment,file,attach,attached,attaching,enclosed,CV,cover letter,fichier joint";
diff --git a/plugins/attachment_reminder/localization/lt_LT.inc b/plugins/attachment_reminder/localization/lt_LT.inc
index 8b8a07d..a8ba0b8 100644
--- a/plugins/attachment_reminder/localization/lt_LT.inc
+++ b/plugins/attachment_reminder/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Ar nepamiršote prisegti priedo?";
 $messages['reminderoption'] = "Priminti apie neprisegtus priedus";
 $messages['keywords'] = "priedas, byla, prisegti, prisegta, prisegama, uždaras, CV, laiškas";
diff --git a/plugins/attachment_reminder/localization/lv_LV.inc b/plugins/attachment_reminder/localization/lv_LV.inc
index 1dc446a..ee4feeb 100644
--- a/plugins/attachment_reminder/localization/lv_LV.inc
+++ b/plugins/attachment_reminder/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Vai Jūs nepiemirsāt pievienot failu?";
 $messages['reminderoption'] = "Atgādināt par nepievienotajiem pielikumiem";
 $messages['keywords'] = "pielikums,fails,pievienot,pielikt,pievienots,pielikts,ievietot,ievietots,CV";
diff --git a/plugins/attachment_reminder/localization/ml_IN.inc b/plugins/attachment_reminder/localization/ml_IN.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/ml_IN.inc
+++ b/plugins/attachment_reminder/localization/ml_IN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/mn_MN.inc b/plugins/attachment_reminder/localization/mn_MN.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/mn_MN.inc
+++ b/plugins/attachment_reminder/localization/mn_MN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/ms_MY.inc b/plugins/attachment_reminder/localization/ms_MY.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/ms_MY.inc
+++ b/plugins/attachment_reminder/localization/ms_MY.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/my_MM.inc b/plugins/attachment_reminder/localization/my_MM.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/my_MM.inc
+++ b/plugins/attachment_reminder/localization/my_MM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/nb_NO.inc b/plugins/attachment_reminder/localization/nb_NO.inc
index cf79784..1462837 100644
--- a/plugins/attachment_reminder/localization/nb_NO.inc
+++ b/plugins/attachment_reminder/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Glemte du å legge ved en fil?";
 $messages['reminderoption'] = "Gi meg en påminnelse om glemte vedlegg";
 $messages['keywords'] = "vedlegg, fil, legg ved, lagt ved, legger ved, lukket, CV, følgebrev";
diff --git a/plugins/attachment_reminder/localization/nl_BE.inc b/plugins/attachment_reminder/localization/nl_BE.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/nl_BE.inc
+++ b/plugins/attachment_reminder/localization/nl_BE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/nl_NL.inc b/plugins/attachment_reminder/localization/nl_NL.inc
index 2131eb1..293ad17 100644
--- a/plugins/attachment_reminder/localization/nl_NL.inc
+++ b/plugins/attachment_reminder/localization/nl_NL.inc
@@ -1,5 +1,20 @@
 <?php
 
-$messages['forgotattachment'] = "Ben je vergeten het bestand bij te voegen?";
-$messages['reminderoption'] = "Remind about forgotten attachments";
-$messages['keywords'] = "attachment,bestand,bijgaand,bijgaande,brief,bijgevoegd,bijgesloten,CV";
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
+$messages['forgotattachment'] = "Bent u vergeten het bestand bij te voegen?";
+$messages['reminderoption'] = "Herinner mij aan vergeten bijlagen";
+$messages['keywords'] = "attachment,bestand,bijgaand,bijgaande,brief,bijgevoegd,bijgesloten,CV,document,bijgesloten";
diff --git a/plugins/attachment_reminder/localization/nn_NO.inc b/plugins/attachment_reminder/localization/nn_NO.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/nn_NO.inc
+++ b/plugins/attachment_reminder/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/nqo.inc b/plugins/attachment_reminder/localization/nqo.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/nqo.inc
+++ b/plugins/attachment_reminder/localization/nqo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/om.inc b/plugins/attachment_reminder/localization/om.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/om.inc
+++ b/plugins/attachment_reminder/localization/om.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/pl_PL.inc b/plugins/attachment_reminder/localization/pl_PL.inc
index 5815746..06cede5 100644
--- a/plugins/attachment_reminder/localization/pl_PL.inc
+++ b/plugins/attachment_reminder/localization/pl_PL.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
 $messages['forgotattachment'] = "Czy nie zapomniałeś załączyć pliku?";
 $messages['reminderoption'] = "Włącz przypominanie o brakującym załączniku";
 $messages['keywords'] = "załącznik,plik,załącz,CV";
diff --git a/plugins/attachment_reminder/localization/pt_BR.inc b/plugins/attachment_reminder/localization/pt_BR.inc
index a9320fb..b06e892 100644
--- a/plugins/attachment_reminder/localization/pt_BR.inc
+++ b/plugins/attachment_reminder/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Você esqueceu-se de anexar um arquivo?";
 $messages['reminderoption'] = "Alertar quando os anexos forem esquecidos";
 $messages['keywords'] = "anexo,arquivo,anexar,anexado,anexando,incluso,CV,currículo";
diff --git a/plugins/attachment_reminder/localization/pt_PT.inc b/plugins/attachment_reminder/localization/pt_PT.inc
index 10e6beb..de2d04e 100644
--- a/plugins/attachment_reminder/localization/pt_PT.inc
+++ b/plugins/attachment_reminder/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Você esqueceu-se de anexar um ficheiro?";
 $messages['reminderoption'] = "Lembrar sobre anexos esquecidos";
 $messages['keywords'] = "anexo,ficheiro,anexar,anexado,a anexar,em anexo,currículo,carta de apresentação";
diff --git a/plugins/attachment_reminder/localization/ro_RO.inc b/plugins/attachment_reminder/localization/ro_RO.inc
index 048efe2..ff11539 100644
--- a/plugins/attachment_reminder/localization/ro_RO.inc
+++ b/plugins/attachment_reminder/localization/ro_RO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Ați uitat să atașati ?";
 $messages['reminderoption'] = "Adu-mi aminte de atașamente";
 $messages['keywords'] = "atașament,atasament,atas,atasat,ataș,attach,fisier,fișier,attach,atach,attache";
diff --git a/plugins/attachment_reminder/localization/ru_RU.inc b/plugins/attachment_reminder/localization/ru_RU.inc
index 40186e8..d592b1e 100644
--- a/plugins/attachment_reminder/localization/ru_RU.inc
+++ b/plugins/attachment_reminder/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Вы не забыли прикрепить файл?";
 $messages['reminderoption'] = "Напоминать о забытых вложениях";
 $messages['keywords'] = "вложение,файл, вложенный, прикрепленный,резюме,документ";
diff --git a/plugins/attachment_reminder/localization/sk_SK.inc b/plugins/attachment_reminder/localization/sk_SK.inc
index b169ad0..344d1e6 100644
--- a/plugins/attachment_reminder/localization/sk_SK.inc
+++ b/plugins/attachment_reminder/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Nezabudli ste pridať prílohu?";
 $messages['reminderoption'] = "Pripomenúť zabudnuté prílohy";
 $messages['keywords'] = "príloha,súbor,pripojiť,priložená,priložený,priložené,v prílohe,životopis,sprievodný list";
diff --git a/plugins/attachment_reminder/localization/sl_SI.inc b/plugins/attachment_reminder/localization/sl_SI.inc
index 8acfdbd..9531f8e 100644
--- a/plugins/attachment_reminder/localization/sl_SI.inc
+++ b/plugins/attachment_reminder/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Ste pozabili pripeti datoteko?";
 $messages['reminderoption'] = "Opozorilo za dodajanje priponk";
 $messages['keywords'] = "priponka,datoteka,pripeti,pripeta,pripenjati,priložen,priložiti,CV,spremno pismo";
diff --git a/plugins/attachment_reminder/localization/sr_CS.inc b/plugins/attachment_reminder/localization/sr_CS.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/sr_CS.inc
+++ b/plugins/attachment_reminder/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/sv_SE.inc b/plugins/attachment_reminder/localization/sv_SE.inc
index 1641db0..744a961 100644
--- a/plugins/attachment_reminder/localization/sv_SE.inc
+++ b/plugins/attachment_reminder/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Glömde du att bifoga en fil?";
 $messages['reminderoption'] = "Påminn om glömda bilagor";
 $messages['keywords'] = "bilaga,fil,bifoga,bifogad,bifogar,infogad,CV,personligt brev";
diff --git a/plugins/attachment_reminder/localization/te_IN.inc b/plugins/attachment_reminder/localization/te_IN.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/te_IN.inc
+++ b/plugins/attachment_reminder/localization/te_IN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/th_TH.inc b/plugins/attachment_reminder/localization/th_TH.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/th_TH.inc
+++ b/plugins/attachment_reminder/localization/th_TH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/ti.inc b/plugins/attachment_reminder/localization/ti.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/ti.inc
+++ b/plugins/attachment_reminder/localization/ti.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/tr_TR.inc b/plugins/attachment_reminder/localization/tr_TR.inc
index 65b6893..f03587d 100644
--- a/plugins/attachment_reminder/localization/tr_TR.inc
+++ b/plugins/attachment_reminder/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "Bir dosya eklemeyi unuttunuz mu?";
 $messages['reminderoption'] = "Unutulan dosya eklemelerini hatırlat";
 $messages['keywords'] = "ekleme,dosya,ek,eklenildi,ekleniliyor,konuldu,CV,kapak mektubu";
diff --git a/plugins/attachment_reminder/localization/tzm.inc b/plugins/attachment_reminder/localization/tzm.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/tzm.inc
+++ b/plugins/attachment_reminder/localization/tzm.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/uk_UA.inc b/plugins/attachment_reminder/localization/uk_UA.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/uk_UA.inc
+++ b/plugins/attachment_reminder/localization/uk_UA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/ur_PK.inc b/plugins/attachment_reminder/localization/ur_PK.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/ur_PK.inc
+++ b/plugins/attachment_reminder/localization/ur_PK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/vi_VN.inc b/plugins/attachment_reminder/localization/vi_VN.inc
index 5dce08f..c3b4aaa 100644
--- a/plugins/attachment_reminder/localization/vi_VN.inc
+++ b/plugins/attachment_reminder/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
 */
-
 $messages['forgotattachment'] = "";
 $messages['reminderoption'] = "";
 $messages['keywords'] = "";
diff --git a/plugins/attachment_reminder/localization/zh_CN.inc b/plugins/attachment_reminder/localization/zh_CN.inc
index c789a38..6c44fe9 100644
--- a/plugins/attachment_reminder/localization/zh_CN.inc
+++ b/plugins/attachment_reminder/localization/zh_CN.inc
@@ -1,5 +1,20 @@
 <?php
 
-$messages['forgotattachment'] = "您似乎忘記加入附件了,你確定要寄出?";
-$messages['reminderoption'] = "Remind about forgotten attachments";
-$messages['keywords'] = "附件,附加,附檔,附上,附加檔案";
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
+$messages['forgotattachment'] = "您似乎忘记添加附件了,是否继续发送?";
+$messages['reminderoption'] = "忘记添加附件提醒";
+$messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter";
diff --git a/plugins/attachment_reminder/localization/zh_TW.inc b/plugins/attachment_reminder/localization/zh_TW.inc
index c789a38..aaa91cd 100644
--- a/plugins/attachment_reminder/localization/zh_TW.inc
+++ b/plugins/attachment_reminder/localization/zh_TW.inc
@@ -1,5 +1,20 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
 $messages['forgotattachment'] = "您似乎忘記加入附件了,你確定要寄出?";
-$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['reminderoption'] = "提醒加入附件";
 $messages['keywords'] = "附件,附加,附檔,附上,附加檔案";
diff --git a/plugins/enigma/localization/ru_RU.inc b/plugins/enigma/localization/ru_RU.inc
index 09acd53..20db6b1 100644
--- a/plugins/enigma/localization/ru_RU.inc
+++ b/plugins/enigma/localization/ru_RU.inc
@@ -16,7 +16,6 @@
 @version 2010-12-23
 
 */
-
 $labels['enigmasettings'] = 'Enigma: Настройки';
 $labels['enigmacerts'] = 'Enigma: Сертификаты (S/MIME)';
 $labels['enigmakeys'] = 'Enigma: Ключи (PGP)';
diff --git a/plugins/help/localization/ar.inc b/plugins/help/localization/ar.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/ar.inc
+++ b/plugins/help/localization/ar.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/ar_SA.inc b/plugins/help/localization/ar_SA.inc
index 971d3c0..9a9fe72 100644
--- a/plugins/help/localization/ar_SA.inc
+++ b/plugins/help/localization/ar_SA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'مساعدة';
 $labels['about'] = 'حوْل';
 $labels['license'] = 'الرخصة';
diff --git a/plugins/help/localization/ast.inc b/plugins/help/localization/ast.inc
index 1e3045a..7e5e287 100644
--- a/plugins/help/localization/ast.inc
+++ b/plugins/help/localization/ast.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Ayuda';
 $labels['about'] = 'Tocante a';
 $labels['license'] = 'Llicencia';
diff --git a/plugins/help/localization/az_AZ.inc b/plugins/help/localization/az_AZ.inc
index 60606fc..5d4bd65 100644
--- a/plugins/help/localization/az_AZ.inc
+++ b/plugins/help/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Kömək';
 $labels['about'] = 'Haqqında';
 $labels['license'] = 'Lisenziya';
diff --git a/plugins/help/localization/be_BE.inc b/plugins/help/localization/be_BE.inc
index c14713b..3bbb1db 100644
--- a/plugins/help/localization/be_BE.inc
+++ b/plugins/help/localization/be_BE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Дапамога';
 $labels['about'] = 'Апісанне';
 $labels['license'] = 'Ліцэнзія';
diff --git a/plugins/help/localization/bg_BG.inc b/plugins/help/localization/bg_BG.inc
index 7199513..05a0aaf 100644
--- a/plugins/help/localization/bg_BG.inc
+++ b/plugins/help/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Помощ';
 $labels['about'] = 'Относно';
 $labels['license'] = 'Лиценз';
diff --git a/plugins/help/localization/bn_BD.inc b/plugins/help/localization/bn_BD.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/bn_BD.inc
+++ b/plugins/help/localization/bn_BD.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/br.inc b/plugins/help/localization/br.inc
index ae5d624..5224034 100644
--- a/plugins/help/localization/br.inc
+++ b/plugins/help/localization/br.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Skoazell';
 $labels['about'] = 'Diwar-benn';
 $labels['license'] = 'Lañvaz';
diff --git a/plugins/help/localization/bs_BA.inc b/plugins/help/localization/bs_BA.inc
index 6559879..89a46e4 100644
--- a/plugins/help/localization/bs_BA.inc
+++ b/plugins/help/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Pomoć';
 $labels['about'] = 'O programu';
 $labels['license'] = 'Licenca';
diff --git a/plugins/help/localization/ca_ES.inc b/plugins/help/localization/ca_ES.inc
index 60c86f7..4bca2f2 100644
--- a/plugins/help/localization/ca_ES.inc
+++ b/plugins/help/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Ajuda';
 $labels['about'] = 'Quant a';
 $labels['license'] = 'Llicència';
diff --git a/plugins/help/localization/cs_CZ.inc b/plugins/help/localization/cs_CZ.inc
index f207f01..427ef98 100644
--- a/plugins/help/localization/cs_CZ.inc
+++ b/plugins/help/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Nápověda';
 $labels['about'] = 'O aplikaci';
 $labels['license'] = 'Licence';
diff --git a/plugins/help/localization/cy_GB.inc b/plugins/help/localization/cy_GB.inc
index f5c3400..c9e9fb4 100644
--- a/plugins/help/localization/cy_GB.inc
+++ b/plugins/help/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Cymorth';
 $labels['about'] = 'Amdan';
 $labels['license'] = 'Trwydded';
diff --git a/plugins/help/localization/da_DK.inc b/plugins/help/localization/da_DK.inc
index 43e3080..af63e50 100644
--- a/plugins/help/localization/da_DK.inc
+++ b/plugins/help/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Hjælp';
 $labels['about'] = 'Om';
 $labels['license'] = 'Licens';
diff --git a/plugins/help/localization/de_CH.inc b/plugins/help/localization/de_CH.inc
index 9df46d9..0d42675 100644
--- a/plugins/help/localization/de_CH.inc
+++ b/plugins/help/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Hilfe';
 $labels['about'] = 'Information';
 $labels['license'] = 'Lizenz';
diff --git a/plugins/help/localization/de_DE.inc b/plugins/help/localization/de_DE.inc
index 308419a..6771257 100644
--- a/plugins/help/localization/de_DE.inc
+++ b/plugins/help/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Hilfe';
 $labels['about'] = 'Über';
 $labels['license'] = 'Lizenz';
diff --git a/plugins/help/localization/el_GR.inc b/plugins/help/localization/el_GR.inc
index 3286f0e..74be22b 100644
--- a/plugins/help/localization/el_GR.inc
+++ b/plugins/help/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Βοηθεια';
 $labels['about'] = 'Σχετικά';
 $labels['license'] = 'Άδεια χρήσης';
diff --git a/plugins/help/localization/en_GB.inc b/plugins/help/localization/en_GB.inc
index b23cfb6..1be6607 100644
--- a/plugins/help/localization/en_GB.inc
+++ b/plugins/help/localization/en_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Help';
 $labels['about'] = 'About';
 $labels['license'] = 'Licence';
diff --git a/plugins/help/localization/eo.inc b/plugins/help/localization/eo.inc
index 0f03dfc..017e159 100644
--- a/plugins/help/localization/eo.inc
+++ b/plugins/help/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Helpo';
 $labels['about'] = 'Pri';
 $labels['license'] = 'Permesilo';
diff --git a/plugins/help/localization/es_AR.inc b/plugins/help/localization/es_AR.inc
index ee0eee3..5425367 100644
--- a/plugins/help/localization/es_AR.inc
+++ b/plugins/help/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Ayuda';
 $labels['about'] = 'Acerca de';
 $labels['license'] = 'Licencia';
diff --git a/plugins/help/localization/es_ES.inc b/plugins/help/localization/es_ES.inc
index ee0eee3..5425367 100644
--- a/plugins/help/localization/es_ES.inc
+++ b/plugins/help/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Ayuda';
 $labels['about'] = 'Acerca de';
 $labels['license'] = 'Licencia';
diff --git a/plugins/help/localization/et_EE.inc b/plugins/help/localization/et_EE.inc
index 633c5eb..fef6b77 100644
--- a/plugins/help/localization/et_EE.inc
+++ b/plugins/help/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Abi';
 $labels['about'] = 'Roundcube info';
 $labels['license'] = 'Litsents';
diff --git a/plugins/help/localization/eu_ES.inc b/plugins/help/localization/eu_ES.inc
index f06d4f8..d6547c7 100644
--- a/plugins/help/localization/eu_ES.inc
+++ b/plugins/help/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Laguntza';
 $labels['about'] = 'Honi buruz';
 $labels['license'] = 'Lizentzia';
diff --git a/plugins/help/localization/fa_AF.inc b/plugins/help/localization/fa_AF.inc
index 5e4ca75..e9fac20 100644
--- a/plugins/help/localization/fa_AF.inc
+++ b/plugins/help/localization/fa_AF.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'راهنما';
 $labels['about'] = 'درباره نرم افزار';
 $labels['license'] = 'حق نشر';
diff --git a/plugins/help/localization/fa_IR.inc b/plugins/help/localization/fa_IR.inc
index 3285a26..adb9c57 100644
--- a/plugins/help/localization/fa_IR.inc
+++ b/plugins/help/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'راهنما';
 $labels['about'] = 'درباره';
 $labels['license'] = 'گواهینامه';
diff --git a/plugins/help/localization/fi_FI.inc b/plugins/help/localization/fi_FI.inc
index 46e062e..9f11fce 100644
--- a/plugins/help/localization/fi_FI.inc
+++ b/plugins/help/localization/fi_FI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Ohje';
 $labels['about'] = 'Tietoja';
 $labels['license'] = 'Lisenssi';
diff --git a/plugins/help/localization/fr_FR.inc b/plugins/help/localization/fr_FR.inc
index f4b4cae..97e0017 100644
--- a/plugins/help/localization/fr_FR.inc
+++ b/plugins/help/localization/fr_FR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Aide';
 $labels['about'] = 'A propos';
 $labels['license'] = 'Licence';
diff --git a/plugins/help/localization/gl_ES.inc b/plugins/help/localization/gl_ES.inc
index 146084f..74a5742 100644
--- a/plugins/help/localization/gl_ES.inc
+++ b/plugins/help/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Axuda';
 $labels['about'] = 'Acerca de';
 $labels['license'] = 'Licenza';
diff --git a/plugins/help/localization/he_IL.inc b/plugins/help/localization/he_IL.inc
index e3024d7..bf75bfb 100644
--- a/plugins/help/localization/he_IL.inc
+++ b/plugins/help/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'עזרה';
 $labels['about'] = 'אודות';
 $labels['license'] = 'רשיון';
diff --git a/plugins/help/localization/hi_IN.inc b/plugins/help/localization/hi_IN.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/hi_IN.inc
+++ b/plugins/help/localization/hi_IN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/hu_HU.inc b/plugins/help/localization/hu_HU.inc
index e3f9499..d285e67 100644
--- a/plugins/help/localization/hu_HU.inc
+++ b/plugins/help/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Segítség';
 $labels['about'] = 'Névjegy';
 $labels['license'] = 'Licenc';
diff --git a/plugins/help/localization/hy_AM.inc b/plugins/help/localization/hy_AM.inc
index a034e04..7b106ca 100644
--- a/plugins/help/localization/hy_AM.inc
+++ b/plugins/help/localization/hy_AM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Օգնություն';
 $labels['about'] = 'Նկարագիր';
 $labels['license'] = 'Արտոնագիր';
diff --git a/plugins/help/localization/ia.inc b/plugins/help/localization/ia.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/ia.inc
+++ b/plugins/help/localization/ia.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/id_ID.inc b/plugins/help/localization/id_ID.inc
index fab62a6..7bad95c 100644
--- a/plugins/help/localization/id_ID.inc
+++ b/plugins/help/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Bantuan';
 $labels['about'] = 'Tentang';
 $labels['license'] = 'Lisensi';
diff --git a/plugins/help/localization/it_IT.inc b/plugins/help/localization/it_IT.inc
index 73d9dd6..f88471b 100644
--- a/plugins/help/localization/it_IT.inc
+++ b/plugins/help/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Aiuto';
 $labels['about'] = 'Informazioni';
 $labels['license'] = 'Licenza';
diff --git a/plugins/help/localization/ja_JP.inc b/plugins/help/localization/ja_JP.inc
index 44a8114..db3d5e5 100644
--- a/plugins/help/localization/ja_JP.inc
+++ b/plugins/help/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'ヘルプ';
 $labels['about'] = 'このプログラムについて';
 $labels['license'] = 'ライセンス';
diff --git a/plugins/help/localization/km_KH.inc b/plugins/help/localization/km_KH.inc
index 5b1da1e..1dae389 100644
--- a/plugins/help/localization/km_KH.inc
+++ b/plugins/help/localization/km_KH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'ជំនួយ';
 $labels['about'] = 'អំពី';
 $labels['license'] = 'អាជ្ញាប័ណ្ណ';
diff --git a/plugins/help/localization/ko_KR.inc b/plugins/help/localization/ko_KR.inc
index 82aa507..88390e3 100644
--- a/plugins/help/localization/ko_KR.inc
+++ b/plugins/help/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = '도움말';
 $labels['about'] = '정보';
 $labels['license'] = '라이선스';
diff --git a/plugins/help/localization/lb_LU.inc b/plugins/help/localization/lb_LU.inc
index a86f55f..63d6aeb 100644
--- a/plugins/help/localization/lb_LU.inc
+++ b/plugins/help/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Hëllef';
 $labels['about'] = 'Iwwert';
 $labels['license'] = 'Lizenz';
diff --git a/plugins/help/localization/lt_LT.inc b/plugins/help/localization/lt_LT.inc
index b871688..b10223d 100644
--- a/plugins/help/localization/lt_LT.inc
+++ b/plugins/help/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Žinynas';
 $labels['about'] = 'Apie';
 $labels['license'] = 'Licencija';
diff --git a/plugins/help/localization/lv_LV.inc b/plugins/help/localization/lv_LV.inc
index 95b55a2..c3b15f0 100644
--- a/plugins/help/localization/lv_LV.inc
+++ b/plugins/help/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Palīdzība';
 $labels['about'] = 'Par';
 $labels['license'] = 'Licence';
diff --git a/plugins/help/localization/ml_IN.inc b/plugins/help/localization/ml_IN.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/ml_IN.inc
+++ b/plugins/help/localization/ml_IN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/mn_MN.inc b/plugins/help/localization/mn_MN.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/mn_MN.inc
+++ b/plugins/help/localization/mn_MN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/ms_MY.inc b/plugins/help/localization/ms_MY.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/ms_MY.inc
+++ b/plugins/help/localization/ms_MY.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/my_MM.inc b/plugins/help/localization/my_MM.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/my_MM.inc
+++ b/plugins/help/localization/my_MM.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/nb_NO.inc b/plugins/help/localization/nb_NO.inc
index 13448ca..4a2f798 100644
--- a/plugins/help/localization/nb_NO.inc
+++ b/plugins/help/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Hjelp';
 $labels['about'] = 'Om';
 $labels['license'] = 'Lisensvilkår';
diff --git a/plugins/help/localization/nl_BE.inc b/plugins/help/localization/nl_BE.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/nl_BE.inc
+++ b/plugins/help/localization/nl_BE.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/nl_NL.inc b/plugins/help/localization/nl_NL.inc
index a83dbaf..a6c97e3 100644
--- a/plugins/help/localization/nl_NL.inc
+++ b/plugins/help/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Help';
 $labels['about'] = 'Over';
 $labels['license'] = 'Licentie';
diff --git a/plugins/help/localization/nn_NO.inc b/plugins/help/localization/nn_NO.inc
index 9c31b3c..edb7cd6 100644
--- a/plugins/help/localization/nn_NO.inc
+++ b/plugins/help/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Hjelp';
 $labels['about'] = 'Om';
 $labels['license'] = 'Lisens';
diff --git a/plugins/help/localization/nqo.inc b/plugins/help/localization/nqo.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/nqo.inc
+++ b/plugins/help/localization/nqo.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/om.inc b/plugins/help/localization/om.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/om.inc
+++ b/plugins/help/localization/om.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/pl_PL.inc b/plugins/help/localization/pl_PL.inc
index 8961e9b..817dc9d 100644
--- a/plugins/help/localization/pl_PL.inc
+++ b/plugins/help/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Pomoc';
 $labels['about'] = 'O programie';
 $labels['license'] = 'Licencja';
diff --git a/plugins/help/localization/pt_BR.inc b/plugins/help/localization/pt_BR.inc
index 629b874..7aff20b 100644
--- a/plugins/help/localization/pt_BR.inc
+++ b/plugins/help/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Ajuda';
 $labels['about'] = 'Sobre';
 $labels['license'] = 'Licença';
diff --git a/plugins/help/localization/pt_PT.inc b/plugins/help/localization/pt_PT.inc
index 160abe2..4c141c5 100644
--- a/plugins/help/localization/pt_PT.inc
+++ b/plugins/help/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Ajuda';
 $labels['about'] = 'Sobre...';
 $labels['license'] = 'Licença';
diff --git a/plugins/help/localization/ro_RO.inc b/plugins/help/localization/ro_RO.inc
index 9944fc1..1706d0c 100644
--- a/plugins/help/localization/ro_RO.inc
+++ b/plugins/help/localization/ro_RO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Ajutor';
 $labels['about'] = 'Despre';
 $labels['license'] = 'Licența';
diff --git a/plugins/help/localization/ru_RU.inc b/plugins/help/localization/ru_RU.inc
index 311efdf..b3b7c11 100644
--- a/plugins/help/localization/ru_RU.inc
+++ b/plugins/help/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Помощь';
 $labels['about'] = 'О программе';
 $labels['license'] = 'Лицензия';
diff --git a/plugins/help/localization/sk_SK.inc b/plugins/help/localization/sk_SK.inc
index 9f65de3..ca88dbb 100644
--- a/plugins/help/localization/sk_SK.inc
+++ b/plugins/help/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Nápoveda';
 $labels['about'] = 'O aplikácii';
 $labels['license'] = 'Licencia';
diff --git a/plugins/help/localization/sl_SI.inc b/plugins/help/localization/sl_SI.inc
index dd5904d..509e667 100644
--- a/plugins/help/localization/sl_SI.inc
+++ b/plugins/help/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Pomoč';
 $labels['about'] = 'Vizitka';
 $labels['license'] = 'Licenca';
diff --git a/plugins/help/localization/sr_CS.inc b/plugins/help/localization/sr_CS.inc
index 6c1a0be..e0cf7cc 100644
--- a/plugins/help/localization/sr_CS.inc
+++ b/plugins/help/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Помоћ';
 $labels['about'] = 'Info';
 $labels['license'] = 'Licenca';
diff --git a/plugins/help/localization/sv_SE.inc b/plugins/help/localization/sv_SE.inc
index 3325b78..184efca 100644
--- a/plugins/help/localization/sv_SE.inc
+++ b/plugins/help/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Hjälp';
 $labels['about'] = 'Om';
 $labels['license'] = 'Licens';
diff --git a/plugins/help/localization/te_IN.inc b/plugins/help/localization/te_IN.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/te_IN.inc
+++ b/plugins/help/localization/te_IN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/th_TH.inc b/plugins/help/localization/th_TH.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/th_TH.inc
+++ b/plugins/help/localization/th_TH.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/ti.inc b/plugins/help/localization/ti.inc
index 0d40237..5eccd50 100644
--- a/plugins/help/localization/ti.inc
+++ b/plugins/help/localization/ti.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'መምሃሪ';
 $labels['about'] = 'ብዛዕባ';
 $labels['license'] = 'ፍቓድ';
diff --git a/plugins/help/localization/tr_TR.inc b/plugins/help/localization/tr_TR.inc
index a2c0941..b11f033 100644
--- a/plugins/help/localization/tr_TR.inc
+++ b/plugins/help/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Yardım';
 $labels['about'] = 'Hakkında';
 $labels['license'] = 'Lisans';
diff --git a/plugins/help/localization/tzm.inc b/plugins/help/localization/tzm.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/tzm.inc
+++ b/plugins/help/localization/tzm.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/uk_UA.inc b/plugins/help/localization/uk_UA.inc
index 0c26bae..8d2f76c 100644
--- a/plugins/help/localization/uk_UA.inc
+++ b/plugins/help/localization/uk_UA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Допомога';
 $labels['about'] = 'Про програму';
 $labels['license'] = 'Ліцензія';
diff --git a/plugins/help/localization/ur_PK.inc b/plugins/help/localization/ur_PK.inc
index 8ae66ab..4616047 100644
--- a/plugins/help/localization/ur_PK.inc
+++ b/plugins/help/localization/ur_PK.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
-
 ?>
diff --git a/plugins/help/localization/vi_VN.inc b/plugins/help/localization/vi_VN.inc
index 6af4e44..b3aff3c 100644
--- a/plugins/help/localization/vi_VN.inc
+++ b/plugins/help/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = 'Trợ giúp';
 $labels['about'] = 'Giới thiệu';
 $labels['license'] = 'Bản quyền';
diff --git a/plugins/help/localization/zh_CN.inc b/plugins/help/localization/zh_CN.inc
index 75c59eb..c2bbd17 100644
--- a/plugins/help/localization/zh_CN.inc
+++ b/plugins/help/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = '帮助';
 $labels['about'] = '关于';
 $labels['license'] = '许可协议';
diff --git a/plugins/help/localization/zh_TW.inc b/plugins/help/localization/zh_TW.inc
index 7432167..59c7d8a 100644
--- a/plugins/help/localization/zh_TW.inc
+++ b/plugins/help/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
-
 $labels['help'] = '說明';
 $labels['about'] = '關於';
 $labels['license'] = '許可證';
diff --git a/plugins/hide_blockquote/localization/ar.inc b/plugins/hide_blockquote/localization/ar.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/ar.inc
+++ b/plugins/hide_blockquote/localization/ar.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/ar_SA.inc b/plugins/hide_blockquote/localization/ar_SA.inc
index 647c43a..30ade13 100644
--- a/plugins/hide_blockquote/localization/ar_SA.inc
+++ b/plugins/hide_blockquote/localization/ar_SA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'إخفاء';
 $labels['show'] = 'إظهار';
 ?>
diff --git a/plugins/hide_blockquote/localization/az_AZ.inc b/plugins/hide_blockquote/localization/az_AZ.inc
index e5318df..b4ae171 100644
--- a/plugins/hide_blockquote/localization/az_AZ.inc
+++ b/plugins/hide_blockquote/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Gizlət';
 $labels['show'] = 'Göstər';
 $labels['quotelimit'] = 'Sətr saytı göstəriləndən çoxdursa sitatı gizlə:';
diff --git a/plugins/hide_blockquote/localization/be_BE.inc b/plugins/hide_blockquote/localization/be_BE.inc
index 313bb2f..28248ad 100644
--- a/plugins/hide_blockquote/localization/be_BE.inc
+++ b/plugins/hide_blockquote/localization/be_BE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Схаваць';
 $labels['show'] = 'Паказаць';
 $labels['quotelimit'] = 'Хаваць цытаванне, калі колькасць радкоў пераўзыходзіць';
diff --git a/plugins/hide_blockquote/localization/bg_BG.inc b/plugins/hide_blockquote/localization/bg_BG.inc
index 3325199..ec64513 100644
--- a/plugins/hide_blockquote/localization/bg_BG.inc
+++ b/plugins/hide_blockquote/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Скрий';
 $labels['show'] = 'Покажи';
 $labels['quotelimit'] = 'Скрива цитатите когато броя редове е по-голям от';
diff --git a/plugins/hide_blockquote/localization/bn_BD.inc b/plugins/hide_blockquote/localization/bn_BD.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/bn_BD.inc
+++ b/plugins/hide_blockquote/localization/bn_BD.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/bs_BA.inc b/plugins/hide_blockquote/localization/bs_BA.inc
index 2d39e8d..9602440 100644
--- a/plugins/hide_blockquote/localization/bs_BA.inc
+++ b/plugins/hide_blockquote/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Sakrij';
 $labels['show'] = 'Prikaži';
 $labels['quotelimit'] = 'Sakrij citate kada je broj linija veći od';
diff --git a/plugins/hide_blockquote/localization/ca_ES.inc b/plugins/hide_blockquote/localization/ca_ES.inc
index 035efe2..d0698f2 100644
--- a/plugins/hide_blockquote/localization/ca_ES.inc
+++ b/plugins/hide_blockquote/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Amaga';
 $labels['show'] = 'Mostra';
 $labels['quotelimit'] = 'Amaga la cita quan el nombre de línies sigui més gran de';
diff --git a/plugins/hide_blockquote/localization/cs_CZ.inc b/plugins/hide_blockquote/localization/cs_CZ.inc
index d957584..766662e 100644
--- a/plugins/hide_blockquote/localization/cs_CZ.inc
+++ b/plugins/hide_blockquote/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Skrýt';
 $labels['show'] = 'Zobrazit';
 $labels['quotelimit'] = 'Skrýt citaci pokud je počet řádků větší než';
diff --git a/plugins/hide_blockquote/localization/cy_GB.inc b/plugins/hide_blockquote/localization/cy_GB.inc
index f7a864e..d60890c 100644
--- a/plugins/hide_blockquote/localization/cy_GB.inc
+++ b/plugins/hide_blockquote/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Cuddio';
 $labels['show'] = 'Dangos';
 $labels['quotelimit'] = 'Cuddio dyfynniad pan mae\'r nifer o linellau yn fwy na';
diff --git a/plugins/hide_blockquote/localization/da_DK.inc b/plugins/hide_blockquote/localization/da_DK.inc
index 7ebe879..3691e54 100644
--- a/plugins/hide_blockquote/localization/da_DK.inc
+++ b/plugins/hide_blockquote/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Skjul';
 $labels['show'] = 'Vis';
 $labels['quotelimit'] = 'Skjul citat antallet af linjer er højere end';
diff --git a/plugins/hide_blockquote/localization/de_CH.inc b/plugins/hide_blockquote/localization/de_CH.inc
index 71f3c1d..5064125 100644
--- a/plugins/hide_blockquote/localization/de_CH.inc
+++ b/plugins/hide_blockquote/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'ausblenden';
 $labels['show'] = 'einblenden';
 $labels['quotelimit'] = 'Zitate verbergen ab einer Zeilenlänge von';
diff --git a/plugins/hide_blockquote/localization/de_DE.inc b/plugins/hide_blockquote/localization/de_DE.inc
index 71f3c1d..5064125 100644
--- a/plugins/hide_blockquote/localization/de_DE.inc
+++ b/plugins/hide_blockquote/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'ausblenden';
 $labels['show'] = 'einblenden';
 $labels['quotelimit'] = 'Zitate verbergen ab einer Zeilenlänge von';
diff --git a/plugins/hide_blockquote/localization/el_GR.inc b/plugins/hide_blockquote/localization/el_GR.inc
index cc0f52b..a557295 100644
--- a/plugins/hide_blockquote/localization/el_GR.inc
+++ b/plugins/hide_blockquote/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Αποκρυψη';
 $labels['show'] = 'Εμφάνιση';
 $labels['quotelimit'] = 'Απόκρυψη παραπομπων όταν οι γραμμές μέτρησης είναι μεγαλύτερες από';
diff --git a/plugins/hide_blockquote/localization/en_GB.inc b/plugins/hide_blockquote/localization/en_GB.inc
index 3f9d0ae..0256e71 100644
--- a/plugins/hide_blockquote/localization/en_GB.inc
+++ b/plugins/hide_blockquote/localization/en_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Hide';
 $labels['show'] = 'Show';
 $labels['quotelimit'] = 'Hide citation when lines count is greater than';
diff --git a/plugins/hide_blockquote/localization/eo.inc b/plugins/hide_blockquote/localization/eo.inc
index 979eed6..9c09c97 100644
--- a/plugins/hide_blockquote/localization/eo.inc
+++ b/plugins/hide_blockquote/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $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/es_AR.inc b/plugins/hide_blockquote/localization/es_AR.inc
index 36ee47f..5046eaf 100644
--- a/plugins/hide_blockquote/localization/es_AR.inc
+++ b/plugins/hide_blockquote/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Ocultar';
 $labels['show'] = 'Mostrar';
 $labels['quotelimit'] = 'Ocultar el mail citado cuando el número de líneas sea mayor que';
diff --git a/plugins/hide_blockquote/localization/es_ES.inc b/plugins/hide_blockquote/localization/es_ES.inc
index bcea6e8..c602650 100644
--- a/plugins/hide_blockquote/localization/es_ES.inc
+++ b/plugins/hide_blockquote/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Ocultar';
 $labels['show'] = 'Mostrar';
 $labels['quotelimit'] = 'Ocultar la cita cuando el número de lineas es mayor que';
diff --git a/plugins/hide_blockquote/localization/et_EE.inc b/plugins/hide_blockquote/localization/et_EE.inc
index d641905..8213946 100644
--- a/plugins/hide_blockquote/localization/et_EE.inc
+++ b/plugins/hide_blockquote/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Peida';
 $labels['show'] = 'Näita';
 $labels['quotelimit'] = 'Peida tsitaat kui ridade arv on suurem kui';
diff --git a/plugins/hide_blockquote/localization/eu_ES.inc b/plugins/hide_blockquote/localization/eu_ES.inc
index 9b9029b..f7adf6e 100644
--- a/plugins/hide_blockquote/localization/eu_ES.inc
+++ b/plugins/hide_blockquote/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Ezkutatu';
 $labels['show'] = 'Erakutsi';
 $labels['quotelimit'] = 'Ezkutatu aipamena lerroen kopurua hau baino handiagoa denean';
diff --git a/plugins/hide_blockquote/localization/fa_AF.inc b/plugins/hide_blockquote/localization/fa_AF.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/fa_AF.inc
+++ b/plugins/hide_blockquote/localization/fa_AF.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/fa_IR.inc b/plugins/hide_blockquote/localization/fa_IR.inc
index 7960190..b4fcc15 100644
--- a/plugins/hide_blockquote/localization/fa_IR.inc
+++ b/plugins/hide_blockquote/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'مخفی کردن';
 $labels['show'] = 'نشان دادن';
 $labels['quotelimit'] = 'مخفی کردن نقل‌قول وقتی تعداد خطوط بیشتر است از';
diff --git a/plugins/hide_blockquote/localization/fi_FI.inc b/plugins/hide_blockquote/localization/fi_FI.inc
index 5b513e8..afec574 100644
--- a/plugins/hide_blockquote/localization/fi_FI.inc
+++ b/plugins/hide_blockquote/localization/fi_FI.inc
@@ -15,8 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Piilota';
 $labels['show'] = 'Näytä';
-$labels['quotelimit'] = 'Hide citation when lines count is greater than';
+$labels['quotelimit'] = 'Piilota lainaus rivejä ollessa enemmän kuin';
 ?>
diff --git a/plugins/hide_blockquote/localization/fr_FR.inc b/plugins/hide_blockquote/localization/fr_FR.inc
index 2623306..00c1c91 100644
--- a/plugins/hide_blockquote/localization/fr_FR.inc
+++ b/plugins/hide_blockquote/localization/fr_FR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Cacher';
 $labels['show'] = 'Afficher';
 $labels['quotelimit'] = 'Cacher la citation quand le nombre de lignes est plus grand que';
diff --git a/plugins/hide_blockquote/localization/gl_ES.inc b/plugins/hide_blockquote/localization/gl_ES.inc
index 6a1db42..f945a50 100644
--- a/plugins/hide_blockquote/localization/gl_ES.inc
+++ b/plugins/hide_blockquote/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Agochar';
 $labels['show'] = 'Amosar';
 $labels['quotelimit'] = 'Agochar mencións cando haxa demasiadas liñas';
diff --git a/plugins/hide_blockquote/localization/he_IL.inc b/plugins/hide_blockquote/localization/he_IL.inc
index 5c49d05..2e35390 100644
--- a/plugins/hide_blockquote/localization/he_IL.inc
+++ b/plugins/hide_blockquote/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'הסתר';
 $labels['show'] = 'הצג';
 $labels['quotelimit'] = 'הסתר ציטוט כאשר מספר השורות גדול מ-';
diff --git a/plugins/hide_blockquote/localization/hi_IN.inc b/plugins/hide_blockquote/localization/hi_IN.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/hi_IN.inc
+++ b/plugins/hide_blockquote/localization/hi_IN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/hu_HU.inc b/plugins/hide_blockquote/localization/hu_HU.inc
index d989b75..97abb9f 100644
--- a/plugins/hide_blockquote/localization/hu_HU.inc
+++ b/plugins/hide_blockquote/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Elrejtés';
 $labels['show'] = 'Megjelenítés';
 $labels['quotelimit'] = 'Idézet elrejtése ha a sorok száma több mint';
diff --git a/plugins/hide_blockquote/localization/hy_AM.inc b/plugins/hide_blockquote/localization/hy_AM.inc
index f6a4d44..b1808e4 100644
--- a/plugins/hide_blockquote/localization/hy_AM.inc
+++ b/plugins/hide_blockquote/localization/hy_AM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Թաքցնել';
 $labels['show'] = 'Ցուցադրել';
 $labels['quotelimit'] = 'Թաքցնել ցիտումը երբ տողերի քանակը գերազանցում է';
diff --git a/plugins/hide_blockquote/localization/ia.inc b/plugins/hide_blockquote/localization/ia.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/ia.inc
+++ b/plugins/hide_blockquote/localization/ia.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/id_ID.inc b/plugins/hide_blockquote/localization/id_ID.inc
index 2cdf673..da65349 100644
--- a/plugins/hide_blockquote/localization/id_ID.inc
+++ b/plugins/hide_blockquote/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Sembunyi';
 $labels['show'] = 'Tampil';
 $labels['quotelimit'] = 'Sembunyikan kutipan ketika jumlah baris lebih besar dari';
diff --git a/plugins/hide_blockquote/localization/it_IT.inc b/plugins/hide_blockquote/localization/it_IT.inc
index 4c6c10f..a243530 100644
--- a/plugins/hide_blockquote/localization/it_IT.inc
+++ b/plugins/hide_blockquote/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $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/ja_JP.inc b/plugins/hide_blockquote/localization/ja_JP.inc
index f67c470..4bf36ae 100644
--- a/plugins/hide_blockquote/localization/ja_JP.inc
+++ b/plugins/hide_blockquote/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = '隠す';
 $labels['show'] = '表示';
 $labels['quotelimit'] = '次の行数より多い引用を非表示';
diff --git a/plugins/hide_blockquote/localization/ko_KR.inc b/plugins/hide_blockquote/localization/ko_KR.inc
index 79dc28e..e26d06f 100644
--- a/plugins/hide_blockquote/localization/ko_KR.inc
+++ b/plugins/hide_blockquote/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = '숨기기';
 $labels['show'] = '보이기';
 $labels['quotelimit'] = '라인 개수가 정해진 개수보다 클 때 인용구 감추기';
diff --git a/plugins/hide_blockquote/localization/lb_LU.inc b/plugins/hide_blockquote/localization/lb_LU.inc
index d0e037e..8f5a07d 100644
--- a/plugins/hide_blockquote/localization/lb_LU.inc
+++ b/plugins/hide_blockquote/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Verstoppen';
 $labels['show'] = 'Weisen';
 $labels['quotelimit'] = 'Zitat verstoppe wann d\'Zeilenunzuel méi grouss ass ewéi';
diff --git a/plugins/hide_blockquote/localization/lt_LT.inc b/plugins/hide_blockquote/localization/lt_LT.inc
index 9814877..9b560de 100644
--- a/plugins/hide_blockquote/localization/lt_LT.inc
+++ b/plugins/hide_blockquote/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Paslėpti';
 $labels['show'] = 'Parodyti';
 $labels['quotelimit'] = 'Paslėpti citatą, kai joje eilučių daugiau negu';
diff --git a/plugins/hide_blockquote/localization/lv_LV.inc b/plugins/hide_blockquote/localization/lv_LV.inc
index e036ef7..162deda 100644
--- a/plugins/hide_blockquote/localization/lv_LV.inc
+++ b/plugins/hide_blockquote/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Slēpt';
 $labels['show'] = 'Rādīt';
 $labels['quotelimit'] = 'Slēpt citātu kad līniju skaits ir lielāks kā';
diff --git a/plugins/hide_blockquote/localization/ml_IN.inc b/plugins/hide_blockquote/localization/ml_IN.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/ml_IN.inc
+++ b/plugins/hide_blockquote/localization/ml_IN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/mn_MN.inc b/plugins/hide_blockquote/localization/mn_MN.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/mn_MN.inc
+++ b/plugins/hide_blockquote/localization/mn_MN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/ms_MY.inc b/plugins/hide_blockquote/localization/ms_MY.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/ms_MY.inc
+++ b/plugins/hide_blockquote/localization/ms_MY.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/my_MM.inc b/plugins/hide_blockquote/localization/my_MM.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/my_MM.inc
+++ b/plugins/hide_blockquote/localization/my_MM.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/nb_NO.inc b/plugins/hide_blockquote/localization/nb_NO.inc
index 403763e..fb20276 100644
--- a/plugins/hide_blockquote/localization/nb_NO.inc
+++ b/plugins/hide_blockquote/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Skjul';
 $labels['show'] = 'Vis';
 $labels['quotelimit'] = 'Skjul sitat når antall linjer er flere enn';
diff --git a/plugins/hide_blockquote/localization/nl_BE.inc b/plugins/hide_blockquote/localization/nl_BE.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/nl_BE.inc
+++ b/plugins/hide_blockquote/localization/nl_BE.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/nl_NL.inc b/plugins/hide_blockquote/localization/nl_NL.inc
index 48ec7a3..104f478 100644
--- a/plugins/hide_blockquote/localization/nl_NL.inc
+++ b/plugins/hide_blockquote/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Verbergen';
 $labels['show'] = 'Tonen';
 $labels['quotelimit'] = 'Verberg citaat wanneer aantal regels groter is dan';
diff --git a/plugins/hide_blockquote/localization/nn_NO.inc b/plugins/hide_blockquote/localization/nn_NO.inc
index 243b63c..4bc583a 100644
--- a/plugins/hide_blockquote/localization/nn_NO.inc
+++ b/plugins/hide_blockquote/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Gøym';
 $labels['show'] = 'Vis';
 $labels['quotelimit'] = 'Gøym sitat når talet på linjer er større enn';
diff --git a/plugins/hide_blockquote/localization/nqo.inc b/plugins/hide_blockquote/localization/nqo.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/nqo.inc
+++ b/plugins/hide_blockquote/localization/nqo.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/om.inc b/plugins/hide_blockquote/localization/om.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/om.inc
+++ b/plugins/hide_blockquote/localization/om.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/pl_PL.inc b/plugins/hide_blockquote/localization/pl_PL.inc
index 73552ed..cdd1f8f 100644
--- a/plugins/hide_blockquote/localization/pl_PL.inc
+++ b/plugins/hide_blockquote/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Ukryj';
 $labels['show'] = 'Pokaż';
 $labels['quotelimit'] = 'Ukryj blok cytatu gdy liczba linii jest większa od';
diff --git a/plugins/hide_blockquote/localization/pt_BR.inc b/plugins/hide_blockquote/localization/pt_BR.inc
index f4c8ca5..b303c06 100644
--- a/plugins/hide_blockquote/localization/pt_BR.inc
+++ b/plugins/hide_blockquote/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Ocultar';
 $labels['show'] = 'Exibir';
 $labels['quotelimit'] = 'Ocultar a citação quando o número de linhas for maior do que';
diff --git a/plugins/hide_blockquote/localization/pt_PT.inc b/plugins/hide_blockquote/localization/pt_PT.inc
index 116acf6..3469378 100644
--- a/plugins/hide_blockquote/localization/pt_PT.inc
+++ b/plugins/hide_blockquote/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Ocultar';
 $labels['show'] = 'Mostrar';
 $labels['quotelimit'] = 'Ocultar citação quando o numero de linhas for maior que';
diff --git a/plugins/hide_blockquote/localization/ro_RO.inc b/plugins/hide_blockquote/localization/ro_RO.inc
index d02c855..978b84a 100644
--- a/plugins/hide_blockquote/localization/ro_RO.inc
+++ b/plugins/hide_blockquote/localization/ro_RO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Ascunde';
 $labels['show'] = 'Afișează';
 $labels['quotelimit'] = 'Ascunde citațiile dacă numărul de linii este mai mare ca';
diff --git a/plugins/hide_blockquote/localization/ru_RU.inc b/plugins/hide_blockquote/localization/ru_RU.inc
index a2131cf..1e6b26c 100644
--- a/plugins/hide_blockquote/localization/ru_RU.inc
+++ b/plugins/hide_blockquote/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Скрыть';
 $labels['show'] = 'Показать';
 $labels['quotelimit'] = 'Скрыть цитату, если число строк более чем';
diff --git a/plugins/hide_blockquote/localization/sk_SK.inc b/plugins/hide_blockquote/localization/sk_SK.inc
index 878ea1c..2a41c1e 100644
--- a/plugins/hide_blockquote/localization/sk_SK.inc
+++ b/plugins/hide_blockquote/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Skryť';
 $labels['show'] = 'Zobraziť';
 $labels['quotelimit'] = 'Skryť citáciu pokiaľ je počet riadkov väčší než';
diff --git a/plugins/hide_blockquote/localization/sl_SI.inc b/plugins/hide_blockquote/localization/sl_SI.inc
index 298d7e9..1728f40 100644
--- a/plugins/hide_blockquote/localization/sl_SI.inc
+++ b/plugins/hide_blockquote/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Skrij';
 $labels['show'] = 'Prikaži';
 $labels['quotelimit'] = 'Skrij citiran tekst, ko je število vrstic večje od';
diff --git a/plugins/hide_blockquote/localization/sr_CS.inc b/plugins/hide_blockquote/localization/sr_CS.inc
index 049ad1d..c96c432 100644
--- a/plugins/hide_blockquote/localization/sr_CS.inc
+++ b/plugins/hide_blockquote/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Сакриј';
 $labels['show'] = 'Прикажи';
 $labels['quotelimit'] = 'Сакриј цитат када је број редова већи од';
diff --git a/plugins/hide_blockquote/localization/sv_SE.inc b/plugins/hide_blockquote/localization/sv_SE.inc
index 00a5ce8..9d021d9 100644
--- a/plugins/hide_blockquote/localization/sv_SE.inc
+++ b/plugins/hide_blockquote/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Dölj';
 $labels['show'] = 'Visa';
 $labels['quotelimit'] = 'Dölj citat när antalet rader överstiger';
diff --git a/plugins/hide_blockquote/localization/te_IN.inc b/plugins/hide_blockquote/localization/te_IN.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/te_IN.inc
+++ b/plugins/hide_blockquote/localization/te_IN.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/th_TH.inc b/plugins/hide_blockquote/localization/th_TH.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/th_TH.inc
+++ b/plugins/hide_blockquote/localization/th_TH.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/ti.inc b/plugins/hide_blockquote/localization/ti.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/ti.inc
+++ b/plugins/hide_blockquote/localization/ti.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/tr_TR.inc b/plugins/hide_blockquote/localization/tr_TR.inc
index 56a05ee..db3d013 100644
--- a/plugins/hide_blockquote/localization/tr_TR.inc
+++ b/plugins/hide_blockquote/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Gizle';
 $labels['show'] = 'Göster';
 $labels['quotelimit'] = 'Satır sayısı şu satır sayısındna fazla ile alıntıları gizle:';
diff --git a/plugins/hide_blockquote/localization/tzm.inc b/plugins/hide_blockquote/localization/tzm.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/tzm.inc
+++ b/plugins/hide_blockquote/localization/tzm.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/uk_UA.inc b/plugins/hide_blockquote/localization/uk_UA.inc
index 8ad5e4f..a8dd541 100644
--- a/plugins/hide_blockquote/localization/uk_UA.inc
+++ b/plugins/hide_blockquote/localization/uk_UA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Приховати';
 $labels['show'] = 'Показати';
 ?>
diff --git a/plugins/hide_blockquote/localization/ur_PK.inc b/plugins/hide_blockquote/localization/ur_PK.inc
index b2afd3b..83c0e3c 100644
--- a/plugins/hide_blockquote/localization/ur_PK.inc
+++ b/plugins/hide_blockquote/localization/ur_PK.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
-
 ?>
diff --git a/plugins/hide_blockquote/localization/vi_VN.inc b/plugins/hide_blockquote/localization/vi_VN.inc
index 705b904..a023511 100644
--- a/plugins/hide_blockquote/localization/vi_VN.inc
+++ b/plugins/hide_blockquote/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = 'Ẩn';
 $labels['show'] = 'Hiển thị';
 $labels['quotelimit'] = 'Ẩn trích dẫn khi tổng số dòng lớn hơn';
diff --git a/plugins/hide_blockquote/localization/zh_CN.inc b/plugins/hide_blockquote/localization/zh_CN.inc
index 78aa89c..6701f2d 100644
--- a/plugins/hide_blockquote/localization/zh_CN.inc
+++ b/plugins/hide_blockquote/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = '隐藏';
 $labels['show'] = '显示';
 $labels['quotelimit'] = '隐藏引用当行数大于';
diff --git a/plugins/hide_blockquote/localization/zh_TW.inc b/plugins/hide_blockquote/localization/zh_TW.inc
index b5ad961..0fcca72 100644
--- a/plugins/hide_blockquote/localization/zh_TW.inc
+++ b/plugins/hide_blockquote/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
-
 $labels['hide'] = '隱藏';
 $labels['show'] = '顯示';
 $labels['quotelimit'] = '隱藏引文當行數大於';
diff --git a/plugins/managesieve/localization/ar_SA.inc b/plugins/managesieve/localization/ar_SA.inc
index 70cd2c2..8e6d841 100644
--- a/plugins/managesieve/localization/ar_SA.inc
+++ b/plugins/managesieve/localization/ar_SA.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['messagedelete'] = 'حذف الرسالة';
 $labels['add'] = 'إضافة';
 $labels['del'] = 'حذف';
diff --git a/plugins/managesieve/localization/az_AZ.inc b/plugins/managesieve/localization/az_AZ.inc
index 88d7d40..e9c60e4 100644
--- a/plugins/managesieve/localization/az_AZ.inc
+++ b/plugins/managesieve/localization/az_AZ.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Süzgəclər';
 $labels['managefilters'] = 'Gələn məktub üçün süzgəclərin idarəsi';
 $labels['filtername'] = 'Süzgəcin adı';
@@ -49,14 +47,12 @@
 $labels['messagereply'] = 'Məktubla cavab ver';
 $labels['messagedelete'] = 'Sil';
 $labels['messagediscard'] = 'Məktubla rədd et';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Daxil olan məktub üçün:';
 $labels['messagesactions'] = '...növbəti hərəkəti yerinə yetir:';
 $labels['add'] = 'Əlavə et';
 $labels['del'] = 'Sil';
 $labels['sender'] = 'Göndərən';
 $labels['recipient'] = 'Qəbul edən';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Məktub neçə müddətdən bir göndərilsin (gündə):';
 $labels['vacationinterval'] = 'Məktublar nə qədər sıx göndərilsin:';
 $labels['days'] = 'günlər';
@@ -84,13 +80,11 @@
 $labels['countislessthan'] = 'say buradan azdır';
 $labels['countislessthanequal'] = 'say azdır və ya bərabərdir';
 $labels['countequals'] = 'say bərabərdir';
-$labels['countnotequals'] = 'count is not equal to';
 $labels['valueisgreaterthan'] = 'dəyər buradan daha böyükdür';
 $labels['valueisgreaterthanequal'] = 'dəyər çoxdur və ya bərabərdir';
 $labels['valueislessthan'] = 'dəyər buradan azdır';
 $labels['valueislessthanequal'] = 'dəyər azdır və ya bərabərdir';
 $labels['valueequals'] = 'dəyər bərabərdir';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = 'Məktublara flaq quraşdır';
 $labels['addflags'] = 'Məktuba flaq əlavə et';
 $labels['removeflags'] = 'Məktubdan flaqları sil';
@@ -122,22 +116,6 @@
 $labels['usedata'] = 'Süzgəcdə bu məlumatları istifadə et:';
 $labels['nextstep'] = 'Sonrakı';
 $labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = 'Əlavə ayarlar';
 $labels['body'] = 'Məzmun';
 $labels['address'] = 'ünvan';
@@ -157,38 +135,26 @@
 $labels['octet'] = 'ciddi (oktet)';
 $labels['asciicasemap'] = 'qeydiyyat üzrə müstəqil (ascii-casemap)';
 $labels['asciinumeric'] = 'ədədi (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'Serverin naməlum xətası.';
 $messages['filterconnerror'] = 'Serverə qoşulmaq alınmır';
-$messages['filterdeleteerror'] = 'Süzgəci silmək mümkün deyil. Server xətası.';
 $messages['filterdeleted'] = 'Süzgəc uğurla silindi.';
 $messages['filtersaved'] = 'Süzgəc uğurla saxlanıldı.';
-$messages['filtersaveerror'] = 'Süzgəci saxlamaq mümkün deyil. Server xətası.';
 $messages['filterdeleteconfirm'] = 'Siz həqiqətən süzgəci silmək istəyirsiniz?';
 $messages['ruledeleteconfirm'] = 'Bu qaydanı silməkdə əminsiniz?';
 $messages['actiondeleteconfirm'] = 'Bu hərəkəti silməkdə əminsiniz?';
 $messages['forbiddenchars'] = 'Sahədə qadağan edilən işarələr.';
 $messages['cannotbeempty'] = 'Sahə boş ola bilməz.';
 $messages['ruleexist'] = 'Bu adla süzgəc artıq mövcuddur.';
-$messages['setactivateerror'] = 'Seçilmiş süzgəc dəstini yandırmaq mümkün deyil. Server xətası.';
-$messages['setdeactivateerror'] = 'Seçilmiş süzgəc dəstini söndürmək mümkün deyil. Server xətası.';
-$messages['setdeleteerror'] = 'Seçilmiş süzgəc dəstini silmək mümkün deyil. Server xətası.';
 $messages['setactivated'] = 'Süzgəc dəsti yandırıldı.';
 $messages['setdeactivated'] = 'Süzgəc dəsti söndürüldü.';
 $messages['setdeleted'] = 'Süzgəc dəsti silindi.';
 $messages['setdeleteconfirm'] = 'Bu süzgəc dəstini silməkdə əminsiniz?';
-$messages['setcreateerror'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Server xərası.';
 $messages['setcreated'] = 'Süzgəc dəsti uğurla yaradıldı.';
-$messages['activateerror'] = 'Seçilmiş süzgəc(lər)i yandırmaq mümkün deyil. Server xətası.';
-$messages['deactivateerror'] = 'Seçilmiş süzgəc(lər)i söndürmək mümkün deyil. Server xətası.';
 $messages['deactivated'] = 'Süzgəc(lər) uğurla yandırıldı.';
 $messages['activated'] = 'Süzgəc(lər) uğurla söndürüldü.';
 $messages['moved'] = 'Süzgəc uğurla köçürüldü.';
-$messages['moveerror'] = 'Süzgəci köçürmək mümkün deyil. Server xətası.';
 $messages['nametoolong'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Ad çox uzundur.';
 $messages['namereserved'] = 'Rezerv edilmiş ad.';
 $messages['setexist'] = 'Dəst artıq mövcuddur.';
 $messages['nodata'] = 'Heç olmasa bir mövqe tutmaq lazımdır!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/be_BE.inc b/plugins/managesieve/localization/be_BE.inc
index b9b4591..29c97ad 100644
--- a/plugins/managesieve/localization/be_BE.inc
+++ b/plugins/managesieve/localization/be_BE.inc
@@ -15,10 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Фільтры';
-$labels['managefilters'] = 'Кіраваць фільтрамі атрыманай пошты';
+$labels['managefilters'] = 'Парадкаваць фільтры атрыманай пошты';
 $labels['filtername'] = 'Назва фільтра';
 $labels['newfilter'] = 'Новы фільтр';
 $labels['filteradd'] = 'Дадаць фільтр';
@@ -38,7 +36,7 @@
 $labels['filternotmatches'] = 'не задавальняе выразу';
 $labels['filterregex'] = 'задавальняе рэгулярнаму выразу';
 $labels['filternotregex'] = 'не задавальняе рэгулярнаму выразу';
-$labels['filterunder'] = 'меньш';
+$labels['filterunder'] = 'менш';
 $labels['filterover'] = 'больш';
 $labels['addrule'] = 'Дадаць правіла';
 $labels['delrule'] = 'Выдаліць правіла';
@@ -78,49 +76,49 @@
 $labels['none'] = 'няма';
 $labels['fromset'] = 'з набору';
 $labels['fromfile'] = 'з файла';
-$labels['filterdisabled'] = 'Filter disabled';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
+$labels['filterdisabled'] = 'Фільтр адключаны';
+$labels['countisgreaterthan'] = 'лік большы за';
+$labels['countisgreaterthanequal'] = 'лік большы за альбо роўны';
+$labels['countislessthan'] = 'лік меншы за';
+$labels['countislessthanequal'] = 'лік меншы за альбо роўны';
+$labels['countequals'] = 'лік роўны';
 $labels['countnotequals'] = 'лік не роўны';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
+$labels['valueisgreaterthan'] = 'значэнне большае за';
+$labels['valueisgreaterthanequal'] = 'значэнне большае за альбо роўнае';
+$labels['valueislessthan'] = 'значэнне меншае за';
+$labels['valueislessthanequal'] = 'значэнне меншае за альбо роўнае';
+$labels['valueequals'] = 'значэнне роўнае';
 $labels['valuenotequals'] = 'значэнне не роўнае';
 $labels['setflags'] = 'Устанавіць флагі на паведамленне';
 $labels['addflags'] = 'Дадаць флагі да паведамлення';
 $labels['removeflags'] = 'Выдаліць флагі з паведамлення';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
+$labels['flagread'] = 'Прачытана';
+$labels['flagdeleted'] = 'Выдалена';
+$labels['flaganswered'] = 'З адказам';
+$labels['flagflagged'] = 'Пазначана';
+$labels['flagdraft'] = 'Чарнавік';
 $labels['setvariable'] = 'Устанавіць зменную';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
+$labels['setvarname'] = 'Імя зменнай:';
+$labels['setvarvalue'] = 'Значэнне зменнай:';
+$labels['setvarmodifiers'] = 'Мадыфікатары:';
+$labels['varlower'] = 'ніжні рэгістр';
+$labels['varupper'] = 'верхні рэгістр';
+$labels['varlowerfirst'] = 'першы знак у ніжнім рэгістры';
+$labels['varupperfirst'] = 'першы знак у верхнім рэгістры';
+$labels['varquotewildcard'] = 'службовыя знакі забіраць у апострафы';
+$labels['varlength'] = 'даўжыня';
+$labels['notify'] = 'Паслаць апавяшчэнне';
+$labels['notifyaddress'] = 'На эл. адрас:';
+$labels['notifybody'] = 'Цела апавяшчэння:';
+$labels['notifysubject'] = 'Тэма апавяшчэння:';
+$labels['notifyfrom'] = 'Адпраўнік апавяшчэння:';
+$labels['notifyimportance'] = 'Важнасць:';
+$labels['notifyimportancelow'] = 'нізкая';
+$labels['notifyimportancenormal'] = 'звычайная';
+$labels['notifyimportancehigh'] = 'высокая';
+$labels['filtercreate'] = 'Стварыць фільтр';
+$labels['usedata'] = 'Ужываць наступныя дадзеныя ў фільтры:';
+$labels['nextstep'] = 'Наступны крок';
 $labels['...'] = '...';
 $labels['currdate'] = 'Бягучая дата';
 $labels['datetest'] = 'Дата';
@@ -138,54 +136,54 @@
 $labels['std11'] = 'дата (RFC2822)';
 $labels['zone'] = 'часавая зона';
 $labels['weekday'] = 'дзень тыдня (0-6)';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['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['index'] = 'індэкс:';
 $labels['indexlast'] = 'назад';
-$messages['filterunknownerror'] = 'Unknown server error.';
-$messages['filterconnerror'] = 'Unable to connect to server.';
-$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
-$messages['filterdeleted'] = 'Filter deleted successfully.';
-$messages['filtersaved'] = 'Filter saved successfully.';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$messages['forbiddenchars'] = 'Forbidden characters in field.';
-$messages['cannotbeempty'] = 'Field cannot be empty.';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Не ўдалося актываваць вылучаны набор фільтраў. Памылка на серверы.';
-$messages['setdeactivateerror'] = 'Не ўдалося дэактываваць вылучаны набор фільтраў. Памылка на серверы.';
-$messages['setdeleteerror'] = 'Не ўдалося выдаліць вылучаны набор фільтраў. Памылка на серверы.';
-$messages['setactivated'] = 'Набор фільтраў актываваны паспяхова.';
-$messages['setdeactivated'] = 'Набор фільтраў дэактываваны паспяхова.';
-$messages['setdeleted'] = 'Набор фільтраў выдалены паспяхова.';
-$messages['setdeleteconfirm'] = 'Напраўду выдаліць вылучаны набор фільтраў?';
+$messages['filterunknownerror'] = 'Невядомая памылка сервера.';
+$messages['filterconnerror'] = 'Не ўдалося злучыцца з серверам.';
+$messages['filterdeleteerror'] = 'Не ўдалося выдаліць фільтр. Памылка на серверы.';
+$messages['filterdeleted'] = 'Фільтр выдалены.';
+$messages['filtersaved'] = 'Фільтр захаваны.';
+$messages['filtersaveerror'] = 'Не ўдалося захаваць фільтр. Памылка на серверы.';
+$messages['filterdeleteconfirm'] = 'Напраўду выдаліць абраны фільтр?';
+$messages['ruledeleteconfirm'] = 'Напраўду выдаліць абранае правіла?';
+$messages['actiondeleteconfirm'] = 'Напраўду выдаліць абранае дзеянне?';
+$messages['forbiddenchars'] = 'Забароненыя знакі ў полі.';
+$messages['cannotbeempty'] = 'Поле не можа быць пустым.';
+$messages['ruleexist'] = 'Фільтр з гэтай назвай ужо існуе.';
+$messages['setactivateerror'] = 'Не ўдалося ўключыць абраны набор фільтраў. Памылка на серверы.';
+$messages['setdeactivateerror'] = 'Не ўдалося адключыць абраны набор фільтраў. Памылка на серверы.';
+$messages['setdeleteerror'] = 'Не ўдалося выдаліць абраны набор фільтраў. Памылка на серверы.';
+$messages['setactivated'] = 'Набор фільтраў актываваны.';
+$messages['setdeactivated'] = 'Набор фільтраў дэактываваны.';
+$messages['setdeleted'] = 'Набор фільтраў выдалены.';
+$messages['setdeleteconfirm'] = 'Напраўду выдаліць абраны набор фільтраў?';
 $messages['setcreateerror'] = 'Не ўдалося стварыць набор фільтраў. Памылка на серверы.';
-$messages['setcreated'] = 'Набор фільтраў створаны паспяхова.';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Фільтр перамешчаны паспяхова.';
-$messages['moveerror'] = 'Не ўдалося перамясціць вылучаны фільтр. Памылка на серверы.';
+$messages['setcreated'] = 'Набор фільтраў створаны.';
+$messages['activateerror'] = 'Не ўдалося ўключыць абраны(я) фільтры. Памылка на серверы.';
+$messages['deactivateerror'] = 'Не ўдалося адключыць абраны(я) фільтры. Памылка на серверы.';
+$messages['deactivated'] = 'Фільтр(ы) адключаны.';
+$messages['activated'] = 'Фільтр(ы) уключаны.';
+$messages['moved'] = 'Фільтр перамешчаны.';
+$messages['moveerror'] = 'Не ўдалося перамясціць абраны фільтр. Памылка на серверы.';
 $messages['nametoolong'] = 'Задаўгая назва.';
 $messages['namereserved'] = 'Зарэзерваваная назва.';
 $messages['setexist'] = 'Набор ужо існуе.';
diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc
index 6887b30..a9a77d5 100644
--- a/plugins/managesieve/localization/bg_BG.inc
+++ b/plugins/managesieve/localization/bg_BG.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Филтри';
 $labels['managefilters'] = 'Управление на филтри за входяща поща';
 $labels['filtername'] = 'Име на филтър';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'наобратно';
 $messages['filterunknownerror'] = 'Неизвестна сървърна грешка.';
 $messages['filterconnerror'] = 'Неуспешно свързване с managesieve сървъра.';
-$messages['filterdeleteerror'] = 'Невъзможно изтриване на филтъра. Възникна сървърна грешка.';
 $messages['filterdeleted'] = 'Филтърът е изтрит успешно.';
 $messages['filtersaved'] = 'Филтърът е записан успешно.';
-$messages['filtersaveerror'] = 'Невъзможно записване на филтъра. Възникна сървърна грешка.';
 $messages['filterdeleteconfirm'] = 'Наистина ли желаете да изтриете избрания филтър?';
 $messages['ruledeleteconfirm'] = 'Сигурни ли сте, че желаете да изтриете избраното условие?';
 $messages['actiondeleteconfirm'] = 'Сигурни ли сте, че желаете да изтриете избраното действие?';
 $messages['forbiddenchars'] = 'Забранени символи в полето.';
 $messages['cannotbeempty'] = 'Полето не може да бъде празно.';
 $messages['ruleexist'] = 'Вече има филтър с указаното име.';
-$messages['setactivateerror'] = 'Невъзможно активиране на избрания набор от филтри. Възникна сървърна грешка.';
-$messages['setdeactivateerror'] = 'Невъзможно деактивиране на избрания набор от филтри. Възникна сървърна грешка.';
-$messages['setdeleteerror'] = 'Невъзможно изтриване на избрания набор от филтри. Възникна сървърна грешка.';
 $messages['setactivated'] = 'Наборът от филтри е активиран успешно.';
 $messages['setdeactivated'] = 'Наборът от филтри е деактивиран успешно.';
 $messages['setdeleted'] = 'Наборът от филтри е изтрит успешно.';
 $messages['setdeleteconfirm'] = 'Сигурни ли сте, че желаете да изтриете избрания набор от филтри?';
-$messages['setcreateerror'] = 'Невъзможно създаване на набор от филтри. Възникна сървърна грешка.';
 $messages['setcreated'] = 'Наборът от филтри е създаден успешно.';
-$messages['activateerror'] = 'Невъзможно включване на филтъра. Възникна сървърна грешка.';
-$messages['deactivateerror'] = 'Невъзможно изключване на филтъра. Възникна сървърна грешка.';
 $messages['deactivated'] = 'Филтърът е изключен успешно.';
 $messages['activated'] = 'Филтърът е включен успешно.';
 $messages['moved'] = 'Филтърът е преместен успешно.';
-$messages['moveerror'] = 'Невъзможно преместване на филтъра. Възникна сървърна грешка.';
 $messages['nametoolong'] = 'Името е прекалено дълго.';
 $messages['namereserved'] = 'Резервирано име.';
 $messages['setexist'] = 'Вече има такъв набор филтри.';
diff --git a/plugins/managesieve/localization/bs_BA.inc b/plugins/managesieve/localization/bs_BA.inc
index d66e301..f4b5ebb 100644
--- a/plugins/managesieve/localization/bs_BA.inc
+++ b/plugins/managesieve/localization/bs_BA.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filteri';
 $labels['managefilters'] = 'Upravljanje dolaznim email filterima';
 $labels['filtername'] = 'Naziv filtera';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'unazad';
 $messages['filterunknownerror'] = 'Nepoznata serverska greška.';
 $messages['filterconnerror'] = 'Nije se moguće povezati na server.';
-$messages['filterdeleteerror'] = 'Nije moguće obrisati filter. Desila se serverska greška.';
 $messages['filterdeleted'] = 'Filter je uspješno obrisan.';
 $messages['filtersaved'] = 'Filter je uspješno sačuvan.';
-$messages['filtersaveerror'] = 'Nije moguće sačuvati filter. Desila se serverska greška.';
 $messages['filterdeleteconfirm'] = 'Da li zaista želite obrisati označeni filter?';
 $messages['ruledeleteconfirm'] = 'Jeste li sigurni da želite obrisati označeno pravilo?';
 $messages['actiondeleteconfirm'] = 'Jeste li sigurni da želite obrisati označenu akciju?';
 $messages['forbiddenchars'] = 'U polje su uneseni nedozvoljeni znakovi.';
 $messages['cannotbeempty'] = 'Polje ne može biti prazno.';
 $messages['ruleexist'] = 'Filter s tim imenom već postoji.';
-$messages['setactivateerror'] = 'Nije moguće aktivirati označeni set filtera. Desila se serverska greška.';
-$messages['setdeactivateerror'] = 'Nije moguće deaktivirati označeni set filtera. Desila se serverska greška.';
-$messages['setdeleteerror'] = 'Nije moguće obrisati označeni set filtera. Desila se serverska greška.';
 $messages['setactivated'] = 'Set filtera je uspješno aktiviran.';
 $messages['setdeactivated'] = 'Set filtera je uspješno deaktiviran.';
 $messages['setdeleted'] = 'Set filtera je uspješno obrisan.';
 $messages['setdeleteconfirm'] = 'Jeste li sigurni da želite obrisati označeni set filtera?';
-$messages['setcreateerror'] = 'Nije moguće kreirati se filtera. Desila se serverska greška.';
 $messages['setcreated'] = 'Set filtera je uspješno kreiran.';
-$messages['activateerror'] = 'Nije moguće omogućiti označene filtere. Desila se serverska greška.';
-$messages['deactivateerror'] = 'Nije moguće onemogućiti označene filtere. Desila se serverska greška.';
 $messages['deactivated'] = 'Filteri su uspješno omogućeni.';
 $messages['activated'] = 'Filteri su uspješno onemogućeni.';
 $messages['moved'] = 'Filteri su uspješno premješteni.';
-$messages['moveerror'] = 'Nije moguće premjestiti označeni filter. Desila se serverska greška.';
 $messages['nametoolong'] = 'Ime je predugo.';
 $messages['namereserved'] = 'Ime je rezervisano.';
 $messages['setexist'] = 'Set već postoji.';
diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc
index 66630fa..cf5117f 100644
--- a/plugins/managesieve/localization/ca_ES.inc
+++ b/plugins/managesieve/localization/ca_ES.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtres';
 $labels['managefilters'] = 'Gestiona els filtres dels missatges d\'entrada';
 $labels['filtername'] = 'Nom del filtre';
@@ -56,7 +54,6 @@
 $labels['del'] = 'Suprimeix';
 $labels['sender'] = 'Remitent';
 $labels['recipient'] = 'Destinatari/a';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):';
 $labels['vacationinterval'] = 'Amb quina freqüència enviar missatges:';
 $labels['days'] = 'dies';
@@ -161,31 +158,22 @@
 $labels['indexlast'] = 'cap enrere';
 $messages['filterunknownerror'] = 'Error desconegut al servidor.';
 $messages['filterconnerror'] = 'No s\'ha pogut connectar al servidor.';
-$messages['filterdeleteerror'] = 'No s\'ha pogut suprimir el filtre. Hi ha hagut un error al servidor.';
 $messages['filterdeleted'] = 'El filtre s\'ha suprimit correctament.';
 $messages['filtersaved'] = 'Filtre desat correctament.';
-$messages['filtersaveerror'] = 'No s\'ha pogut desar el filtre. Hi ha hagut un error al servidor.';
 $messages['filterdeleteconfirm'] = 'Realment voleu suprimit el filtre seleccionat?';
 $messages['ruledeleteconfirm'] = 'Esteu segur que voleu suprimir la norma seleccionada?';
 $messages['actiondeleteconfirm'] = 'Esteu segur que voleu suprimir l\'acció seleccionada?';
 $messages['forbiddenchars'] = 'El camp conté caràcters prohibits.';
 $messages['cannotbeempty'] = 'El camp no pot estar buit.';
 $messages['ruleexist'] = 'Ja existeix un filtre amb aquest nom';
-$messages['setactivateerror'] = 'No s\'ha pogut activar el fitlre seleccionat. Hi ha hagut un error al servidor.';
-$messages['setdeactivateerror'] = 'No s\'ha pogut desactivar el fitlre seleccionat. Hi ha hagut un error al servidor.';
-$messages['setdeleteerror'] = 'No s\'ha pogut suprimir el conjunt de filtres seleccionats. Hi ha hagut un error al servidor.';
 $messages['setactivated'] = 'El conjunt de filtres s\'ha activat correctament.';
 $messages['setdeactivated'] = 'El conjunt de filtres s\'ha desactivat correctament.';
 $messages['setdeleted'] = 'El conjunt de filtres s\'ha suprimit correctament.';
 $messages['setdeleteconfirm'] = 'Esteu segurs que voleu suprimir el conjunt de filtres seleccionats?';
-$messages['setcreateerror'] = 'No s\'ha pogut crear el conjunt de filtres. Hi ha hagut un error al servidor.';
 $messages['setcreated'] = 'S\'ha creat correctament el conjunt de filtres.';
-$messages['activateerror'] = 'No s\'ha pogut habilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
-$messages['deactivateerror'] = 'No s\'ha pogut deshabilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
 $messages['deactivated'] = 'Filtre(s) habilitat(s) correctament.';
 $messages['activated'] = 'Filtre(s) deshabilitat(s) correctament.';
 $messages['moved'] = 'S\'ha mogut correctament el filtre.';
-$messages['moveerror'] = 'No s\'ha pogut moure el filtre seleccionat. Hi ha hagut un error al servidor.';
 $messages['nametoolong'] = 'El nom és massa llarg.';
 $messages['namereserved'] = 'Nom reservat.';
 $messages['setexist'] = 'El conjunt ja existeix.';
diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc
index bbaf353..f14b132 100644
--- a/plugins/managesieve/localization/cs_CZ.inc
+++ b/plugins/managesieve/localization/cs_CZ.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtry';
 $labels['managefilters'] = 'Nastavení filtrů';
 $labels['filtername'] = 'Název filtru';
@@ -56,7 +54,7 @@
 $labels['del'] = 'Smaž';
 $labels['sender'] = 'Odesílatel';
 $labels['recipient'] = 'Příjemce';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
+$labels['vacationaddr'] = 'Moje další e-mailová adresa(y):';
 $labels['vacationdays'] = 'Počet dnů mezi automatickými odpověďmi:';
 $labels['vacationinterval'] = 'Prodleva mezi automatickými odpověďmi:';
 $labels['days'] = 'dnů';
@@ -161,10 +159,10 @@
 $labels['indexlast'] = 'pozpátku';
 $messages['filterunknownerror'] = 'Neznámá chyba serveru';
 $messages['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
-$messages['filterdeleteerror'] = 'Nebylo možné smazat filtr. Server nahlásil chybu';
+$messages['filterdeleteerror'] = 'Nebylo možné smazat filtr. Došlo k chybě serveru.';
 $messages['filterdeleted'] = 'Filtr byl smazán';
 $messages['filtersaved'] = 'Filtr byl uložen';
-$messages['filtersaveerror'] = 'Nebylo možné uložit filtr. Server nahlásil chybu.';
+$messages['filtersaveerror'] = 'Nebylo možné uložit filtr. Došlo k chybě serveru.';
 $messages['filterdeleteconfirm'] = 'Opravdu chcete smazat vybraný filtr?';
 $messages['ruledeleteconfirm'] = 'Jste si jisti, že chcete smazat vybrané pravidlo?';
 $messages['actiondeleteconfirm'] = 'Jste si jisti, že chcete smazat vybranou akci?';
@@ -185,7 +183,7 @@
 $messages['deactivated'] = 'Filtr/y úspěšně zapnuty.';
 $messages['activated'] = 'Filtr/y úspěšne vypnuty.';
 $messages['moved'] = 'Filtr byl úspěšně přesunut.';
-$messages['moveerror'] = 'Nelze přesunout vybraný filtr. Došlo k chybě na serveru.';
+$messages['moveerror'] = 'Nelze přesunout vybraný filtr. Došlo k chybě serveru.';
 $messages['nametoolong'] = 'Příliš dlouhý název.';
 $messages['namereserved'] = 'Vyhrazený název.';
 $messages['setexist'] = 'Sada již existuje.';
diff --git a/plugins/managesieve/localization/cy_GB.inc b/plugins/managesieve/localization/cy_GB.inc
index fceca34..806a49d 100644
--- a/plugins/managesieve/localization/cy_GB.inc
+++ b/plugins/managesieve/localization/cy_GB.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Hidlyddion';
 $labels['managefilters'] = 'Rheoli hidlyddion ebost i fewn';
 $labels['filtername'] = 'Enw hidlydd';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'o chwith';
 $messages['filterunknownerror'] = 'Gwall gweinydd anhysbys.';
 $messages['filterconnerror'] = 'Methwyd cysylltu a\'r gweinydd.';
-$messages['filterdeleteerror'] = 'Methwyd dileu hidlydd. Cafwydd gwall gweinydd.';
 $messages['filterdeleted'] = 'Dilëuwyd hidlydd yn llwyddiannus.';
 $messages['filtersaved'] = 'Cadwyd hidlydd yn llwyddiannus.';
-$messages['filtersaveerror'] = 'Methwyd cadw hidlydd. Cafwyd gwall gweinydd.';
 $messages['filterdeleteconfirm'] = 'Ydych chi wir am ddileu yr hidlydd ddewiswyd?';
 $messages['ruledeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r rheol ddewiswyd?';
 $messages['actiondeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r weithred ddewiswyd?';
 $messages['forbiddenchars'] = 'Llythrennau gwaharddedig yn y maes.';
 $messages['cannotbeempty'] = 'Ni all y maes fod yn wag.';
 $messages['ruleexist'] = 'Mae hidlydd gyda\'r enw yma yn bodoli\'n barod.';
-$messages['setactivateerror'] = 'Methwyd bywiogi y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
-$messages['setdeactivateerror'] = 'Methwyd dadfywiogi y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
-$messages['setdeleteerror'] = 'Methwyd dileu y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
 $messages['setactivated'] = 'Bywiogwyd y set hidlydd yn llwyddiannus.';
 $messages['setdeactivated'] = 'Dadfywiogwyd y set hidlydd yn llwyddiannus.';
 $messages['setdeleted'] = 'Dilëuwyd y set hidlydd yn llwyddiannus.';
 $messages['setdeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r set hidlydd ddewiswyd?';
-$messages['setcreateerror'] = 'Methwyd creu set hidlydd. Cafwyd gwall gweinydd.';
 $messages['setcreated'] = 'Crëuwyd y set hidlydd yn llwyddiannus.';
-$messages['activateerror'] = 'Methwyd galluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
-$messages['deactivateerror'] = 'Methwyd analluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
 $messages['deactivated'] = 'Galluogwyd y hidlydd(ion) yn llwyddiannus.';
 $messages['activated'] = 'Analluogwyd y hidlydd(ion) yn llwyddiannus.';
 $messages['moved'] = 'Symudwyd y hidlydd yn llwyddiannus.';
-$messages['moveerror'] = 'Methwyd symud y hidlydd dewiswyd. Cafwyd gwall gweinydd.';
 $messages['nametoolong'] = 'Enw yn rhy hir.';
 $messages['namereserved'] = 'Enw neilltuedig.';
 $messages['setexist'] = 'Mae\'r set yn bodoli\'n barod.';
diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc
index 2d3c373..863dc1e 100644
--- a/plugins/managesieve/localization/da_DK.inc
+++ b/plugins/managesieve/localization/da_DK.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Ændre indgående mail filtreing';
 $labels['filtername'] = 'Filter navn';
@@ -49,14 +47,12 @@
 $labels['messagereply'] = 'Svar med besked';
 $labels['messagedelete'] = 'Slet besked';
 $labels['messagediscard'] = 'Slet med besked';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'For indkomne besked:';
 $labels['messagesactions'] = '...udfør følgende aktioner:';
 $labels['add'] = 'Tilføje';
 $labels['del'] = 'Fjern';
 $labels['sender'] = 'Afsender';
 $labels['recipient'] = 'Modtager';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Hvor tit skal besked sendes (i dage):';
 $labels['vacationinterval'] = 'Hvor tit skal besked sendes:';
 $labels['days'] = 'dage';
@@ -161,31 +157,22 @@
 $labels['indexlast'] = 'baglends';
 $messages['filterunknownerror'] = 'Ukendt server fejl.';
 $messages['filterconnerror'] = 'Kan ikke forbinde til server.';
-$messages['filterdeleteerror'] = 'Kan ikke slette filter. Server fejl.';
 $messages['filterdeleted'] = 'Filter slettet.';
 $messages['filtersaved'] = 'Filter gemt.';
-$messages['filtersaveerror'] = 'Kan ikke gemme filter. Server fejl.';
 $messages['filterdeleteconfirm'] = 'Vil du slette det valgte filter?';
 $messages['ruledeleteconfirm'] = 'Er du sikker på at du vil slette den valgte regel?';
 $messages['actiondeleteconfirm'] = 'Er du sikker på du vil slette den valgte handling?';
 $messages['forbiddenchars'] = 'Ulovlige tegn i feltet';
 $messages['cannotbeempty'] = 'Feltet kan ikke være tomt.';
 $messages['ruleexist'] = 'Filter med dette navn eksisterer allerede.';
-$messages['setactivateerror'] = 'Kan ikke aktiverer valgt filter sæt. Server fejl.';
-$messages['setdeactivateerror'] = 'Kan ikke deaktivere valgt filter sæt. Server fejl.';
-$messages['setdeleteerror'] = 'Kan ikke slette valgt filter sæt. Server fejl.';
 $messages['setactivated'] = 'Filter sæt aktiveret.';
 $messages['setdeactivated'] = 'Filter sæt deaktiveret.';
 $messages['setdeleted'] = 'Filter sæt slettet.';
 $messages['setdeleteconfirm'] = 'Er du sikker på du vil slette valgt filter sæt?';
-$messages['setcreateerror'] = 'Kan ikke oprette filter sæt. Server fejl.';
 $messages['setcreated'] = 'Filter sæt oprettet.';
-$messages['activateerror'] = 'Kan ikek aktivere valgt filter sæt. Server fejl.';
-$messages['deactivateerror'] = 'Kan ikke deaktivere valgt filter sæt. Server fejl.';
 $messages['deactivated'] = 'Filter(filtre) aktiveret.';
 $messages['activated'] = 'Filter(filtre) deaktiveret.';
 $messages['moved'] = 'Filter flyttet.';
-$messages['moveerror'] = 'Kan ikke flytte valgt filter. Server fejl.';
 $messages['nametoolong'] = 'Navn er for langt.';
 $messages['namereserved'] = 'Reserveret navn.';
 $messages['setexist'] = 'Filterv sæt eksisterer allerede';
diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc
index 6eb58f7..f3559fa 100644
--- a/plugins/managesieve/localization/de_CH.inc
+++ b/plugins/managesieve/localization/de_CH.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Verwalte eingehende Nachrichtenfilter';
 $labels['filtername'] = 'Filtername';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'rückwärts';
 $messages['filterunknownerror'] = 'Unbekannter Serverfehler';
 $messages['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden';
-$messages['filterdeleteerror'] = 'Fehler beim des löschen  Filters. Serverfehler';
 $messages['filterdeleted'] = 'Filter erfolgreich gelöscht';
 $messages['filtersaved'] = 'Filter gespeichert';
-$messages['filtersaveerror'] = 'Serverfehler, konnte den Filter nicht speichern.';
 $messages['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen ?';
 $messages['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?';
 $messages['actiondeleteconfirm'] = 'Sicher, dass Sie die ausgewaehlte Aktion löschen wollen?';
 $messages['forbiddenchars'] = 'Unerlaubte Zeichen im Feld';
 $messages['cannotbeempty'] = 'Feld darf nicht leer sein';
 $messages['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
-$messages['setactivateerror'] = 'Filtersatz kann nicht aktiviert werden. Serverfehler.';
-$messages['setdeactivateerror'] = 'Filtersatz kann nicht deaktiviert werden. Serverfehler.';
-$messages['setdeleteerror'] = 'Filtersatz kann nicht gelöscht werden. Serverfehler.';
 $messages['setactivated'] = 'Filtersatz erfolgreich aktiviert.';
 $messages['setdeactivated'] = 'Filtersatz erfolgreich deaktiviert.';
 $messages['setdeleted'] = 'Filtersatz erfolgreich gelöscht.';
 $messages['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
-$messages['setcreateerror'] = 'Filtersatz kann nicht erstellt werden. Serverfehler.';
 $messages['setcreated'] = 'Filter erfolgreich erstellt.';
-$messages['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
-$messages['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
 $messages['deactivated'] = 'Filter erfolgreich aktiviert.';
 $messages['activated'] = 'Filter erfolgreich deaktiviert.';
 $messages['moved'] = 'Filter erfolgreich verschoben.';
-$messages['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
 $messages['nametoolong'] = 'Filtersatz kann nicht erstellt werden. Name zu lang.';
 $messages['namereserved'] = 'Reservierter Name.';
 $messages['setexist'] = 'Filtersatz existiert bereits.';
diff --git a/plugins/managesieve/localization/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
index b14df43..ac81ccd 100644
--- a/plugins/managesieve/localization/de_DE.inc
+++ b/plugins/managesieve/localization/de_DE.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Filter für eingehende Nachrichten verwalten';
 $labels['filtername'] = 'Filtername';
@@ -56,7 +54,6 @@
 $labels['del'] = 'Löschen';
 $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfänger';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Wie oft sollen Nachrichten gesendet werden (in Tagen):';
 $labels['vacationinterval'] = 'Wie oft sollen Nachrichten gesendet werden:';
 $labels['days'] = 'Tage';
@@ -161,31 +158,22 @@
 $labels['indexlast'] = 'rückwärts';
 $messages['filterunknownerror'] = 'Unbekannter Serverfehler';
 $messages['filterconnerror'] = 'Kann keine Verbindung mit Managesieve-Server herstellen';
-$messages['filterdeleteerror'] = 'Fehler beim Löschen des Filters. Serverfehler';
 $messages['filterdeleted'] = 'Filter erfolgreich gelöscht';
 $messages['filtersaved'] = 'Filter erfolgreich gespeichert';
-$messages['filtersaveerror'] = 'Fehler beim Speichern des Filters. Serverfehler';
 $messages['filterdeleteconfirm'] = 'Möchten Sie den ausgewählten Filter wirklich löschen?';
 $messages['ruledeleteconfirm'] = 'Sind Sie sicher, dass Sie die ausgewählte Regel löschen möchten?';
 $messages['actiondeleteconfirm'] = 'Sind Sie sicher, dass Sie die ausgewählte Aktion löschen möchten?';
 $messages['forbiddenchars'] = 'Unzulässige Zeichen im Eingabefeld';
 $messages['cannotbeempty'] = 'Eingabefeld darf nicht leer sein';
 $messages['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
-$messages['setactivateerror'] = 'Kann ausgewählten Filtersatz nicht aktivieren. Serverfehler';
-$messages['setdeactivateerror'] = 'Kann ausgewählten Filtersatz nicht deaktivieren. Serverfehler';
-$messages['setdeleteerror'] = 'Kann ausgewählten Filtersatz nicht löschen. Serverfehler';
 $messages['setactivated'] = 'Filtersatz wurde erfolgreich aktiviert';
 $messages['setdeactivated'] = 'Filtersatz wurde erfolgreich deaktiviert';
 $messages['setdeleted'] = 'Filtersatz wurde erfolgreich gelöscht';
 $messages['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
-$messages['setcreateerror'] = 'Erstellen von Filter Sätzen nicht möglich. Es ist ein Server Fehler aufgetreten.';
 $messages['setcreated'] = 'Filtersatz wurde erfolgreich erstellt';
-$messages['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
-$messages['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
 $messages['deactivated'] = 'Filter erfolgreich deaktiviert.';
 $messages['activated'] = 'Filter erfolgreich aktiviert.';
 $messages['moved'] = 'Filter erfolgreich verschoben.';
-$messages['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
 $messages['nametoolong'] = 'Kann Filtersatz nicht erstellen. Name zu lang';
 $messages['namereserved'] = 'Reservierter Name.';
 $messages['setexist'] = 'Filtersatz existiert bereits.';
diff --git a/plugins/managesieve/localization/el_GR.inc b/plugins/managesieve/localization/el_GR.inc
index deba507..73ec786 100644
--- a/plugins/managesieve/localization/el_GR.inc
+++ b/plugins/managesieve/localization/el_GR.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Φίλτρα';
 $labels['managefilters'] = 'Διαχείριση φίλτρων εισερχόμενων';
 $labels['filtername'] = 'Ονομασία φίλτρου';
@@ -49,14 +47,12 @@
 $labels['messagereply'] = 'Απάντηση με μήνυμα';
 $labels['messagedelete'] = 'Διαγραφή μηνύματος';
 $labels['messagediscard'] = 'Απόρριψη με μήνυμα';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Για εισερχόμενα μηνύματα που:';
 $labels['messagesactions'] = '...εκτέλεση των παρακάτω ενεργειών:';
 $labels['add'] = 'Προσθήκη';
 $labels['del'] = 'Διαγραφή';
 $labels['sender'] = 'Αποστολέας';
 $labels['recipient'] = 'Παραλήπτης';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Συχνότητα αποστολής μηνυμάτων (σε ημέρες):';
 $labels['vacationinterval'] = 'Συχνότητα αποστολής μηνυμάτων:';
 $labels['days'] = 'ημερες';
@@ -161,31 +157,22 @@
 $labels['indexlast'] = 'προς τα πίσω';
 $messages['filterunknownerror'] = 'Άγνωστο σφάλμα διακομιστή';
 $messages['filterconnerror'] = 'Αδυναμία σύνδεσης στον διακομιστή managesieve';
-$messages['filterdeleteerror'] = 'Αδυναμία διαγραφής φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
 $messages['filterdeleted'] = 'Το φίλτρο διαγράφηκε επιτυχώς';
 $messages['filtersaved'] = 'Το φίλτρο αποθηκεύτηκε επιτυχώς';
-$messages['filtersaveerror'] = 'Αδυναμία αποθήκευσης φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
 $messages['filterdeleteconfirm'] = 'Είστε σίγουροι ότι θέλετε να διαγράψετε το επιλεγμένο φίλτρο? ';
 $messages['ruledeleteconfirm'] = 'Θέλετε όντως να διαγράψετε τον επιλεγμένο κανόνα;';
 $messages['actiondeleteconfirm'] = 'Θέλετε όντως να διαγράψετε την επιλεγμένη ενέργεια;';
 $messages['forbiddenchars'] = 'Μη επιτρεπτοί χαρακτήρες στο πεδίο';
 $messages['cannotbeempty'] = 'Το πεδίο δεν μπορεί να είναι κενό';
 $messages['ruleexist'] = 'Φιλτρο με αυτο το όνομα υπάρχει ήδη. ';
-$messages['setactivateerror'] = 'Αδυναμία ενεργοποιησης επιλεγμενων φιλτρων. Προέκυψε σφάλμα στον διακομιστή.';
-$messages['setdeactivateerror'] = 'Αδυναμία απενεργοποιησης επιλεγμενων φιλτρων. Προέκυψε σφάλμα στον διακομιστή.';
-$messages['setdeleteerror'] = 'Αδυναμία διαγραφής φίλτρων. Προέκυψε σφάλμα στον διακομιστή';
 $messages['setactivated'] = 'Φίλτρα ενεργοποιήθηκαν με επιτυχία.';
 $messages['setdeactivated'] = 'Φίλτρα απενεργοποιήθηκαν με επιτυχία.';
 $messages['setdeleted'] = 'Τα φίλτρα διαγράφηκαν επιτυχώς.';
 $messages['setdeleteconfirm'] = 'Θέλετε όντως να διαγράψετε τα επιλεγμένα φιλτρα?';
-$messages['setcreateerror'] = 'Αδυναμία δημιουργιας φιλτρων. Προέκυψε σφάλμα στον διακομιστή.';
 $messages['setcreated'] = 'Τα φιλτρα δημιουργηθηκαν επιτυχως.';
-$messages['activateerror'] = 'Αδυναμία ενεργοποιησης επιλεγμενου φίλτρου(ων). Προέκυψε σφάλμα στον διακομιστή.';
-$messages['deactivateerror'] = 'Αδυναμία απενεργοποιησης επιλεγμενου φίλτρου(ων). Προέκυψε σφάλμα στον διακομιστή.';
 $messages['deactivated'] = 'Το φιλτρο(α) απενεργοποιηθηκαν επιτυχως.';
 $messages['activated'] = 'Το φίλτρο(α) ενεργοποιηθηκαν επιτυχώς.';
 $messages['moved'] = 'Το φίλτρο μετακινηθηκε επιτυχώς.';
-$messages['moveerror'] = 'Αδυναμία μετακινησης επιλεγμενου φίλτρου. Προέκυψε σφάλμα στον διακομιστή.';
 $messages['nametoolong'] = 'Το όνομα είναι πολύ μεγάλο.';
 $messages['namereserved'] = 'Δεσμευμένο όνομα. ';
 $messages['setexist'] = 'Set υπάρχει ήδη. ';
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
index 8eff950..6300614 100644
--- a/plugins/managesieve/localization/en_GB.inc
+++ b/plugins/managesieve/localization/en_GB.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filters';
 $labels['managefilters'] = 'Manage incoming mail filters';
 $labels['filtername'] = 'Filter name';
@@ -49,18 +47,13 @@
 $labels['messagereply'] = 'Reply with message';
 $labels['messagedelete'] = 'Delete message';
 $labels['messagediscard'] = 'Discard with message';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'For incoming mail:';
 $labels['messagesactions'] = '...execute the following actions:';
 $labels['add'] = 'Add';
 $labels['del'] = 'Delete';
 $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'How often send messages (in days):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
@@ -84,13 +77,11 @@
 $labels['countislessthan'] = 'count is less than';
 $labels['countislessthanequal'] = 'count is less than or equal to';
 $labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count is not equal to';
 $labels['valueisgreaterthan'] = 'value is greater than';
 $labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
 $labels['valueislessthan'] = 'value is less than';
 $labels['valueislessthanequal'] = 'value is less than or equal to';
 $labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = 'Set flags to the message';
 $labels['addflags'] = 'Add flags to the message';
 $labels['removeflags'] = 'Remove flags from the message';
@@ -99,45 +90,10 @@
 $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['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
 $labels['filtercreate'] = 'Create filter';
 $labels['usedata'] = 'Use following data in the filter:';
 $labels['nextstep'] = 'Next Step';
 $labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = 'Advanced options';
 $labels['body'] = 'Body';
 $labels['address'] = 'address';
@@ -157,38 +113,26 @@
 $labels['octet'] = 'strict (octet)';
 $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'Unknown server error';
 $messages['filterconnerror'] = 'Unable to connect to managesieve server';
-$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured';
 $messages['filterdeleted'] = 'Filter deleted successfully';
 $messages['filtersaved'] = 'Filter saved successfully';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
 $messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
 $messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
 $messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
 $messages['forbiddenchars'] = 'Forbidden characters in field';
 $messages['cannotbeempty'] = 'Field cannot be empty';
 $messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
-$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
 $messages['setactivated'] = 'Filters set activated successfully.';
 $messages['setdeactivated'] = 'Filters set deactivated successfully.';
 $messages['setdeleted'] = 'Filters set deleted successfully.';
 $messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$messages['setcreateerror'] = 'Unable to create filters set. Server error occured.';
 $messages['setcreated'] = 'Filters set created successfully.';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
 $messages['deactivated'] = 'Filter(s) disabled successfully.';
 $messages['activated'] = 'Filter(s) enabled successfully.';
 $messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
 $messages['nametoolong'] = 'Name too long.';
 $messages['namereserved'] = 'Reserved name.';
 $messages['setexist'] = 'Set already exists.';
 $messages['nodata'] = 'At least one position must be selected!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/eo.inc b/plugins/managesieve/localization/eo.inc
index 2174d34..f613d92 100644
--- a/plugins/managesieve/localization/eo.inc
+++ b/plugins/managesieve/localization/eo.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtriloj';
 $labels['managefilters'] = 'Mastrumi filtrilojn pri enirantaj mesaĝoj';
 $labels['filtername'] = 'Nomo de filtrilo';
@@ -25,8 +23,6 @@
 $labels['filterdel'] = 'Forigi filtrilon';
 $labels['moveup'] = 'Movi supren';
 $labels['movedown'] = 'Movi malsupren';
-$labels['filterallof'] = 'matching all of the following rules';
-$labels['filteranyof'] = 'matching any of the following rules';
 $labels['filterany'] = 'ĉiuj mesaĝoj';
 $labels['filtercontains'] = 'enhavas';
 $labels['filternotcontains'] = 'ne enhavas';
@@ -48,147 +44,8 @@
 $labels['messagesendcopy'] = 'Sendi kopion de mesaĝo al';
 $labels['messagereply'] = 'Respondi per mesaĝo';
 $labels['messagedelete'] = 'Forigi mesaĝon';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagekeep'] = 'Keep message in Inbox';
-$labels['messagesrules'] = 'For incoming mail:';
-$labels['messagesactions'] = '...execute the following actions:';
 $labels['add'] = 'Aldoni';
 $labels['del'] = 'Forigi';
 $labels['sender'] = 'Sendanto';
 $labels['recipient'] = 'Ricevanto';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
-$labels['vacationdays'] = 'How often send messages (in days):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
-$labels['vacationreason'] = 'Message body (vacation reason):';
-$labels['vacationsubject'] = 'Message subject:';
-$labels['rulestop'] = 'Stop evaluating rules';
-$labels['enable'] = 'Enable/Disable';
-$labels['filterset'] = 'Filters set';
-$labels['filtersets'] = 'Filter sets';
-$labels['filtersetadd'] = 'Add filters set';
-$labels['filtersetdel'] = 'Delete current filters set';
-$labels['filtersetact'] = 'Activate current filters set';
-$labels['filtersetdeact'] = 'Deactivate current filters set';
-$labels['filterdef'] = 'Filter definition';
-$labels['filtersetname'] = 'Filters set name';
-$labels['newfilterset'] = 'New filters set';
-$labels['active'] = 'active';
-$labels['none'] = 'none';
-$labels['fromset'] = 'from set';
-$labels['fromfile'] = 'from file';
-$labels['filterdisabled'] = 'Filter disabled';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count is not equal to';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value is not equal to';
-$labels['setflags'] = 'Set flags to the message';
-$labels['addflags'] = 'Add flags to the message';
-$labels['removeflags'] = 'Remove flags from the message';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
-$labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
-$messages['filterunknownerror'] = 'Unknown server error.';
-$messages['filterconnerror'] = 'Unable to connect to server.';
-$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
-$messages['filterdeleted'] = 'Filter deleted successfully.';
-$messages['filtersaved'] = 'Filter saved successfully.';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$messages['forbiddenchars'] = 'Forbidden characters in field.';
-$messages['cannotbeempty'] = 'Field cannot be empty.';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
-$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
-$messages['setactivated'] = 'Filters set activated successfully.';
-$messages['setdeactivated'] = 'Filters set deactivated successfully.';
-$messages['setdeleted'] = 'Filters set deleted successfully.';
-$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$messages['setcreateerror'] = 'Unable to create filters set. Server error occured.';
-$messages['setcreated'] = 'Filters set created successfully.';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
-$messages['nametoolong'] = 'Name too long.';
-$messages['namereserved'] = 'Reserved name.';
-$messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/es_AR.inc b/plugins/managesieve/localization/es_AR.inc
index a11d45c..7707a2b 100644
--- a/plugins/managesieve/localization/es_AR.inc
+++ b/plugins/managesieve/localization/es_AR.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Administrar filtros de correo entrante';
 $labels['filtername'] = 'Nombre del filtro';
@@ -34,10 +32,6 @@
 $labels['filterisnot'] = 'no es igual a';
 $labels['filterexists'] = 'existe';
 $labels['filternotexists'] = 'no existe';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
 $labels['filterunder'] = 'bajo';
 $labels['filterover'] = 'sobre';
 $labels['addrule'] = 'Agregar regla';
@@ -49,24 +43,16 @@
 $labels['messagereply'] = 'Responder con un mensaje';
 $labels['messagedelete'] = 'Eliminar mensaje';
 $labels['messagediscard'] = 'Descartar con un mensaje';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Para el correo entrante:';
 $labels['messagesactions'] = '... ejecutar las siguientes acciones:';
 $labels['add'] = 'Agregar';
 $labels['del'] = 'Eliminar';
 $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Cada cuanto enviar mensajes (en días):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razón de vacaciones):';
-$labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Parar de evaluar reglas';
-$labels['enable'] = 'Enable/Disable';
 $labels['filterset'] = 'Conjunto de filtros';
-$labels['filtersets'] = 'Filter sets';
 $labels['filtersetadd'] = 'Agregar conjunto de filtros';
 $labels['filtersetdel'] = 'Eliminar conjunto de filtros';
 $labels['filtersetact'] = 'Activar conjunto de filtros';
@@ -79,116 +65,19 @@
 $labels['fromset'] = 'desde conjunto';
 $labels['fromfile'] = 'desde archivo';
 $labels['filterdisabled'] = 'Filtro deshabilitado';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count is not equal to';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value is not equal to';
-$labels['setflags'] = 'Set flags to the message';
-$labels['addflags'] = 'Add flags to the message';
-$labels['removeflags'] = 'Remove flags from the message';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
-$labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'Error desconocido de servidor';
 $messages['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
-$messages['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
 $messages['filterdeleted'] = 'Filtro borrado satisfactoriamente';
 $messages['filtersaved'] = 'Filtro guardado satisfactoriamente';
-$messages['filtersaveerror'] = 'Imposible guardar ell filtro. Ha ocurrido un error en el servidor';
 $messages['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
 $messages['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
 $messages['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
 $messages['forbiddenchars'] = 'Caracteres prohibidos en el campo';
 $messages['cannotbeempty'] = 'El campo no puede estar vacío';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Imposible activar el conjunto de filtros. Error en el servidor.';
-$messages['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros. Error en el servidor.';
-$messages['setdeleteerror'] = 'Imposible eliminar el conjunto de filtros. Error en el servidor.';
 $messages['setactivated'] = 'Conjunto de filtros activados correctamente';
 $messages['setdeactivated'] = 'Conjunto de filtros desactivados correctamente';
 $messages['setdeleted'] = 'Conjunto de filtros eliminados correctamente';
 $messages['setdeleteconfirm'] = '¿Esta seguro, que quiere eliminar el conjunto de filtros seleccionado?';
-$messages['setcreateerror'] = 'Imposible crear el conjunto de filtros. Error en el servidor.';
 $messages['setcreated'] = 'Conjunto de filtros creados correctamente';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
 $messages['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre del conjunto de filtros muy largo';
-$messages['namereserved'] = 'Reserved name.';
-$messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc
index a79763a..208477a 100644
--- a/plugins/managesieve/localization/es_ES.inc
+++ b/plugins/managesieve/localization/es_ES.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Administrar filtros de correo entrante';
 $labels['filtername'] = 'Nombre del filtro';
@@ -56,7 +54,7 @@
 $labels['del'] = 'Eliminar';
 $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
+$labels['vacationaddr'] = 'Mis direcciones adicionales de correo electrónico:';
 $labels['vacationdays'] = 'Cada cuánto enviar mensajes (en días):';
 $labels['vacationinterval'] = 'Cada cuánto enviar mensajes:';
 $labels['days'] = 'días';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'hacia atrás';
 $messages['filterunknownerror'] = 'Error desconocido de servidor.';
 $messages['filterconnerror'] = 'Imposible conectar con el servidor managesieve.';
-$messages['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor.';
 $messages['filterdeleted'] = 'Filtro borrado satisfactoriamente.';
 $messages['filtersaved'] = 'Filtro guardado satisfactoriamente.';
-$messages['filtersaveerror'] = 'Imposible guardar el filtro. Ha ocurrido un error en el servidor.';
 $messages['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
 $messages['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
 $messages['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
 $messages['forbiddenchars'] = 'Caracteres prohibidos en el campo.';
 $messages['cannotbeempty'] = 'El campo no puede estar vacío.';
 $messages['ruleexist'] = 'Ya existe un filtro con el nombre especificado.';
-$messages['setactivateerror'] = 'Imposible activar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor.';
-$messages['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor.';
-$messages['setdeleteerror'] = 'Imposible borrar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor.';
 $messages['setactivated'] = 'Conjunto de filtros activado satisfactoriamente.';
 $messages['setdeactivated'] = 'Conjunto de filtros desactivado satisfactoriamente.';
 $messages['setdeleted'] = 'Conjunto de filtros borrado satisfactoriamente.';
 $messages['setdeleteconfirm'] = '¿Está seguro de que desea borrar el conjunto de filtros seleccionado?';
-$messages['setcreateerror'] = 'Imposible crear el conjunto de filtros. Ha ocurrido un error en el servidor.';
 $messages['setcreated'] = 'Conjunto de filtros creado satisfactoriamente.';
-$messages['activateerror'] = 'No se ha podido habilitar el filtro(s) seleccionado. Se ha producido un error de servidor.';
-$messages['deactivateerror'] = 'No se ha podido deshabilitar el filtro(s) seleccionado. Se ha producido un error de servidor.';
 $messages['deactivated'] = 'Filtro(s) deshabilitado(s) correctamente.';
 $messages['activated'] = 'Filtro(s) habilitado(s) correctamente.';
 $messages['moved'] = 'Filtro movido correctamente.';
-$messages['moveerror'] = 'No se ha podido mover el filtro seleccionado. Ha ocurrido un error de servidor.';
 $messages['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre demasiado largo';
 $messages['namereserved'] = 'Nombre reservado.';
 $messages['setexist'] = 'El conjunto ya existe.';
diff --git a/plugins/managesieve/localization/et_EE.inc b/plugins/managesieve/localization/et_EE.inc
index 7af0e07..e8a3bd3 100644
--- a/plugins/managesieve/localization/et_EE.inc
+++ b/plugins/managesieve/localization/et_EE.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtrid';
 $labels['managefilters'] = 'Halda sisenevate kirjade filtreid';
 $labels['filtername'] = 'Filtri nimi';
@@ -49,14 +47,12 @@
 $labels['messagereply'] = 'Vasta kirjaga';
 $labels['messagedelete'] = 'Kustuta kiri';
 $labels['messagediscard'] = 'Viska ära teatega';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Siseneva kirja puhul, mis:';
 $labels['messagesactions'] = '...käivita järgnevad tegevused:';
 $labels['add'] = 'Lisa';
 $labels['del'] = 'Kustuta';
 $labels['sender'] = 'Saatja';
 $labels['recipient'] = 'Saaja';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Kui tihti kirju saata (päevades):';
 $labels['vacationinterval'] = 'Kui tihti kirju saata:';
 $labels['days'] = 'päeva';
@@ -161,31 +157,22 @@
 $labels['indexlast'] = 'tagasisuunas';
 $messages['filterunknownerror'] = 'Tundmatu serveri tõrge';
 $messages['filterconnerror'] = 'Managesieve serveriga ühendumine nurjus';
-$messages['filterdeleteerror'] = 'Filtri kustutamine nurjus. Ilmnes serveri tõrge.';
 $messages['filterdeleted'] = 'Filter edukalt kustutatud';
 $messages['filtersaved'] = 'Filter edukalt salvestatud';
-$messages['filtersaveerror'] = 'Filtri salvestamine nurjus. Ilmnes serveri tõrge.';
 $messages['filterdeleteconfirm'] = 'Soovid valitud filtri kustutada?';
 $messages['ruledeleteconfirm'] = 'Soovid valitud reegli kustutada?';
 $messages['actiondeleteconfirm'] = 'Soovid valitud tegevuse kustutada?';
 $messages['forbiddenchars'] = 'Väljal on lubamatu märk';
 $messages['cannotbeempty'] = 'Väli ei või tühi olla';
 $messages['ruleexist'] = 'Määratud nimega filter on juba olemas';
-$messages['setactivateerror'] = 'Valitud filtrite kogumi aktiveerimine nurjus. Ilmnes serveri tõrge.';
-$messages['setdeactivateerror'] = 'Valitud filtrite kogumi deaktiveerimine nurjus. Ilmnes serveri tõrge.';
-$messages['setdeleteerror'] = 'Valitud filtrite kogumi kustutamine nurjus. Ilmnes serveri tõrge.';
 $messages['setactivated'] = 'Filtrite kogumi aktiveerimine õnnestus.';
 $messages['setdeactivated'] = 'Filtrite kogumi deaktiveerimine õnnestus.';
 $messages['setdeleted'] = 'Filtrite kogumi kustutamine õnnestus.';
 $messages['setdeleteconfirm'] = 'Oled kindel, et soovid valitud filtrite kogumi kustutada?';
-$messages['setcreateerror'] = 'Filtrite kogumi loomine nurjus. Ilmnes serveri tõrge.';
 $messages['setcreated'] = 'Filtrite kogumi loomine õnnestus.';
-$messages['activateerror'] = 'Valitud filtrite lubamine nurjus. Ilmnes serveri tõrge.';
-$messages['deactivateerror'] = 'Valitud filtrite keelamine nurjus. Ilmnes serveri tõrge.';
 $messages['deactivated'] = 'Filter edukalt lubatud.';
 $messages['activated'] = 'Filter edukalt keelatud.';
 $messages['moved'] = 'Filter edukalt liigutatud.';
-$messages['moveerror'] = 'Valitud filtri liigutamine nurjus. Ilmnes serveri tõrge.';
 $messages['nametoolong'] = 'Nimi on liiga pikk.';
 $messages['namereserved'] = 'Nimi on reserveeritud.';
 $messages['setexist'] = 'Kogum on juba olemas.';
diff --git a/plugins/managesieve/localization/eu_ES.inc b/plugins/managesieve/localization/eu_ES.inc
index c7846e6..fde8f91 100644
--- a/plugins/managesieve/localization/eu_ES.inc
+++ b/plugins/managesieve/localization/eu_ES.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Iragazkiak';
 $labels['managefilters'] = 'Administratu postaren sarrera-iragazkiak';
 $labels['filtername'] = 'Iragazkiaren izena';
diff --git a/plugins/managesieve/localization/fa_IR.inc b/plugins/managesieve/localization/fa_IR.inc
index 5d3cdcd..8aeb517 100644
--- a/plugins/managesieve/localization/fa_IR.inc
+++ b/plugins/managesieve/localization/fa_IR.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'صافی‌ها';
 $labels['managefilters'] = 'مدیریت صافی‌های نامه ورودی';
 $labels['filtername'] = 'نام صافی';
@@ -56,7 +54,6 @@
 $labels['del'] = 'حذف';
 $labels['sender'] = 'فرستنده';
 $labels['recipient'] = 'گیرنده';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'پیغام ها در چه مواقعی فرستاده شدند (در روزهای):';
 $labels['vacationinterval'] = 'مواقعی که پیغام‌ها ارسال می‌شوند:';
 $labels['days'] = 'روزها';
@@ -161,31 +158,22 @@
 $labels['indexlast'] = 'به عقب';
 $messages['filterunknownerror'] = 'خطای سرور نامعلوم.';
 $messages['filterconnerror'] = 'ناتوانی در اتصال به سرور.';
-$messages['filterdeleteerror'] = 'ناتوانی در حذف صافی. خطای سرور رخ داد.';
 $messages['filterdeleted'] = 'صافی با موفقیت حذف شد.';
 $messages['filtersaved'] = 'صافی با موفقیت ذخیره شد.';
-$messages['filtersaveerror'] = 'ناتوانی در ذخیره فیلتر. خطای سرور رخ داد.';
 $messages['filterdeleteconfirm'] = 'آیا مطمئن به حذف صافی انتخاب شده هستید؟';
 $messages['ruledeleteconfirm'] = 'آیا مطمئن هستید که می خواهید قانون انتخاب شده را حذف کنید؟';
 $messages['actiondeleteconfirm'] = 'آیا مطمئن هستید که می خواهید عمل انتخاب شده را حذف کنید.';
 $messages['forbiddenchars'] = 'حروف ممنوعه در فیلد.';
 $messages['cannotbeempty'] = 'فیلد نمی تواند خالی باشد.';
 $messages['ruleexist'] = 'صافی با این نام مشخص وجود دارد.';
-$messages['setactivateerror'] = 'ناتوان در فعال کردن مجموعه صافی‌ها انتخاب شده. خطای سرور رخ داد.';
-$messages['setdeactivateerror'] = 'ناتوان در غیرفعال کردن مجموعه صافی‌ها انتخاب شده. خطای سرور رخ داد.';
-$messages['setdeleteerror'] = 'ناتوان در حذف مجموعه صافی‌ها انتخاب شده. خطای سرور رخ داد.';
 $messages['setactivated'] = 'مجموعه صافی‌ها با موفقیت فعال شد.';
 $messages['setdeactivated'] = 'مجموعه صافی‌ها با موفقیت غیرفعال شد.';
 $messages['setdeleted'] = 'مجموعه صافی‌ها با موفقیت حذف شد.';
 $messages['setdeleteconfirm'] = 'آیا مطمئن هستید که می‌خواهید مجموعه صافی‌ها انتخاب شده را حذف کنید؟';
-$messages['setcreateerror'] = 'ناتوانی در ایجاد مجموعه صافی‌ها. خطای سرور رخ داد.';
 $messages['setcreated'] = 'مجموعه صافی‌ها با موفقیت ایجاد شد.';
-$messages['activateerror'] = 'ناتوانی در فعال کردن صافی(های) انتخاب شده. خطای سرور رخ داد.';
-$messages['deactivateerror'] = 'ناتوانی در غیرفعال کردن صافی(های) انتخاب شده. خطای سرور رخ داد.';
 $messages['deactivated'] = 'صافی(ها) با موفقیت فعال شدند.';
 $messages['activated'] = 'صافی(ها) با موفقیت غیرفعال شدند.';
 $messages['moved'] = 'صافی با موفقیت منتقل شد.';
-$messages['moveerror'] = 'ناتوانی در انتقال صافی انتخاب شده. خطای سرور رخ داد.';
 $messages['nametoolong'] = 'نام خیلی بلند.';
 $messages['namereserved'] = 'نام رزرو شده.';
 $messages['setexist'] = 'مجموعه در حال حاضر موجود است.';
diff --git a/plugins/managesieve/localization/fi_FI.inc b/plugins/managesieve/localization/fi_FI.inc
index 8108165..afdca3d 100644
--- a/plugins/managesieve/localization/fi_FI.inc
+++ b/plugins/managesieve/localization/fi_FI.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Suodattimet';
 $labels['managefilters'] = 'Hallitse saapuvan sähköpostin suodattimia';
 $labels['filtername'] = 'Suodattimen nimi';
@@ -34,67 +32,16 @@
 $labels['filterisnot'] = 'ei ole samanlainen kuin';
 $labels['filterexists'] = 'on olemassa';
 $labels['filternotexists'] = 'ei ole olemassa';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
-$labels['filterunder'] = 'under';
-$labels['filterover'] = 'over';
 $labels['addrule'] = 'Lisää sääntö';
 $labels['delrule'] = 'Poista sääntö';
-$labels['messagemoveto'] = 'Move message to';
-$labels['messageredirect'] = 'Redirect message to';
-$labels['messagecopyto'] = 'Copy message to';
-$labels['messagesendcopy'] = 'Send message copy to';
-$labels['messagereply'] = 'Reply with message';
-$labels['messagedelete'] = 'Delete message';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagekeep'] = 'Keep message in Inbox';
-$labels['messagesrules'] = 'For incoming mail:';
-$labels['messagesactions'] = '...execute the following actions:';
 $labels['add'] = 'Lisää';
 $labels['del'] = 'Poista';
 $labels['sender'] = 'Lähettäjä';
 $labels['recipient'] = 'Vastaanottaja';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
-$labels['vacationdays'] = 'How often send messages (in days):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
-$labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Viestin aihe:';
-$labels['rulestop'] = 'Stop evaluating rules';
-$labels['enable'] = 'Enable/Disable';
-$labels['filterset'] = 'Filters set';
-$labels['filtersets'] = 'Filter sets';
-$labels['filtersetadd'] = 'Add filters set';
-$labels['filtersetdel'] = 'Delete current filters set';
-$labels['filtersetact'] = 'Activate current filters set';
-$labels['filtersetdeact'] = 'Deactivate current filters set';
-$labels['filterdef'] = 'Filter definition';
-$labels['filtersetname'] = 'Filters set name';
-$labels['newfilterset'] = 'New filters set';
-$labels['active'] = 'active';
-$labels['none'] = 'none';
-$labels['fromset'] = 'from set';
-$labels['fromfile'] = 'from file';
-$labels['filterdisabled'] = 'Filter disabled';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count is not equal to';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = 'Aseta liput viestiin';
 $labels['addflags'] = 'Lisää liput viestiin';
 $labels['removeflags'] = 'Poista liput viestistä';
-$labels['flagread'] = 'Read';
 $labels['flagdeleted'] = 'Poistettu';
 $labels['flaganswered'] = 'Vastattu';
 $labels['flagflagged'] = 'Liputettu';
@@ -102,93 +49,15 @@
 $labels['setvariable'] = 'Aseta muuttuja';
 $labels['setvarname'] = 'Muuttujan nimi:';
 $labels['setvarvalue'] = 'Muuttujan arvo:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
 $labels['notifyimportance'] = 'Tärkeysaste:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
 $labels['filtercreate'] = 'Luo suodatin';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
 $labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = 'Lisävalinnat';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
 $labels['default'] = 'oletus';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'Tuntematon palvelinvirhe.';
 $messages['filterconnerror'] = 'Yhteys palvelimeen epäonnistui.';
-$messages['filterdeleteerror'] = 'Suodattimen poisto epäonnistui palvelinvirheen vuoksi.';
 $messages['filterdeleted'] = 'Suodatin poistettu onnistuneesti.';
-$messages['filtersaved'] = 'Filter saved successfully.';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$messages['forbiddenchars'] = 'Forbidden characters in field.';
 $messages['cannotbeempty'] = 'Kenttä ei voi olla tyhjä.';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
-$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
-$messages['setactivated'] = 'Filters set activated successfully.';
-$messages['setdeactivated'] = 'Filters set deactivated successfully.';
-$messages['setdeleted'] = 'Filters set deleted successfully.';
-$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$messages['setcreateerror'] = 'Unable to create filters set. Server error occured.';
-$messages['setcreated'] = 'Filters set created successfully.';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
 $messages['moved'] = 'Suodatin siirretty onnistuneesti.';
-$messages['moveerror'] = 'Suodattimen siirtäminen epäonnistui palvelinvirheen vuoksi.';
 $messages['nametoolong'] = 'Nimi on liian pitkä.';
-$messages['namereserved'] = 'Reserved name.';
-$messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
index 8896023..0e9549b 100644
--- a/plugins/managesieve/localization/fr_FR.inc
+++ b/plugins/managesieve/localization/fr_FR.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtres';
 $labels['managefilters'] = 'Gérer les filtres sur les courriels entrants';
 $labels['filtername'] = 'Nom du filtre';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'retour arrière';
 $messages['filterunknownerror'] = 'Erreur du serveur inconnue';
 $messages['filterconnerror'] = 'Connexion au serveur Managesieve impossible';
-$messages['filterdeleteerror'] = 'Suppression du filtre impossible. Le serveur à produit une erreur';
 $messages['filterdeleted'] = 'Le filtre a bien été supprimé';
 $messages['filtersaved'] = 'Le filtre a bien été enregistré';
-$messages['filtersaveerror'] = 'Enregistrement du filtre impossibe. Le serveur à produit une erreur';
 $messages['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
 $messages['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée?';
 $messages['actiondeleteconfirm'] = 'Voulez-vous vraiment supprimer l\'action sélectionnée?';
 $messages['forbiddenchars'] = 'Caractères interdits dans le champ';
 $messages['cannotbeempty'] = 'Le champ ne peut pas être vide';
 $messages['ruleexist'] = 'Un filtre existe déjà avec ce nom.';
-$messages['setactivateerror'] = 'Impossible d\'aactiver le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
-$messages['setdeactivateerror'] = 'Impossible de désactiver le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
-$messages['setdeleteerror'] = 'Impossible de supprimer le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
 $messages['setactivated'] = 'Le groupe de filtres a bien été activé.';
 $messages['setdeactivated'] = 'Le groupe de filtres a bien été désactivé.';
 $messages['setdeleted'] = 'Le groupe de filtres a bien été supprimé.';
 $messages['setdeleteconfirm'] = 'Voulez vous vraiment supprimer le groupe de filtres sélectionné ?';
-$messages['setcreateerror'] = 'Impossible de créer le groupe de filtres. Le serveur a rencontré une erreur.';
 $messages['setcreated'] = 'Le groupe de filtres a bien été créé.';
-$messages['activateerror'] = 'Impossible d\'activer le(s) filtre(s) sélectionné(s). Une erreur serveur s\'est produite.';
-$messages['deactivateerror'] = 'Impossible de désactiver le(s) filtre(s) sélectionné(s). Une erreur serveur s\'est produite.';
 $messages['deactivated'] = 'Filtre(s) désactivé(s) avec succès.';
 $messages['activated'] = 'Filtre(s) activé(s) avec succès.';
 $messages['moved'] = 'Filtre déplacé avec succès.';
-$messages['moveerror'] = 'Déplacement du filtre sélectionné impossible. Le serveur a renvoyé une erreur.';
 $messages['nametoolong'] = 'Nom trop long.';
 $messages['namereserved'] = 'Nom réservé.';
 $messages['setexist'] = 'Ce groupe existe déjà.';
diff --git a/plugins/managesieve/localization/gl_ES.inc b/plugins/managesieve/localization/gl_ES.inc
index 7fc4028..e588ef5 100644
--- a/plugins/managesieve/localization/gl_ES.inc
+++ b/plugins/managesieve/localization/gl_ES.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Xestionar os filtros de correo entrante';
 $labels['filtername'] = 'Nome do filtro';
@@ -49,14 +47,12 @@
 $labels['messagereply'] = 'Respostar con unha mensaxe';
 $labels['messagedelete'] = 'Eliminar a mensaxe';
 $labels['messagediscard'] = 'Descartar con unha mensaxe';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Para o correo entrante:';
 $labels['messagesactions'] = '... executar as seguintes accións:';
 $labels['add'] = 'Engadir';
 $labels['del'] = 'Eliminar';
 $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Cada canto enviar mensaxes (en días):';
 $labels['vacationinterval'] = 'Con qué frecuencia vanse enviar mensaxes:';
 $labels['days'] = 'días';
@@ -161,31 +157,22 @@
 $labels['indexlast'] = 'cara atrás';
 $messages['filterunknownerror'] = 'Erro descoñecido servidor';
 $messages['filterconnerror'] = 'Imposible conectar co servidor managesieve';
-$messages['filterdeleteerror'] = 'Imposible eliminar filtro. Ocurriu un erro no servidor';
 $messages['filterdeleted'] = 'Filtro borrado con éxito';
 $messages['filtersaved'] = 'Filtro gardado con éxito';
-$messages['filtersaveerror'] = 'Imposible gardar o filtro. Ocurriu un erro no servidor';
 $messages['filterdeleteconfirm'] = 'Realmente desexa eliminar o filtro seleccionado?';
 $messages['ruledeleteconfirm'] = 'Está seguro de que desexa eliminar a regra seleccionada?';
 $messages['actiondeleteconfirm'] = 'Está seguro de que desexa eliminar a acción seleccionada?';
 $messages['forbiddenchars'] = 'Caracteres non permitidos no campo';
 $messages['cannotbeempty'] = 'O campo non pode estar baleiro';
 $messages['ruleexist'] = 'Xa existe un filtro con nome especificado.';
-$messages['setactivateerror'] = 'Imposible activar o conxunto de filtros seleccionado. Ocurriu un erro no servidor';
-$messages['setdeactivateerror'] = 'Imposible desactivar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
-$messages['setdeleteerror'] = 'Imposible eliminar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
 $messages['setactivated'] = 'O conxunto de filtros activouse con éxito';
 $messages['setdeactivated'] = 'O conxunto de filtros desactivouse con éxito';
 $messages['setdeleted'] = 'O Conxunto de filtros borrouse con éxito';
 $messages['setdeleteconfirm'] = 'Está seguro de que desexa eliminar o conxunto de filtros seleccionado?';
-$messages['setcreateerror'] = 'Imposible crear o conxunto de filtros. Ocurriu un error no servidor';
 $messages['setcreated'] = 'Conxunto de filtros creado con éxito';
-$messages['activateerror'] = 'Non foi posible activar o(s) filtro(s) seleccionado(s). Ocurriu un erro no servidor.';
-$messages['deactivateerror'] = 'Non foi posible desactivar o(s) filtro(s) seleccionado(s). Ocurriu un erro no servidor.';
 $messages['deactivated'] = 'Desactiváronse os filtros correctamente.';
 $messages['activated'] = 'Activáronse os filtros correctamente';
 $messages['moved'] = 'Moveuse correctamente o filtro.';
-$messages['moveerror'] = 'Non foi posible mover o(s) filtro(s) seleccionado(s). Ocurriu un erro no servidor.';
 $messages['nametoolong'] = 'Imposible crear o conxunto de filtros. O nome é longo de máis';
 $messages['namereserved'] = 'Nome reservado';
 $messages['setexist'] = 'Xa existe o conxunto';
diff --git a/plugins/managesieve/localization/he_IL.inc b/plugins/managesieve/localization/he_IL.inc
index ca015b6..7c2ff29 100644
--- a/plugins/managesieve/localization/he_IL.inc
+++ b/plugins/managesieve/localization/he_IL.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'מסננים';
 $labels['managefilters'] = 'ניהול מסננים לדואר נכנס';
 $labels['filtername'] = 'שם המסנן';
@@ -56,7 +54,6 @@
 $labels['del'] = 'מחיקה';
 $labels['sender'] = 'השולח';
 $labels['recipient'] = 'הנמען';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'באיזו תדירות ( בימים ) לשלוח הודעות:';
 $labels['vacationinterval'] = 'באיזו תדירות לשלוח ההודעה';
 $labels['days'] = 'ימים';
@@ -161,31 +158,22 @@
 $labels['indexlast'] = 'בחזרה';
 $messages['filterunknownerror'] = 'שגיאת שרת בלתי מוכרת.';
 $messages['filterconnerror'] = 'לא ניתן להתחבר לשרת.';
-$messages['filterdeleteerror'] = 'לא ניתן למחוק את המסנן. אירעה שגיאה בצד השרת.';
 $messages['filterdeleted'] = 'המסנן נמחק בהצלחה.';
 $messages['filtersaved'] = 'המסנן נשמר בהצלחה.';
-$messages['filtersaveerror'] = 'לא ניתן לשמור את המסנן. אירעה שגיאה בצד השרת.';
 $messages['filterdeleteconfirm'] = 'האם אכן ברצונך למחוק את המסנן הנבחר?';
 $messages['ruledeleteconfirm'] = 'האם אכן ברצונך למחוק את הכלל הנבחר?';
 $messages['actiondeleteconfirm'] = 'האם אכן ברצונך למחוק את הפעולה הנבחרת?';
 $messages['forbiddenchars'] = 'תווים אסורים בשדה.';
 $messages['cannotbeempty'] = 'השדה לא יכול להישאר ריק.';
 $messages['ruleexist'] = 'כבר קיים מסנן בשם כזה.';
-$messages['setactivateerror'] = 'לא ניתן להפעיל את ערכת המסננים הנבחרת. אירעה שגיאה בצד השרת.';
-$messages['setdeactivateerror'] = 'לא ניתן לנטרל את ערכת המסננים הנבחרת. אירעה שגיאה בצד השרת.';
-$messages['setdeleteerror'] = 'לא ניתן למחוק את ערכת המסננים הנבחרת. אירעה שגיאה בצד השרת.';
 $messages['setactivated'] = 'ערכת המסננים הופעלה בהצלחה.';
 $messages['setdeactivated'] = 'ערכת המסננים נוטרלה בהצלחה.';
 $messages['setdeleted'] = 'ערכת המסננים נמחקה בהצלחה.';
 $messages['setdeleteconfirm'] = 'האם אכן ברצונך למחוק את ערכת המסננים הנבחרת?';
-$messages['setcreateerror'] = 'לא ניתן ליצור ערכת מסננים. אירעה שגיאה בצד השרת.';
 $messages['setcreated'] = 'ערכת המסננים נוצרה בהצלחה.';
-$messages['activateerror'] = 'לא ניתן להפעיל את המסננים הנבחרים. אירעה שגיאה בצד השרת.';
-$messages['deactivateerror'] = 'לא ניתן לנטרל את המסננים הנבחרים. אירעה שגיאה בצד השרת.';
 $messages['deactivated'] = 'המסננים הופעלו בהצלחה.';
 $messages['activated'] = 'המסננים נוטרלו בהצלחה.';
 $messages['moved'] = 'המסנן הועבר בהצלחה.';
-$messages['moveerror'] = 'לא ניתן להעביר את המסנן הנבחר. אירעה שגיאה בצד השרת.';
 $messages['nametoolong'] = 'השם ארוך מדי.';
 $messages['namereserved'] = 'השם הזה שמור.';
 $messages['setexist'] = 'הערכה כבר קיימת.';
diff --git a/plugins/managesieve/localization/hr_HR.inc b/plugins/managesieve/localization/hr_HR.inc
index 4e07a3f..eadbfcc 100644
--- a/plugins/managesieve/localization/hr_HR.inc
+++ b/plugins/managesieve/localization/hr_HR.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filteri';
 $labels['managefilters'] = 'Uredi filtere za pristiglu poštu';
 $labels['filtername'] = 'Naziv filtera';
@@ -49,18 +47,13 @@
 $labels['messagereply'] = 'Odgovori sa porukom';
 $labels['messagedelete'] = 'Obriši poruku';
 $labels['messagediscard'] = 'Otkaži sa porukom';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Za pristigle poruke:';
 $labels['messagesactions'] = '...primijeni sljedeće akcije:';
 $labels['add'] = 'Dodaj';
 $labels['del'] = 'Obriši';
 $labels['sender'] = 'Pošiljatelj';
 $labels['recipient'] = 'Primatelj';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Koliko često slati poruku (u danima):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Tijelo poruke (razlog odmora):';
 $labels['vacationsubject'] = 'Naslov poruke:';
 $labels['rulestop'] = 'Prekini izvođenje filtera';
@@ -84,13 +77,11 @@
 $labels['countislessthan'] = 'brojač je manji od';
 $labels['countislessthanequal'] = 'brojač je manji ili jednak od';
 $labels['countequals'] = 'brojač je jednak';
-$labels['countnotequals'] = 'count is not equal to';
 $labels['valueisgreaterthan'] = 'vrijednost je veća od';
 $labels['valueisgreaterthanequal'] = 'vrijednost je veća ili jednaka od';
 $labels['valueislessthan'] = 'vrijednost je manja od';
 $labels['valueislessthanequal'] = 'vrijednost je manja ili jednaka od';
 $labels['valueequals'] = 'vrijednost je jednaka';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = 'Postavi oznake na poruku';
 $labels['addflags'] = 'Dodaj oznake na poruku';
 $labels['removeflags'] = 'Ukloni oznake sa poruke';
@@ -99,45 +90,10 @@
 $labels['flaganswered'] = 'Odgovorena';
 $labels['flagflagged'] = 'Označena';
 $labels['flagdraft'] = 'Predložak';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
 $labels['filtercreate'] = 'Stvori filter';
 $labels['usedata'] = 'Koristi podatke za filter:';
 $labels['nextstep'] = 'Idući korak';
 $labels['...'] = '…';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = 'Napredne postavke';
 $labels['body'] = 'Tijelo poruke';
 $labels['address'] = 'adresa';
@@ -157,38 +113,26 @@
 $labels['octet'] = 'strogo (oktet)';
 $labels['asciicasemap'] = 'neosjetljivo na veličinu slova (ascii-casemap)';
 $labels['asciinumeric'] = 'numerički (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'Nepoznata greška na poslužitelju';
 $messages['filterconnerror'] = 'Nemoguće spajanje na poslužitelj (managesieve)';
-$messages['filterdeleteerror'] = 'Nemoguće brisanje filtera. Greška na poslužitelju';
 $messages['filterdeleted'] = 'Filter je uspješno obrisan';
 $messages['filtersaved'] = 'Filter je uspješno spremljen';
-$messages['filtersaveerror'] = 'Nemoguće spremiti filter. Greška na poslužitelju';
 $messages['filterdeleteconfirm'] = 'Sigurno želite obrisati odabrani filter?';
 $messages['ruledeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabrana pravila?';
 $messages['actiondeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabrane akcije?';
 $messages['forbiddenchars'] = 'Nedozvoljeni znakovi u polju';
 $messages['cannotbeempty'] = 'Polje nesmije biti prazno';
 $messages['ruleexist'] = 'Filter sa zadanim imenom već postoji.';
-$messages['setactivateerror'] = 'Nemoguće aktivirati odabranu grupu filtera. Greška na poslužitelju';
-$messages['setdeactivateerror'] = 'Nemoguće deaktivirati odabranu grupu filtera. Greška na poslužitelju';
-$messages['setdeleteerror'] = 'Nemoguće obrisati odabranu grupu filtera. Greška na poslužitelju';
 $messages['setactivated'] = 'Grupa filtera je uspješno aktivirana';
 $messages['setdeactivated'] = 'Grupa filtera je uspješno deaktivirana';
 $messages['setdeleted'] = 'Grupa filtera je uspješno obrisana';
 $messages['setdeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabranu grupu filtera?';
-$messages['setcreateerror'] = 'Nemoguće stvoriti grupu filtera. Greška na poslužitelju';
 $messages['setcreated'] = 'Grupa filtera je uspješno stvorena';
-$messages['activateerror'] = 'Nije moguće omogućiti odabrani filter(e). Greška poslužitelja.';
-$messages['deactivateerror'] = 'Nije moguće onemogučiti odabrane filter(e). Greška poslužitelja.';
 $messages['deactivated'] = 'Filter(i) omogućen(i) uspješno.';
 $messages['activated'] = 'Filter(i) onemogućen(i) uspješno.';
 $messages['moved'] = 'Filter uspješno premješten.';
-$messages['moveerror'] = 'Nije moguće premjestiti odabrani filter. Greška poslužitelja.';
 $messages['nametoolong'] = 'Nemoguće napraviti grupu filtera. Naziv je predugačak';
 $messages['namereserved'] = 'Rezervirano ime.';
 $messages['setexist'] = 'Skup već postoji.';
 $messages['nodata'] = 'Barem jedan pozicija mora biti odabrana!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/hu_HU.inc b/plugins/managesieve/localization/hu_HU.inc
index ffc6652..862c32b 100644
--- a/plugins/managesieve/localization/hu_HU.inc
+++ b/plugins/managesieve/localization/hu_HU.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Üzenetszűrők';
 $labels['managefilters'] = 'Bejövő üzenetek szűrői';
 $labels['filtername'] = 'Szűrő neve';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'visszafelé';
 $messages['filterunknownerror'] = 'Ismeretlen szerverhiba';
 $messages['filterconnerror'] = 'Nem tudok a szűrőszerverhez kapcsolódni';
-$messages['filterdeleteerror'] = 'A szűrőt nem lehet törölni, szerverhiba történt';
 $messages['filterdeleted'] = 'A szűrő törlése sikeres';
 $messages['filtersaved'] = 'A szűrő mentése sikeres';
-$messages['filtersaveerror'] = 'A szűrő mentése sikertelen, szerverhiba történt';
 $messages['filterdeleteconfirm'] = 'Biztosan törli ezt a szűrőt?';
 $messages['ruledeleteconfirm'] = 'Biztosan törli ezt a szabályt?';
 $messages['actiondeleteconfirm'] = 'Biztosan törli ezt a műveletet?';
 $messages['forbiddenchars'] = 'Érvénytelen karakter a mezőben';
 $messages['cannotbeempty'] = 'A mező nem lehet üres';
 $messages['ruleexist'] = 'Már van ilyen névvel elmentett szűrő.';
-$messages['setactivateerror'] = 'A kiválasztott szűrő készletet nem sikerült engedélyezni. Szerver hiba történt.';
-$messages['setdeactivateerror'] = 'A kiválasztott szűrő készletet nem sikerült tiltani. Szerver hiba történt.';
-$messages['setdeleteerror'] = 'Nem sikerült a kiválasztott szűrő készletet törölni. Szerver hiba történt.';
 $messages['setactivated'] = 'A filter készlet engedélyezése sikeresen végrehajtódott.';
 $messages['setdeactivated'] = 'A filter készlet tiltása sikeresen végrehajtódott.';
 $messages['setdeleted'] = 'A filter készlet törlése sikeresen végrehajtódott.';
 $messages['setdeleteconfirm'] = 'Biztosan törölni szeretnéd a kiválasztott szűrő készleteket?';
-$messages['setcreateerror'] = 'Nem sikerült létrehozni a szűrő készletet. Szerver hiba történt.';
 $messages['setcreated'] = 'A szűrő készlet sikeresen létrejött.';
-$messages['activateerror'] = 'Nem sikerült engedélyezni a kiválasztott szűrö(k)et. Szerver hiba történt.';
-$messages['deactivateerror'] = 'Nem sikerült kikapcsolni a kiválasztott szűrő(ke)t. Szerver hiba történt.';
 $messages['deactivated'] = 'Szűrő(k) sikeresen bekapcsolva.';
 $messages['activated'] = 'Szűrő(k) sikeresen kikapcsolva.';
 $messages['moved'] = 'A szűrő sikeresen áthelyezve.';
-$messages['moveerror'] = 'Az áthelyezés nem sikerült. Szerver hiba történt.';
 $messages['nametoolong'] = 'Túll hosszu név';
 $messages['namereserved'] = 'Nem használható (foglalt) név-';
 $messages['setexist'] = 'A készlet már létezik.';
diff --git a/plugins/managesieve/localization/hy_AM.inc b/plugins/managesieve/localization/hy_AM.inc
index e16df44..5a520f4 100644
--- a/plugins/managesieve/localization/hy_AM.inc
+++ b/plugins/managesieve/localization/hy_AM.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Զտիչներ';
 $labels['managefilters'] = 'Կառավարել ստացվող նամակների զտիչները';
 $labels['filtername'] = 'Զտիչի անուն';
@@ -49,18 +47,13 @@
 $labels['messagereply'] = 'Պատասխանել հաղորդագրությամբ';
 $labels['messagedelete'] = 'Ջնջել հաղորդագրությունը';
 $labels['messagediscard'] = 'Հեռացնել, հաղորդագրությամբ';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Ստացվող հաղորդագրությունների համար';
 $labels['messagesactions'] = '…կատարել հետևյալ գործողությունները.';
 $labels['add'] = 'Ավելացնել';
 $labels['del'] = 'Ջնջել';
 $labels['sender'] = 'Ուղարկող';
 $labels['recipient'] = 'Ստացող';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Ինչ հաճախությամբ ուղարկել հաղորդագրությունները (օրեր)`';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Հաղորդագրության բովանդակություն (արձակուրդի պատճառ)`';
 $labels['vacationsubject'] = 'Հաղորդագրության վերնագիր`';
 $labels['rulestop'] = 'Դադարել պայմանների ստուգումը';
@@ -84,13 +77,11 @@
 $labels['countislessthan'] = 'քանակը պակաս է';
 $labels['countislessthanequal'] = 'քանակը պակաս է կամ հավասար է';
 $labels['countequals'] = 'քանակը հավասար է';
-$labels['countnotequals'] = 'count is not equal to';
 $labels['valueisgreaterthan'] = 'արժեքը գերազանցում է';
 $labels['valueisgreaterthanequal'] = 'արժեքը գերազանցում է կամ հավասար է';
 $labels['valueislessthan'] = 'արժեքը պակաս է';
 $labels['valueislessthanequal'] = 'արժեքը պակաս է կամ հավասար է';
 $labels['valueequals'] = 'արժեքը հավասար է';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = 'Հաղորդագրությունը նշել որպես';
 $labels['addflags'] = 'Ավելացնել նշաններ հաղորդագրությանը';
 $labels['removeflags'] = 'Հեռացնել նշաններ հաղորդագրությունից';
@@ -99,45 +90,10 @@
 $labels['flaganswered'] = 'Պատասխանված';
 $labels['flagflagged'] = 'Նշված';
 $labels['flagdraft'] = 'Սևագիր';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
 $labels['filtercreate'] = 'Ստեղծել զտիչ';
 $labels['usedata'] = 'Զտիչում օգտագործել հետևյալ տեղեկությունը.';
 $labels['nextstep'] = 'Հաջորդ քայլ';
 $labels['...'] = '…';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = 'Հավելյալ ընտրանքներ';
 $labels['body'] = 'Մարմին';
 $labels['address'] = 'հասցե';
@@ -157,38 +113,26 @@
 $labels['octet'] = 'անփոփոխ (օկտետ)';
 $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'Սերվերի անհայտ սխալ';
 $messages['filterconnerror'] = 'Սերվերի հետ կապի խնդիր։';
-$messages['filterdeleteerror'] = 'Սերվերի սխալ, զտիչի ջնջումն ձախողվեց։';
 $messages['filterdeleted'] = 'Զտիչը ջնջվեց։';
 $messages['filtersaved'] = 'Զտիչը պահպանվեց։';
-$messages['filtersaveerror'] = 'Սերվերի սխալ, զտիչի պահպանման սխալ։';
 $messages['filterdeleteconfirm'] = 'Դուք իսկապե՞ս ցանկանում եք ջնջել նշված զտիչը։';
 $messages['ruledeleteconfirm'] = 'Դուք իսկապե՞ս ցանկանում եք ջնջել նշված պայմանը։';
 $messages['actiondeleteconfirm'] = 'Դուք իսկապե՞ս ցանկանում եք ջնջել նշված գործողությունը։';
 $messages['forbiddenchars'] = 'Դաշտում առկա են արգելված նիշեր։';
 $messages['cannotbeempty'] = 'Դաշտը դատարկ չի կարող լինել։';
 $messages['ruleexist'] = 'Տրված անունով զտիչ արդեն գոյություն ունի։';
-$messages['setactivateerror'] = 'Սերվերի սխալ։ Նշված զտիչների համալիրի միացման ձախողում։';
-$messages['setdeactivateerror'] = 'Սերվերի սխալ։ Նշված զտիչների համալիրի անջատման ձախողում։';
-$messages['setdeleteerror'] = 'Սերվերի սխալ։ Նշված զտիչների համալիրի ջնջման ձախողում։';
 $messages['setactivated'] = 'Զտիչների համալիրը միացված է։';
 $messages['setdeactivated'] = 'Զտիչների համալիրը անջատված է։';
 $messages['setdeleted'] = 'Զտիչների համալիրը ջնջված է։';
 $messages['setdeleteconfirm'] = 'Դուք իսկապե՞ս ցանկանում եք ջնջել նշված զտիչների համալիրը։';
-$messages['setcreateerror'] = 'Սերվերի սխալ։ Զտիչների համալիրի ստեղծումը ձախողվեց։';
 $messages['setcreated'] = 'Զտիչների համալիրը ստեղծված է։';
-$messages['activateerror'] = 'Սերվերի սխալ։ Նշված զտիչի միացման ձախողում։';
-$messages['deactivateerror'] = 'Սերվերի սխալ։ Նշված զտիչի անջատման ձախողում։';
 $messages['deactivated'] = 'Զտիչի միացված է։';
 $messages['activated'] = 'Զտիչի անջատված է։';
 $messages['moved'] = 'Զտիչի տեղափոխված է։';
-$messages['moveerror'] = 'Սերվերի սխալ։ Նշված զտիչի տեղափոխման ձախողում։';
 $messages['nametoolong'] = 'Անունը չափազանց երկար է։';
 $messages['namereserved'] = 'Անթույլատրելի անուն։';
 $messages['setexist'] = 'Համալիրը արդեն գոյություն ունի։';
 $messages['nodata'] = 'Պահանջվում է նշել գոնե մեկ դիրք։';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/ia.inc b/plugins/managesieve/localization/ia.inc
index ae1ba6e..c0177d0 100644
--- a/plugins/managesieve/localization/ia.inc
+++ b/plugins/managesieve/localization/ia.inc
@@ -15,180 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtros';
-$labels['managefilters'] = 'Manage incoming mail filters';
-$labels['filtername'] = 'Filter name';
-$labels['newfilter'] = 'New filter';
 $labels['filteradd'] = 'Adder filtro';
 $labels['filterdel'] = 'Deler filtro';
-$labels['moveup'] = 'Move up';
-$labels['movedown'] = 'Move down';
-$labels['filterallof'] = 'matching all of the following rules';
-$labels['filteranyof'] = 'matching any of the following rules';
-$labels['filterany'] = 'all messages';
-$labels['filtercontains'] = 'contains';
-$labels['filternotcontains'] = 'not contains';
-$labels['filteris'] = 'is equal to';
-$labels['filterisnot'] = 'is not equal to';
-$labels['filterexists'] = 'exists';
-$labels['filternotexists'] = 'not exists';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
-$labels['filterunder'] = 'under';
-$labels['filterover'] = 'over';
-$labels['addrule'] = 'Add rule';
-$labels['delrule'] = 'Delete rule';
-$labels['messagemoveto'] = 'Move message to';
-$labels['messageredirect'] = 'Redirect message to';
-$labels['messagecopyto'] = 'Copy message to';
-$labels['messagesendcopy'] = 'Send message copy to';
-$labels['messagereply'] = 'Reply with message';
-$labels['messagedelete'] = 'Delete message';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagekeep'] = 'Keep message in Inbox';
-$labels['messagesrules'] = 'For incoming mail:';
-$labels['messagesactions'] = '...execute the following actions:';
-$labels['add'] = 'Add';
-$labels['del'] = 'Delete';
-$labels['sender'] = 'Sender';
-$labels['recipient'] = 'Recipient';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
-$labels['vacationdays'] = 'How often send messages (in days):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
-$labels['vacationreason'] = 'Message body (vacation reason):';
-$labels['vacationsubject'] = 'Message subject:';
-$labels['rulestop'] = 'Stop evaluating rules';
-$labels['enable'] = 'Enable/Disable';
-$labels['filterset'] = 'Filters set';
-$labels['filtersets'] = 'Filter sets';
-$labels['filtersetadd'] = 'Add filters set';
-$labels['filtersetdel'] = 'Delete current filters set';
-$labels['filtersetact'] = 'Activate current filters set';
-$labels['filtersetdeact'] = 'Deactivate current filters set';
-$labels['filterdef'] = 'Filter definition';
-$labels['filtersetname'] = 'Filters set name';
-$labels['newfilterset'] = 'New filters set';
-$labels['active'] = 'active';
-$labels['none'] = 'none';
-$labels['fromset'] = 'from set';
-$labels['fromfile'] = 'from file';
-$labels['filterdisabled'] = 'Filter disabled';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count is not equal to';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value is not equal to';
-$labels['setflags'] = 'Set flags to the message';
-$labels['addflags'] = 'Add flags to the message';
-$labels['removeflags'] = 'Remove flags from the message';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
-$labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
-$messages['filterunknownerror'] = 'Unknown server error.';
-$messages['filterconnerror'] = 'Unable to connect to server.';
-$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
-$messages['filterdeleted'] = 'Filter deleted successfully.';
-$messages['filtersaved'] = 'Filter saved successfully.';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$messages['forbiddenchars'] = 'Forbidden characters in field.';
-$messages['cannotbeempty'] = 'Field cannot be empty.';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
-$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
-$messages['setactivated'] = 'Filters set activated successfully.';
-$messages['setdeactivated'] = 'Filters set deactivated successfully.';
-$messages['setdeleted'] = 'Filters set deleted successfully.';
-$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$messages['setcreateerror'] = 'Unable to create filters set. Server error occured.';
-$messages['setcreated'] = 'Filters set created successfully.';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
-$messages['nametoolong'] = 'Name too long.';
-$messages['namereserved'] = 'Reserved name.';
-$messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/id_ID.inc b/plugins/managesieve/localization/id_ID.inc
index e1c30ee..d402449 100644
--- a/plugins/managesieve/localization/id_ID.inc
+++ b/plugins/managesieve/localization/id_ID.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Atur filter email masuk';
 $labels['filtername'] = 'Nama filter';
@@ -49,18 +47,13 @@
 $labels['messagereply'] = 'balas dengan pesan';
 $labels['messagedelete'] = 'Hapus pesan';
 $labels['messagediscard'] = 'Buang dengan pesan';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Untuk email masuk:';
 $labels['messagesactions'] = '...lakukan tindakan berikut';
 $labels['add'] = 'Tambah';
 $labels['del'] = 'Hapus';
 $labels['sender'] = 'Pengirim';
 $labels['recipient'] = 'Penerima';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Seberapa sering mengirim pesan (dalam hari):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Isi pesan (alasan liburan):';
 $labels['vacationsubject'] = 'Judul pesan:';
 $labels['rulestop'] = 'Berhenti mengevaluasi aturan';
@@ -84,13 +77,11 @@
 $labels['countislessthan'] = 'penghitungan lebih kecil dari';
 $labels['countislessthanequal'] = 'penghitungan lebih kecil dari atau sama dengan';
 $labels['countequals'] = 'penghitungan sama dengan';
-$labels['countnotequals'] = 'count is not equal to';
 $labels['valueisgreaterthan'] = 'nilai lebih besar dari';
 $labels['valueisgreaterthanequal'] = 'nilai lebih besar dari atau sama dengan';
 $labels['valueislessthan'] = 'nilai lebih kecil dari';
 $labels['valueislessthanequal'] = 'nilai lebih kecil dari atau sama dengan';
 $labels['valueequals'] = 'nilai sama dengan';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = 'Atur tanda pada pesan';
 $labels['addflags'] = 'Berikan tanda pada pesan';
 $labels['removeflags'] = 'Cabut tanda dari pesan';
@@ -122,22 +113,6 @@
 $labels['usedata'] = 'Gunakan data berikut dalam filter:';
 $labels['nextstep'] = 'Langkah Selanjutnya';
 $labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = 'Pilihan lanjutan';
 $labels['body'] = 'Isi';
 $labels['address'] = 'alamat';
@@ -157,38 +132,26 @@
 $labels['octet'] = 'ketat (oktet)';
 $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'Error pada server tak dikenali.';
 $messages['filterconnerror'] = 'Tidak dapat menyambung ke server.';
-$messages['filterdeleteerror'] = 'Tidak bisa menghapus penyaringan. Terjadi error pada server.';
 $messages['filterdeleted'] = 'Penyaringan berhasil dihapus.';
 $messages['filtersaved'] = 'Penyaringan berhasil disimpan.';
-$messages['filtersaveerror'] = 'Tidak bisa menyimpan penyaringan. Terjadi error pada server.';
 $messages['filterdeleteconfirm'] = 'Yakin untuk menghapus penyaringan terpilih?';
 $messages['ruledeleteconfirm'] = 'Yakin untuk menghapus aturan terpilih?';
 $messages['actiondeleteconfirm'] = 'Yakin untuk menghapus tindakan terpilih?';
 $messages['forbiddenchars'] = 'Karakter terlarang pada isian.';
 $messages['cannotbeempty'] = 'Isian tidak bisa kosong.';
 $messages['ruleexist'] = 'Penyaringan dengan nama tersebut sudah ada.';
-$messages['setactivateerror'] = 'Tidak bisa menghidupkan kumpulan penyaringan terpilih. Terjadi error pada server.';
-$messages['setdeactivateerror'] = 'Tidak bisa mematikan kumpulan penyaringan terpilih. Terjadi error pada server.';
-$messages['setdeleteerror'] = 'Tidak bisa menghapus kumpulan penyaringan terpilih. Terjadi error pada server.';
 $messages['setactivated'] = 'Kumpulan penyaringan berhasil dihidupkan.';
 $messages['setdeactivated'] = 'Kumpulan penyaringan berhasil dimatikan.';
 $messages['setdeleted'] = 'Kumpulan penyaringan berhasil dihapus.';
 $messages['setdeleteconfirm'] = 'Yakin ingin menghapus kumpulan penyaringan terpilih?';
-$messages['setcreateerror'] = 'Tidak bisa membuat kumpulan penyaringan. Terjadi galat pada server.';
 $messages['setcreated'] = 'Kumpulan penyaringan berhasul dibuat.';
-$messages['activateerror'] = 'Tidak bisa menghidupkan penyaringan terpilih. terjadi galat pada server.';
-$messages['deactivateerror'] = 'Tidak bisa mematikan penyaringan terpilih. Terjadi galat pada server.';
 $messages['deactivated'] = 'Berhasil menghidupkan penyaringan.';
 $messages['activated'] = 'Berhasil mematikan penyaringan.';
 $messages['moved'] = 'Berhasil memindahkan penyaringan.';
-$messages['moveerror'] = 'Tidak bisa memindahkan penyaringan terpilih. Terjadi error pada server.';
 $messages['nametoolong'] = 'Nama terlalu panjang.';
 $messages['namereserved'] = 'Nama sudah terpesan.';
 $messages['setexist'] = 'Kumpulan sudah ada.';
 $messages['nodata'] = 'Setidaknya satu posisi harus dipilih!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc
index 6042bf8..9de758f 100644
--- a/plugins/managesieve/localization/it_IT.inc
+++ b/plugins/managesieve/localization/it_IT.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtri';
 $labels['managefilters'] = 'Gestione dei filtri per la posta in arrivo';
 $labels['filtername'] = 'Nome del filtro';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'indietro';
 $messages['filterunknownerror'] = 'Errore sconosciuto del server';
 $messages['filterconnerror'] = 'Collegamento al server managesieve fallito';
-$messages['filterdeleteerror'] = 'Eliminazione del filtro fallita. Si è verificato un errore nel server';
 $messages['filterdeleted'] = 'Filtro eliminato con successo';
 $messages['filtersaved'] = 'Filtro salvato con successo';
-$messages['filtersaveerror'] = 'Salvataggio del filtro fallito. Si è verificato un errore nel server';
 $messages['filterdeleteconfirm'] = 'Vuoi veramente eliminare il filtro selezionato?';
 $messages['ruledeleteconfirm'] = 'Sei sicuro di voler eliminare la regola selezionata?';
 $messages['actiondeleteconfirm'] = 'Sei sicuro di voler eliminare l\'azione selezionata?';
 $messages['forbiddenchars'] = 'Caratteri non consentiti nel campo';
 $messages['cannotbeempty'] = 'Il campo non può essere vuoto';
 $messages['ruleexist'] = 'Esiste già un filtro con questo nome';
-$messages['setactivateerror'] = 'Impossibile attivare il filtro. Errore del server';
-$messages['setdeactivateerror'] = 'Impossibile disattivare il filtro. Errore del server';
-$messages['setdeleteerror'] = 'Impossibile cancellare il filtro. Errore del server';
 $messages['setactivated'] = 'Filtro attivato';
 $messages['setdeactivated'] = 'Filtro disattivato';
 $messages['setdeleted'] = 'Filtro cancellato';
 $messages['setdeleteconfirm'] = 'Sei sicuro di voler cancellare il gruppo di filtri';
-$messages['setcreateerror'] = 'Impossibile creare il gruppo. Errore del server';
 $messages['setcreated'] = 'Gruppo di filtri creato';
-$messages['activateerror'] = 'impossibile selezionare il filtro (server error)';
-$messages['deactivateerror'] = 'impossibile disabilitare il filtro (server error)';
 $messages['deactivated'] = 'filtro abilitato';
 $messages['activated'] = 'filtro disabilitato';
 $messages['moved'] = 'filtro spostato';
-$messages['moveerror'] = 'impossibile spostare il filtro (server error)';
 $messages['nametoolong'] = 'Impossibile creare il gruppo: Nome troppo lungo';
 $messages['namereserved'] = 'nome riservato';
 $messages['setexist'] = 'Il gruppo esiste già';
diff --git a/plugins/managesieve/localization/ja_JP.inc b/plugins/managesieve/localization/ja_JP.inc
index 52cb89a..1fff7e3 100644
--- a/plugins/managesieve/localization/ja_JP.inc
+++ b/plugins/managesieve/localization/ja_JP.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'フィルター';
 $labels['managefilters'] = '受信メールのフィルターを管理';
 $labels['filtername'] = 'フィルター名';
@@ -161,34 +159,34 @@
 $labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = '不明なサーバーのエラーです。';
 $messages['filterconnerror'] = 'サーバに接続できません。';
-$messages['filterdeleteerror'] = 'フィルターを削除できませんでした。サーバーでエラーが発生しました。';
+$messages['filterdeleteerror'] = 'フィルターを削除できません。サーバーでエラーが発生しました。';
 $messages['filterdeleted'] = 'フィルターを削除しました。';
 $messages['filtersaved'] = 'フィルターを保存しました。';
-$messages['filtersaveerror'] = 'フィルターの保存できませんでした。サーバーでエラーが発生しました。';
+$messages['filtersaveerror'] = 'フィルターの保存できません。サーバーでエラーが発生しました。';
 $messages['filterdeleteconfirm'] = '本当に選択したフィルターを削除しますか?';
 $messages['ruledeleteconfirm'] = '本当に選択したルールを削除しますか?';
 $messages['actiondeleteconfirm'] = '本当に選択した操作を削除しますか?';
 $messages['forbiddenchars'] = '項目に禁止している文字が含まれています。';
 $messages['cannotbeempty'] = '項目は空欄にできません。';
 $messages['ruleexist'] = '指定した名前のフィルターが既に存在します。';
-$messages['setactivateerror'] = '選択したフィルターセットを有効にできませんでした。サーバーでエラーが発生しました。';
-$messages['setdeactivateerror'] = '選択したフィルターセットを無効にできませんでした。サーバーでエラーが発生しました。';
-$messages['setdeleteerror'] = '選択したフィルターセットを削除できませんでした。サーバーでエラーが発生しました。';
+$messages['setactivateerror'] = '選択したフィルターセットを有効にできません。サーバーでエラーが発生しました。';
+$messages['setdeactivateerror'] = '選択したフィルターセットを無効にできません。サーバーでエラーが発生しました。';
+$messages['setdeleteerror'] = '選択したフィルターセットを削除できません。サーバーでエラーが発生しました。';
 $messages['setactivated'] = 'フィルターセットを有効にしました。';
 $messages['setdeactivated'] = 'フィルターセットを無効にしました。';
 $messages['setdeleted'] = 'フィルターセットを削除しました。';
 $messages['setdeleteconfirm'] = '本当に選択したフィルターセットを削除しますか?';
-$messages['setcreateerror'] = 'フィルターセットを作成できませんでした。サーバーでエラーが発生しました。';
+$messages['setcreateerror'] = 'フィルターセットを作成できません。サーバーでエラーが発生しました。';
 $messages['setcreated'] = 'フィルターセットを作成しました。';
-$messages['activateerror'] = '選択したフィルターを有効にできませんでした。サーバーでエラーが発生しました。';
-$messages['deactivateerror'] = '選択したフィルターを無効にできませんでした。サーバーでエラーが発生しました。';
+$messages['activateerror'] = '選択したフィルターを有効にできません。サーバーでエラーが発生しました。';
+$messages['deactivateerror'] = '選択したフィルターを無効にできません。サーバーでエラーが発生しました。';
 $messages['deactivated'] = 'フィルターを有効にしました。';
 $messages['activated'] = 'フィルターを無効にしました。';
 $messages['moved'] = 'フィルターを移動しました。';
-$messages['moveerror'] = '選択したフィルターを移動できませんでした。サーバーでエラーが発生しました。';
+$messages['moveerror'] = 'Unable to move selected filter. Server error occurred.';
 $messages['nametoolong'] = '名前が長すぎます。';
 $messages['namereserved'] = '予約されている名前です。';
 $messages['setexist'] = 'フィルターセットが既に存在します。';
 $messages['nodata'] = '少なくとも1つの場所を選択しなければなりません!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
+$messages['invaliddateformat'] = '無効な日付または日付部分の書式';
 ?>
diff --git a/plugins/managesieve/localization/ko_KR.inc b/plugins/managesieve/localization/ko_KR.inc
index 332596d..b552fa9 100644
--- a/plugins/managesieve/localization/ko_KR.inc
+++ b/plugins/managesieve/localization/ko_KR.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = '필터';
 $labels['managefilters'] = '수신 메일 필터 관리';
 $labels['filtername'] = '필터명';
@@ -56,7 +54,6 @@
 $labels['del'] = '삭제';
 $labels['sender'] = '발신인';
 $labels['recipient'] = '수신인';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = '메시지 발신 주기 (일):';
 $labels['vacationinterval'] = '메시지 발신 주기:';
 $labels['days'] = '일';
@@ -161,31 +158,22 @@
 $labels['indexlast'] = '역방향';
 $messages['filterunknownerror'] = '알수 없는 서버 오류.';
 $messages['filterconnerror'] = '서버에 연결할 수 없음.';
-$messages['filterdeleteerror'] = '필터를 삭제할 수 없음. 서버 오류가 발생함.';
 $messages['filterdeleted'] = '필터가 성공적으로 삭제됨.';
 $messages['filtersaved'] = '필터가 성공적으로 저장됨.';
-$messages['filtersaveerror'] = '필터를 저장할 수 없음. 서버 오류가 발생함.';
 $messages['filterdeleteconfirm'] = '정말로 선택한 필터를 삭제하시겠습니까?';
 $messages['ruledeleteconfirm'] = '정말로 선택한 규칙을 삭제하시겠습니까?';
 $messages['actiondeleteconfirm'] = '정말로 선택한 동작을 삭제하시겠습니까?';
 $messages['forbiddenchars'] = '필드에 금지된 문자가 존재함.';
 $messages['cannotbeempty'] = '필드는 비워둘 수 없음.';
 $messages['ruleexist'] = '지정한 이름의 필터가 이미 존재함.';
-$messages['setactivateerror'] = '선택한 필터 세트를 활성화 할 수 없음. 서버 오류가 발생함.';
-$messages['setdeactivateerror'] = '선택한 필터 세트를 비활성화 할 수 없음. 서버 오류가 발생함.';
-$messages['setdeleteerror'] = '선택한 필터 세트를 삭제할 수 없음. 서버 오류가 발생함.';
 $messages['setactivated'] = '필터 세트가 성공적으로 활성화됨.';
 $messages['setdeactivated'] = '필터 세트가 성공적으로 비활성화됨.';
 $messages['setdeleted'] = '필터 세트가 성공적으로 삭제됨.';
 $messages['setdeleteconfirm'] = '정말로 선택한 필터 세트를 삭제하시겠습니까?';
-$messages['setcreateerror'] = '필터 세트를 생성할 수 없음. 서버 오류가 발생함.';
 $messages['setcreated'] = '필터 세트가 성공적으로 생성됨.';
-$messages['activateerror'] = '선택한 필터를 활성화할 수 없음. 서버 오류가 발생함.';
-$messages['deactivateerror'] = '선택한 필터를 비활성화할 수 없음. 서버 오류가 발생함.';
 $messages['deactivated'] = '필터가 성공적으로 비활성화됨.';
 $messages['activated'] = '필터가 성공적으로 활성화됨.';
 $messages['moved'] = '필터가 성공적으로 이동함.';
-$messages['moveerror'] = '선택한 필터를 이동할 수 없음. 서버 오류가 발생함.';
 $messages['nametoolong'] = '이름이 너무 김.';
 $messages['namereserved'] = '예약된 이름.';
 $messages['setexist'] = '세트가 이미 존재함.';
diff --git a/plugins/managesieve/localization/lb_LU.inc b/plugins/managesieve/localization/lb_LU.inc
index 9977d1d..621fff8 100644
--- a/plugins/managesieve/localization/lb_LU.inc
+++ b/plugins/managesieve/localization/lb_LU.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filteren';
 $labels['managefilters'] = 'Filtere geréieren fir Mailen déi erakommen';
 $labels['filtername'] = 'Numm vum Filter';
@@ -34,10 +32,6 @@
 $labels['filterisnot'] = 'ass net gläich';
 $labels['filterexists'] = 'existéiert';
 $labels['filternotexists'] = 'existéiert net';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
 $labels['filterunder'] = 'ënner';
 $labels['filterover'] = 'iwwer';
 $labels['addrule'] = 'Reegel dobäisetzen';
@@ -48,147 +42,8 @@
 $labels['messagesendcopy'] = 'Kopie vum Message schécken un';
 $labels['messagereply'] = 'Mat dësem Message äntweren';
 $labels['messagedelete'] = 'Message läschen';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagekeep'] = 'Keep message in Inbox';
-$labels['messagesrules'] = 'For incoming mail:';
-$labels['messagesactions'] = '...execute the following actions:';
 $labels['add'] = 'Dobäisetzen';
 $labels['del'] = 'Läschen';
 $labels['sender'] = 'Ofsender';
 $labels['recipient'] = 'Empfänger';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
-$labels['vacationdays'] = 'How often send messages (in days):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
-$labels['vacationreason'] = 'Message body (vacation reason):';
-$labels['vacationsubject'] = 'Message subject:';
-$labels['rulestop'] = 'Stop evaluating rules';
-$labels['enable'] = 'Enable/Disable';
-$labels['filterset'] = 'Filters set';
-$labels['filtersets'] = 'Filter sets';
-$labels['filtersetadd'] = 'Add filters set';
-$labels['filtersetdel'] = 'Delete current filters set';
-$labels['filtersetact'] = 'Activate current filters set';
-$labels['filtersetdeact'] = 'Deactivate current filters set';
-$labels['filterdef'] = 'Filter definition';
-$labels['filtersetname'] = 'Filters set name';
-$labels['newfilterset'] = 'New filters set';
-$labels['active'] = 'active';
-$labels['none'] = 'none';
-$labels['fromset'] = 'from set';
-$labels['fromfile'] = 'from file';
-$labels['filterdisabled'] = 'Filter disabled';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count is not equal to';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value is not equal to';
-$labels['setflags'] = 'Set flags to the message';
-$labels['addflags'] = 'Add flags to the message';
-$labels['removeflags'] = 'Remove flags from the message';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
-$labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
-$messages['filterunknownerror'] = 'Unknown server error.';
-$messages['filterconnerror'] = 'Unable to connect to server.';
-$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
-$messages['filterdeleted'] = 'Filter deleted successfully.';
-$messages['filtersaved'] = 'Filter saved successfully.';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$messages['forbiddenchars'] = 'Forbidden characters in field.';
-$messages['cannotbeempty'] = 'Field cannot be empty.';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
-$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
-$messages['setactivated'] = 'Filters set activated successfully.';
-$messages['setdeactivated'] = 'Filters set deactivated successfully.';
-$messages['setdeleted'] = 'Filters set deleted successfully.';
-$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$messages['setcreateerror'] = 'Unable to create filters set. Server error occured.';
-$messages['setcreated'] = 'Filters set created successfully.';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
-$messages['nametoolong'] = 'Name too long.';
-$messages['namereserved'] = 'Reserved name.';
-$messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/lt_LT.inc b/plugins/managesieve/localization/lt_LT.inc
index 8a2dfa6..5dc81af 100644
--- a/plugins/managesieve/localization/lt_LT.inc
+++ b/plugins/managesieve/localization/lt_LT.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtrai';
 $labels['managefilters'] = 'Tvarkyti gaunamų laiškų filtrus';
 $labels['filtername'] = 'Filtro pavadinimas';
@@ -48,8 +46,6 @@
 $labels['messagesendcopy'] = 'Nusiųsti laiško kopiją';
 $labels['messagereply'] = 'Atsakyti laišku';
 $labels['messagedelete'] = 'Pašalinti laišką';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Gaunamiems laiškams:';
 $labels['messagesactions'] = '…vykdyti šiuos veiksmus:';
 $labels['add'] = 'Pridėti';
@@ -161,31 +157,22 @@
 $labels['indexlast'] = 'atbulai';
 $messages['filterunknownerror'] = 'Nežinoma serverio klaida.';
 $messages['filterconnerror'] = 'Neįmanoma užmegzti ryšio su serveriu.';
-$messages['filterdeleteerror'] = 'Filtro panaikinti neįmanoma. Įvyko serverio klaida.';
 $messages['filterdeleted'] = 'Filtras panaikintas sėkmingai.';
 $messages['filtersaved'] = 'Filtras sėkmingai išsaugotas';
-$messages['filtersaveerror'] = 'Filtro išsaugoti neįmanoma. Įvyko serverio klaida.';
 $messages['filterdeleteconfirm'] = 'Ar jūs esate įsitikinęs, jog norite panaikinti pasirinktus filtrus(-ą)?';
 $messages['ruledeleteconfirm'] = 'Ar jūs įsitikinęs, jog norite panaikinti pasirinktą taisyklę?';
 $messages['actiondeleteconfirm'] = 'Ar jūs įsitikinęs, jog norite panaikinti pasirinktą veiksmą?';
 $messages['forbiddenchars'] = 'Laukelyje yra draudžiamų simbolių.';
 $messages['cannotbeempty'] = 'Laukelis negali būti tuščias';
 $messages['ruleexist'] = 'Filtras tokiu vardu jau yra.';
-$messages['setactivateerror'] = 'Neįmanoma aktyvuoti pasirinkto filtrų rinkinio. Įvyko serverio klaida.';
-$messages['setdeactivateerror'] = 'Neįmanoma deaktyvuoti pasirinkto filtrų rinkinio. Įvyko serverio klaida.';
-$messages['setdeleteerror'] = 'Neįmanoma panaikinti pasirinkto filtrų rinkinio. Įvyko serverio klaida.';
 $messages['setactivated'] = 'Filtrų rinkinys sėkmingai aktyvuotas.';
 $messages['setdeactivated'] = 'Filtrų rinkinys sėkmingai deaktyvuotas.';
 $messages['setdeleted'] = 'Filtrų rinkinys sėkmingai panaikintas.';
 $messages['setdeleteconfirm'] = 'Ar jūs esate tikri, jog norite panaikinti pasirinktą filtrų rinkinį?';
-$messages['setcreateerror'] = 'Neįmanoma sukurti filtrų rinkinio. Įvyko serverio klaida.';
 $messages['setcreated'] = 'Filtrų rinkinys sėkmingai sukurtas.';
-$messages['activateerror'] = 'Neįmanoma įjungti pasirinktų filtrų(-o). Įvyko serverio klaida.';
-$messages['deactivateerror'] = 'Neįmanoma išjungti pasirinktų filtrų(-o). Įvyko serverio klaida.';
 $messages['deactivated'] = 'Filtras(-as) sėkmingai išjungti.';
 $messages['activated'] = 'Filtras(-as) sėkmingai įjungti.';
 $messages['moved'] = 'Filtrai perkelti sėkmingai.';
-$messages['moveerror'] = 'Pasirinkto filtro perkelti neįmanoma. Įvyko serverio klaida.';
 $messages['nametoolong'] = 'Vardas per ilgas.';
 $messages['namereserved'] = 'Rezervuotas vardas.';
 $messages['setexist'] = 'Rinkinys jau yra sukurtas.';
diff --git a/plugins/managesieve/localization/lv_LV.inc b/plugins/managesieve/localization/lv_LV.inc
index c577e7c..73aa765 100644
--- a/plugins/managesieve/localization/lv_LV.inc
+++ b/plugins/managesieve/localization/lv_LV.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Vēstuļu filtri';
 $labels['managefilters'] = 'Pārvaldīt ienākošo vēstuļu filtrus';
 $labels['filtername'] = 'Filtra nosaukums';
@@ -49,14 +47,12 @@
 $labels['messagereply'] = 'Atbildēt ar vēstuli';
 $labels['messagedelete'] = 'Dzēst vēstuli';
 $labels['messagediscard'] = 'Dzēst vēstuli un atbildēt';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Ienākošajām vēstulēm:';
 $labels['messagesactions'] = '...izpildīt sekojošās darbības:';
 $labels['add'] = 'Pievienot';
 $labels['del'] = 'Dzēst';
 $labels['sender'] = 'Sūtītājs';
 $labels['recipient'] = 'Saņēmējs';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Cik dienu laikā vienam un tam pašam sūtītājam neatbildēt atkārtoti (piem., 7):';
 $labels['vacationinterval'] = 'Cik bieži sūtīt vēstules:';
 $labels['days'] = 'dienas';
@@ -161,31 +157,22 @@
 $labels['indexlast'] = '"backwards"';
 $messages['filterunknownerror'] = 'Nezināma servera kļūda.';
 $messages['filterconnerror'] = 'Neizdevās pieslēgties ManageSieve serverim.';
-$messages['filterdeleteerror'] = 'Neizdevās izdzēst filtru - servera kļūda.';
 $messages['filterdeleted'] = 'Filtrs veiksmīgi izdzēsts.';
 $messages['filtersaved'] = 'Filtrs veiksmīgi saglabāts.';
-$messages['filtersaveerror'] = 'Neizdevās saglabāt filtru - servera kļūda.';
 $messages['filterdeleteconfirm'] = 'Vai Jūs tiešām vēlaties dzēst atzīmēto filtru?';
 $messages['ruledeleteconfirm'] = 'Vai Jūs tiešām vēlaties dzēst atzīmēto nosacījumu?';
 $messages['actiondeleteconfirm'] = 'Vai Jūs tiešām vēlaties dzēst atzīmēto darbību?';
 $messages['forbiddenchars'] = 'Lauks satur aizliegtus simbolus.';
 $messages['cannotbeempty'] = 'Lauks nedrīkst būt tukšs.';
 $messages['ruleexist'] = 'Filtrs ar tādu nosaukumu jau pastāv.';
-$messages['setactivateerror'] = 'Neizdevās aktivizēt atzīmēto filtru kopu - servera kļūda.';
-$messages['setdeactivateerror'] = 'Neizdevās deaktivizēt atzīmēto filtru kopu - servera kļūda.';
-$messages['setdeleteerror'] = 'Neizdevās izdzēst atzīmēto filtru kopu - servera kļūda.';
 $messages['setactivated'] = 'Filtru kopa veiksmīgi aktivizēta.';
 $messages['setdeactivated'] = 'Filtru kopa veiksmīgi deaktivizēta.';
 $messages['setdeleted'] = 'Filtru kopa veiksmīgi izdzēsta.';
 $messages['setdeleteconfirm'] = 'Vai tiešām Jūs vēlaties dzēst atzīmēto filtru kopu?';
-$messages['setcreateerror'] = 'Neizdevās izveidot filtru kopu - servera kļūda.';
 $messages['setcreated'] = 'Filtru kopa veiksmīgi izveidota.';
-$messages['activateerror'] = 'Nav iespējams ieslēgt izvēlēto(s) filtru(s) - servera kļūda.';
-$messages['deactivateerror'] = 'Nav iespējams atslēgt izvēlēto(s) filtru(s) - servera kļūda.';
 $messages['deactivated'] = 'Filtrs(i) veiksmīgi atslēgts(i).';
 $messages['activated'] = 'Filtrs(i) veiksmīgi ieslēgts(i).';
 $messages['moved'] = 'Filtrs veiksmīgi pārvietots.';
-$messages['moveerror'] = 'Nav iespējams pārvietot izvēlēto filtru - servera kļūda.';
 $messages['nametoolong'] = 'Neizdevās izveidot filtru kopu. Pārāk garš kopas nosaukums.';
 $messages['namereserved'] = 'Rezervētais nosaukums.';
 $messages['setexist'] = 'Kopa jau eksistē.';
diff --git a/plugins/managesieve/localization/ml_IN.inc b/plugins/managesieve/localization/ml_IN.inc
index bd4b6f8..4dac394 100644
--- a/plugins/managesieve/localization/ml_IN.inc
+++ b/plugins/managesieve/localization/ml_IN.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'അരിപ്പകള്‍';
 $labels['managefilters'] = 'അകത്തോട്ടുള്ള ഇമെയില്‍ അരിപ്പകള്‍ ക്രമീകരിക്കുക';
 $labels['filtername'] = 'അരിപ്പയുടെ പേര്';
@@ -49,18 +47,13 @@
 $labels['messagereply'] = 'സന്ദേശം വെച്ച് മറുപടി അയക്കു';
 $labels['messagedelete'] = 'സന്ദേശം മായ്ക്കു';
 $labels['messagediscard'] = 'സന്ദേശത്തോടെ നിരാകരിക്കുക';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'ആഗമന സന്ദേശങ്ങള്‍ക്ക്:';
 $labels['messagesactions'] = '...ഈ പ്രവര്‍ത്തനങ്ങള്‍ ചെയ്യുക:';
 $labels['add'] = 'ചേര്‍ക്കു';
 $labels['del'] = 'നീക്കം ചെയ്യുക';
 $labels['sender'] = 'അയചയാള്‍';
 $labels['recipient'] = 'സ്വീകര്‍ത്താവ്';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'എത്ര ഭിവസം കൂടുമ്പോള്‍ സന്ദേശം അയക്കണം:';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'സന്ദേശത്തിന്റെ ഉള്ളടക്കം (അവധിയുടെ കാരണം):';
 $labels['vacationsubject'] = 'സന്ദേശത്തിന്റെ വിഷയം:';
 $labels['rulestop'] = 'നിയമങ്ങള്‍ വിലയിരുത്തുന്നത് നിര്‍ത്തുക';
@@ -84,13 +77,11 @@
 $labels['countislessthan'] = 'എണ്ണം ഇതിനെക്കാള്‍ കുറവ്';
 $labels['countislessthanequal'] = 'എണ്ണം ഇതിനെക്കാള്‍ കൂറവ് ഇല്ലെങ്കില്‍ സമം';
 $labels['countequals'] = 'എണ്ണം ഇതിനോട് സമം';
-$labels['countnotequals'] = 'count is not equal to';
 $labels['valueisgreaterthan'] = 'മൂല്യം ഇതിനെക്കാള്‍ കുടുതല്‍';
 $labels['valueisgreaterthanequal'] = 'മുല്യം ഇതിനെക്കാള്‍ കൂടുതല്‍ ഇല്ലെങ്കില്‍ സമം';
 $labels['valueislessthan'] = 'മൂല്യം ഇതിനെക്കാള്‍ കുറവ്';
 $labels['valueislessthanequal'] = 'മൂല്യം ഇതിനെക്കാള്‍ കൂറവ് ഇല്ലെങ്കില്‍ തുല്യം';
 $labels['valueequals'] = 'മൂല്യം ഇതിനോട് സമം';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = 'സന്ദേശത്തില്‍ അടയാളമിടുക';
 $labels['addflags'] = 'സന്ദേശത്തില്‍ അടയാളം ചേര്‍ക്കുക';
 $labels['removeflags'] = 'സന്ദേശത്തില്‍ നിന്നും അടയാളം മാറ്റുക';
@@ -99,45 +90,10 @@
 $labels['flaganswered'] = 'മറുപടി നല്‍കിയവ';
 $labels['flagflagged'] = 'അടയാളപ്പെടുത്തിയവ';
 $labels['flagdraft'] = 'കരട്';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
 $labels['filtercreate'] = 'അരിപ്പ ഉണ്ടാക്കുക';
 $labels['usedata'] = 'ഈ വിവരങ്ങള്‍ അരിപ്പയില്‍ ഉപയോഗിക്കുക:';
 $labels['nextstep'] = 'അടുത്ത പടി';
 $labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = 'വിപുലീക്രിതമായ ക്രമീകരണങ്ങള്‍';
 $labels['body'] = 'ഉള്ളടക്കം';
 $labels['address'] = 'മേല്‍വിലാസം';
@@ -157,38 +113,26 @@
 $labels['octet'] = 'കര്‍ശനം (octet)';
 $labels['asciicasemap'] = 'വലിയ-ചെറിയക്ഷരങ്ങള്‍ തമ്മില്‍ വ്യത്യാസമില്ലാത്ത (ascii-casemap)';
 $labels['asciinumeric'] = 'സംഖ്യകള്‍ (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'അജ്ഞാതമായ സെര്‍വ്വര്‍ പിശക്.';
 $messages['filterconnerror'] = 'സെര്‍വ്വറുമായി ബന്ധപ്പെടാന്‍ സാധിക്കുന്നില്ല.';
-$messages['filterdeleteerror'] = 'അരിപ്പ മായ്ക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
 $messages['filterdeleted'] = 'അരിപ്പ വിജകരമായി മായ്ച്ചു.';
 $messages['filtersaved'] = 'അരിപ്പ വിജകരമായി സൂക്ഷിച്ചു.';
-$messages['filtersaveerror'] = 'അരിപ്പ സൂക്ഷിക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
 $messages['filterdeleteconfirm'] = 'തെരഞ്ഞെടുത്ത അരിപ്പ നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
 $messages['ruledeleteconfirm'] = 'തെരഞ്ഞെടുത്ത നിയമം നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
 $messages['actiondeleteconfirm'] = 'തെരഞ്ഞെടുത്ത പ്രവര്‍ത്തി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
 $messages['forbiddenchars'] = 'ഫില്‍ഡില്‍ സാധുവല്ലാത്ത അക്ഷരങ്ങള്‍.';
 $messages['cannotbeempty'] = 'ഫീല്‍ഡ് ശൂന്യമാകാന്‍ പാടില്ല.';
 $messages['ruleexist'] = 'ഈ പേരിലുള്ള അരിപ്പ ഇപ്പോള്‍ തന്നെ ഉണ്ട്.';
-$messages['setactivateerror'] = 'അരിപ്പയുടെ കൂട്ടത്തെ പ്രവര്‍ത്തനസജ്ജമാക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
-$messages['setdeactivateerror'] = 'അരിപ്പയുടെ കൂട്ടത്തെ പ്രവര്‍ത്തനരഹിതമാക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
-$messages['setdeleteerror'] = 'തെരഞ്ഞെടുത്ത അരിപ്പയുടെ കൂട്ടത്തെ മായ്ക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
 $messages['setactivated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി പ്രവര്‍ത്തനസജ്ജമാക്കി.';
 $messages['setdeactivated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി പ്രവര്‍ത്തനരഹിതമാക്കി.';
 $messages['setdeleted'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി മായ്ച്ചു.';
 $messages['setdeleteconfirm'] = 'തെരഞ്ഞെടുത്ത അരിപ്പകളുടെ കൂട്ടത്തെ നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
-$messages['setcreateerror'] = 'അരിപ്പയുടെ കൂട്ടത്തെ നിര്‍മ്മിക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
 $messages['setcreated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി നിര്‍മ്മിച്ചു.';
-$messages['activateerror'] = 'അരിപ്പ (കള്‍) പ്രവര്‍ത്തനസജ്ജം ആക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം!';
-$messages['deactivateerror'] = 'അരിപ്പ (കള്‍) നിര്‍വീര്യം ആക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം!';
 $messages['deactivated'] = 'അരിപ്പ വിജകരമായി പ്രവര്‍ത്തനസജ്ജമാക്കി.';
 $messages['activated'] = 'അരിപ്പകള്‍ നിര്‍വീര്യം ആക്കപ്പെട്ടിരിക്കുന്നു';
 $messages['moved'] = 'അരിപ്പ വിജകരമായി മാറ്റി.';
-$messages['moveerror'] = 'തെരഞ്ഞെടുത്ത അരിപ്പ മാറ്റാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
 $messages['nametoolong'] = 'പേരിന് നീളം കൂടുതല്‍.';
 $messages['namereserved'] = 'നീക്കിവെച്ച വാക്ക്.';
 $messages['setexist'] = 'കൂട്ടം നേരത്തെ തന്നെ ഉണ്ട്.';
 $messages['nodata'] = 'ഒരു സ്ഥാനമെങ്കിലും തെരഞ്ഞെടുക്കണം!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/mr_IN.inc b/plugins/managesieve/localization/mr_IN.inc
index a8b046e..88edb92 100644
--- a/plugins/managesieve/localization/mr_IN.inc
+++ b/plugins/managesieve/localization/mr_IN.inc
@@ -15,180 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'चाळण्या';
-$labels['managefilters'] = 'Manage incoming mail filters';
-$labels['filtername'] = 'Filter name';
-$labels['newfilter'] = 'New filter';
-$labels['filteradd'] = 'Add filter';
-$labels['filterdel'] = 'Delete filter';
 $labels['moveup'] = 'वर हलवा';
 $labels['movedown'] = 'खाली हलवा';
 $labels['filterallof'] = 'खालील सर्व नियम जुळत आहेत';
-$labels['filteranyof'] = 'matching any of the following rules';
 $labels['filterany'] = 'सर्व संदेश';
-$labels['filtercontains'] = 'contains';
-$labels['filternotcontains'] = 'not contains';
 $labels['filteris'] = 'च्या बरोबर आहे';
 $labels['filterisnot'] = 'च्या बरोबर नाही';
 $labels['filterexists'] = 'अस्तित्वात आहे';
 $labels['filternotexists'] = 'अस्तित्वात नाही';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
 $labels['filterunder'] = 'खाली';
 $labels['filterover'] = 'वरती';
-$labels['addrule'] = 'Add rule';
-$labels['delrule'] = 'Delete rule';
-$labels['messagemoveto'] = 'Move message to';
-$labels['messageredirect'] = 'Redirect message to';
-$labels['messagecopyto'] = 'Copy message to';
-$labels['messagesendcopy'] = 'Send message copy to';
-$labels['messagereply'] = 'Reply with message';
 $labels['messagedelete'] = 'संदेश काढून टाका';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagekeep'] = 'Keep message in Inbox';
-$labels['messagesrules'] = 'For incoming mail:';
 $labels['messagesactions'] = 'खालील कृती आमलात आणा :';
 $labels['add'] = 'समावेश करा';
 $labels['del'] = 'नष्ट करा';
 $labels['sender'] = 'प्रेषक';
-$labels['recipient'] = 'Recipient';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
-$labels['vacationdays'] = 'How often send messages (in days):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
-$labels['vacationreason'] = 'Message body (vacation reason):';
-$labels['vacationsubject'] = 'Message subject:';
-$labels['rulestop'] = 'Stop evaluating rules';
-$labels['enable'] = 'Enable/Disable';
-$labels['filterset'] = 'Filters set';
-$labels['filtersets'] = 'Filter sets';
-$labels['filtersetadd'] = 'Add filters set';
-$labels['filtersetdel'] = 'Delete current filters set';
-$labels['filtersetact'] = 'Activate current filters set';
-$labels['filtersetdeact'] = 'Deactivate current filters set';
-$labels['filterdef'] = 'Filter definition';
-$labels['filtersetname'] = 'Filters set name';
-$labels['newfilterset'] = 'New filters set';
-$labels['active'] = 'active';
-$labels['none'] = 'none';
-$labels['fromset'] = 'from set';
-$labels['fromfile'] = 'from file';
-$labels['filterdisabled'] = 'Filter disabled';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count is not equal to';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value is not equal to';
-$labels['setflags'] = 'Set flags to the message';
-$labels['addflags'] = 'Add flags to the message';
-$labels['removeflags'] = 'Remove flags from the message';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
-$labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
-$messages['filterunknownerror'] = 'Unknown server error.';
-$messages['filterconnerror'] = 'Unable to connect to server.';
-$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
-$messages['filterdeleted'] = 'Filter deleted successfully.';
-$messages['filtersaved'] = 'Filter saved successfully.';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$messages['forbiddenchars'] = 'Forbidden characters in field.';
-$messages['cannotbeempty'] = 'Field cannot be empty.';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
-$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
-$messages['setactivated'] = 'Filters set activated successfully.';
-$messages['setdeactivated'] = 'Filters set deactivated successfully.';
-$messages['setdeleted'] = 'Filters set deleted successfully.';
-$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$messages['setcreateerror'] = 'Unable to create filters set. Server error occured.';
-$messages['setcreated'] = 'Filters set created successfully.';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
-$messages['nametoolong'] = 'Name too long.';
-$messages['namereserved'] = 'Reserved name.';
-$messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/nb_NO.inc b/plugins/managesieve/localization/nb_NO.inc
index 208ed98..e0a3448 100644
--- a/plugins/managesieve/localization/nb_NO.inc
+++ b/plugins/managesieve/localization/nb_NO.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Rediger filter for innkommende e-post';
 $labels['filtername'] = 'Filternavn';
@@ -49,14 +47,12 @@
 $labels['messagereply'] = 'Svar med melding';
 $labels['messagedelete'] = 'Slett melding';
 $labels['messagediscard'] = 'Avvis med melding';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'For innkommende e-post';
 $labels['messagesactions'] = '... gjør følgende:';
 $labels['add'] = 'Legg til';
 $labels['del'] = 'Slett';
 $labels['sender'] = 'Avsender';
 $labels['recipient'] = 'Mottaker';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Periode mellom meldinger (i dager):';
 $labels['vacationinterval'] = 'Periode mellom meldinger:';
 $labels['days'] = 'dager';
@@ -161,31 +157,22 @@
 $labels['indexlast'] = 'baklengs';
 $messages['filterunknownerror'] = 'Ukjent problem med tjener.';
 $messages['filterconnerror'] = 'Kunne ikke koble til tjeneren.';
-$messages['filterdeleteerror'] = 'Kunne ikke slette filter. Det dukket opp en feil på tjeneren.';
 $messages['filterdeleted'] = 'Filteret er blitt slettet.';
 $messages['filtersaved'] = 'Filteret er blitt lagret.';
-$messages['filtersaveerror'] = 'Kunne ikke lagre filteret. Det dukket opp en feil på tjeneren.';
 $messages['filterdeleteconfirm'] = 'Vil du virkelig slette det valgte filteret?';
 $messages['ruledeleteconfirm'] = 'Er du sikker på at du vil slette valgte regel?';
 $messages['actiondeleteconfirm'] = 'Er du sikker på at du vil slette valgte hendelse?';
 $messages['forbiddenchars'] = 'Ugyldige tegn i felt.';
 $messages['cannotbeempty'] = 'Feltet kan ikke stå tomt.';
 $messages['ruleexist'] = 'Det finnes allerede et filter med dette navnet.';
-$messages['setactivateerror'] = 'Kunne ikke aktivere det valgte filtersettet. Det oppsto en tjenerfeil.';
-$messages['setdeactivateerror'] = 'Kunne ikke deaktivere det valgte filtersettet. Det oppsto en tjenerfeil.';
-$messages['setdeleteerror'] = 'Kunne ikke slette det valgte filtersettet. Det oppsto en tjenerfeil.';
 $messages['setactivated'] = 'Filtersett aktivert.';
 $messages['setdeactivated'] = 'Filtersett deaktivert.';
 $messages['setdeleted'] = 'Filtersett slettet.';
 $messages['setdeleteconfirm'] = 'Er du sikker på at du vil slette det valgte filtersettet?';
-$messages['setcreateerror'] = 'Kunne ikke opprette filtersettet. Det oppsto en tjenerfeil.';
 $messages['setcreated'] = 'Filtersett opprettet.';
-$messages['activateerror'] = 'Kunne ikke skru på valgte filter. Det oppsto en tjenerfeil.';
-$messages['deactivateerror'] = 'Kunne ikke skru av valgte filter. Det oppsto en tjenerfeil.';
 $messages['deactivated'] = 'Filter skrudd på.';
 $messages['activated'] = 'Filter skrudd av.';
 $messages['moved'] = 'Filter ble flyttet.';
-$messages['moveerror'] = 'Kunne ikke flytte valgte filter. Det oppsto en tjenerfeil.';
 $messages['nametoolong'] = 'Navnet er for langt.';
 $messages['namereserved'] = 'Navnet er reservert.';
 $messages['setexist'] = 'Settet eksisterer allerede.';
diff --git a/plugins/managesieve/localization/nl_NL.inc b/plugins/managesieve/localization/nl_NL.inc
index 42bfd73..97a4e16 100644
--- a/plugins/managesieve/localization/nl_NL.inc
+++ b/plugins/managesieve/localization/nl_NL.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filters';
 $labels['managefilters'] = 'Beheer filters voor inkomende e-mail';
 $labels['filtername'] = 'Filternaam';
@@ -65,18 +63,18 @@
 $labels['vacationsubject'] = 'Onderwerp:';
 $labels['rulestop'] = 'Stop met regels uitvoeren';
 $labels['enable'] = 'In-/uitschakelen';
-$labels['filterset'] = 'Filterverzameling';
-$labels['filtersets'] = 'Filterverzamelingen';
-$labels['filtersetadd'] = 'Nieuwe filterverzameling';
-$labels['filtersetdel'] = 'Verwijder filterverzameling';
-$labels['filtersetact'] = 'Huidige filterverzameling activeren';
-$labels['filtersetdeact'] = 'Huidige filterverzameling uitschakelen';
+$labels['filterset'] = 'Filterset';
+$labels['filtersets'] = 'Filtersets';
+$labels['filtersetadd'] = 'Nieuwe filterset';
+$labels['filtersetdel'] = 'Verwijder huidige filterset';
+$labels['filtersetact'] = 'Huidige filterset activeren';
+$labels['filtersetdeact'] = 'Huidige filterset uitschakelen';
 $labels['filterdef'] = 'Filterdefinitie';
-$labels['filtersetname'] = 'Filterverzamelingnaam';
-$labels['newfilterset'] = 'Nieuwe filterverzameling';
+$labels['filtersetname'] = 'Filtersetnaam';
+$labels['newfilterset'] = 'Nieuwe filterset';
 $labels['active'] = 'actief';
 $labels['none'] = 'geen';
-$labels['fromset'] = 'van verzameling';
+$labels['fromset'] = 'van set';
 $labels['fromfile'] = 'van bestand';
 $labels['filterdisabled'] = 'Filter uitgeschakeld';
 $labels['countisgreaterthan'] = 'aantal is groter dan';
@@ -161,34 +159,34 @@
 $labels['indexlast'] = 'terugwaarts';
 $messages['filterunknownerror'] = 'Onbekende fout';
 $messages['filterconnerror'] = 'Kan geen verbinding maken met de managesieve server';
-$messages['filterdeleteerror'] = 'Kan filter niet verwijderen. Er is een fout opgetreden';
+$messages['filterdeleteerror'] = 'Kan filter niet verwijderen. Er trad een serverfout op.';
 $messages['filterdeleted'] = 'Filter succesvol verwijderd';
 $messages['filtersaved'] = 'Filter succesvol opgeslagen';
-$messages['filtersaveerror'] = 'Kan filter niet opslaan. Er is een fout opgetreden.';
+$messages['filtersaveerror'] = 'Kan filter niet opslaan. Er trad een serverfout op.';
 $messages['filterdeleteconfirm'] = 'Weet je zeker dat je het geselecteerde filter wilt verwijderen?';
 $messages['ruledeleteconfirm'] = 'Weet je zeker dat je de geselecteerde regel wilt verwijderen?';
 $messages['actiondeleteconfirm'] = 'Weet je zeker dat je de geselecteerde actie wilt verwijderen?';
 $messages['forbiddenchars'] = 'Verboden karakters in het veld';
 $messages['cannotbeempty'] = 'Veld mag niet leeg zijn';
 $messages['ruleexist'] = 'Er bestaat al een filter met deze naam.';
-$messages['setactivateerror'] = 'Filterverzameling kon niet geactiveerd worden. Er trad een serverfout op.';
-$messages['setdeactivateerror'] = 'Filterverzameling kon niet gedeactiveerd worden. Er trad een serverfout op.';
-$messages['setdeleteerror'] = 'Filterverzameling kon niet verwijderd worden. Er trad een serverfout op.';
+$messages['setactivateerror'] = 'Filterset kon niet geactiveerd worden. Er trad een serverfout op.';
+$messages['setdeactivateerror'] = 'Filterset kon niet gedeactiveerd worden. Er trad een serverfout op.';
+$messages['setdeleteerror'] = 'Filterset kon niet verwijderd worden. Er trad een serverfout op.';
 $messages['setactivated'] = 'Filterset succesvol geactiveerd.';
-$messages['setdeactivated'] = 'Filterverzameling succesvol gedeactiveerd.';
-$messages['setdeleted'] = 'Filterverzameling succesvol verwijderd.';
+$messages['setdeactivated'] = 'Filterset succesvol gedeactiveerd.';
+$messages['setdeleted'] = 'Filterset succesvol verwijderd.';
 $messages['setdeleteconfirm'] = 'Weet u zeker dat u de geselecteerde filterset wilt verwijderen?';
-$messages['setcreateerror'] = 'Filterverzameling kon niet aangemaakt worden. Er trad een serverfout op.';
-$messages['setcreated'] = 'Filterverzameling succesvol aangemaakt.';
+$messages['setcreateerror'] = 'Filterset kon niet aangemaakt worden. Er trad een serverfout op.';
+$messages['setcreated'] = 'Filterset succesvol aangemaakt.';
 $messages['activateerror'] = 'Geselecteerde filter(s) konden niet ingeschakeld worden. Er trad een serverfout op.';
 $messages['deactivateerror'] = 'Geselecteerde filter(s) konden niet uitgeschakeld worden. Er trad een serverfout op.';
 $messages['deactivated'] = 'Filter(s) succesvol ingeschakeld.';
 $messages['activated'] = 'Filter(s) succesvol uitgeschakeld.';
 $messages['moved'] = 'Filter succesvol verplaatst.';
-$messages['moveerror'] = 'Geselecteerde filter(s) konden niet verplaatst worden. Er trad een serverfout op.';
+$messages['moveerror'] = 'Het geselecteerde filter kon niet verplaatst worden. Er trad een serverfout op.';
 $messages['nametoolong'] = 'Naam is te lang.';
 $messages['namereserved'] = 'Gereserveerde naam.';
-$messages['setexist'] = 'Set bestaat al.';
+$messages['setexist'] = 'Filterset bestaat al.';
 $messages['nodata'] = 'Tenminste één positie moet geselecteerd worden!';
 $messages['invaliddateformat'] = 'Ongeldige datum of datumformaat';
 ?>
diff --git a/plugins/managesieve/localization/nn_NO.inc b/plugins/managesieve/localization/nn_NO.inc
index c6b65c3..4ef35db 100644
--- a/plugins/managesieve/localization/nn_NO.inc
+++ b/plugins/managesieve/localization/nn_NO.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Rediger filter for innkommande e-post';
 $labels['filtername'] = 'Filternamn';
@@ -49,18 +47,13 @@
 $labels['messagereply'] = 'Svar med melding';
 $labels['messagedelete'] = 'Slett melding';
 $labels['messagediscard'] = 'Avvis med melding';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'For innkommande e-post';
 $labels['messagesactions'] = '…gjer følgjande:';
 $labels['add'] = 'Legg til';
 $labels['del'] = 'Slett';
 $labels['sender'] = 'Avsendar';
 $labels['recipient'] = 'Mottakar';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Periode mellom meldingar (i dagar):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Innhald (grunngjeving for fråvær)';
 $labels['vacationsubject'] = 'Meldingsemne:';
 $labels['rulestop'] = 'Stopp evaluering av regler';
@@ -84,13 +77,11 @@
 $labels['countislessthan'] = 'mengd er færre enn';
 $labels['countislessthanequal'] = 'mengd er færre enn eller lik';
 $labels['countequals'] = 'mengd er lik';
-$labels['countnotequals'] = 'count is not equal to';
 $labels['valueisgreaterthan'] = 'verdien er høgare enn';
 $labels['valueisgreaterthanequal'] = 'verdien er høgare eller lik';
 $labels['valueislessthan'] = 'verdien er lågare enn';
 $labels['valueislessthanequal'] = 'verdien er lågare eller lik';
 $labels['valueequals'] = 'verdien er lik';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = 'Sett meldingsflagg';
 $labels['addflags'] = 'Legg til flagg på meldinga';
 $labels['removeflags'] = 'Fjern flagg fra meldinga';
@@ -107,7 +98,6 @@
 $labels['varupper'] = 'med store bokstavar';
 $labels['varlowerfirst'] = 'med liten forbokstav';
 $labels['varupperfirst'] = 'med stor forbokstav';
-$labels['varquotewildcard'] = 'quote special characters';
 $labels['varlength'] = 'lengde';
 $labels['notify'] = 'Send varsel';
 $labels['notifyaddress'] = 'Til e-postadresse:';
@@ -122,22 +112,6 @@
 $labels['usedata'] = 'Bruk følgande data i filteret:';
 $labels['nextstep'] = 'Neste steg';
 $labels['...'] = '…';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = 'Avanserte val';
 $labels['body'] = 'Meldingstekst';
 $labels['address'] = 'adresse';
@@ -157,38 +131,26 @@
 $labels['octet'] = 'streng (oktett)';
 $labels['asciicasemap'] = 'ikkje skil mellom store og små bokstavar (ascii-casemap)';
 $labels['asciinumeric'] = 'numerisk (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'Ukjent problem med tenar.';
 $messages['filterconnerror'] = 'Kunne ikkje kople til tenaren.';
-$messages['filterdeleteerror'] = 'Kunne ikkje slette filter. Det oppstod ein feil på tenaren.';
 $messages['filterdeleted'] = 'Filteret er blitt sletta.';
 $messages['filtersaved'] = 'Filteret er blitt lagra.';
-$messages['filtersaveerror'] = 'Kunne ikkje lagre filteret. Det oppstod ein feil på tenaren.';
 $messages['filterdeleteconfirm'] = 'Vil du verkeleg slette det valde filteret?';
 $messages['ruledeleteconfirm'] = 'Er du sikker på at du vil slette vald regel?';
 $messages['actiondeleteconfirm'] = 'Er du sikker på at du vil slette vald hending?';
 $messages['forbiddenchars'] = 'Ugyldige teikn i felt.';
 $messages['cannotbeempty'] = 'Feltet kan ikkje stå tomt.';
 $messages['ruleexist'] = 'Det finst alt eit filter med dette namnet.';
-$messages['setactivateerror'] = 'Kunne ikkje aktivere det valde filtersettet. Det oppsto ein tenarfeil.';
-$messages['setdeactivateerror'] = 'Kunne ikkje deaktivere det valde filtersettet. Det oppsto ein tenarfeil.';
-$messages['setdeleteerror'] = 'Kunne ikkje slette det valde filtersettet. Det oppsto ein tenarfeil.';
 $messages['setactivated'] = 'Filtersett aktivert.';
 $messages['setdeactivated'] = 'Filtersett deaktivert.';
 $messages['setdeleted'] = 'Filtersett sletta.';
 $messages['setdeleteconfirm'] = 'Er du sikker på at du vil slette det valde filtersettet?';
-$messages['setcreateerror'] = 'Kunne ikkje opprette filtersettet. Det oppstod ein tenarfeil.';
 $messages['setcreated'] = 'Filtersett oppretta.';
-$messages['activateerror'] = 'Kunne ikkje skru på valde filter. Det oppstod ein tenarfeil.';
-$messages['deactivateerror'] = 'Kunne ikkje skru av valde filter. Det oppstod ein tenarfeil.';
 $messages['deactivated'] = 'Filter skrudd på.';
 $messages['activated'] = 'Filter skrudd av.';
 $messages['moved'] = 'Filter vart flytta.';
-$messages['moveerror'] = 'Kunne ikkje flytte valde filter. Det oppstod ein tenarfeil.';
 $messages['nametoolong'] = 'Namnet er for langt.';
 $messages['namereserved'] = 'Namnet er reservert.';
 $messages['setexist'] = 'Settet eksisterer alt.';
 $messages['nodata'] = 'Du må velje minst éin posisjon!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/pl_PL.inc b/plugins/managesieve/localization/pl_PL.inc
index 25882a6..2759309 100644
--- a/plugins/managesieve/localization/pl_PL.inc
+++ b/plugins/managesieve/localization/pl_PL.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtry';
 $labels['managefilters'] = 'Zarządzanie filtrami poczty przychodzącej';
 $labels['filtername'] = 'Nazwa filtru';
diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc
index 7835e1e..9b245e7 100644
--- a/plugins/managesieve/localization/pt_BR.inc
+++ b/plugins/managesieve/localization/pt_BR.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Gerenciar filtros de entrada de e-mail';
 $labels['filtername'] = 'Nome do filtro';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'retroceder';
 $messages['filterunknownerror'] = 'Erro desconhecido de servidor';
 $messages['filterconnerror'] = 'Não foi possível conectar ao servidor managesieve';
-$messages['filterdeleteerror'] = 'Não foi possível excluir filtro. Occorreu um erro de servidor';
 $messages['filterdeleted'] = 'Filtro excluído com sucesso';
 $messages['filtersaved'] = 'Filtro gravado com sucesso';
-$messages['filtersaveerror'] = 'Não foi possível gravar filtro. Occoreu um erro de servidor.';
 $messages['filterdeleteconfirm'] = 'Deseja realmente excluir o filtro selecionado?';
 $messages['ruledeleteconfirm'] = 'Deseja realmente excluir a regra selecionada?';
 $messages['actiondeleteconfirm'] = 'Deseja realmente excluir a ação selecionada?';
 $messages['forbiddenchars'] = 'Caracteres não permitidos no campo';
 $messages['cannotbeempty'] = 'Campo não pode ficar em branco';
 $messages['ruleexist'] = 'O filtro com o nome especificado já existe.';
-$messages['setactivateerror'] = 'Não foi possível ativar o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
-$messages['setdeactivateerror'] = 'Não foi possível desativar o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
-$messages['setdeleteerror'] = 'Não foi possível excluir o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
 $messages['setactivated'] = 'Conjunto de filtros ativados com sucesso.';
 $messages['setdeactivated'] = 'Conjunto de filtros desativados com sucesso.';
 $messages['setdeleted'] = 'Conjunto de filtros excluídos com sucesso.';
 $messages['setdeleteconfirm'] = 'Você está certo que deseja excluir o conjunto de filtros selecionados?';
-$messages['setcreateerror'] = 'Não foi possível criar o conjunto de filtros. Ocorreu um erro no servidor.';
 $messages['setcreated'] = 'Conjunto de filtros criado com sucesso.';
-$messages['activateerror'] = 'Não foi possível habilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.';
-$messages['deactivateerror'] = 'Não foi possível desabilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.';
 $messages['deactivated'] = 'Filtro(s) habilitado(s) com sucesso.';
 $messages['activated'] = 'Filtro(s) desabilitado(s) com sucesso.';
 $messages['moved'] = 'Filtro movido com sucesso.';
-$messages['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.';
 $messages['nametoolong'] = 'Nome muito longo.';
 $messages['namereserved'] = 'Nome reservado.';
 $messages['setexist'] = 'Conjunto já existe.';
diff --git a/plugins/managesieve/localization/pt_PT.inc b/plugins/managesieve/localization/pt_PT.inc
index c028ebd..4e93076 100644
--- a/plugins/managesieve/localization/pt_PT.inc
+++ b/plugins/managesieve/localization/pt_PT.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Gerir filtros';
 $labels['filtername'] = 'Nome do filtro';
@@ -161,10 +159,10 @@
 $labels['indexlast'] = 'retroceder';
 $messages['filterunknownerror'] = 'Erro de servidor desconhecido';
 $messages['filterconnerror'] = 'Não é possível ligar ao servidor Sieve';
-$messages['filterdeleteerror'] = 'Não foi possível eliminar o filtro. Erro no servidor';
+$messages['filterdeleteerror'] = 'Não foi possível eliminar o filtro.  Ocorreu um erro no servidor.';
 $messages['filterdeleted'] = 'Filtro eliminado com sucesso';
 $messages['filtersaved'] = 'Filtro guardado com sucesso';
-$messages['filtersaveerror'] = 'Não foi possível guardar o filtro. Erro no servidor';
+$messages['filtersaveerror'] = 'Não foi possível guardar o filtro.  Ocorreu um erro no servidor.';
 $messages['filterdeleteconfirm'] = 'Tem a certeza que pretende eliminar este filtro?';
 $messages['ruledeleteconfirm'] = 'Tem a certeza que pretende eliminar esta regra?';
 $messages['actiondeleteconfirm'] = 'Tem a certeza que pretende eliminar esta acção?';
diff --git a/plugins/managesieve/localization/ro_RO.inc b/plugins/managesieve/localization/ro_RO.inc
index 894b78d..2cddf36 100644
--- a/plugins/managesieve/localization/ro_RO.inc
+++ b/plugins/managesieve/localization/ro_RO.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Administreaza filtrele pentru mesaje primite.';
 $labels['filtername'] = 'Nume filtru';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'invers';
 $messages['filterunknownerror'] = 'Eroare necunoscută la server:';
 $messages['filterconnerror'] = 'Nu mă pot conecta la server.';
-$messages['filterdeleteerror'] = 'Nu pot şterge filtrul. S-a produs o eroare la server.';
 $messages['filterdeleted'] = 'Filtrul a fost şters cu succes.';
 $messages['filtersaved'] = 'Filtrul a fost salvat cu succes.';
-$messages['filtersaveerror'] = 'Nu am putut salva filtrul. S-a produs o eroare la server.';
 $messages['filterdeleteconfirm'] = 'Chiar vrei să ştergi filtrul selectat?';
 $messages['ruledeleteconfirm'] = 'Eşti sigur că vrei să ştergi regula selectată?';
 $messages['actiondeleteconfirm'] = 'Eşti sigur că vrei să ştergi acţiunea selectată?';
 $messages['forbiddenchars'] = 'Caractere nepermise în câmp.';
 $messages['cannotbeempty'] = 'Câmpul nu poate fi gol.';
 $messages['ruleexist'] = 'Filtrul cu numele specificat există deja.';
-$messages['setactivateerror'] = 'Nu pot activa setul de filtre selectat. S-a produs o eroare la server.';
-$messages['setdeactivateerror'] = 'Nu pot dezactiva setul de filtre selectat. S-a produs o eroare la server.';
-$messages['setdeleteerror'] = 'Nu pot şterge setul de filtre selectat. S-a produs o eroare la server.';
 $messages['setactivated'] = 'Setul de filtre activat cu succes.';
 $messages['setdeactivated'] = 'Setul de filtre dezactivat cu succes.';
 $messages['setdeleted'] = 'Setul de filtre şters cu succes.';
 $messages['setdeleteconfirm'] = 'Eşti sigur(ă) că vrei să ştergi setul de filtre selectat?';
-$messages['setcreateerror'] = 'Nu am putut crea setul de filtre. S-a produs o eroare la server.';
 $messages['setcreated'] = 'Setul de filtre creat cu succes.';
-$messages['activateerror'] = 'Nu am putut activa filtrele selectate. S-a produs o eroare la server.';
-$messages['deactivateerror'] = 'Nu am putut dezactiva filtrele selectate. S-a produs o eroare la server.';
 $messages['deactivated'] = 'Filtrele au fost activate cu succes.';
 $messages['activated'] = 'Filtrele au fost dezactivate cu succes.';
 $messages['moved'] = 'Filtrele au fost mutate cu succes.';
-$messages['moveerror'] = 'Nu am putut muta filtreele selectate. S-a produs o eroare la server.';
 $messages['nametoolong'] = 'Numele este prea lung.';
 $messages['namereserved'] = 'Nume rezervat.';
 $messages['setexist'] = 'Setul există deja.';
diff --git a/plugins/managesieve/localization/ru_RU.inc b/plugins/managesieve/localization/ru_RU.inc
index 7342fd1..eccce94 100644
--- a/plugins/managesieve/localization/ru_RU.inc
+++ b/plugins/managesieve/localization/ru_RU.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Фильтры';
 $labels['managefilters'] = 'Управление фильтрами для входящей почты';
 $labels['filtername'] = 'Название фильтра';
diff --git a/plugins/managesieve/localization/si_LK.inc b/plugins/managesieve/localization/si_LK.inc
index 05d7a79..6537ed5 100644
--- a/plugins/managesieve/localization/si_LK.inc
+++ b/plugins/managesieve/localization/si_LK.inc
@@ -15,180 +15,28 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'පෙරහණ';
-$labels['managefilters'] = 'Manage incoming mail filters';
-$labels['filtername'] = 'Filter name';
-$labels['newfilter'] = 'New filter';
-$labels['filteradd'] = 'Add filter';
-$labels['filterdel'] = 'Delete filter';
 $labels['moveup'] = 'ඉහළට ගෙනයන්න';
 $labels['movedown'] = 'පහළට ගෙනයන්න';
-$labels['filterallof'] = 'matching all of the following rules';
-$labels['filteranyof'] = 'matching any of the following rules';
 $labels['filterany'] = 'සියලු පණිවිඩ';
 $labels['filtercontains'] = 'අඩංගු';
-$labels['filternotcontains'] = 'not contains';
-$labels['filteris'] = 'is equal to';
-$labels['filterisnot'] = 'is not equal to';
-$labels['filterexists'] = 'exists';
-$labels['filternotexists'] = 'not exists';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
-$labels['filterunder'] = 'under';
-$labels['filterover'] = 'over';
-$labels['addrule'] = 'Add rule';
-$labels['delrule'] = 'Delete rule';
-$labels['messagemoveto'] = 'Move message to';
-$labels['messageredirect'] = 'Redirect message to';
-$labels['messagecopyto'] = 'Copy message to';
-$labels['messagesendcopy'] = 'Send message copy to';
-$labels['messagereply'] = 'Reply with message';
 $labels['messagedelete'] = 'පණිවිඩය මකන්න';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagekeep'] = 'Keep message in Inbox';
-$labels['messagesrules'] = 'For incoming mail:';
-$labels['messagesactions'] = '...execute the following actions:';
 $labels['add'] = 'එක් කරන්න';
 $labels['del'] = 'මකන්න';
 $labels['sender'] = 'යවන්නා';
 $labels['recipient'] = 'ලබන්නා';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
-$labels['vacationdays'] = 'How often send messages (in days):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
-$labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'පණිවිඩයේ මාතෘකාව:';
-$labels['rulestop'] = 'Stop evaluating rules';
 $labels['enable'] = 'සක්‍රීය කරන්න/අක්‍රීය කරන්න';
-$labels['filterset'] = 'Filters set';
-$labels['filtersets'] = 'Filter sets';
-$labels['filtersetadd'] = 'Add filters set';
-$labels['filtersetdel'] = 'Delete current filters set';
-$labels['filtersetact'] = 'Activate current filters set';
-$labels['filtersetdeact'] = 'Deactivate current filters set';
-$labels['filterdef'] = 'Filter definition';
-$labels['filtersetname'] = 'Filters set name';
-$labels['newfilterset'] = 'New filters set';
 $labels['active'] = 'සක්‍රීය';
 $labels['none'] = 'කිසිවක් නැත';
-$labels['fromset'] = 'from set';
-$labels['fromfile'] = 'from file';
-$labels['filterdisabled'] = 'Filter disabled';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count is not equal to';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value is not equal to';
-$labels['setflags'] = 'Set flags to the message';
-$labels['addflags'] = 'Add flags to the message';
-$labels['removeflags'] = 'Remove flags from the message';
 $labels['flagread'] = 'කියවන්න';
 $labels['flagdeleted'] = 'මකන ලදී';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
 $labels['flagdraft'] = 'කටු සටහන';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
 $labels['nextstep'] = 'මීලග පියවර';
 $labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
 $labels['address'] = 'ලිපිනය';
 $labels['envelope'] = 'ලියුම් කවරය';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
 $labels['modtype'] = 'වර්ගය:';
 $labels['allparts'] = 'සියල්ල';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
-$messages['filterunknownerror'] = 'Unknown server error.';
-$messages['filterconnerror'] = 'Unable to connect to server.';
-$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
-$messages['filterdeleted'] = 'Filter deleted successfully.';
-$messages['filtersaved'] = 'Filter saved successfully.';
-$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$messages['forbiddenchars'] = 'Forbidden characters in field.';
-$messages['cannotbeempty'] = 'Field cannot be empty.';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
-$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
-$messages['setactivated'] = 'Filters set activated successfully.';
-$messages['setdeactivated'] = 'Filters set deactivated successfully.';
-$messages['setdeleted'] = 'Filters set deleted successfully.';
-$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$messages['setcreateerror'] = 'Unable to create filters set. Server error occured.';
-$messages['setcreated'] = 'Filters set created successfully.';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
 $messages['nametoolong'] = 'නම දිග වැඩිය.';
-$messages['namereserved'] = 'Reserved name.';
-$messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/sk_SK.inc b/plugins/managesieve/localization/sk_SK.inc
index 0addfd4..5e7bfb3 100644
--- a/plugins/managesieve/localization/sk_SK.inc
+++ b/plugins/managesieve/localization/sk_SK.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Správa filtrov príchádzajúcej pošty';
 $labels['filtername'] = 'Názov filtra';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'dozadu';
 $messages['filterunknownerror'] = 'Neznáma chyba serveru';
 $messages['filterconnerror'] = 'Nepodarilo sa pripojiť k managesieve serveru';
-$messages['filterdeleteerror'] = 'Nepodarilo sa zmazať filter, server ohlásil chybu';
 $messages['filterdeleted'] = 'Filter bol zmazaný';
 $messages['filtersaved'] = 'Filter bol uložený';
-$messages['filtersaveerror'] = 'Nepodarilo sa uložiť filter, server ohlásil chybu';
 $messages['filterdeleteconfirm'] = 'Naozaj si prajete zmazať tento filter?';
 $messages['ruledeleteconfirm'] = 'Naozaj si prajete zamzať toto pravidlo?';
 $messages['actiondeleteconfirm'] = 'Naozaj si prajete zmazať túto akciu?';
 $messages['forbiddenchars'] = 'Pole obsahuje nepovolené znaky';
 $messages['cannotbeempty'] = 'Pole nemôže byť prázdne';
 $messages['ruleexist'] = 'Filter so zadaným menom už existuje.';
-$messages['setactivateerror'] = 'Nepodarilo sa aktivovať zvolenú sadu filtrov, server ohlásil chybu';
-$messages['setdeactivateerror'] = 'Nepodarilo sa deaktivovať zvolenú sadu filtrov, server ohlásil chybu';
-$messages['setdeleteerror'] = 'Nepodarilo sa zmazať zvolenú sadu filtrov, server ohlásil chybu';
 $messages['setactivated'] = 'Sada filtrov bola aktivovaná';
 $messages['setdeactivated'] = 'Sada filtrov bola deaktivovaná';
 $messages['setdeleted'] = 'Sada filtrov bola zmazaná';
 $messages['setdeleteconfirm'] = 'Naozaj si prajete zmazať túto sadu filtrov?';
-$messages['setcreateerror'] = 'Nepodarilo sa vytvoriť sadu filtrov, server ohlásil chybu';
 $messages['setcreated'] = 'Sada filtrov bola vytvorená';
-$messages['activateerror'] = 'Nepodarilo sa povoliť vybraný filter(e). Chyba servera.';
-$messages['deactivateerror'] = 'Nepodarilo sa vypnúť vybraný filter(e). Chyba servera.';
 $messages['deactivated'] = 'Filter(e) povolený.';
 $messages['activated'] = 'Filter(e) úspešne vypnutý.';
 $messages['moved'] = 'Filter presunutý.';
-$messages['moveerror'] = 'Nemôžem presunúť zvolený filter. Chyba servera.';
 $messages['nametoolong'] = 'Názov sady filtrov je príliš dlhý';
 $messages['namereserved'] = 'Rezervovaný názov.';
 $messages['setexist'] = 'Množina už existuje.';
diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc
index ed727e9..c776a33 100644
--- a/plugins/managesieve/localization/sl_SI.inc
+++ b/plugins/managesieve/localization/sl_SI.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtri';
 $labels['managefilters'] = 'Uredi filtre za dohodno pošto';
 $labels['filtername'] = 'Ime filtra';
@@ -56,7 +54,6 @@
 $labels['del'] = 'Izbriši';
 $labels['sender'] = 'Pošiljatelj';
 $labels['recipient'] = 'Prejemnik';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Kako pogosto naj bodo sporočila poslana (v dnevih):';
 $labels['vacationinterval'] = 'Sporočila pošlji na:';
 $labels['days'] = 'dni';
@@ -161,31 +158,22 @@
 $labels['indexlast'] = 'obraten vrstni red';
 $messages['filterunknownerror'] = 'Prišlo je do neznane napake.';
 $messages['filterconnerror'] = 'Povezave s strežnikom (managesieve) ni bilo mogoče vzpostaviti';
-$messages['filterdeleteerror'] = 'Pravila ni bilo mogoče izbrisati. Prišlo je do napake.';
 $messages['filterdeleted'] = 'Pravilo je bilo uspešno izbrisano.';
 $messages['filtersaved'] = 'Pravilo je bilo uspešno shranjeno';
-$messages['filtersaveerror'] = 'Pravilo ni bilo shranjeno. Prišlo je do napake.';
 $messages['filterdeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
 $messages['ruledeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
 $messages['actiondeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano dejanje?';
 $messages['forbiddenchars'] = 'V polju so neveljavni znaki';
 $messages['cannotbeempty'] = 'Polje ne sme biti prazno';
 $messages['ruleexist'] = 'Filer s tem imenom že obstaja';
-$messages['setactivateerror'] = 'Izbranega filtra ni bilo mogoče vključiti. Prišlo je do napake na strežniku.';
-$messages['setdeactivateerror'] = 'Izbranega filtra ni bilo mogoče izključiti. Prišlo je do napake na strežniku.';
-$messages['setdeleteerror'] = 'Izbranega filtra ni bilo mogoče izbrisati. Prišlo je do napake na strežniku.';
 $messages['setactivated'] = 'Filter je bil uspešno vključen.';
 $messages['setdeactivated'] = 'Filter je bil uspešno onemogočen.';
 $messages['setdeleted'] = 'Filter je bil uspešno izbrisan.';
 $messages['setdeleteconfirm'] = 'Ste prepričani, da želite izbrisati ta filter?';
-$messages['setcreateerror'] = 'Filtra ni bilo mogoče ustvariti. Prišlo je do napake na strežniku.';
 $messages['setcreated'] = 'Filter je bil uspešno ustvarjen.';
-$messages['activateerror'] = 'Izbranega/ih filtra/ov ni bilo mogoče vključiti. Prišlo je do napake na strežniku.';
-$messages['deactivateerror'] = 'Izbranega/ih fitra/ov ni bilo mogoče izključiti. Prišlo je do napake na strežniku.';
 $messages['deactivated'] = 'Filtri so bili uspešno omogočeni.';
 $messages['activated'] = 'Filtri so bili uspešno onemogočeni.';
 $messages['moved'] = 'Filter je bil uspešno premaknjen.';
-$messages['moveerror'] = 'Izbranega filtra ni bilo mogoče premakniti. Prišlo je do napake na strežniku.';
 $messages['nametoolong'] = 'Ime je predolgo.';
 $messages['namereserved'] = 'Rezervirano ime.';
 $messages['setexist'] = 'Nastavitev filtra že obstaja.';
diff --git a/plugins/managesieve/localization/sv_SE.inc b/plugins/managesieve/localization/sv_SE.inc
index a7bed5e..5d855bd 100644
--- a/plugins/managesieve/localization/sv_SE.inc
+++ b/plugins/managesieve/localization/sv_SE.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Administrera filter';
 $labels['filtername'] = 'Filternamn';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'omvänd';
 $messages['filterunknownerror'] = 'Okänt serverfel';
 $messages['filterconnerror'] = 'Anslutning till serverns filtertjänst misslyckades';
-$messages['filterdeleteerror'] = 'Filtret kunde inte tas bort på grund av serverfel';
 $messages['filterdeleted'] = 'Filtret är borttaget';
 $messages['filtersaved'] = 'Filtret har sparats';
-$messages['filtersaveerror'] = 'Filtret kunde inte sparas på grund av serverfel';
 $messages['filterdeleteconfirm'] = 'Vill du ta bort det markerade filtret?';
 $messages['ruledeleteconfirm'] = 'Vill du ta bort filterregeln?';
 $messages['actiondeleteconfirm'] = 'Vill du ta bort filteråtgärden?';
 $messages['forbiddenchars'] = 'Otillåtet tecken i fältet';
 $messages['cannotbeempty'] = 'Fältet kan inte lämnas tomt';
 $messages['ruleexist'] = 'Ett filter med angivet namn finns redan.';
-$messages['setactivateerror'] = 'Filtergruppen kunde inte aktiveras på grund av serverfel';
-$messages['setdeactivateerror'] = 'Filtergruppen kunde inte deaktiveras på grund av serverfel';
-$messages['setdeleteerror'] = 'Filtergruppen kunde inte tas bort på grund av serverfel';
 $messages['setactivated'] = 'Filtergruppen är aktiverad';
 $messages['setdeactivated'] = 'Filtergruppen är deaktiverad';
 $messages['setdeleted'] = 'Filtergruppen är borttagen';
 $messages['setdeleteconfirm'] = 'Vill du ta bort filtergruppen?';
-$messages['setcreateerror'] = 'Filtergruppen kunde inte läggas till på grund av serverfel';
 $messages['setcreated'] = 'Filtergruppen har lagts till';
-$messages['activateerror'] = 'Kunde inte aktivera filter på grund av serverfel.';
-$messages['deactivateerror'] = 'Kunde inte deaktivera filter på grund av serverfel.';
 $messages['deactivated'] = 'Filter aktiverat.';
 $messages['activated'] = 'Filter deaktiverat.';
 $messages['moved'] = 'Filter flyttat.';
-$messages['moveerror'] = 'Kunde inte flytta filter på grund av serverfel.';
 $messages['nametoolong'] = 'Filtergruppen kan inte läggas till med för långt namn';
 $messages['namereserved'] = 'Reserverat namn.';
 $messages['setexist'] = 'Filtergrupp finns redan.';
diff --git a/plugins/managesieve/localization/th_TH.inc b/plugins/managesieve/localization/th_TH.inc
index bf91251..c2d041c 100644
--- a/plugins/managesieve/localization/th_TH.inc
+++ b/plugins/managesieve/localization/th_TH.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'ตัวกรองข้อมูล';
 $labels['filtername'] = 'ชื่อตัวกรองข้อมูล';
 $labels['newfilter'] = 'สร้างตัวกรองข้อมูลใหม่';
diff --git a/plugins/managesieve/localization/tr_TR.inc b/plugins/managesieve/localization/tr_TR.inc
index 67c6d2c..98db751 100644
--- a/plugins/managesieve/localization/tr_TR.inc
+++ b/plugins/managesieve/localization/tr_TR.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Filtreler';
 $labels['managefilters'] = 'Gelen e-posta filtrelerini yönet';
 $labels['filtername'] = 'Filtre adı';
@@ -56,7 +54,7 @@
 $labels['del'] = 'Sil';
 $labels['sender'] = 'Gönderici';
 $labels['recipient'] = 'Alıcı';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
+$labels['vacationaddr'] = 'Ek e-posta adres(ler)im:';
 $labels['vacationdays'] = 'Ne sıklıkla mesajlar gönderilir(gün)';
 $labels['vacationinterval'] = 'Ne kadar sıklıkla mesaj gönderirsiniz:';
 $labels['days'] = 'günler';
@@ -161,31 +159,22 @@
 $labels['indexlast'] = 'geriye yönelik';
 $messages['filterunknownerror'] = 'Bilinmeyen sunucu hatası.';
 $messages['filterconnerror'] = 'Sunucuya bağlanamıyor.';
-$messages['filterdeleteerror'] = 'Filtre silinemedi. Sunucuda hata oluştu.';
 $messages['filterdeleted'] = 'Filtre başarıyla silindi.';
 $messages['filtersaved'] = 'Filter başarıyla kaydedildi.';
-$messages['filtersaveerror'] = 'Filtre kaydedilemedi. Sunucuda hata oluştu.';
 $messages['filterdeleteconfirm'] = 'Seçilen filtreleri  gerçekten silmek istiyor musun?';
 $messages['ruledeleteconfirm'] = 'Seçili kuralları silmek istediğinizden emin misiniz?';
 $messages['actiondeleteconfirm'] = 'Seçili aksiyonları silmek istediğinizden emin misiniz?';
 $messages['forbiddenchars'] = 'Alanda izin verilmeyen karakterler var.';
 $messages['cannotbeempty'] = 'Alan boş olmaz';
 $messages['ruleexist'] = 'Belirtilen isimde bir filtre zaten var.';
-$messages['setactivateerror'] = 'Seçilen filtreler etkinleştirilemedi. Sunucuda hata oluştu.';
-$messages['setdeactivateerror'] = 'Seçilen filtreler pasifleştirilemedi. Sunucuda hata oluştu.';
-$messages['setdeleteerror'] = 'Seçilen filtreler silinemedi. Sunucuda hata oluştu.';
 $messages['setactivated'] = 'Filtreler başarıyla etkinleştirilemedi.';
 $messages['setdeactivated'] = 'Filtreler başarıyla pasifleştirildi.';
 $messages['setdeleted'] = 'Filtre seti başarıyla silindi.';
 $messages['setdeleteconfirm'] = 'Seçilen filtre setlerini silmek istediğinizden emin misiniz?';
-$messages['setcreateerror'] = 'Filtre setleri oluşturulamadı. Sunucuda hata oluştu.';
 $messages['setcreated'] = 'Filtre setleri başarıyla oluşturuldu.';
-$messages['activateerror'] = 'Seçilen filtre(ler) etkinleştirilemedi. Sunucuda hata oluştu.';
-$messages['deactivateerror'] = 'Seçilen filtre(ler) pasifleştirilemedi. Sunucuda hata oluştu.';
 $messages['deactivated'] = 'Filtre(ler) başarıyla etkinleştirildi.';
 $messages['activated'] = 'Filtre(ler) başarıyla iptal edildi.';
 $messages['moved'] = 'Filtre başarıyla taşındı.';
-$messages['moveerror'] = 'Seçilen filtre(ler) taşınamadı. Sunucuda hata oluştu.';
 $messages['nametoolong'] = 'İsim çok uzun.';
 $messages['namereserved'] = 'rezerve edilmiş isim.';
 $messages['setexist'] = 'Set zaten var.';
diff --git a/plugins/managesieve/localization/uk_UA.inc b/plugins/managesieve/localization/uk_UA.inc
index 033ac56..a0e7b6a 100644
--- a/plugins/managesieve/localization/uk_UA.inc
+++ b/plugins/managesieve/localization/uk_UA.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Фільтри';
 $labels['managefilters'] = 'Керування фільтрами вхідної пошти';
 $labels['filtername'] = 'Назва фільтру';
@@ -34,43 +32,28 @@
 $labels['filterisnot'] = 'не ідентичний до';
 $labels['filterexists'] = 'існує';
 $labels['filternotexists'] = 'не існує';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
 $labels['filterunder'] = 'менше, ніж';
 $labels['filterover'] = 'більше, ніж';
 $labels['addrule'] = 'Додати правило';
 $labels['delrule'] = 'Видалити правило';
 $labels['messagemoveto'] = 'Пересунути повідомлення до';
 $labels['messageredirect'] = 'Перенаправити повідомлення до';
-$labels['messagecopyto'] = 'Copy message to';
-$labels['messagesendcopy'] = 'Send message copy to';
 $labels['messagereply'] = 'Автовідповідач';
 $labels['messagedelete'] = 'Видалити повідомлення';
 $labels['messagediscard'] = 'Відхилити з повідомленням';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Для вхідної пошти';
 $labels['messagesactions'] = '... виконати дію:';
 $labels['add'] = 'Додати';
 $labels['del'] = 'Видалити';
 $labels['sender'] = 'Відправник';
 $labels['recipient'] = 'Отримувач';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Як часто повторювати (у днях):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Текст повідомлення:';
-$labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Зупинити перевірку правил';
-$labels['enable'] = 'Enable/Disable';
 $labels['filterset'] = 'Набір фільтрів';
-$labels['filtersets'] = 'Filter sets';
 $labels['filtersetadd'] = 'Додати набір фільтрів';
 $labels['filtersetdel'] = 'Видалити поточний набір';
 $labels['filtersetact'] = 'Активувати поточний набір';
-$labels['filtersetdeact'] = 'Deactivate current filters set';
 $labels['filterdef'] = 'Параметри фільтру';
 $labels['filtersetname'] = 'Назва набору фільтрів';
 $labels['newfilterset'] = 'Новий набір фільтрів';
@@ -79,116 +62,18 @@
 $labels['fromset'] = 'з набору';
 $labels['fromfile'] = 'з файлу';
 $labels['filterdisabled'] = 'Фільтр вимкнено';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count is not equal to';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value is not equal to';
-$labels['setflags'] = 'Set flags to the message';
-$labels['addflags'] = 'Add flags to the message';
-$labels['removeflags'] = 'Remove flags from the message';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
-$labels['...'] = '...';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'Невідома помилка сервера';
 $messages['filterconnerror'] = 'Неможливо з\'єднатися з сервером';
-$messages['filterdeleteerror'] = 'Неможливо видалити фільтр. Помилка сервера';
 $messages['filterdeleted'] = 'Фільтр успішно видалено';
 $messages['filtersaved'] = 'Фільтр успішно збережено';
-$messages['filtersaveerror'] = 'Неможливо зберегти фільтр. Помилка сервера';
 $messages['filterdeleteconfirm'] = 'Ви дійсно хочете видалити обраний фільтр?';
 $messages['ruledeleteconfirm'] = 'Ви дійсно хочете видалити обране правило?';
 $messages['actiondeleteconfirm'] = 'Ви дійсно хочете видалити обрану дію?';
 $messages['forbiddenchars'] = 'Введено заборонений символ';
 $messages['cannotbeempty'] = 'Поле не може бути пустим';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Неможливо активувати обраний набір. Помилка сервера';
-$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$messages['setdeleteerror'] = 'Неможливо видалити обраний набір. Помилка сервера';
 $messages['setactivated'] = 'Набір фільтрів активовано успішно';
-$messages['setdeactivated'] = 'Filters set deactivated successfully.';
 $messages['setdeleted'] = 'Набір фільтрів видалено успішно';
 $messages['setdeleteconfirm'] = 'Ви впевнені, що хочете видалити обраний набір?';
-$messages['setcreateerror'] = 'Не вдалося створити набір. Помилка сервера';
 $messages['setcreated'] = 'Набір фільтрів створено успішно';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
 $messages['nametoolong'] = 'Не вдалося створити набір. Занадто довга назва';
-$messages['namereserved'] = 'Reserved name.';
-$messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/vi_VN.inc b/plugins/managesieve/localization/vi_VN.inc
index d98c022..747d193 100644
--- a/plugins/managesieve/localization/vi_VN.inc
+++ b/plugins/managesieve/localization/vi_VN.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = 'Bộ lọc';
 $labels['managefilters'] = 'Quản lý bộ lọc thư đến';
 $labels['filtername'] = 'Lọc tên';
@@ -49,18 +47,13 @@
 $labels['messagereply'] = 'Trả lời tin nhắn';
 $labels['messagedelete'] = 'Xóa thư';
 $labels['messagediscard'] = 'Loại bỏ với tin nhắn';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'Với thư đến';
 $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['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = 'Số lần gửi thư (trong ngày)';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Nội dung chính';
 $labels['vacationsubject'] = 'Tiêu đề thư';
 $labels['rulestop'] = 'Ngừng đánh giá qui luật';
@@ -84,13 +77,11 @@
 $labels['countislessthan'] = 'Đếm ít hơn';
 $labels['countislessthanequal'] = 'Đếm ít hơn hoặc bằng';
 $labels['countequals'] = 'Đếm bằng';
-$labels['countnotequals'] = 'count is not equal to';
 $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'] = 'value is not equal to';
 $labels['setflags'] = 'Thiết lập đánh dấu cho thư';
 $labels['addflags'] = 'Thêm đánh dấu cho thư';
 $labels['removeflags'] = 'Bỏ đánh dấu khỏi thư';
@@ -111,9 +102,6 @@
 $labels['varlength'] = 'độ dài';
 $labels['notify'] = 'Gửi thông báo';
 $labels['notifyaddress'] = 'Gửi đến địa chỉ email:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
 $labels['notifyimportance'] = 'Mức độ quan trọng:';
 $labels['notifyimportancelow'] = 'thấp';
 $labels['notifyimportancenormal'] = 'vừa phải';
@@ -122,22 +110,6 @@
 $labels['usedata'] = 'Dùng dữ liệu trong bộ lọc sau:';
 $labels['nextstep'] = 'Bước tiếp theo';
 $labels['...'] = '…';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
-$labels['date'] = 'date (yyyy-mm-dd)';
-$labels['julian'] = 'date (julian)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
-$labels['zone'] = 'time-zone';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = 'Tùy chọn tính năng cao hơn';
 $labels['body'] = 'Nội dung';
 $labels['address'] = 'Địa chỉ';
@@ -157,38 +129,26 @@
 $labels['octet'] = 'Khắt khe';
 $labels['asciicasemap'] = 'Không phân biệt chữ hoa chữ thường';
 $labels['asciinumeric'] = 'Bảng mã ASCII';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = 'Không tìm được lỗi máy chủ';
 $messages['filterconnerror'] = 'Không kết nối được với máy chủ.';
-$messages['filterdeleteerror'] = 'Không thể xóa bộ lọc. Xuất hiện lỗi ở máy chủ';
 $messages['filterdeleted'] = 'Xóa bộ lọc thành công';
 $messages['filtersaved'] = 'Lưu bộ lọc thành công';
-$messages['filtersaveerror'] = 'Không thể lưu bộ lọc. Xuất hiện lỗi ở máy chủ';
 $messages['filterdeleteconfirm'] = 'Bạn có thực sự muốn xóa bộ lọc được chọn?';
 $messages['ruledeleteconfirm'] = 'Bạn có chắc chắn muốn xóa qui luật được chọn?';
 $messages['actiondeleteconfirm'] = 'Bạn có chắc chắn muốn xóa hành động được chọn?';
 $messages['forbiddenchars'] = 'Ký tự bị cấm trong ô';
 $messages['cannotbeempty'] = 'Ô không thể bị bỏ trống';
 $messages['ruleexist'] = 'Đã tồn tại bộ lọc với tên cụ thế';
-$messages['setactivateerror'] = 'Không thể kích hoạt bộ lọc được lựa chọn. Xuất hiện lỗi ở máy chủ';
-$messages['setdeactivateerror'] = 'Không thể không kích hoạt bộ lọc được lựa chọn. Xuất hiện lỗi ở máy chủ';
-$messages['setdeleteerror'] = 'Không thể xóa bộ lọc được lựa chọn. Forbidden characters in field.';
 $messages['setactivated'] = 'Bộ lọc được khởi động thành công';
 $messages['setdeactivated'] = 'Ngừng kích hoạt bộ lọc thành công';
 $messages['setdeleted'] = 'Xóa bộ lọc thành công';
 $messages['setdeleteconfirm'] = 'Bạn có chắc bạn muốn xóa thiết lập bộ lọc được chọn?';
-$messages['setcreateerror'] = 'Không thể tạo thiết lập bộ lọc. Có lỗi xuất hiện ở máy chủ';
 $messages['setcreated'] = 'Thiết lập bộ lọc được tạo thành công';
-$messages['activateerror'] = 'Không thể khởi động bộ lọc được chọn. Có lỗi xuất hiện ở máy chủ';
-$messages['deactivateerror'] = 'Không thể tắt bộ lọc đã chọn. Có lỗi xuất hiện ở máy chủ';
 $messages['deactivated'] = 'Bộ lọc được khởi động thành công';
 $messages['activated'] = 'Bộ lọc được tắt thành công';
 $messages['moved'] = 'Bộ lọc được chuyển đi thành công';
-$messages['moveerror'] = 'Không thể chuyển bộc lọc đã chọn. Có lỗi xuất hiện ở máy chủ';
 $messages['nametoolong'] = 'Tên quá dài';
 $messages['namereserved'] = 'Tên đã được bảo vệ';
 $messages['setexist'] = 'Thiết lập đã tồn tại';
 $messages['nodata'] = 'Ít nhất một vị trí phải được chọn';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index fdff5fa..5c38cfe 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = '过滤器';
 $labels['managefilters'] = '管理邮件过滤规则';
 $labels['filtername'] = '过滤规则名称';
@@ -49,14 +47,12 @@
 $labels['messagereply'] = '回复以下内容';
 $labels['messagedelete'] = '删除邮件';
 $labels['messagediscard'] = '舍弃邮件并回复以下内容';
-$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = '对新收取的邮件应用规则:';
 $labels['messagesactions'] = '执行以下操作:';
 $labels['add'] = '添加';
 $labels['del'] = '删除';
 $labels['sender'] = '发件人';
 $labels['recipient'] = '收件人';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = '发送邮件频率(单位:天):';
 $labels['vacationinterval'] = '发送邮件频率:';
 $labels['days'] = '天';
@@ -84,13 +80,11 @@
 $labels['countislessthan'] = '计数小于';
 $labels['countislessthanequal'] = '计数小于或等于';
 $labels['countequals'] = '计数等于';
-$labels['countnotequals'] = 'count is not equal to';
 $labels['valueisgreaterthan'] = '值大于';
 $labels['valueisgreaterthanequal'] = '值大于或等于';
 $labels['valueislessthan'] = '值小于';
 $labels['valueislessthanequal'] = '值小于或等于';
 $labels['valueequals'] = '值等于';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = '设定邮件的标识';
 $labels['addflags'] = '增加邮件的标识';
 $labels['removeflags'] = '删除邮件的标识';
@@ -124,20 +118,14 @@
 $labels['...'] = '...';
 $labels['currdate'] = '当前日期';
 $labels['datetest'] = '日期';
-$labels['dateheader'] = 'header:';
 $labels['year'] = '年';
 $labels['month'] = '月';
 $labels['day'] = '天';
 $labels['date'] = '日期 (年-月-日)';
-$labels['julian'] = 'date (julian)';
 $labels['hour'] = '小时';
 $labels['minute'] = '分钟';
 $labels['second'] = '秒';
-$labels['time'] = 'time (hh:mm:ss)';
-$labels['iso8601'] = 'date (ISO8601)';
-$labels['std11'] = 'date (RFC2822)';
 $labels['zone'] = '时区';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = '高级选项';
 $labels['body'] = '正文';
 $labels['address'] = '地址';
@@ -157,38 +145,26 @@
 $labels['octet'] = '严格模式(字节)';
 $labels['asciicasemap'] = '不区分大小写(ascii 字符)';
 $labels['asciinumeric'] = '数字类型(ascii 数字)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = '未知的服务器错误';
 $messages['filterconnerror'] = '无法连接至服务器';
-$messages['filterdeleteerror'] = '无法删除过滤器。服务器发生错误';
 $messages['filterdeleted'] = '过滤器已成功删除';
 $messages['filtersaved'] = '过滤器已成功保存。';
-$messages['filtersaveerror'] = '无法保存过滤器。服务器发生错误';
 $messages['filterdeleteconfirm'] = '您确定要删除所选择的过滤器吗?';
 $messages['ruledeleteconfirm'] = '您确定要删除所选择的规则吗?';
 $messages['actiondeleteconfirm'] = '您确定要删除所选择的操作吗?';
 $messages['forbiddenchars'] = '内容包含禁用字符';
 $messages['cannotbeempty'] = '内容不能为空';
 $messages['ruleexist'] = '指定过滤器名称已存在。';
-$messages['setactivateerror'] = '无法启用指定过滤器,服务器发生错误。';
-$messages['setdeactivateerror'] = '无法停用指定过滤器,服务器发生错误。';
-$messages['setdeleteerror'] = '无法删除指定过滤器,服务器发生错误。';
 $messages['setactivated'] = '启用过滤器集成功。';
 $messages['setdeactivated'] = '禁用过滤器集成功。';
 $messages['setdeleted'] = '删除过滤器成功。';
 $messages['setdeleteconfirm'] = '您确定要删除指定的过滤器吗?';
-$messages['setcreateerror'] = '无法创建过滤器,服务器发生错误。';
 $messages['setcreated'] = '过滤器成功创建。';
-$messages['activateerror'] = '无法启用选中的过滤器,服务器发生错误。';
-$messages['deactivateerror'] = '无法禁用选中的过滤器,服务器发生错误。';
 $messages['deactivated'] = '启用过滤器成功。';
 $messages['activated'] = '禁用过滤器成功。';
 $messages['moved'] = '移动过滤器成功。';
-$messages['moveerror'] = '无法移动选中的过滤器,服务器发生错误。';
 $messages['nametoolong'] = '无法创建过滤器集,名称太长。';
 $messages['namereserved'] = '保留名称。';
 $messages['setexist'] = '设置已存在。';
 $messages['nodata'] = '至少选择一个位置!';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/managesieve/localization/zh_TW.inc b/plugins/managesieve/localization/zh_TW.inc
index 46b9ea9..72eb339 100644
--- a/plugins/managesieve/localization/zh_TW.inc
+++ b/plugins/managesieve/localization/zh_TW.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
-
-
 $labels['filters'] = '篩選器';
 $labels['managefilters'] = '設定篩選器';
 $labels['filtername'] = '篩選器名稱';
@@ -56,11 +54,7 @@
 $labels['del'] = '刪除';
 $labels['sender'] = '寄件者';
 $labels['recipient'] = '收件者';
-$labels['vacationaddr'] = 'My additional e-mail address(es):';
 $labels['vacationdays'] = '多久回覆一次(單位:天):';
-$labels['vacationinterval'] = 'How often send messages:';
-$labels['days'] = 'days';
-$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = '信件內容(休假原因):';
 $labels['vacationsubject'] = '訊息主旨:';
 $labels['rulestop'] = '停止評估規則';
@@ -84,13 +78,11 @@
 $labels['countislessthan'] = '計數小於';
 $labels['countislessthanequal'] = '數量小於或等於';
 $labels['countequals'] = '數量等於';
-$labels['countnotequals'] = 'count is not equal to';
 $labels['valueisgreaterthan'] = '值大於';
 $labels['valueisgreaterthanequal'] = '值大於等於';
 $labels['valueislessthan'] = '值小於';
 $labels['valueislessthanequal'] = '值小於或等於';
 $labels['valueequals'] = '值等於';
-$labels['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = '設定標幟';
 $labels['addflags'] = '新增標記到訊息';
 $labels['removeflags'] = '移除訊息標記';
@@ -122,22 +114,12 @@
 $labels['usedata'] = '於規則中使用轉寄時間';
 $labels['nextstep'] = '下一步';
 $labels['...'] = '…';
-$labels['currdate'] = 'Current date';
-$labels['datetest'] = 'Date';
-$labels['dateheader'] = 'header:';
-$labels['year'] = 'year';
-$labels['month'] = 'month';
-$labels['day'] = 'day';
 $labels['date'] = '日期 (yyyy-mm-dd)';
 $labels['julian'] = '日期 (Julian Day)';
-$labels['hour'] = 'hour';
-$labels['minute'] = 'minute';
-$labels['second'] = 'second';
 $labels['time'] = '時間 (hh:mm:ss)';
 $labels['iso8601'] = '日期 (ISO8601)';
 $labels['std11'] = '日期 (RFC2822)';
 $labels['zone'] = '時區';
-$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = '進階選項';
 $labels['body'] = '內文';
 $labels['address'] = '郵件位址';
@@ -157,38 +139,26 @@
 $labels['octet'] = '嚴謹模式(八位元組)';
 $labels['asciicasemap'] = '不區分大小寫(採用ASCII-Casemap)';
 $labels['asciinumeric'] = '數字類型(ascii-numeric)';
-$labels['index'] = 'index:';
-$labels['indexlast'] = 'backwards';
 $messages['filterunknownerror'] = '未知的伺服器錯誤';
 $messages['filterconnerror'] = '無法與伺服器連線';
-$messages['filterdeleteerror'] = '無法刪除篩選器。發生伺服器錯誤';
 $messages['filterdeleted'] = '成功刪除篩選器';
 $messages['filtersaved'] = '成功儲存篩選器。';
-$messages['filtersaveerror'] = '無法儲存篩選器。發生伺服器錯誤';
 $messages['filterdeleteconfirm'] = '您確定要刪除選擇的郵件規則嗎?';
 $messages['ruledeleteconfirm'] = '您確定要刪除選的規則嗎?';
 $messages['actiondeleteconfirm'] = '您確定要刪除選擇的動作嗎?';
 $messages['forbiddenchars'] = '內容包含禁用字元';
 $messages['cannotbeempty'] = '內容不能為空白';
 $messages['ruleexist'] = '規則名稱重複';
-$messages['setactivateerror'] = '無法啟用選擇的篩選器集合。 伺服器發生錯誤';
-$messages['setdeactivateerror'] = '無法停用選擇的篩選器集合。 伺服器發生錯誤';
-$messages['setdeleteerror'] = '無法刪除選擇的篩選器集合。 伺服器發生錯誤';
 $messages['setactivated'] = '篩選器集合成功啟用';
 $messages['setdeactivated'] = '篩選器集合成功停用';
 $messages['setdeleted'] = '篩選器集合成功刪除';
 $messages['setdeleteconfirm'] = '你確定要刪除選擇的篩選器集合嗎?';
-$messages['setcreateerror'] = '無法建立篩選器集合。 伺服器發生錯誤';
 $messages['setcreated'] = '篩選器集合成功建立';
-$messages['activateerror'] = '無法啟用選擇的篩選器。伺服器錯誤';
-$messages['deactivateerror'] = '無法停用選擇的篩選器。伺服器錯誤';
 $messages['deactivated'] = '篩選器已啟用';
 $messages['activated'] = '篩選器已停用';
 $messages['moved'] = '篩選器已移動';
-$messages['moveerror'] = '無法移動選擇的篩選器。伺服器錯誤。';
 $messages['nametoolong'] = '名稱太長。';
 $messages['namereserved'] = '保留名稱.';
 $messages['setexist'] = '設定已存在';
 $messages['nodata'] = '至少要選擇一個位置';
-$messages['invaliddateformat'] = 'Invalid date or date part format';
 ?>
diff --git a/plugins/markasjunk/localization/ar.inc b/plugins/markasjunk/localization/ar.inc
index 335ea31..1915e97 100644
--- a/plugins/markasjunk/localization/ar.inc
+++ b/plugins/markasjunk/localization/ar.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'غير المرغوب';
 $labels['buttontitle'] = 'حدد كغير مرغوب';
 ?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/az_AZ.inc b/plugins/markasjunk/localization/az_AZ.inc
index abf6cdc..407db71 100644
--- a/plugins/markasjunk/localization/az_AZ.inc
+++ b/plugins/markasjunk/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Spam qovluğuna köçür';
 $labels['reportedasjunk'] = 'Spam qovluğuna köçürüldü';
diff --git a/plugins/markasjunk/localization/be_BE.inc b/plugins/markasjunk/localization/be_BE.inc
index 095c0d8..3f4a5f9 100644
--- a/plugins/markasjunk/localization/be_BE.inc
+++ b/plugins/markasjunk/localization/be_BE.inc
@@ -15,8 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
-$labels['buttontext'] = 'Непажаданыя';
-$labels['buttontitle'] = 'Пазначыць як непажаданы';
-$labels['reportedasjunk'] = 'Паспяхова пазначаны як напажаданы';
+$labels['buttontext'] = 'Спам';
+$labels['buttontitle'] = 'Пазначыць як спам';
+$labels['reportedasjunk'] = 'Пазначаны як спам';
 ?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/bg_BG.inc b/plugins/markasjunk/localization/bg_BG.inc
index a672476..c49bafa 100644
--- a/plugins/markasjunk/localization/bg_BG.inc
+++ b/plugins/markasjunk/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Спам';
 $labels['buttontitle'] = 'Маркирай като спам';
 $labels['reportedasjunk'] = 'Писмото е маркирано като спам успешно';
diff --git a/plugins/markasjunk/localization/br.inc b/plugins/markasjunk/localization/br.inc
index febdfa9..3980bc2 100644
--- a/plugins/markasjunk/localization/br.inc
+++ b/plugins/markasjunk/localization/br.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Lastez';
 $labels['buttontitle'] = 'Merkañ evel lastez';
 $labels['reportedasjunk'] = 'Danevellet evel lastez gant berzh';
diff --git a/plugins/markasjunk/localization/bs_BA.inc b/plugins/markasjunk/localization/bs_BA.inc
index 7eaaf88..6a32ee0 100644
--- a/plugins/markasjunk/localization/bs_BA.inc
+++ b/plugins/markasjunk/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $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 f10aa7a..18fef58 100644
--- a/plugins/markasjunk/localization/ca_ES.inc
+++ b/plugins/markasjunk/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $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/cs_CZ.inc b/plugins/markasjunk/localization/cs_CZ.inc
index 81ec393..d0dbc6cd 100644
--- a/plugins/markasjunk/localization/cs_CZ.inc
+++ b/plugins/markasjunk/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Označit jako Spam';
 $labels['reportedasjunk'] = 'Úspěšně nahlášeno jako Spam';
diff --git a/plugins/markasjunk/localization/cy_GB.inc b/plugins/markasjunk/localization/cy_GB.inc
index b089625..9ea2c9d 100644
--- a/plugins/markasjunk/localization/cy_GB.inc
+++ b/plugins/markasjunk/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Sothach';
 $labels['buttontitle'] = 'Nodi fel Sbwriel';
 $labels['reportedasjunk'] = 'Adroddwyd yn llwyddiannus fel Sbwriel';
diff --git a/plugins/markasjunk/localization/da_DK.inc b/plugins/markasjunk/localization/da_DK.inc
index fec4cbb..ac2a4c8 100644
--- a/plugins/markasjunk/localization/da_DK.inc
+++ b/plugins/markasjunk/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Marker som spam mail';
 $labels['reportedasjunk'] = 'Successfuldt rapporteret som spam mail';
diff --git a/plugins/markasjunk/localization/de_CH.inc b/plugins/markasjunk/localization/de_CH.inc
index 30ba401..c610285 100644
--- a/plugins/markasjunk/localization/de_CH.inc
+++ b/plugins/markasjunk/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Als SPAM markieren';
 $labels['reportedasjunk'] = 'Erfolgreich als SPAM gemeldet';
diff --git a/plugins/markasjunk/localization/de_DE.inc b/plugins/markasjunk/localization/de_DE.inc
index 0bab300..28abacf 100644
--- a/plugins/markasjunk/localization/de_DE.inc
+++ b/plugins/markasjunk/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'als SPAM markieren';
 $labels['reportedasjunk'] = 'Erfolgreich als SPAM gemeldet';
diff --git a/plugins/markasjunk/localization/el_GR.inc b/plugins/markasjunk/localization/el_GR.inc
index 1c74987..d63ecd5 100644
--- a/plugins/markasjunk/localization/el_GR.inc
+++ b/plugins/markasjunk/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Ανεπιθύμητα';
 $labels['buttontitle'] = 'Σήμανση ως Ανεπιθύμητου';
 $labels['reportedasjunk'] = 'Αναφέρθηκε ως Ανεπιθήμητο';
diff --git a/plugins/markasjunk/localization/en_GB.inc b/plugins/markasjunk/localization/en_GB.inc
index d51efd4..92c0419 100644
--- a/plugins/markasjunk/localization/en_GB.inc
+++ b/plugins/markasjunk/localization/en_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $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 af42a32..d92e489 100644
--- a/plugins/markasjunk/localization/eo.inc
+++ b/plugins/markasjunk/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Rubaĵo';
 $labels['buttontitle'] = 'Marki kiel rubaĵo';
 $labels['reportedasjunk'] = 'Sukcese raportita kiel rubaĵo';
diff --git a/plugins/markasjunk/localization/es_AR.inc b/plugins/markasjunk/localization/es_AR.inc
index e2dbdc3..b9c452b 100644
--- a/plugins/markasjunk/localization/es_AR.inc
+++ b/plugins/markasjunk/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Correo no deseado';
 $labels['buttontitle'] = 'Marcar como SPAM';
 $labels['reportedasjunk'] = 'Mensaje reportado como SPAM';
diff --git a/plugins/markasjunk/localization/es_ES.inc b/plugins/markasjunk/localization/es_ES.inc
index fadf304..e1f7f17 100644
--- a/plugins/markasjunk/localization/es_ES.inc
+++ b/plugins/markasjunk/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'SPAM';
 $labels['buttontitle'] = 'Marcar como SPAM';
 $labels['reportedasjunk'] = 'Mensaje informado como SPAM';
diff --git a/plugins/markasjunk/localization/et_EE.inc b/plugins/markasjunk/localization/et_EE.inc
index c582f3c..2b1d1f8 100644
--- a/plugins/markasjunk/localization/et_EE.inc
+++ b/plugins/markasjunk/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Rämps';
 $labels['buttontitle'] = 'Märgista Rämpsuks';
 $labels['reportedasjunk'] = 'Edukalt Rämpsuks märgitud';
diff --git a/plugins/markasjunk/localization/eu_ES.inc b/plugins/markasjunk/localization/eu_ES.inc
index 6101da5..ade169b 100644
--- a/plugins/markasjunk/localization/eu_ES.inc
+++ b/plugins/markasjunk/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Zabor-mezua';
 $labels['buttontitle'] = 'Markatu zabor-mezu bezala';
 $labels['reportedasjunk'] = 'Zabor bezala markatu da';
diff --git a/plugins/markasjunk/localization/fa_IR.inc b/plugins/markasjunk/localization/fa_IR.inc
index 50fbd41..f0ba389 100644
--- a/plugins/markasjunk/localization/fa_IR.inc
+++ b/plugins/markasjunk/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'بنجل';
 $labels['buttontitle'] = 'علامت گذاری به عنوان بنجل';
 $labels['reportedasjunk'] = 'با موفقیت به عنوان بنجل گزارش شد';
diff --git a/plugins/markasjunk/localization/fi_FI.inc b/plugins/markasjunk/localization/fi_FI.inc
index e343116..adf71ea 100644
--- a/plugins/markasjunk/localization/fi_FI.inc
+++ b/plugins/markasjunk/localization/fi_FI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Roskaposti';
 $labels['buttontitle'] = 'Merkitse roskapostiksi';
 $labels['reportedasjunk'] = 'Roskapostista on ilmoitettu onnistuneesti';
diff --git a/plugins/markasjunk/localization/fr_FR.inc b/plugins/markasjunk/localization/fr_FR.inc
index 7054d09..1eaa480 100644
--- a/plugins/markasjunk/localization/fr_FR.inc
+++ b/plugins/markasjunk/localization/fr_FR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Indésirables';
 $labels['buttontitle'] = 'Marquer comme indésirable';
 $labels['reportedasjunk'] = 'Notification de message indésirable envoyée';
diff --git a/plugins/markasjunk/localization/gl_ES.inc b/plugins/markasjunk/localization/gl_ES.inc
index 35fe084..336c010 100644
--- a/plugins/markasjunk/localization/gl_ES.inc
+++ b/plugins/markasjunk/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Correo lixo';
 $labels['buttontitle'] = 'Marcar como correo lixo';
 $labels['reportedasjunk'] = 'Mensaxe marcada como correo lixo';
diff --git a/plugins/markasjunk/localization/he_IL.inc b/plugins/markasjunk/localization/he_IL.inc
index 13f6350..d672e4b 100644
--- a/plugins/markasjunk/localization/he_IL.inc
+++ b/plugins/markasjunk/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'זבל';
 $labels['buttontitle'] = 'סמן כדואר זבל';
 $labels['reportedasjunk'] = 'דואר הזבל דווח בהצלחה';
diff --git a/plugins/markasjunk/localization/hr_HR.inc b/plugins/markasjunk/localization/hr_HR.inc
index 4fe9718..86c72b8 100644
--- a/plugins/markasjunk/localization/hr_HR.inc
+++ b/plugins/markasjunk/localization/hr_HR.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
-$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Označi kao smeće (spam)';
 $labels['reportedasjunk'] = 'Uspješno prijavljeno kao smeće (spam)';
 ?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/hu_HU.inc b/plugins/markasjunk/localization/hu_HU.inc
index 7d38610..aaccbd4 100644
--- a/plugins/markasjunk/localization/hu_HU.inc
+++ b/plugins/markasjunk/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Levélszemét';
 $labels['buttontitle'] = 'Szemétnek jelölés';
 $labels['reportedasjunk'] = 'Sikeresen szemétnek jelentve';
diff --git a/plugins/markasjunk/localization/hy_AM.inc b/plugins/markasjunk/localization/hy_AM.inc
index b562e5c..f084212 100644
--- a/plugins/markasjunk/localization/hy_AM.inc
+++ b/plugins/markasjunk/localization/hy_AM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Թափոն';
 $labels['buttontitle'] = 'Նշել որպես Թափոն';
 $labels['reportedasjunk'] = 'Բարեհաջող հաղորդվեց որպես Թափոն';
diff --git a/plugins/markasjunk/localization/id_ID.inc b/plugins/markasjunk/localization/id_ID.inc
index 7063bda..e2988fb 100644
--- a/plugins/markasjunk/localization/id_ID.inc
+++ b/plugins/markasjunk/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Sampah';
 $labels['buttontitle'] = 'Tandai sebagai sampah';
 $labels['reportedasjunk'] = 'Berhasil dilaporkan sebagai sampah';
diff --git a/plugins/markasjunk/localization/it_IT.inc b/plugins/markasjunk/localization/it_IT.inc
index b787536..86db382 100644
--- a/plugins/markasjunk/localization/it_IT.inc
+++ b/plugins/markasjunk/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Marca come Spam';
 $labels['reportedasjunk'] = 'Messaggio marcato come Spam';
diff --git a/plugins/markasjunk/localization/ja_JP.inc b/plugins/markasjunk/localization/ja_JP.inc
index abd84d8..a90e6be 100644
--- a/plugins/markasjunk/localization/ja_JP.inc
+++ b/plugins/markasjunk/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = '迷惑メール';
 $labels['buttontitle'] = '迷惑メールとして設定';
 $labels['reportedasjunk'] = '迷惑メールとして報告しました。';
diff --git a/plugins/markasjunk/localization/km_KH.inc b/plugins/markasjunk/localization/km_KH.inc
index a102c00..ca4ceed 100644
--- a/plugins/markasjunk/localization/km_KH.inc
+++ b/plugins/markasjunk/localization/km_KH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'សំបុត្រមិនល្អ';
 $labels['buttontitle'] = 'ចាត់ជា សំបុត្រមិនល្អ';
 $labels['reportedasjunk'] = 'រាយការណ៏ថាជា សំបុត្រមិនល្អ បានសំរេច';
diff --git a/plugins/markasjunk/localization/ko_KR.inc b/plugins/markasjunk/localization/ko_KR.inc
index 2df78d4..209f530 100644
--- a/plugins/markasjunk/localization/ko_KR.inc
+++ b/plugins/markasjunk/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = '정크메일';
 $labels['buttontitle'] = '정크메일로 표시';
 $labels['reportedasjunk'] = '성공적으로, 정크메일이라 보고 됨';
diff --git a/plugins/markasjunk/localization/ku.inc b/plugins/markasjunk/localization/ku.inc
index 5621476..0bb30fa 100644
--- a/plugins/markasjunk/localization/ku.inc
+++ b/plugins/markasjunk/localization/ku.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
-$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'nawnişani bka ba şkaw';
 $labels['reportedasjunk'] = 'ba gşti raport kra';
 ?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/lb_LU.inc b/plugins/markasjunk/localization/lb_LU.inc
index e4a4f72..c6f1081 100644
--- a/plugins/markasjunk/localization/lb_LU.inc
+++ b/plugins/markasjunk/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Als Spam markéieren';
 $labels['reportedasjunk'] = 'Erfollegräich als Spam gemellt';
diff --git a/plugins/markasjunk/localization/lt_LT.inc b/plugins/markasjunk/localization/lt_LT.inc
index 0d7144d..b93e85d 100644
--- a/plugins/markasjunk/localization/lt_LT.inc
+++ b/plugins/markasjunk/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $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/lv_LV.inc b/plugins/markasjunk/localization/lv_LV.inc
index d29e60d..6c56c54 100644
--- a/plugins/markasjunk/localization/lv_LV.inc
+++ b/plugins/markasjunk/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Mēstules';
 $labels['buttontitle'] = 'Atzīmēt kā mēstuli';
 $labels['reportedasjunk'] = 'Sekmīgi iatzīmēta kā mēstule';
diff --git a/plugins/markasjunk/localization/ml_IN.inc b/plugins/markasjunk/localization/ml_IN.inc
index c665470..aaa736b 100644
--- a/plugins/markasjunk/localization/ml_IN.inc
+++ b/plugins/markasjunk/localization/ml_IN.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
-$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'സ്പാം ആയി അടയാളപ്പെടുത്തുക';
 $labels['reportedasjunk'] = 'സ്പാം ആയി അടയാളപ്പെടുത്തി';
 ?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/mr_IN.inc b/plugins/markasjunk/localization/mr_IN.inc
index 7c4611b..232b4b3 100644
--- a/plugins/markasjunk/localization/mr_IN.inc
+++ b/plugins/markasjunk/localization/mr_IN.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
-$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'नको असलेला अशी खूण करा';
 $labels['reportedasjunk'] = 'नको आहे असे यशस्वीरीत्या नक्की केले';
 ?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/nb_NO.inc b/plugins/markasjunk/localization/nb_NO.inc
index 155dbf8..af1b2cb 100644
--- a/plugins/markasjunk/localization/nb_NO.inc
+++ b/plugins/markasjunk/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $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 49f40ec..e1ed115 100644
--- a/plugins/markasjunk/localization/nl_NL.inc
+++ b/plugins/markasjunk/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Markeer als spam';
 $labels['reportedasjunk'] = 'Succesvol gemarkeerd als spam';
diff --git a/plugins/markasjunk/localization/nn_NO.inc b/plugins/markasjunk/localization/nn_NO.inc
index 9b08089..f198c56 100644
--- a/plugins/markasjunk/localization/nn_NO.inc
+++ b/plugins/markasjunk/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Useriøs e-post';
 $labels['buttontitle'] = 'Marker som useriøs e-post';
 $labels['reportedasjunk'] = 'Rapportering av useriøs e-post var vellykka';
diff --git a/plugins/markasjunk/localization/pl_PL.inc b/plugins/markasjunk/localization/pl_PL.inc
index b3d4b45..a23a8de 100644
--- a/plugins/markasjunk/localization/pl_PL.inc
+++ b/plugins/markasjunk/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Oznacz jako SPAM';
 $labels['reportedasjunk'] = 'Pomyślnie oznaczono jako SPAM';
diff --git a/plugins/markasjunk/localization/pt_BR.inc b/plugins/markasjunk/localization/pt_BR.inc
index 83252ab..001d463 100644
--- a/plugins/markasjunk/localization/pt_BR.inc
+++ b/plugins/markasjunk/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $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 eabde40..fd26a38 100644
--- a/plugins/markasjunk/localization/pt_PT.inc
+++ b/plugins/markasjunk/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Lixo';
 $labels['buttontitle'] = 'Marcar como Lixo';
 $labels['reportedasjunk'] = 'Reportado como Lixo com sucesso';
diff --git a/plugins/markasjunk/localization/ro_RO.inc b/plugins/markasjunk/localization/ro_RO.inc
index 199eddd..b843fa5 100644
--- a/plugins/markasjunk/localization/ro_RO.inc
+++ b/plugins/markasjunk/localization/ro_RO.inc
@@ -15,8 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
-$labels['buttontext'] = 'Vechituri';
-$labels['buttontitle'] = 'Marchează ca SPAM';
-$labels['reportedasjunk'] = 'Raportat cu succes ca SPAM';
+$labels['buttontext'] = 'Spam';
+$labels['buttontitle'] = 'Marchează ca Spam';
+$labels['reportedasjunk'] = 'Raportat cu succes ca Spam';
 ?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/ru_RU.inc b/plugins/markasjunk/localization/ru_RU.inc
index 7efa504..78e2695 100644
--- a/plugins/markasjunk/localization/ru_RU.inc
+++ b/plugins/markasjunk/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'СПАМ';
 $labels['buttontitle'] = 'Переместить в СПАМ';
 $labels['reportedasjunk'] = 'Перемещено в СПАМ';
diff --git a/plugins/markasjunk/localization/si_LK.inc b/plugins/markasjunk/localization/si_LK.inc
index 807eee5..06283ef 100644
--- a/plugins/markasjunk/localization/si_LK.inc
+++ b/plugins/markasjunk/localization/si_LK.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
-$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'සුන්බුන් ලෙස සලකුණු කරන්න';
 $labels['reportedasjunk'] = 'සුන්බුන් ලෙස වාර්තා කිරීම සාර්ථකයි';
 ?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/sk_SK.inc b/plugins/markasjunk/localization/sk_SK.inc
index bfbc14f..101b57a 100644
--- a/plugins/markasjunk/localization/sk_SK.inc
+++ b/plugins/markasjunk/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Označiť ako Spam';
 $labels['reportedasjunk'] = 'Úspešne nahlásené ako Spam';
diff --git a/plugins/markasjunk/localization/sl_SI.inc b/plugins/markasjunk/localization/sl_SI.inc
index af2f41a..538bb7f 100644
--- a/plugins/markasjunk/localization/sl_SI.inc
+++ b/plugins/markasjunk/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $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/sr_CS.inc b/plugins/markasjunk/localization/sr_CS.inc
index b8d468b..6977bdc 100644
--- a/plugins/markasjunk/localization/sr_CS.inc
+++ b/plugins/markasjunk/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Смеће';
 $labels['buttontitle'] = 'Означи као cмеће';
 $labels['reportedasjunk'] = 'Успешно пријављени као cмеће';
diff --git a/plugins/markasjunk/localization/sv_SE.inc b/plugins/markasjunk/localization/sv_SE.inc
index 6f4c583..369821e 100644
--- a/plugins/markasjunk/localization/sv_SE.inc
+++ b/plugins/markasjunk/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'Skräp';
 $labels['buttontitle'] = 'Märk som skräp';
 $labels['reportedasjunk'] = 'Framgångsrikt rapporterat som skräp';
diff --git a/plugins/markasjunk/localization/tr_TR.inc b/plugins/markasjunk/localization/tr_TR.inc
index 85a5aed..c423079 100644
--- a/plugins/markasjunk/localization/tr_TR.inc
+++ b/plugins/markasjunk/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = 'İstenmeyen';
 $labels['buttontitle'] = 'Çöp olarak işaretle';
 $labels['reportedasjunk'] = 'Spam olarak rapor edildi';
diff --git a/plugins/markasjunk/localization/uk_UA.inc b/plugins/markasjunk/localization/uk_UA.inc
index 0666d08..34e627f 100644
--- a/plugins/markasjunk/localization/uk_UA.inc
+++ b/plugins/markasjunk/localization/uk_UA.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
-$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Перемістити в "Спам';
 $labels['reportedasjunk'] = 'Переміщено до "Спаму';
 ?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/vi_VN.inc b/plugins/markasjunk/localization/vi_VN.inc
index 8de7161..cd09098 100644
--- a/plugins/markasjunk/localization/vi_VN.inc
+++ b/plugins/markasjunk/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $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 4656432..1f2250e 100644
--- a/plugins/markasjunk/localization/zh_CN.inc
+++ b/plugins/markasjunk/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = '垃圾邮件';
 $labels['buttontitle'] = '标记为垃圾邮件';
 $labels['reportedasjunk'] = '成功报告该邮件为垃圾邮件';
diff --git a/plugins/markasjunk/localization/zh_TW.inc b/plugins/markasjunk/localization/zh_TW.inc
index da0b57c..a42fd11 100644
--- a/plugins/markasjunk/localization/zh_TW.inc
+++ b/plugins/markasjunk/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
-
 $labels['buttontext'] = '垃圾郵件';
 $labels['buttontitle'] = '標示為垃圾信';
 $labels['reportedasjunk'] = '成功回報垃圾信';
diff --git a/plugins/new_user_dialog/localization/ar.inc b/plugins/new_user_dialog/localization/ar.inc
index 7016e55..110b6c4 100644
--- a/plugins/new_user_dialog/localization/ar.inc
+++ b/plugins/new_user_dialog/localization/ar.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'يرجى إكمال هوية المرسل';
 $labels['identitydialoghint'] = 'يظهر هذا المربع مرة واحدة فقط عند تسجيل الدخول أول مرة .';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ar_SA.inc b/plugins/new_user_dialog/localization/ar_SA.inc
index 9bfd249..ea65a05 100644
--- a/plugins/new_user_dialog/localization/ar_SA.inc
+++ b/plugins/new_user_dialog/localization/ar_SA.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialoghint'] = 'يظهر هذا المربع مرة واحدة فقط عند أول الدخول';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ast.inc b/plugins/new_user_dialog/localization/ast.inc
index 1d4c9fc..0ec826d 100644
--- a/plugins/new_user_dialog/localization/ast.inc
+++ b/plugins/new_user_dialog/localization/ast.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Por favor, completa los tos datos personales';
 $labels['identitydialoghint'] = 'Esti diálogu namái va apaecer la primer vegada que te coneutes al corréu.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/az_AZ.inc b/plugins/new_user_dialog/localization/az_AZ.inc
index d3c7f89..c5196dd 100644
--- a/plugins/new_user_dialog/localization/az_AZ.inc
+++ b/plugins/new_user_dialog/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Lütfən, adınızı yazın.';
 $labels['identitydialoghint'] = 'Bu məlumat yalnız ilk girişdə göstərilir.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/be_BE.inc b/plugins/new_user_dialog/localization/be_BE.inc
index 3901806..9986d43 100644
--- a/plugins/new_user_dialog/localization/be_BE.inc
+++ b/plugins/new_user_dialog/localization/be_BE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
-$labels['identitydialogtitle'] = 'Калі ласка, запоўніце асабістыя звесткі';
-$labels['identitydialoghint'] = 'Гэтае вакно з\'яўляецца толькі аднойчы, у час першага ўваходу.';
+$labels['identitydialogtitle'] = 'Калі ласка, запоўніце тоеснасць адпраўніка';
+$labels['identitydialoghint'] = 'Гэтае акно з\'яўляецца толькі аднойчы, у час першага ўваходу.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/bg_BG.inc b/plugins/new_user_dialog/localization/bg_BG.inc
index 708f8f4..38b2c3a 100644
--- a/plugins/new_user_dialog/localization/bg_BG.inc
+++ b/plugins/new_user_dialog/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Моля попълнете Вашите данни за идентичност на подател';
 $labels['identitydialoghint'] = 'Този диалог се появява само при първоначално регистриране.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/bs_BA.inc b/plugins/new_user_dialog/localization/bs_BA.inc
index f8cc93c..ade75f2 100644
--- a/plugins/new_user_dialog/localization/bs_BA.inc
+++ b/plugins/new_user_dialog/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Molimo vas da kompletirate vaš identitet pošiljaoca';
 $labels['identitydialoghint'] = 'Ovaj okvir se pojavljuje samo jednom prilikom prve prijave.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ca_ES.inc b/plugins/new_user_dialog/localization/ca_ES.inc
index 3675954..148bd44 100644
--- a/plugins/new_user_dialog/localization/ca_ES.inc
+++ b/plugins/new_user_dialog/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Si us plau, completeu la identitat del vostre remitent';
 $labels['identitydialoghint'] = 'Aquest quadre només apareix un cop a la primera entrada.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/cs_CZ.inc b/plugins/new_user_dialog/localization/cs_CZ.inc
index 7b4a25b..ccc9b10 100644
--- a/plugins/new_user_dialog/localization/cs_CZ.inc
+++ b/plugins/new_user_dialog/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Prosím doplňte své jméno a e-mail';
 $labels['identitydialoghint'] = 'Tento dialog se objeví pouze při prvním přihlášení.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/cy_GB.inc b/plugins/new_user_dialog/localization/cy_GB.inc
index 7d935d0..33eb284 100644
--- a/plugins/new_user_dialog/localization/cy_GB.inc
+++ b/plugins/new_user_dialog/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Cwblhewch eich enw danfonwr';
 $labels['identitydialoghint'] = 'Mae\'r bocs hwn yn ymddangos unwaith ar eich mewngofnodiad cyntaf.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/da_DK.inc b/plugins/new_user_dialog/localization/da_DK.inc
index e5a69dd..a34282a 100644
--- a/plugins/new_user_dialog/localization/da_DK.inc
+++ b/plugins/new_user_dialog/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Udfyld din afsender identitet';
 $labels['identitydialoghint'] = 'Denne boks vises kun én gang ved første login';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/de_CH.inc b/plugins/new_user_dialog/localization/de_CH.inc
index 195fdc2..b5aed05 100644
--- a/plugins/new_user_dialog/localization/de_CH.inc
+++ b/plugins/new_user_dialog/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Bitte vervollständigen Sie Ihre Absender-Informationen';
 $labels['identitydialoghint'] = 'Dieser Dialog erscheint nur einmal beim ersten Login.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/de_DE.inc b/plugins/new_user_dialog/localization/de_DE.inc
index 195fdc2..b5aed05 100644
--- a/plugins/new_user_dialog/localization/de_DE.inc
+++ b/plugins/new_user_dialog/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Bitte vervollständigen Sie Ihre Absender-Informationen';
 $labels['identitydialoghint'] = 'Dieser Dialog erscheint nur einmal beim ersten Login.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/el_GR.inc b/plugins/new_user_dialog/localization/el_GR.inc
index 0102868..761ec36 100644
--- a/plugins/new_user_dialog/localization/el_GR.inc
+++ b/plugins/new_user_dialog/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Παρακαλώ συμπληρώστε την ταυτότητα του αποστολέα';
 $labels['identitydialoghint'] = 'Αυτό το πλαίσιο εμφανίζεται μια φορά κατά την πρώτη σύνδεση';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/en_GB.inc b/plugins/new_user_dialog/localization/en_GB.inc
index 4c7b593..37043cb 100644
--- a/plugins/new_user_dialog/localization/en_GB.inc
+++ b/plugins/new_user_dialog/localization/en_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Please complete your sender identity.';
 $labels['identitydialoghint'] = 'This box only appears once at the first login.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/eo.inc b/plugins/new_user_dialog/localization/eo.inc
index 5ac957e..5eff253 100644
--- a/plugins/new_user_dialog/localization/eo.inc
+++ b/plugins/new_user_dialog/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Bonvole plenumu vian identon pri sendanto';
 $labels['identitydialoghint'] = 'Ĉi tiu kesto aperas nur unufoje je la unua ensaluto.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/es_AR.inc b/plugins/new_user_dialog/localization/es_AR.inc
index a1e42c9..bda1c74 100644
--- a/plugins/new_user_dialog/localization/es_AR.inc
+++ b/plugins/new_user_dialog/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Por favor, seleccione una identidad para los mensajes salientes';
 $labels['identitydialoghint'] = 'Este diálogo aparecerá sólo una vez durante el primer ingreso';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/es_ES.inc b/plugins/new_user_dialog/localization/es_ES.inc
index 7f005f1..45f55d8 100644
--- a/plugins/new_user_dialog/localization/es_ES.inc
+++ b/plugins/new_user_dialog/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Por favor, complete sus datos personales';
 $labels['identitydialoghint'] = 'Este diálogo sólo aparecerá la primera vez que se conecte al correo.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/et_EE.inc b/plugins/new_user_dialog/localization/et_EE.inc
index 295e57f..2f2d5e7 100644
--- a/plugins/new_user_dialog/localization/et_EE.inc
+++ b/plugins/new_user_dialog/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Palun täida oma saatja identiteet';
 $labels['identitydialoghint'] = 'See kast ilmub ainult esimesel sisselogimisel.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/eu_ES.inc b/plugins/new_user_dialog/localization/eu_ES.inc
index 4e0f5ec..1276ea7 100644
--- a/plugins/new_user_dialog/localization/eu_ES.inc
+++ b/plugins/new_user_dialog/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Osatu zure bidaltzaile-identitatea';
 $labels['identitydialoghint'] = 'Kutxa hau behin bakarri agertzen da lehenengoz sartzean.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/fa_AF.inc b/plugins/new_user_dialog/localization/fa_AF.inc
index 23867ba..d66d4cb 100644
--- a/plugins/new_user_dialog/localization/fa_AF.inc
+++ b/plugins/new_user_dialog/localization/fa_AF.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'لطفا مشخصات فرستنده را کامل کنید';
 $labels['identitydialoghint'] = 'این متن تنها هنگام اولین ورود نمایش داده خواهد شد';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/fa_IR.inc b/plugins/new_user_dialog/localization/fa_IR.inc
index c75ac59..b1f89f2 100644
--- a/plugins/new_user_dialog/localization/fa_IR.inc
+++ b/plugins/new_user_dialog/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'لطفا شناسنه ارسالی‌تان را کامل کنید';
 $labels['identitydialoghint'] = 'این جعبه فقط یک بار در اولین ورود ظاهر می‌شود.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/fi_FI.inc b/plugins/new_user_dialog/localization/fi_FI.inc
index 974a627..882df96 100644
--- a/plugins/new_user_dialog/localization/fi_FI.inc
+++ b/plugins/new_user_dialog/localization/fi_FI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Täydennä lähettäjätietosi';
 $labels['identitydialoghint'] = 'Tämä kohta näkyy vain ensimmäisellä kirjautumiskerralla.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/fr_FR.inc b/plugins/new_user_dialog/localization/fr_FR.inc
index 10021db..e34f0bc 100644
--- a/plugins/new_user_dialog/localization/fr_FR.inc
+++ b/plugins/new_user_dialog/localization/fr_FR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Veuillez saisir votre identité d\'expéditeur';
 $labels['identitydialoghint'] = 'Cette fenêtre de dialogue ne s\'affiche qu\'une seule fois à la première connexion.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/gl_ES.inc b/plugins/new_user_dialog/localization/gl_ES.inc
index f829cf4..83c73b9 100644
--- a/plugins/new_user_dialog/localization/gl_ES.inc
+++ b/plugins/new_user_dialog/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Por favor, complete os seus datos persoais';
 $labels['identitydialoghint'] = 'Este diálogo só aparecerá a primera vez que se conecte ao correo.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/he_IL.inc b/plugins/new_user_dialog/localization/he_IL.inc
index 4702949..e4a7472 100644
--- a/plugins/new_user_dialog/localization/he_IL.inc
+++ b/plugins/new_user_dialog/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'נא להשלים את פרטי זהותך';
 $labels['identitydialoghint'] = 'תיבה זו מופיעה פעם אחת בזמן הכניסה הראשונה למערכת';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/hr_HR.inc b/plugins/new_user_dialog/localization/hr_HR.inc
index 6c3f112..136d9c5 100644
--- a/plugins/new_user_dialog/localization/hr_HR.inc
+++ b/plugins/new_user_dialog/localization/hr_HR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Molim dovršite vaš identitet za slanje poruka';
 $labels['identitydialoghint'] = 'Ova poruka će se pojaviti samo kod prve prijave.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/hu_HU.inc b/plugins/new_user_dialog/localization/hu_HU.inc
index b07d9f1..b793b4b 100644
--- a/plugins/new_user_dialog/localization/hu_HU.inc
+++ b/plugins/new_user_dialog/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Kérem töltse ki a küldő azonosítóját';
 $labels['identitydialoghint'] = 'Ez az ablak csak az első belépéskor jelenik meg.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/hy_AM.inc b/plugins/new_user_dialog/localization/hy_AM.inc
index f6e53ee..be3a1d9 100644
--- a/plugins/new_user_dialog/localization/hy_AM.inc
+++ b/plugins/new_user_dialog/localization/hy_AM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Լրացրեք Ձեր ինքնությունը';
 $labels['identitydialoghint'] = 'Այս նշումը երևում է միայն առաջին մուտքի ժամանակ մեկ անգամ';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/id_ID.inc b/plugins/new_user_dialog/localization/id_ID.inc
index c339582..e0b2e7b 100644
--- a/plugins/new_user_dialog/localization/id_ID.inc
+++ b/plugins/new_user_dialog/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Tolong lengkapi identitas pengirim Anda';
 $labels['identitydialoghint'] = 'Kotak ini hanya muncul sekali saat masuk pertama kali.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/it_IT.inc b/plugins/new_user_dialog/localization/it_IT.inc
index 16af9bc..b8f8df5 100644
--- a/plugins/new_user_dialog/localization/it_IT.inc
+++ b/plugins/new_user_dialog/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Per favore completa le informazioni riguardo la tua identità';
 $labels['identitydialoghint'] = 'Questa finestra comparirà una volta sola al primo accesso';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ja_JP.inc b/plugins/new_user_dialog/localization/ja_JP.inc
index 98a0694..5f24301 100644
--- a/plugins/new_user_dialog/localization/ja_JP.inc
+++ b/plugins/new_user_dialog/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = '送信者情報の入力を完了してください。';
 $labels['identitydialoghint'] = 'このボックスは最初のログイン時に一度だけ表示されます。';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/km_KH.inc b/plugins/new_user_dialog/localization/km_KH.inc
index 970a19a..cbb8771 100644
--- a/plugins/new_user_dialog/localization/km_KH.inc
+++ b/plugins/new_user_dialog/localization/km_KH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'សូមបំពេញអ្តសញ្ញាណអ្នកផ្ញើ';
 $labels['identitydialoghint'] = 'ប្រអប់នេះបង្ហាញតែម្តងទេ ពេលចូលលើកទីមួយ';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ko_KR.inc b/plugins/new_user_dialog/localization/ko_KR.inc
index e8f8e3b..2f14b0f 100644
--- a/plugins/new_user_dialog/localization/ko_KR.inc
+++ b/plugins/new_user_dialog/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = '수신인의 신원을 완성하시기 바랍니다.';
 $labels['identitydialoghint'] = '이 상자는 최초로 로그인할 때만 나타납니다.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ku.inc b/plugins/new_user_dialog/localization/ku.inc
index d151ed1..2ca2654 100644
--- a/plugins/new_user_dialog/localization/ku.inc
+++ b/plugins/new_user_dialog/localization/ku.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'tkaya nawnişani nenar ba tawawi bnwsa';
 $labels['identitydialoghint'] = 'am qtwia wadiara yak jar la sarata krawatawa';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/lb_LU.inc b/plugins/new_user_dialog/localization/lb_LU.inc
index de6de2f..4fe5554 100644
--- a/plugins/new_user_dialog/localization/lb_LU.inc
+++ b/plugins/new_user_dialog/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Vervollstänneg w.e.gl deng Sender-Identitéit';
 $labels['identitydialoghint'] = 'Dës Këscht erschéngt just beim éischte Login.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/lt_LT.inc b/plugins/new_user_dialog/localization/lt_LT.inc
index 5005cd5..dc982ba 100644
--- a/plugins/new_user_dialog/localization/lt_LT.inc
+++ b/plugins/new_user_dialog/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Prašom užpildyti trūkstamą informaciją apie save';
 $labels['identitydialoghint'] = 'Šis langas rodomas tik prisijungus pirmąjį kartą.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/lv_LV.inc b/plugins/new_user_dialog/localization/lv_LV.inc
index 513ab61..037f7cb 100644
--- a/plugins/new_user_dialog/localization/lv_LV.inc
+++ b/plugins/new_user_dialog/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Lūdzu aizpildiet Jūsu, kā sūtītāja, identitātes informāciju';
 $labels['identitydialoghint'] = 'Šis logs parādīsies tikai pirmajā autorizācijas reizē.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ml_IN.inc b/plugins/new_user_dialog/localization/ml_IN.inc
index 09471b0..d97ad99 100644
--- a/plugins/new_user_dialog/localization/ml_IN.inc
+++ b/plugins/new_user_dialog/localization/ml_IN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'സ്വീകര്‍ത്താവിന്റെ വ്യക്തിത്വം പൂര്‍ത്തീകരിക്കുക';
 $labels['identitydialoghint'] = 'ആദ്യത്തെ പ്രവേശനത്തില്‍ മാത്രമേ ഈ പെട്ടി വരികയുള്ളു';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/mr_IN.inc b/plugins/new_user_dialog/localization/mr_IN.inc
index 535588e..d78f2b0 100644
--- a/plugins/new_user_dialog/localization/mr_IN.inc
+++ b/plugins/new_user_dialog/localization/mr_IN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'कृपया पाठवणा-याची ओळख पूर्ण करा';
 $labels['identitydialoghint'] = 'हा चौकोन पहिल्यांदा लॉगिन करताना एकदाच दिसेल.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/nb_NO.inc b/plugins/new_user_dialog/localization/nb_NO.inc
index 963fcc2..320bd9a 100644
--- a/plugins/new_user_dialog/localization/nb_NO.inc
+++ b/plugins/new_user_dialog/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Vennligst fullfør din avvsender identitet.';
 $labels['identitydialoghint'] = 'Denne boksen kommer kun ved første pålogging.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/nl_NL.inc b/plugins/new_user_dialog/localization/nl_NL.inc
index f18a877..450b4f6 100644
--- a/plugins/new_user_dialog/localization/nl_NL.inc
+++ b/plugins/new_user_dialog/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Vul alstublieft uw afzendergegevens in.';
 $labels['identitydialoghint'] = 'Dit scherm verschijnt eenmalig bij uw eerste aanmelding.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/nn_NO.inc b/plugins/new_user_dialog/localization/nn_NO.inc
index fc4cda2..a1122bc 100644
--- a/plugins/new_user_dialog/localization/nn_NO.inc
+++ b/plugins/new_user_dialog/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Fullfør avsendaridentiteten din.';
 $labels['identitydialoghint'] = 'Denne boksen kjem berre fram ved første pålogging.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/pl_PL.inc b/plugins/new_user_dialog/localization/pl_PL.inc
index 60c5da1..be7ed19 100644
--- a/plugins/new_user_dialog/localization/pl_PL.inc
+++ b/plugins/new_user_dialog/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Uzupełnij tożsamość nadawcy';
 $labels['identitydialoghint'] = 'To okno pojawia się tylko przy pierwszym logowaniu.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/pt_BR.inc b/plugins/new_user_dialog/localization/pt_BR.inc
index b6babcc..32640f4 100644
--- a/plugins/new_user_dialog/localization/pt_BR.inc
+++ b/plugins/new_user_dialog/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Por favor complete a sua identidade';
 $labels['identitydialoghint'] = 'Esta tela aparece somente no primeiro acesso.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/pt_PT.inc b/plugins/new_user_dialog/localization/pt_PT.inc
index cb7cdbc..5eeff7e 100644
--- a/plugins/new_user_dialog/localization/pt_PT.inc
+++ b/plugins/new_user_dialog/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Por favor, complete a sua identidade';
 $labels['identitydialoghint'] = 'Esta caixa aparece apenas uma vez no primeiro acesso.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ro_RO.inc b/plugins/new_user_dialog/localization/ro_RO.inc
index d840908..e765212 100644
--- a/plugins/new_user_dialog/localization/ro_RO.inc
+++ b/plugins/new_user_dialog/localization/ro_RO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
-$labels['identitydialogtitle'] = 'Te rog completează identitatea de expeditor.';
-$labels['identitydialoghint'] = 'Această căsuţă apare o data la prima autentificare.';
+$labels['identitydialogtitle'] = 'Te rog completează identitatea expeditorului.';
+$labels['identitydialoghint'] = 'Această căsuţă apare doar la prima autentificare.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ru_RU.inc b/plugins/new_user_dialog/localization/ru_RU.inc
index 5fa87ab..0b40885 100644
--- a/plugins/new_user_dialog/localization/ru_RU.inc
+++ b/plugins/new_user_dialog/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Пожалуйста, укажите Ваше имя.';
 $labels['identitydialoghint'] = 'Данное сообщение отображается только при первом входе.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/sk_SK.inc b/plugins/new_user_dialog/localization/sk_SK.inc
index 92e87b3..236c1d8 100644
--- a/plugins/new_user_dialog/localization/sk_SK.inc
+++ b/plugins/new_user_dialog/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Doplňte prosím Vašu identifikáciu odosielateľa';
 $labels['identitydialoghint'] = 'Toto okno sa objaví len pri prvom prihlásení.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/sl_SI.inc b/plugins/new_user_dialog/localization/sl_SI.inc
index 0bfea61..12d115a 100644
--- a/plugins/new_user_dialog/localization/sl_SI.inc
+++ b/plugins/new_user_dialog/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Izberite identiteto za pošiljanje';
 $labels['identitydialoghint'] = 'To okno se prikaže le ob prvi prijavi v spletno pošto.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/sr_CS.inc b/plugins/new_user_dialog/localization/sr_CS.inc
index 9ae4811..25298a1 100644
--- a/plugins/new_user_dialog/localization/sr_CS.inc
+++ b/plugins/new_user_dialog/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Молимо вас да попуните свој идентитет пошиљаоца';
 $labels['identitydialoghint'] = 'Ово поље се појављује само једном у првом логовању';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/sv_SE.inc b/plugins/new_user_dialog/localization/sv_SE.inc
index 08c7000..2fb0180 100644
--- a/plugins/new_user_dialog/localization/sv_SE.inc
+++ b/plugins/new_user_dialog/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Fyll i namn och avsändaradress under personliga inställningar';
 $labels['identitydialoghint'] = 'Informationen visas endast vid första inloggningen.';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/tr_TR.inc b/plugins/new_user_dialog/localization/tr_TR.inc
index ae560f9..982a5b6 100644
--- a/plugins/new_user_dialog/localization/tr_TR.inc
+++ b/plugins/new_user_dialog/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Lütfen gönderici kimliğinizi tamamlayın';
 $labels['identitydialoghint'] = 'Bu ekran ilk girişte bir kereliğine gözükür';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/uk_UA.inc b/plugins/new_user_dialog/localization/uk_UA.inc
index 6d5349c..b6caef0 100644
--- a/plugins/new_user_dialog/localization/uk_UA.inc
+++ b/plugins/new_user_dialog/localization/uk_UA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = 'Будь ласка, вкажіть Ваше ім’я';
 $labels['identitydialoghint'] = 'Це повідомлення відображається тільки під час першого заходу';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/vi_VN.inc b/plugins/new_user_dialog/localization/vi_VN.inc
index 1be6570..a694781 100644
--- a/plugins/new_user_dialog/localization/vi_VN.inc
+++ b/plugins/new_user_dialog/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $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';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/zh_CN.inc b/plugins/new_user_dialog/localization/zh_CN.inc
index 990670e..16fc0d4 100644
--- a/plugins/new_user_dialog/localization/zh_CN.inc
+++ b/plugins/new_user_dialog/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = '请填写发送人身份';
 $labels['identitydialoghint'] = '本提示仅在第一次登录时显示。';
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/zh_TW.inc b/plugins/new_user_dialog/localization/zh_TW.inc
index 52998ea..25f5883 100644
--- a/plugins/new_user_dialog/localization/zh_TW.inc
+++ b/plugins/new_user_dialog/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
-
 $labels['identitydialogtitle'] = '請完成您的身份資訊';
 $labels['identitydialoghint'] = '此視窗只會於第一次登入時出現。';
 ?>
\ No newline at end of file
diff --git a/plugins/newmail_notifier/localization/ar_SA.inc b/plugins/newmail_notifier/localization/ar_SA.inc
index 4e04d4f..7ea3d2e 100644
--- a/plugins/newmail_notifier/localization/ar_SA.inc
+++ b/plugins/newmail_notifier/localization/ar_SA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'إظهار رسالة تنبيه فى المتصفح عند وصول رسالة جديدة';
 $labels['desktop'] = 'إظهار رسالة تنبيه على سطح المكتب عند وصول رسالة جديدة';
 $labels['sound'] = 'التنبيه الصوتى عند وصول رسالة جديدة';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'هذه رسالة تجربية';
 $labels['desktopdisabled'] = 'رسائل التنبيه على سطح المكتب غير مفعلة فى متصفح الانترنت الخاص بك';
 $labels['desktopunsupported'] = 'المتصفح الخاص بك لا يدعم رسائل سطح المكتب';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/ast.inc b/plugins/newmail_notifier/localization/ast.inc
index 63f4ad0..3c5c192 100644
--- a/plugins/newmail_notifier/localization/ast.inc
+++ b/plugins/newmail_notifier/localization/ast.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Amosar notificaciones del navegador cuando aporte un mensaxe nuevu';
 $labels['desktop'] = 'Amosar notificaciones del escritoriu cuando aporte un mensaxe nuevu';
 $labels['sound'] = 'Reproducir soníu cuando aporte un mensaxe nuevu';
diff --git a/plugins/newmail_notifier/localization/az_AZ.inc b/plugins/newmail_notifier/localization/az_AZ.inc
index 16d9a2e..94283f9 100644
--- a/plugins/newmail_notifier/localization/az_AZ.inc
+++ b/plugins/newmail_notifier/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Yeni məktubun gəlməsi haqda brauzerdə xəbər ver';
 $labels['desktop'] = 'Yeni məktubun gəlməsi haqda iş masasında xəbər ver';
 $labels['sound'] = 'Yeni məktubun gəlməsi haqda səs siqnalı ver';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Bu sınaq bildirişidir';
 $labels['desktopdisabled'] = 'Sizin brauzerdə iş masasında bildiriş söndürülüb';
 $labels['desktopunsupported'] = 'Sizin brauzer iş masasında bildiriş funksiyasını dəstəkləmir';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/be_BE.inc b/plugins/newmail_notifier/localization/be_BE.inc
index b015470..e0b8e0b 100644
--- a/plugins/newmail_notifier/localization/be_BE.inc
+++ b/plugins/newmail_notifier/localization/be_BE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Паказваць апавяшчэнні аб атрыманні новых паведамленняў у браўзеры';
 $labels['desktop'] = 'Паказваць апавяшчэнні аб атрыманні новых паведамленняў на працоўным стале';
 $labels['sound'] = 'Агучваць атрыманне новых паведамленняў';
@@ -23,7 +22,7 @@
 $labels['title'] = 'Новы ліст!';
 $labels['body'] = 'Вы атрымалі новае паведамленне.';
 $labels['testbody'] = 'Гэта тэставае апавяшчэнне.';
-$labels['desktopdisabled'] = 'Інфармаванне працоўнага стала адлкючана ў вашым азіральніку';
-$labels['desktopunsupported'] = 'Ваш азіральнік не падтрымлівае інфармаванне працоўнага стала.';
+$labels['desktopdisabled'] = 'Апавяшчэнні на працоўным стале адключаныя ў браўзеры.';
+$labels['desktopunsupported'] = 'Ваш браўзер не падтрымлівае апавяшчэнні на працоўным стале.';
 $labels['desktoptimeout'] = 'Зачыніць апавяшчэнне на працоўным стале';
 ?>
diff --git a/plugins/newmail_notifier/localization/bg_BG.inc b/plugins/newmail_notifier/localization/bg_BG.inc
index 3abf9f7..15791dd 100644
--- a/plugins/newmail_notifier/localization/bg_BG.inc
+++ b/plugins/newmail_notifier/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Показва известия в браузъра при ново писмо';
 $labels['desktop'] = 'Показва известия на работния плот при ново писмо';
 $labels['sound'] = 'Възпроизведи звук при ново писмо';
diff --git a/plugins/newmail_notifier/localization/br.inc b/plugins/newmail_notifier/localization/br.inc
index c4d447f..0ef3c86 100644
--- a/plugins/newmail_notifier/localization/br.inc
+++ b/plugins/newmail_notifier/localization/br.inc
@@ -15,15 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
-$labels['basic'] = 'Display browser notifications on new message';
-$labels['desktop'] = 'Display desktop notifications on new message';
 $labels['sound'] = 'Seniñ ar son pa kemennadenn nevez';
-$labels['test'] = 'Test';
 $labels['title'] = 'Kemennadenn nevez !';
-$labels['body'] = 'You\'ve received a new message.';
-$labels['testbody'] = 'This is a test notification.';
-$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
-$labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/bs_BA.inc b/plugins/newmail_notifier/localization/bs_BA.inc
index 4089f24..a849c64 100644
--- a/plugins/newmail_notifier/localization/bs_BA.inc
+++ b/plugins/newmail_notifier/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Prikaži obavijesti za nove poruke u pregledniku';
 $labels['desktop'] = 'Prikaži obavijesti za nove poruke na desktopu';
 $labels['sound'] = 'Zvučni signal za novu poruku';
diff --git a/plugins/newmail_notifier/localization/ca_ES.inc b/plugins/newmail_notifier/localization/ca_ES.inc
index bcafd4c..bb510ae 100644
--- a/plugins/newmail_notifier/localization/ca_ES.inc
+++ b/plugins/newmail_notifier/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $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';
@@ -25,5 +24,4 @@
 $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.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/cs_CZ.inc b/plugins/newmail_notifier/localization/cs_CZ.inc
index 065363d..c7f2a8d 100644
--- a/plugins/newmail_notifier/localization/cs_CZ.inc
+++ b/plugins/newmail_notifier/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Zobrazit upozornění v prohlížeči při příchozí zprávě';
 $labels['desktop'] = 'Zobrazit upozornění na ploše při příchozí zprávě';
 $labels['sound'] = 'Přehrát zvuk při příchozí zprávě';
diff --git a/plugins/newmail_notifier/localization/cy_GB.inc b/plugins/newmail_notifier/localization/cy_GB.inc
index a9ea1a3..126ddfd 100644
--- a/plugins/newmail_notifier/localization/cy_GB.inc
+++ b/plugins/newmail_notifier/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Dangos hysbysiadau porwr ar neges newydd';
 $labels['desktop'] = 'Dangos hysbysiadau penbwrdd ar neges newydd';
 $labels['sound'] = 'Chwarae sŵn ar neges newydd';
diff --git a/plugins/newmail_notifier/localization/da_DK.inc b/plugins/newmail_notifier/localization/da_DK.inc
index 615aa9b..26e4e6a 100644
--- a/plugins/newmail_notifier/localization/da_DK.inc
+++ b/plugins/newmail_notifier/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Vis browserbesked ved ny besked';
 $labels['desktop'] = 'Vis skrivebordsbesked ved ny besked';
 $labels['sound'] = 'Afspil en lyd ved ny besked';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Dette er en test meddelelse.';
 $labels['desktopdisabled'] = 'Skrivebordsbeskeder er deaktiveret i din browser.';
 $labels['desktopunsupported'] = 'Din browser understøtter ikke skrivebordsbeskeder.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/de_CH.inc b/plugins/newmail_notifier/localization/de_CH.inc
index b056306..1119e6a 100644
--- a/plugins/newmail_notifier/localization/de_CH.inc
+++ b/plugins/newmail_notifier/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Anzeige im Browser bei neuer Nachricht';
 $labels['desktop'] = 'Desktop-Benachrichtigung bei neuer Nachricht';
 $labels['sound'] = 'Akustische Meldung bei neuer Nachricht';
diff --git a/plugins/newmail_notifier/localization/de_DE.inc b/plugins/newmail_notifier/localization/de_DE.inc
index 20cd11e..4ecb8a3 100644
--- a/plugins/newmail_notifier/localization/de_DE.inc
+++ b/plugins/newmail_notifier/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Benachrichtigung im Browser bei neuer Nachricht';
 $labels['desktop'] = 'Desktop-Benachrichtigung bei neuer Nachricht';
 $labels['sound'] = 'Akustische Meldung bei neuer Nachricht';
diff --git a/plugins/newmail_notifier/localization/el_GR.inc b/plugins/newmail_notifier/localization/el_GR.inc
index 18804db..5f41bc9 100644
--- a/plugins/newmail_notifier/localization/el_GR.inc
+++ b/plugins/newmail_notifier/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Εμφανίση ειδοποιήσεων πρόγραμματος περιήγησης στο νέο μήνυμα';
 $labels['desktop'] = 'Εμφάνιση ειδοποιήσεων στην επιφάνεια εργασίας για νέο μήνυμα ';
 $labels['sound'] = 'Ηχητική ειδοποίηση κατά την λήψη νέων μηνυμάτων';
diff --git a/plugins/newmail_notifier/localization/en_GB.inc b/plugins/newmail_notifier/localization/en_GB.inc
index c8ddabf..3ac79e5 100644
--- a/plugins/newmail_notifier/localization/en_GB.inc
+++ b/plugins/newmail_notifier/localization/en_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Display browser notifications on new message';
 $labels['desktop'] = 'Display desktop notifications on new message';
 $labels['sound'] = 'Play sound on new message';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'This is a test notification.';
 $labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
 $labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/eo.inc b/plugins/newmail_notifier/localization/eo.inc
index f895246..8a46576 100644
--- a/plugins/newmail_notifier/localization/eo.inc
+++ b/plugins/newmail_notifier/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $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';
@@ -25,5 +24,4 @@
 $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.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/es_AR.inc b/plugins/newmail_notifier/localization/es_AR.inc
index 23c50d6..682d79e 100644
--- a/plugins/newmail_notifier/localization/es_AR.inc
+++ b/plugins/newmail_notifier/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Mostrar notificación cuando haya nuevos mensajes';
 $labels['desktop'] = 'Mostrar notificación en escritorio cuando haya nuevos mensajes';
 $labels['sound'] = 'Reproducir sonido cuando haya nuevos mensajes';
diff --git a/plugins/newmail_notifier/localization/es_ES.inc b/plugins/newmail_notifier/localization/es_ES.inc
index e207439..8809aa0 100644
--- a/plugins/newmail_notifier/localization/es_ES.inc
+++ b/plugins/newmail_notifier/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Mostrar notificaciones del navegador cuando llegue un nuevo mensaje';
 $labels['desktop'] = 'Mostrar notificaciones del escritorio cuando llegue un nuevo mensaje';
 $labels['sound'] = 'Reproducir sonido cuando llegue un nuevo mensaje';
@@ -25,5 +24,5 @@
 $labels['testbody'] = 'Esta es una notificación de pruebas.';
 $labels['desktopdisabled'] = 'Las notificaciones de escritorio están deshabilitadas en tu navegador.';
 $labels['desktopunsupported'] = 'Tu navegador no soporta notificaciones de escritorio.';
-$labels['desktoptimeout'] = 'Close desktop notification';
+$labels['desktoptimeout'] = 'Cerrar notificación de escritorio';
 ?>
diff --git a/plugins/newmail_notifier/localization/et_EE.inc b/plugins/newmail_notifier/localization/et_EE.inc
index 07bd0b6..22bdde9 100644
--- a/plugins/newmail_notifier/localization/et_EE.inc
+++ b/plugins/newmail_notifier/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Uue kirja saabumisel näita lehitsejas teavitust';
 $labels['desktop'] = 'Uue kirja saabumisel näita töölaua teavitust';
 $labels['sound'] = 'Uue kirja saabumisel mängi heli';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'See on teavituse proov.';
 $labels['desktopdisabled'] = 'Töölaua märguanded on su veebilehitsejas keelatud.';
 $labels['desktopunsupported'] = 'Sinu veebilehitseja ei toeta töölaua märguandeid.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/eu_ES.inc b/plugins/newmail_notifier/localization/eu_ES.inc
index a087048..7d7d904 100644
--- a/plugins/newmail_notifier/localization/eu_ES.inc
+++ b/plugins/newmail_notifier/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Bistaratu nabigatzailearen jakinarazpenak mezu berrian';
 $labels['desktop'] = 'Bistaratu sistemaren jakinarazpenak mezu berrian';
 $labels['sound'] = 'Jo soinu bat mezu berriarekin';
diff --git a/plugins/newmail_notifier/localization/fa_IR.inc b/plugins/newmail_notifier/localization/fa_IR.inc
index 4cc32dc..af58aee 100644
--- a/plugins/newmail_notifier/localization/fa_IR.inc
+++ b/plugins/newmail_notifier/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'نمایش تذکرهای مرورگر برای پیغام جدید';
 $labels['desktop'] = 'نمایش تذکرهای رومیزی برای پیغام جدید';
 $labels['sound'] = 'پخش صدا برای پیغام جدید';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'این یک تذکر آزمایشی است.';
 $labels['desktopdisabled'] = 'تذکرهای رومیزی در مرورگر شما غیرفعال شده‌اند.';
 $labels['desktopunsupported'] = 'مرورگر شما تذکرهای رومیزی را پشتیبانی نمی‌کند.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/fi_FI.inc b/plugins/newmail_notifier/localization/fi_FI.inc
index 2488c7d..8d5c012 100644
--- a/plugins/newmail_notifier/localization/fi_FI.inc
+++ b/plugins/newmail_notifier/localization/fi_FI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Näytä selainilmoitus uuden viestin saapuessa';
 $labels['desktop'] = 'Näytä työpöytäilmoitus uuden viestin saapuessa';
 $labels['sound'] = 'Toista ääni uuden viestin saapuessa';
diff --git a/plugins/newmail_notifier/localization/fr_FR.inc b/plugins/newmail_notifier/localization/fr_FR.inc
index ff9d7ed..613b409 100644
--- a/plugins/newmail_notifier/localization/fr_FR.inc
+++ b/plugins/newmail_notifier/localization/fr_FR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Afficher une notification dans le navigateur à réception d\'un nouveau message';
 $labels['desktop'] = 'Afficher une notification sur le bureau à réception d\'un nouveau message';
 $labels['sound'] = 'Jouer un son à réception d\'un nouveau message';
diff --git a/plugins/newmail_notifier/localization/gl_ES.inc b/plugins/newmail_notifier/localization/gl_ES.inc
index a34eb2c..1dae352 100644
--- a/plugins/newmail_notifier/localization/gl_ES.inc
+++ b/plugins/newmail_notifier/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Amosar notificacións no navegador cando entre unha mensaxe nova';
 $labels['desktop'] = 'Amosar notificacións no escritorio cando chegue unha mensaxe nova';
 $labels['sound'] = 'Tocar un son cando chegue unha mensaxe nova';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Esta é unha notificación de proba';
 $labels['desktopdisabled'] = 'As notificacións de escritorio están desactivadas no seu navegador';
 $labels['desktopunsupported'] = 'O teu navegador non soporta notificacións de escritorio.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/he_IL.inc b/plugins/newmail_notifier/localization/he_IL.inc
index 5d907d5..9002d7c 100644
--- a/plugins/newmail_notifier/localization/he_IL.inc
+++ b/plugins/newmail_notifier/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'איתות מהדפדפן על הגעת הודעות חדשות';
 $labels['desktop'] = 'איתות משולחן העבודה על הגעת הודעות חדשות';
 $labels['sound'] = 'השמעת איתות קולי בעת הגעה של הודעה חדשה';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'זה איתות לנסיון';
 $labels['desktopdisabled'] = 'איתותים משולחן העבודה אינם פעילים בדפדפן שלך';
 $labels['desktopunsupported'] = 'הדפדפן שלך אינו תומך באיתותים משולחן העבודה';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/hr_HR.inc b/plugins/newmail_notifier/localization/hr_HR.inc
index 97eea8b..3ee6cff 100644
--- a/plugins/newmail_notifier/localization/hr_HR.inc
+++ b/plugins/newmail_notifier/localization/hr_HR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Prikaži dojave preglednika kada dođe nova poruka';
 $labels['desktop'] = 'Prikaži dojave na desktopu kada dođe nova poruka';
 $labels['sound'] = 'Pusti zvuk kada dođe nova poruka';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Ovo je probna dojava.';
 $labels['desktopdisabled'] = 'Dojave na desktopu su onemogućene u vašem pregledniku.';
 $labels['desktopunsupported'] = 'Vaš preglednik ne podržava dojave na desktopu.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/hu_HU.inc b/plugins/newmail_notifier/localization/hu_HU.inc
index 7aa0329..59464f2 100644
--- a/plugins/newmail_notifier/localization/hu_HU.inc
+++ b/plugins/newmail_notifier/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Értesítés megjelenítése böngészőben amikor új üzenet érkezik';
 $labels['desktop'] = 'Asztali értesítés megjelenítése új üzenet érkezésekor';
 $labels['sound'] = 'Hang lejátszása új üzenet érkezésekor';
diff --git a/plugins/newmail_notifier/localization/hy_AM.inc b/plugins/newmail_notifier/localization/hy_AM.inc
index 1254e4b..23fdbed 100644
--- a/plugins/newmail_notifier/localization/hy_AM.inc
+++ b/plugins/newmail_notifier/localization/hy_AM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Ցուցադրել զննարկչի ծանուցում նոր հաղորդագրություն ստանալիս';
 $labels['desktop'] = 'Ցուցադրել սեղանադրի ծանուցում նոր հաղորդագրություն ստանալիս';
 $labels['sound'] = 'Ձայն հանել նոր հաղորդագրություն ստանալիս';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Սա փորձնական ծանուցում է';
 $labels['desktopdisabled'] = 'Սեղանադրի ծանուցումները Ձեր զննարկչում անջատված են';
 $labels['desktopunsupported'] = 'Ձեր զննարկիչը չունի սեղանադրի ծանուցումների հնարավորություն։';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/ia.inc b/plugins/newmail_notifier/localization/ia.inc
index f206707..cf83712 100644
--- a/plugins/newmail_notifier/localization/ia.inc
+++ b/plugins/newmail_notifier/localization/ia.inc
@@ -15,15 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Monstrar notificationes de navigator in cata nove message';
-$labels['desktop'] = 'Display desktop notifications on new message';
-$labels['sound'] = 'Play the sound on new message';
 $labels['test'] = 'Prova';
 $labels['title'] = 'Nove message!';
-$labels['body'] = 'You\'ve received a new message.';
 $labels['testbody'] = 'Iste es un notification de prova.';
-$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
-$labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/id_ID.inc b/plugins/newmail_notifier/localization/id_ID.inc
index 7c0594d..1f32afa 100644
--- a/plugins/newmail_notifier/localization/id_ID.inc
+++ b/plugins/newmail_notifier/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Tampilkan pemberitahuan pada peramban saat ada pesan baru';
 $labels['desktop'] = 'Tampilkan pemberitahuan pada desktop saat ada pesan baru';
 $labels['sound'] = 'Mainkan suara saat ada pesan baru';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Ini adalah percobaan pemberitahuan.';
 $labels['desktopdisabled'] = 'Pemberitahuan di desktop dimatikan pada peramban Anda.';
 $labels['desktopunsupported'] = 'Peramban Anda tidak mendukung pemberitahuan pada desktop';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/it_IT.inc b/plugins/newmail_notifier/localization/it_IT.inc
index b516038..8e3843b 100644
--- a/plugins/newmail_notifier/localization/it_IT.inc
+++ b/plugins/newmail_notifier/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'visualizza notifica nel browser per nuovi messaggi';
 $labels['desktop'] = 'visualizza notifiche sul desktop per nuovi messaggi';
 $labels['sound'] = 'riproduci il suono per nuovi messaggi';
diff --git a/plugins/newmail_notifier/localization/ja_JP.inc b/plugins/newmail_notifier/localization/ja_JP.inc
index b8dda36..6efcb69 100644
--- a/plugins/newmail_notifier/localization/ja_JP.inc
+++ b/plugins/newmail_notifier/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = '新しいメッセージの通知をブラウザーに表示';
 $labels['desktop'] = '新しいメッセージの通知をデスクトップに表示';
 $labels['sound'] = '新しいメッセージが届くと音を再生';
@@ -25,5 +24,5 @@
 $labels['testbody'] = 'これはテストの通知です。';
 $labels['desktopdisabled'] = 'ブラウザーでデスクトップ通知が無効になっています。';
 $labels['desktopunsupported'] = 'ブラウザーがデスクトップ通知をサポートしていません。';
-$labels['desktoptimeout'] = 'Close desktop notification';
+$labels['desktoptimeout'] = 'デスクトップ通知を閉じる';
 ?>
diff --git a/plugins/newmail_notifier/localization/km_KH.inc b/plugins/newmail_notifier/localization/km_KH.inc
index 00d5c0b..fdad4b3 100644
--- a/plugins/newmail_notifier/localization/km_KH.inc
+++ b/plugins/newmail_notifier/localization/km_KH.inc
@@ -15,15 +15,9 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
-$labels['basic'] = 'Display browser notifications on new message';
-$labels['desktop'] = 'Display desktop notifications on new message';
 $labels['sound'] = 'បន្លឹសម្កេងពេលមានសារថ្មី';
 $labels['test'] = 'សាកល្បង';
 $labels['title'] = 'មានសារថ្មី';
 $labels['body'] = 'អ្នកបានទទួលសារថ្មី';
 $labels['testbody'] = 'នេះជាការសាក្បងដំណឹង';
-$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
-$labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/ko_KR.inc b/plugins/newmail_notifier/localization/ko_KR.inc
index f38b0e6..81abd55 100644
--- a/plugins/newmail_notifier/localization/ko_KR.inc
+++ b/plugins/newmail_notifier/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = '새로운 메시지가 도착 시에 브라우저의 알림에 표시';
 $labels['desktop'] = '새로운 메시지가 도착 시에 데스크탑의 알림에 표시';
 $labels['sound'] = '새로운 메시지가 도착 시에 소리 재생';
@@ -25,5 +24,4 @@
 $labels['testbody'] = '이 것은 시험용 알림입니다.';
 $labels['desktopdisabled'] = '당신의 브라우져에서는 데스크탑의 알림이 불가능하도록 되어있습니다.';
 $labels['desktopunsupported'] = '당신의 브라우져에서는 데스크탑의 알림을 지원하지 않습니다.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/lb_LU.inc b/plugins/newmail_notifier/localization/lb_LU.inc
index 69d8fa5..8e6f5f6 100644
--- a/plugins/newmail_notifier/localization/lb_LU.inc
+++ b/plugins/newmail_notifier/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Browser-Notifikatioun bei neiem Message uweisen';
 $labels['desktop'] = 'Desktop-Notifikatioun bei neiem Message uweisen';
 $labels['sound'] = 'Dësen Toun bei neiem Message spillen';
@@ -25,4 +24,5 @@
 $labels['testbody'] = 'Dëst ass eng Test-Benoorichtegung.';
 $labels['desktopdisabled'] = 'Desktop-Notifikatioune sinn an dengem Browser ausgeschalt.';
 $labels['desktopunsupported'] = 'Däi Browser ënnerstëtzt keng Desktop-Notifikatiounen.';
+$labels['desktoptimeout'] = 'Browser-Notifikatioun zoumaachen';
 ?>
diff --git a/plugins/newmail_notifier/localization/lt_LT.inc b/plugins/newmail_notifier/localization/lt_LT.inc
index dcf3351..6db304f 100644
--- a/plugins/newmail_notifier/localization/lt_LT.inc
+++ b/plugins/newmail_notifier/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Pranešti apie naujus laiškus naršyklėje';
 $labels['desktop'] = 'Pranešti apie naujus laiškus sistemos pranešimu';
 $labels['sound'] = 'Pranešti apie naujus laiškus garsu';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Tai – bandomasis pranešimas.';
 $labels['desktopdisabled'] = 'Jūsų naršyklėje sistemos pranešimai išjungti.';
 $labels['desktopunsupported'] = 'Jūsų naršyklėje sistemos pranešimai nepalaikomi.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/lv_LV.inc b/plugins/newmail_notifier/localization/lv_LV.inc
index 0c5a65e..60d951e 100644
--- a/plugins/newmail_notifier/localization/lv_LV.inc
+++ b/plugins/newmail_notifier/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Saņemot jaunu vēstuli, parādīt paziņojumu';
 $labels['desktop'] = 'Saņemot jaunu vēstuli, parādīt darbavirsmas paziņojumu';
 $labels['sound'] = 'Saņemot jaunu vēstuli, atskaņot skaņas signālu';
diff --git a/plugins/newmail_notifier/localization/ml_IN.inc b/plugins/newmail_notifier/localization/ml_IN.inc
index f5dea26..44ec26e 100644
--- a/plugins/newmail_notifier/localization/ml_IN.inc
+++ b/plugins/newmail_notifier/localization/ml_IN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'ബ്രൌസര്‍ അറിയിപ്പുകള്‍ പുതിയ സന്ദേശത്തില്‍ കാണിക്കുക';
 $labels['desktop'] = 'ഡെസ്ക്ക്ടോപ്പ് അറിയിപ്പുകള്‍ പുതിയ സന്ദേശത്തില്‍ കാണിക്കുക';
 $labels['sound'] = 'പുതിയ സന്ദേശത്തില്‍ സബ്ദം കേള്‍പ്പിക്കുക';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'ഇത് ഒരു പരീക്ഷണ അറിയിപ്പാണ്.';
 $labels['desktopdisabled'] = 'താങ്കളുടെ ബ്രൌസറില്‍ ഡെസ്ക്ക്ടോപ്പ് നോട്ടിഫിക്കേഷന്‍ പ്രവര്‍ത്തനരഹിതമാണ്.';
 $labels['desktopunsupported'] = 'താങ്കളുടെ ബ്രൌസ്സര്‍ ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകള്‍ പിന്‍തുണയ്ക്കുന്നില്ല.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/mr_IN.inc b/plugins/newmail_notifier/localization/mr_IN.inc
index 80f6e09..14b453a 100644
--- a/plugins/newmail_notifier/localization/mr_IN.inc
+++ b/plugins/newmail_notifier/localization/mr_IN.inc
@@ -15,15 +15,9 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
-$labels['basic'] = 'Display browser notifications on new message';
-$labels['desktop'] = 'Display desktop notifications on new message';
 $labels['sound'] = 'नवीन संदेश आल्यास नाद करा';
 $labels['test'] = 'चाचणी';
 $labels['title'] = 'नवीन ईमेल';
 $labels['body'] = 'तुमच्यासाठी नवीन संदेश आला आहे';
 $labels['testbody'] = 'हा एक चाचणी निर्देश आहे';
-$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
-$labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/nb_NO.inc b/plugins/newmail_notifier/localization/nb_NO.inc
index 71dbc42..7174da1 100644
--- a/plugins/newmail_notifier/localization/nb_NO.inc
+++ b/plugins/newmail_notifier/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Vis varsel i nettleseren ved ny melding';
 $labels['desktop'] = 'Vis varsel på skrivebordet ved ny melding';
 $labels['sound'] = 'Spill av lyd ved ny melding';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Dette er et testvarsel.';
 $labels['desktopdisabled'] = 'Skrivebordsvarsel er slått av i din nettleser.';
 $labels['desktopunsupported'] = 'Din nettleser støtter ikke visning av varsel på skrivebordet.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/nl_NL.inc b/plugins/newmail_notifier/localization/nl_NL.inc
index b4c7998..8390159 100644
--- a/plugins/newmail_notifier/localization/nl_NL.inc
+++ b/plugins/newmail_notifier/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Toon melding in browser bij nieuw bericht';
 $labels['desktop'] = 'Toon melding op bureaublad bij nieuw bericht';
 $labels['sound'] = 'Geluid afspelen bij nieuw bericht';
diff --git a/plugins/newmail_notifier/localization/nn_NO.inc b/plugins/newmail_notifier/localization/nn_NO.inc
index 8e1d58f..4d42182 100644
--- a/plugins/newmail_notifier/localization/nn_NO.inc
+++ b/plugins/newmail_notifier/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Vis varsel i nettlesaren ved ny melding';
 $labels['desktop'] = 'Vis varsel på skrivebordet ved ny melding';
 $labels['sound'] = 'Spill av lyd ved ny melding';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Dette er eit testvarsel.';
 $labels['desktopdisabled'] = 'Skrivebordsvarsel er slått av i din nettlesar.';
 $labels['desktopunsupported'] = 'Din nettlesar støttar ikkje vising av varsel på skrivebordet.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/pl_PL.inc b/plugins/newmail_notifier/localization/pl_PL.inc
index ed44cc8..5aa9f05 100644
--- a/plugins/newmail_notifier/localization/pl_PL.inc
+++ b/plugins/newmail_notifier/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Wyświetlaj powiadomienia o nadejściu nowej wiadomości w przeglądarce';
 $labels['desktop'] = 'Wyświetlaj powiadomienia o nadejściu nowej wiadomości na pulpicie';
 $labels['sound'] = 'Odtwarzaj dźwięk o nadejściu nowej wiadomości';
diff --git a/plugins/newmail_notifier/localization/pt_BR.inc b/plugins/newmail_notifier/localization/pt_BR.inc
index 1ef45c6..6982e21 100644
--- a/plugins/newmail_notifier/localization/pt_BR.inc
+++ b/plugins/newmail_notifier/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Exibir notificação quando uma nova mensagem chegar';
 $labels['desktop'] = 'Exibir notificação no desktop quando uma nova mensagem chegar';
 $labels['sound'] = 'Alerta sonoro quando uma nova mensagem chegar';
diff --git a/plugins/newmail_notifier/localization/pt_PT.inc b/plugins/newmail_notifier/localization/pt_PT.inc
index c2c19dc..622fc1c 100644
--- a/plugins/newmail_notifier/localization/pt_PT.inc
+++ b/plugins/newmail_notifier/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Mostrar notificação quando uma nova mensagem chegar';
 $labels['desktop'] = 'Mostrar alerta no ambiente de trabalho de nova mensagem';
 $labels['sound'] = 'Alerta sonoro para nova mensagem';
diff --git a/plugins/newmail_notifier/localization/ro_RO.inc b/plugins/newmail_notifier/localization/ro_RO.inc
index f17f65b..b039dd2 100644
--- a/plugins/newmail_notifier/localization/ro_RO.inc
+++ b/plugins/newmail_notifier/localization/ro_RO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Afişează notificări în browser la mesaj nou.';
 $labels['desktop'] = 'Afişează notificări desktop la mesaj nou.';
 $labels['sound'] = 'Redă un sunet la mesaj nou.';
diff --git a/plugins/newmail_notifier/localization/ru_RU.inc b/plugins/newmail_notifier/localization/ru_RU.inc
index db8a8dc..d7ae6a7 100644
--- a/plugins/newmail_notifier/localization/ru_RU.inc
+++ b/plugins/newmail_notifier/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Показывать в браузере уведомление о приходе нового сообщения';
 $labels['desktop'] = 'Показывать на рабочем столе уведомление о приходе нового сообщения';
 $labels['sound'] = 'Подавать звуковой сигнал о приходе нового сообщения';
diff --git a/plugins/newmail_notifier/localization/si_LK.inc b/plugins/newmail_notifier/localization/si_LK.inc
index a16d836..cc139aa 100644
--- a/plugins/newmail_notifier/localization/si_LK.inc
+++ b/plugins/newmail_notifier/localization/si_LK.inc
@@ -15,15 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
-$labels['basic'] = 'Display browser notifications on new message';
-$labels['desktop'] = 'Display desktop notifications on new message';
-$labels['sound'] = 'Play the sound on new message';
 $labels['test'] = 'පිරික්සන්න';
-$labels['title'] = 'New Email!';
-$labels['body'] = 'You\'ve received a new message.';
-$labels['testbody'] = 'This is a test notification.';
-$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
-$labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/sk_SK.inc b/plugins/newmail_notifier/localization/sk_SK.inc
index 97af999..b60447c 100644
--- a/plugins/newmail_notifier/localization/sk_SK.inc
+++ b/plugins/newmail_notifier/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Zobraziť upozornenie v prehliadači pri novej správe';
 $labels['desktop'] = 'Zobraziť upozornenie na ploche pri novej správe';
 $labels['sound'] = 'Prehrať zvuk pri novej správe';
diff --git a/plugins/newmail_notifier/localization/sl_SI.inc b/plugins/newmail_notifier/localization/sl_SI.inc
index 23bd751..32f36f7 100644
--- a/plugins/newmail_notifier/localization/sl_SI.inc
+++ b/plugins/newmail_notifier/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Prikaži obvestilo za nova sporočila';
 $labels['desktop'] = 'Prikaži obvestila na namizju za vsa nova sporočila';
 $labels['sound'] = 'Ob novem sporočilu predvajaj zvok';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'To je testno obvestilo.';
 $labels['desktopdisabled'] = 'Obvestila na namizju so v vašem brskalniku onemogočena.';
 $labels['desktopunsupported'] = 'Vaš brskalnik ne podpira izpis obvestil na namizju.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/sr_CS.inc b/plugins/newmail_notifier/localization/sr_CS.inc
index 66df076..bc587bf 100644
--- a/plugins/newmail_notifier/localization/sr_CS.inc
+++ b/plugins/newmail_notifier/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Прикажи обавештења о новим порукама у прегледачу';
 $labels['desktop'] = 'Прикажи обавештења о новим порукама у систему';
 $labels['sound'] = 'Пусти звук по пријему поруке';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Ово је пробно обавештење.';
 $labels['desktopdisabled'] = 'Обавештења у систему су искључена у вашем прегледачу';
 $labels['desktopunsupported'] = 'Ваш прегледач не подржава обавештења у систему.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/sv_SE.inc b/plugins/newmail_notifier/localization/sv_SE.inc
index 091118f..5e0c9fc 100644
--- a/plugins/newmail_notifier/localization/sv_SE.inc
+++ b/plugins/newmail_notifier/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Avisera nytt meddelande i webbläsaren';
 $labels['desktop'] = 'Avisera nytt meddelande på skrivbordet';
 $labels['sound'] = 'Avisera nytt meddelande med ljudsignal';
diff --git a/plugins/newmail_notifier/localization/ti.inc b/plugins/newmail_notifier/localization/ti.inc
index efb79d0..17b8e73 100644
--- a/plugins/newmail_notifier/localization/ti.inc
+++ b/plugins/newmail_notifier/localization/ti.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'ሓዱሽ መል እኽቲ ጠቆምቲ አብ ጎስጓሲ ይርአ';
 $labels['desktop'] = 'ሓዱሽ መል እኽቲ ጠቆምቲ ኣብ ደስክቶፕ ይርአ';
 $labels['sound'] = 'ሓዱሽ መል እኽቲ ምስዝመጽእ ድምጺ ይሰማዕ';
diff --git a/plugins/newmail_notifier/localization/tr_TR.inc b/plugins/newmail_notifier/localization/tr_TR.inc
index 23a366c..8c4e0c1 100644
--- a/plugins/newmail_notifier/localization/tr_TR.inc
+++ b/plugins/newmail_notifier/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Yeni mesajlarda web tarayıcı bildirimlerini göster';
 $labels['desktop'] = 'Yeni mesajlarda masa üstü bildirimlerini göster';
 $labels['sound'] = 'Yeni mesajlarda muzik çal';
@@ -25,5 +24,5 @@
 $labels['testbody'] = 'Bu bir test bildirimidir.';
 $labels['desktopdisabled'] = 'Web tarayıcınızda masa üstü bildirimi iptal edildi';
 $labels['desktopunsupported'] = 'Web tarayıcınız masa üstü bildidrimleri desteklemiyor';
-$labels['desktoptimeout'] = 'Close desktop notification';
+$labels['desktoptimeout'] = 'Masaüstü bildirimini kapat';
 ?>
diff --git a/plugins/newmail_notifier/localization/uk_UA.inc b/plugins/newmail_notifier/localization/uk_UA.inc
index 8bc0820..06fb8b9 100644
--- a/plugins/newmail_notifier/localization/uk_UA.inc
+++ b/plugins/newmail_notifier/localization/uk_UA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Показувати у браузері сповіщення про нові повідомлення';
 $labels['desktop'] = 'Показувати на робочому столі сповіщення про нові повідомлення';
 $labels['sound'] = 'Програвати звук при появленні нового повідомлення';
@@ -25,5 +24,4 @@
 $labels['testbody'] = 'Це тестове сповіщення';
 $labels['desktopdisabled'] = 'Повідомлення на робочому столі відключені у вашому браузері.';
 $labels['desktopunsupported'] = 'Ваш браузер не підтримує повідомлення на робочому столі.';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/vi_VN.inc b/plugins/newmail_notifier/localization/vi_VN.inc
index bda7525..e8ce68b 100644
--- a/plugins/newmail_notifier/localization/vi_VN.inc
+++ b/plugins/newmail_notifier/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = 'Hiển thị thông báo trên trình duyệt là có thư mới';
 $labels['desktop'] = 'Hiển thị thông báo trên màn hình là có thư mới';
 $labels['sound'] = 'Mở tính năng âm thanh trên thư mới';
@@ -25,5 +24,4 @@
 $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['desktopunsupported'] = 'Trình duyệt của bạn không hỗ trợ thông báo trên máy tính';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/zh_CN.inc b/plugins/newmail_notifier/localization/zh_CN.inc
index e1a8692..cc40577 100644
--- a/plugins/newmail_notifier/localization/zh_CN.inc
+++ b/plugins/newmail_notifier/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = '在浏览器中显示新邮件提醒';
 $labels['desktop'] = '在桌面显示新邮件提醒';
 $labels['sound'] = '收到新邮件时播放声音';
@@ -25,5 +24,4 @@
 $labels['testbody'] = '这是一个提醒测试。';
 $labels['desktopdisabled'] = '您的浏览器已禁止桌面提醒功能。';
 $labels['desktopunsupported'] = '您的浏览器不支持桌面提醒功能。';
-$labels['desktoptimeout'] = 'Close desktop notification';
 ?>
diff --git a/plugins/newmail_notifier/localization/zh_TW.inc b/plugins/newmail_notifier/localization/zh_TW.inc
index 7dac7cc..c6d6c8a 100644
--- a/plugins/newmail_notifier/localization/zh_TW.inc
+++ b/plugins/newmail_notifier/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
-
 $labels['basic'] = '當有新郵件顯示瀏覽器通知';
 $labels['desktop'] = '當有新郵件顯示桌面通知';
 $labels['sound'] = '當有新郵件播放音效';
diff --git a/plugins/password/localization/ar.inc b/plugins/password/localization/ar.inc
index 1d4440f..521127a 100644
--- a/plugins/password/localization/ar.inc
+++ b/plugins/password/localization/ar.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'تغيير كلمة المرور';
 $labels['curpasswd']  = 'كلمة المرور الحالية:';
 $labels['newpasswd']  = 'كلمة المرور الجديدة:';
diff --git a/plugins/password/localization/ar_SA.inc b/plugins/password/localization/ar_SA.inc
index 236303b..990505b 100644
--- a/plugins/password/localization/ar_SA.inc
+++ b/plugins/password/localization/ar_SA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'تغيير كلمة المرور';
 $labels['curpasswd']  = 'كلمة المرور الحالية';
 $labels['newpasswd']  = 'كلمة المرور الجديدة';
diff --git a/plugins/password/localization/ast.inc b/plugins/password/localization/ast.inc
index cce1021..99b283e 100644
--- a/plugins/password/localization/ast.inc
+++ b/plugins/password/localization/ast.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Camudar contraseña';
 $labels['curpasswd']  = 'Contraseña actual:';
 $labels['newpasswd']  = 'Contraseña nueva:';
diff --git a/plugins/password/localization/az_AZ.inc b/plugins/password/localization/az_AZ.inc
index 20f3377..18fa758 100644
--- a/plugins/password/localization/az_AZ.inc
+++ b/plugins/password/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Şifrəni dəyiş';
 $labels['curpasswd']  = 'Hal-hazırki şifrə:';
 $labels['newpasswd']  = 'Yeni şifrə:';
diff --git a/plugins/password/localization/be_BE.inc b/plugins/password/localization/be_BE.inc
index 3ac8f19..457e67e 100644
--- a/plugins/password/localization/be_BE.inc
+++ b/plugins/password/localization/be_BE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Змяніць пароль';
 $labels['curpasswd']  = 'Бягучы пароль:';
 $labels['newpasswd']  = 'Новы пароль:';
diff --git a/plugins/password/localization/bg_BG.inc b/plugins/password/localization/bg_BG.inc
index ec695f4..c1c8b9b 100644
--- a/plugins/password/localization/bg_BG.inc
+++ b/plugins/password/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Промяна на парола';
 $labels['curpasswd']  = 'Текуща парола:';
 $labels['newpasswd']  = 'Нова парола:';
diff --git a/plugins/password/localization/br.inc b/plugins/password/localization/br.inc
index 0e7f799..423fc74 100644
--- a/plugins/password/localization/br.inc
+++ b/plugins/password/localization/br.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Kemmañ ar ger-tremen';
 $labels['curpasswd']  = 'Ger-tremen red :';
 $labels['newpasswd']  = 'Ger-tremen nevez :';
@@ -28,6 +27,5 @@
 $messages['connecterror'] = 'N\'haller ket enrollañ ar ger-tremen nevez. Fazi gant ar c\'hennask.';
 $messages['internalerror'] = 'N\'haller ket enrollañ ar ger-tremen nevez.';
 $messages['passwordshort'] = 'Ret eo d\'ar ger-tremen bezañ hiroc\'h eget $length arouezenn.';
-$messages['passwordweak'] = 'Password must include at least one number and one punctuation character.';
 $messages['passwordforbidden'] = 'Arouezennoù difennet zo er ger-tremen.';
 ?>
diff --git a/plugins/password/localization/bs_BA.inc b/plugins/password/localization/bs_BA.inc
index 136d666..f030fef 100644
--- a/plugins/password/localization/bs_BA.inc
+++ b/plugins/password/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Promijeni šifru';
 $labels['curpasswd']  = 'Trenutna šifra:';
 $labels['newpasswd']  = 'Nova šifra:';
diff --git a/plugins/password/localization/ca_ES.inc b/plugins/password/localization/ca_ES.inc
index 694255d..3ab4ed1 100644
--- a/plugins/password/localization/ca_ES.inc
+++ b/plugins/password/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Canvia la contrasenya';
 $labels['curpasswd']  = 'Contrasenya actual:';
 $labels['newpasswd']  = 'Nova contrasenya:';
diff --git a/plugins/password/localization/cs_CZ.inc b/plugins/password/localization/cs_CZ.inc
index 2b88c22..46076b0 100644
--- a/plugins/password/localization/cs_CZ.inc
+++ b/plugins/password/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Změna hesla';
 $labels['curpasswd']  = 'Aktuální heslo:';
 $labels['newpasswd']  = 'Nové heslo:';
diff --git a/plugins/password/localization/cy_GB.inc b/plugins/password/localization/cy_GB.inc
index 0fb249f..16fc654 100644
--- a/plugins/password/localization/cy_GB.inc
+++ b/plugins/password/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Newid Cyfrinair';
 $labels['curpasswd']  = 'Cyfrinair Presennol:';
 $labels['newpasswd']  = 'Cyfrinair Newydd:';
diff --git a/plugins/password/localization/da_DK.inc b/plugins/password/localization/da_DK.inc
index 7b98e6e..76e161d 100644
--- a/plugins/password/localization/da_DK.inc
+++ b/plugins/password/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Skift adgangskode';
 $labels['curpasswd']  = 'Nuværende adgangskode:';
 $labels['newpasswd']  = 'Ny adgangskode:';
diff --git a/plugins/password/localization/de_CH.inc b/plugins/password/localization/de_CH.inc
index 29e5cf0..a446e1b 100644
--- a/plugins/password/localization/de_CH.inc
+++ b/plugins/password/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Passwort ändern';
 $labels['curpasswd']  = 'Aktuelles Passwort';
 $labels['newpasswd']  = 'Neues Passwort';
diff --git a/plugins/password/localization/de_DE.inc b/plugins/password/localization/de_DE.inc
index 027fcad..fab78fc 100644
--- a/plugins/password/localization/de_DE.inc
+++ b/plugins/password/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Kennwort ändern';
 $labels['curpasswd']  = 'Aktuelles Kennwort:';
 $labels['newpasswd']  = 'Neues Kennwort:';
diff --git a/plugins/password/localization/el_GR.inc b/plugins/password/localization/el_GR.inc
index 2141263..b1c72ab 100644
--- a/plugins/password/localization/el_GR.inc
+++ b/plugins/password/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Αλλαγη κωδικου προσβασης';
 $labels['curpasswd']  = 'Τρεχων κωδικος προσβασης:';
 $labels['newpasswd']  = 'Νεος κωδικος προσβασης:';
diff --git a/plugins/password/localization/en_GB.inc b/plugins/password/localization/en_GB.inc
index 66746a2..1f1b4e2 100644
--- a/plugins/password/localization/en_GB.inc
+++ b/plugins/password/localization/en_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Change Password';
 $labels['curpasswd']  = 'Current Password:';
 $labels['newpasswd']  = 'New Password:';
diff --git a/plugins/password/localization/eo.inc b/plugins/password/localization/eo.inc
index f9205bf..d985c18 100644
--- a/plugins/password/localization/eo.inc
+++ b/plugins/password/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Ŝanĝi pasvorton';
 $labels['curpasswd']  = 'Nuna pasvorto:';
 $labels['newpasswd']  = 'Nova pasvorto:';
diff --git a/plugins/password/localization/es_AR.inc b/plugins/password/localization/es_AR.inc
index cb4e249..47589cf 100644
--- a/plugins/password/localization/es_AR.inc
+++ b/plugins/password/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Cambiar Contraseña';
 $labels['curpasswd']  = 'Contraseña Actual:';
 $labels['newpasswd']  = 'Contraseña Nueva:';
diff --git a/plugins/password/localization/es_ES.inc b/plugins/password/localization/es_ES.inc
index 7e89477..80ee2e9 100644
--- a/plugins/password/localization/es_ES.inc
+++ b/plugins/password/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Cambiar contraseña';
 $labels['curpasswd']  = 'Contraseña actual:';
 $labels['newpasswd']  = 'Contraseña nueva:';
diff --git a/plugins/password/localization/et_EE.inc b/plugins/password/localization/et_EE.inc
index a216e30..e1c524d 100644
--- a/plugins/password/localization/et_EE.inc
+++ b/plugins/password/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Muuda parooli';
 $labels['curpasswd']  = 'Vana parool:';
 $labels['newpasswd']  = 'Uus parool:';
diff --git a/plugins/password/localization/eu_ES.inc b/plugins/password/localization/eu_ES.inc
index f613cd2..b814d29 100644
--- a/plugins/password/localization/eu_ES.inc
+++ b/plugins/password/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Pasahitza aldatu';
 $labels['curpasswd']  = 'Oraingo pasahitza:';
 $labels['newpasswd']  = 'Pasahitz berria:';
diff --git a/plugins/password/localization/fa_AF.inc b/plugins/password/localization/fa_AF.inc
index 6fe3427..5bf7c3a 100644
--- a/plugins/password/localization/fa_AF.inc
+++ b/plugins/password/localization/fa_AF.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'تغییر رمز عبور';
 $labels['curpasswd']  = 'رمز عبور کنونی';
 $labels['newpasswd']  = 'رمز عبور جدید';
diff --git a/plugins/password/localization/fa_IR.inc b/plugins/password/localization/fa_IR.inc
index 1cff47f..5f92857 100644
--- a/plugins/password/localization/fa_IR.inc
+++ b/plugins/password/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'تغییر گذرواژه';
 $labels['curpasswd']  = 'گذرواژه فعلی';
 $labels['newpasswd']  = 'گذرواژه جدید';
diff --git a/plugins/password/localization/fi_FI.inc b/plugins/password/localization/fi_FI.inc
index 7532eff..3b6735b 100644
--- a/plugins/password/localization/fi_FI.inc
+++ b/plugins/password/localization/fi_FI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Vaihda salasana';
 $labels['curpasswd']  = 'Nykyinen salasana:';
 $labels['newpasswd']  = 'Uusi salasana:';
diff --git a/plugins/password/localization/fr_FR.inc b/plugins/password/localization/fr_FR.inc
index 3807a51..c38abc5 100644
--- a/plugins/password/localization/fr_FR.inc
+++ b/plugins/password/localization/fr_FR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Changer le mot de passe';
 $labels['curpasswd']  = 'Mot de passe actuel:';
 $labels['newpasswd']  = 'Nouveau mot de passe:';
diff --git a/plugins/password/localization/gl_ES.inc b/plugins/password/localization/gl_ES.inc
index 24a4da5..f738c62 100644
--- a/plugins/password/localization/gl_ES.inc
+++ b/plugins/password/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Cambiar contrasinal';
 $labels['curpasswd']  = 'Contrasinal actual:';
 $labels['newpasswd']  = 'Contrasinal novo:';
diff --git a/plugins/password/localization/he_IL.inc b/plugins/password/localization/he_IL.inc
index 0b813e9..ce05ea5 100644
--- a/plugins/password/localization/he_IL.inc
+++ b/plugins/password/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'שינוי סיסמה';
 $labels['curpasswd']  = 'סיסמה נוכחית:';
 $labels['newpasswd']  = 'סיסמה חדשה:';
diff --git a/plugins/password/localization/hr_HR.inc b/plugins/password/localization/hr_HR.inc
index b66abaa..44b62b2 100644
--- a/plugins/password/localization/hr_HR.inc
+++ b/plugins/password/localization/hr_HR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Promijeni zaporku';
 $labels['curpasswd']  = 'Važeća zaporka:';
 $labels['newpasswd']  = 'Nova zaporka:';
diff --git a/plugins/password/localization/hu_HU.inc b/plugins/password/localization/hu_HU.inc
index 987bdcc..e9167b0 100644
--- a/plugins/password/localization/hu_HU.inc
+++ b/plugins/password/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Jelszó módosítás';
 $labels['curpasswd']  = 'Jelenlegi jelszó:';
 $labels['newpasswd']  = 'Új jelszó:';
diff --git a/plugins/password/localization/hy_AM.inc b/plugins/password/localization/hy_AM.inc
index b55e955..ebca6cd 100644
--- a/plugins/password/localization/hy_AM.inc
+++ b/plugins/password/localization/hy_AM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Գաղտնաբառի փոփոխում';
 $labels['curpasswd']  = 'Առկա գաղտնաբառը`';
 $labels['newpasswd']  = 'Նոր գաղտնաբառը`';
diff --git a/plugins/password/localization/id_ID.inc b/plugins/password/localization/id_ID.inc
index 614aee4..b7b0cde 100644
--- a/plugins/password/localization/id_ID.inc
+++ b/plugins/password/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Ubah Sandi';
 $labels['curpasswd']  = 'Sandi saat ini:';
 $labels['newpasswd']  = 'Sandi Baru:';
diff --git a/plugins/password/localization/it_IT.inc b/plugins/password/localization/it_IT.inc
index 698b491..ddb83ca 100644
--- a/plugins/password/localization/it_IT.inc
+++ b/plugins/password/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Modifica la Password';
 $labels['curpasswd']  = 'Password corrente:';
 $labels['newpasswd']  = 'Nuova password:';
diff --git a/plugins/password/localization/ja_JP.inc b/plugins/password/localization/ja_JP.inc
index 9b445f3..cc5a117 100644
--- a/plugins/password/localization/ja_JP.inc
+++ b/plugins/password/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'パスワードの変更';
 $labels['curpasswd']  = '現在のパスワード:';
 $labels['newpasswd']  = '新しいパスワード:';
diff --git a/plugins/password/localization/ko_KR.inc b/plugins/password/localization/ko_KR.inc
index ba113b2..21e2dbb 100644
--- a/plugins/password/localization/ko_KR.inc
+++ b/plugins/password/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = '암호 변경';
 $labels['curpasswd']  = '현재 암호:';
 $labels['newpasswd']  = '새 암호:';
diff --git a/plugins/password/localization/ku.inc b/plugins/password/localization/ku.inc
index 4ec48bf..5446268 100644
--- a/plugins/password/localization/ku.inc
+++ b/plugins/password/localization/ku.inc
@@ -15,19 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'گۆڕینی ووشەی نهێنی';
-$labels['curpasswd']  = 'Current Password:';
-$labels['newpasswd']  = 'New Password:';
-$labels['confpasswd']  = 'Confirm New Password:';
-$messages['nopassword'] = 'Please input new password.';
-$messages['nocurpassword'] = 'Please input current password.';
-$messages['passwordincorrect'] = 'Current password incorrect.';
-$messages['passwordinconsistency'] = 'Passwords do not match, please try again.';
-$messages['crypterror'] = 'Could not save new password. Encryption function missing.';
-$messages['connecterror'] = 'Could not save new password. Connection error.';
-$messages['internalerror'] = 'Could not save new password.';
-$messages['passwordshort'] = 'Password must be at least $length characters long.';
-$messages['passwordweak'] = 'Password must include at least one number and one punctuation character.';
-$messages['passwordforbidden'] = 'Password contains forbidden characters.';
 ?>
diff --git a/plugins/password/localization/lb_LU.inc b/plugins/password/localization/lb_LU.inc
index 6e8f8a0..08026f2 100644
--- a/plugins/password/localization/lb_LU.inc
+++ b/plugins/password/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Passwuert änneren';
 $labels['curpasswd']  = 'Aktuellt Passwuert:';
 $labels['newpasswd']  = 'Neit Passwuert:';
diff --git a/plugins/password/localization/lt_LT.inc b/plugins/password/localization/lt_LT.inc
index 470cff2..4425d63 100644
--- a/plugins/password/localization/lt_LT.inc
+++ b/plugins/password/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Slaptažodžio keitimas';
 $labels['curpasswd']  = 'Dabartinis slaptažodis:';
 $labels['newpasswd']  = 'Naujasis slaptažodis:';
diff --git a/plugins/password/localization/lv_LV.inc b/plugins/password/localization/lv_LV.inc
index cd74320..c45bc83 100644
--- a/plugins/password/localization/lv_LV.inc
+++ b/plugins/password/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Nomainīt paroli';
 $labels['curpasswd']  = 'Pašreizējā parole:';
 $labels['newpasswd']  = 'Jaunā parole:';
diff --git a/plugins/password/localization/nb_NO.inc b/plugins/password/localization/nb_NO.inc
index 46ddf5b..9901303 100644
--- a/plugins/password/localization/nb_NO.inc
+++ b/plugins/password/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Bytt passord';
 $labels['curpasswd']  = 'Nåværende passord:';
 $labels['newpasswd']  = 'Nytt passord:';
diff --git a/plugins/password/localization/nl_NL.inc b/plugins/password/localization/nl_NL.inc
index c545089..1b5f0b1 100644
--- a/plugins/password/localization/nl_NL.inc
+++ b/plugins/password/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Wachtwoord wijzigen';
 $labels['curpasswd']  = 'Huidig wachtwoord:';
 $labels['newpasswd']  = 'Nieuw wachtwoord:';
diff --git a/plugins/password/localization/nn_NO.inc b/plugins/password/localization/nn_NO.inc
index 0a56e0f..89d0ad1 100644
--- a/plugins/password/localization/nn_NO.inc
+++ b/plugins/password/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Bytt passord';
 $labels['curpasswd']  = 'Noverande passord:';
 $labels['newpasswd']  = 'Nytt passord:';
diff --git a/plugins/password/localization/pl_PL.inc b/plugins/password/localization/pl_PL.inc
index 975c40a..b3ce372 100644
--- a/plugins/password/localization/pl_PL.inc
+++ b/plugins/password/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Zmiana hasła';
 $labels['curpasswd']  = 'Aktualne hasło:';
 $labels['newpasswd']  = 'Nowe hasło:';
diff --git a/plugins/password/localization/pt_BR.inc b/plugins/password/localization/pt_BR.inc
index 0b28437..ac71476 100644
--- a/plugins/password/localization/pt_BR.inc
+++ b/plugins/password/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Alterar senha';
 $labels['curpasswd']  = 'Senha atual:';
 $labels['newpasswd']  = 'Nova senha:';
diff --git a/plugins/password/localization/pt_PT.inc b/plugins/password/localization/pt_PT.inc
index 13fe83c..fc5b288 100644
--- a/plugins/password/localization/pt_PT.inc
+++ b/plugins/password/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Alterar password';
 $labels['curpasswd']  = 'Password atual:';
 $labels['newpasswd']  = 'Nova password:';
diff --git a/plugins/password/localization/ro_RO.inc b/plugins/password/localization/ro_RO.inc
index fcc048f..0042543 100644
--- a/plugins/password/localization/ro_RO.inc
+++ b/plugins/password/localization/ro_RO.inc
@@ -15,19 +15,18 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Schimbați parola';
 $labels['curpasswd']  = 'Parola curentă:';
 $labels['newpasswd']  = 'Parola nouă:';
-$labels['confpasswd']  = 'Confirmați parola nouă:';
+$labels['confpasswd']  = 'Confirmare parola nouă:';
 $messages['nopassword'] = 'Te rog să introduci noua parolă.';
 $messages['nocurpassword'] = 'Te rog să introduci parola curentă';
 $messages['passwordincorrect'] = 'Parola curentă este incorectă.';
-$messages['passwordinconsistency'] = 'Parolele nu se potrivesc, vă rugăm să mai încercați';
-$messages['crypterror'] = 'Nu am reușit să salvez noua parolă. Lipsa funcției de criptare.';
+$messages['passwordinconsistency'] = 'Parolele nu se potrivesc, te rog să mai încerci';
+$messages['crypterror'] = 'Nu am reușit să salvez noua parolă. Funcția de criptare lipsește.';
 $messages['connecterror'] = 'Nu am reușit să salvez noua parolă. Eroare connexiune.';
 $messages['internalerror'] = 'Nu am reușit să salvez noua parolă.';
-$messages['passwordshort'] = 'Parola trebuie să aibă $length caractere.';
-$messages['passwordweak'] = 'Parola trebuie să conțina cel puțin un număr si un semn de punctuație';
+$messages['passwordshort'] = 'Parola trebuie să aibă minim $length caractere.';
+$messages['passwordweak'] = 'Parola trebuie să conțina cel puțin un număr si un semn de punctuație.';
 $messages['passwordforbidden'] = 'Parola conține caractere nepermise.';
 ?>
diff --git a/plugins/password/localization/ru_RU.inc b/plugins/password/localization/ru_RU.inc
index e07e527..85b7bf2 100644
--- a/plugins/password/localization/ru_RU.inc
+++ b/plugins/password/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Изменить пароль';
 $labels['curpasswd']  = 'Текущий пароль:';
 $labels['newpasswd']  = 'Новый пароль:';
diff --git a/plugins/password/localization/sk_SK.inc b/plugins/password/localization/sk_SK.inc
index eb7301f..fd02102 100644
--- a/plugins/password/localization/sk_SK.inc
+++ b/plugins/password/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Zmeniť heslo';
 $labels['curpasswd']  = 'Súčasné heslo:';
 $labels['newpasswd']  = 'Nové heslo:';
diff --git a/plugins/password/localization/sl_SI.inc b/plugins/password/localization/sl_SI.inc
index 1998087..99af3c9 100644
--- a/plugins/password/localization/sl_SI.inc
+++ b/plugins/password/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Spremeni geslo';
 $labels['curpasswd']  = 'Obstoječe geslo:';
 $labels['newpasswd']  = 'Novo geslo:';
diff --git a/plugins/password/localization/sr_CS.inc b/plugins/password/localization/sr_CS.inc
index d30b76e..0900b31 100644
--- a/plugins/password/localization/sr_CS.inc
+++ b/plugins/password/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Промијени лозинку';
 $labels['curpasswd']  = 'Тренутна лозинка:';
 $labels['newpasswd']  = 'Нова лозинка:';
diff --git a/plugins/password/localization/sv_SE.inc b/plugins/password/localization/sv_SE.inc
index fdef486..0aee9da 100644
--- a/plugins/password/localization/sv_SE.inc
+++ b/plugins/password/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Ändra lösenord';
 $labels['curpasswd']  = 'Nuvarande lösenord:';
 $labels['newpasswd']  = 'Nytt lösenord:';
diff --git a/plugins/password/localization/ti.inc b/plugins/password/localization/ti.inc
index cb8da48..9453318 100644
--- a/plugins/password/localization/ti.inc
+++ b/plugins/password/localization/ti.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'መሕለፊ ቃል ይለወጥ';
 $labels['curpasswd']  = 'ህልው መሕለፊ ቃል:';
 $labels['newpasswd']  = 'ሓዱሽ መሕለፊ ቃል:';
diff --git a/plugins/password/localization/tr_TR.inc b/plugins/password/localization/tr_TR.inc
index 3b0cfaf..75ee30f 100644
--- a/plugins/password/localization/tr_TR.inc
+++ b/plugins/password/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Parolayı Değiştir';
 $labels['curpasswd']  = 'Şimdiki Parola:';
 $labels['newpasswd']  = 'Yeni Parola:';
diff --git a/plugins/password/localization/uk_UA.inc b/plugins/password/localization/uk_UA.inc
index b01c58d..0d102e5 100644
--- a/plugins/password/localization/uk_UA.inc
+++ b/plugins/password/localization/uk_UA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = 'Змінити пароль';
 $labels['curpasswd']  = 'Поточний пароль:';
 $labels['newpasswd']  = 'Новий пароль:';
diff --git a/plugins/password/localization/vi_VN.inc b/plugins/password/localization/vi_VN.inc
index 0c9a930..3e5745f 100644
--- a/plugins/password/localization/vi_VN.inc
+++ b/plugins/password/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $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:';
diff --git a/plugins/password/localization/zh_CN.inc b/plugins/password/localization/zh_CN.inc
index 22c14f2..02db6e8 100644
--- a/plugins/password/localization/zh_CN.inc
+++ b/plugins/password/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = '修改密码';
 $labels['curpasswd']  = '当前密码:';
 $labels['newpasswd']  = '新密码:';
diff --git a/plugins/password/localization/zh_TW.inc b/plugins/password/localization/zh_TW.inc
index ea7abb7..e5e2414 100644
--- a/plugins/password/localization/zh_TW.inc
+++ b/plugins/password/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
-
 $labels['changepasswd']  = '更改密碼';
 $labels['curpasswd']  = '目前的密碼';
 $labels['newpasswd']  = '新密碼';
diff --git a/plugins/subscriptions_option/localization/az_AZ.inc b/plugins/subscriptions_option/localization/az_AZ.inc
index 6a8cc1e..27ee6a5 100644
--- a/plugins/subscriptions_option/localization/az_AZ.inc
+++ b/plugins/subscriptions_option/localization/az_AZ.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'IMAP göndərişi istifadə et';
 ?>
diff --git a/plugins/subscriptions_option/localization/be_BE.inc b/plugins/subscriptions_option/localization/be_BE.inc
index 7996f75..4703368 100644
--- a/plugins/subscriptions_option/localization/be_BE.inc
+++ b/plugins/subscriptions_option/localization/be_BE.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Выкарыстоўваць IMAP-падпіскі';
 ?>
diff --git a/plugins/subscriptions_option/localization/bg_BG.inc b/plugins/subscriptions_option/localization/bg_BG.inc
index 520cf67..fd025e7 100644
--- a/plugins/subscriptions_option/localization/bg_BG.inc
+++ b/plugins/subscriptions_option/localization/bg_BG.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Използвай IMAP абонаменти';
 ?>
diff --git a/plugins/subscriptions_option/localization/bs_BA.inc b/plugins/subscriptions_option/localization/bs_BA.inc
index 63798c2..6900cf5 100644
--- a/plugins/subscriptions_option/localization/bs_BA.inc
+++ b/plugins/subscriptions_option/localization/bs_BA.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Koristi IMAP pretplate';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/ca_ES.inc b/plugins/subscriptions_option/localization/ca_ES.inc
index 8cdb1d6..3a72396 100644
--- a/plugins/subscriptions_option/localization/ca_ES.inc
+++ b/plugins/subscriptions_option/localization/ca_ES.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Fes servir subscripcions IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/cs_CZ.inc b/plugins/subscriptions_option/localization/cs_CZ.inc
index e24d110..60dafa7 100644
--- a/plugins/subscriptions_option/localization/cs_CZ.inc
+++ b/plugins/subscriptions_option/localization/cs_CZ.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Používat odebírání IMAP složek';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/cy_GB.inc b/plugins/subscriptions_option/localization/cy_GB.inc
index 2fb980b..229524f 100644
--- a/plugins/subscriptions_option/localization/cy_GB.inc
+++ b/plugins/subscriptions_option/localization/cy_GB.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Defnyddio tanysgrifiadau IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/da_DK.inc b/plugins/subscriptions_option/localization/da_DK.inc
index aee9d26..06ed8f7 100644
--- a/plugins/subscriptions_option/localization/da_DK.inc
+++ b/plugins/subscriptions_option/localization/da_DK.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Brug IMAP abonnementer';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/de_CH.inc b/plugins/subscriptions_option/localization/de_CH.inc
index 6433a98..6253f87 100644
--- a/plugins/subscriptions_option/localization/de_CH.inc
+++ b/plugins/subscriptions_option/localization/de_CH.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Nur abonnierte Ordner anzeigen';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/de_DE.inc b/plugins/subscriptions_option/localization/de_DE.inc
index 6433a98..6253f87 100644
--- a/plugins/subscriptions_option/localization/de_DE.inc
+++ b/plugins/subscriptions_option/localization/de_DE.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Nur abonnierte Ordner anzeigen';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/el_GR.inc b/plugins/subscriptions_option/localization/el_GR.inc
index 9eb90cb..aae45c2 100644
--- a/plugins/subscriptions_option/localization/el_GR.inc
+++ b/plugins/subscriptions_option/localization/el_GR.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Χρησιμοποιήστε IMAP Συνδρομές';
 ?>
diff --git a/plugins/subscriptions_option/localization/en_GB.inc b/plugins/subscriptions_option/localization/en_GB.inc
index 17a4861..4895fdd 100644
--- a/plugins/subscriptions_option/localization/en_GB.inc
+++ b/plugins/subscriptions_option/localization/en_GB.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Use IMAP Subscriptions';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/eo.inc b/plugins/subscriptions_option/localization/eo.inc
index d315c46..aefdac8 100644
--- a/plugins/subscriptions_option/localization/eo.inc
+++ b/plugins/subscriptions_option/localization/eo.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Uzi IMAP-abonojn';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/es_AR.inc b/plugins/subscriptions_option/localization/es_AR.inc
index 327e500..d062f19 100644
--- a/plugins/subscriptions_option/localization/es_AR.inc
+++ b/plugins/subscriptions_option/localization/es_AR.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Usar suscripción a carpetas IMAP';
 ?>
diff --git a/plugins/subscriptions_option/localization/es_ES.inc b/plugins/subscriptions_option/localization/es_ES.inc
index 9acd159..48a20fe 100644
--- a/plugins/subscriptions_option/localization/es_ES.inc
+++ b/plugins/subscriptions_option/localization/es_ES.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Usar suscripciones IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/et_EE.inc b/plugins/subscriptions_option/localization/et_EE.inc
index 9e3b15d..2d7789d 100644
--- a/plugins/subscriptions_option/localization/et_EE.inc
+++ b/plugins/subscriptions_option/localization/et_EE.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Kasuta IMAP tellimusi';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/eu_ES.inc b/plugins/subscriptions_option/localization/eu_ES.inc
index bcbacf8..a6d349e 100644
--- a/plugins/subscriptions_option/localization/eu_ES.inc
+++ b/plugins/subscriptions_option/localization/eu_ES.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Erabili IMAP harpidetzak';
 ?>
diff --git a/plugins/subscriptions_option/localization/fa_AF.inc b/plugins/subscriptions_option/localization/fa_AF.inc
index a9e8c5b..696fbdc 100644
--- a/plugins/subscriptions_option/localization/fa_AF.inc
+++ b/plugins/subscriptions_option/localization/fa_AF.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'از ثبت نام های IMAP استفاده کنید';
 ?>
diff --git a/plugins/subscriptions_option/localization/fa_IR.inc b/plugins/subscriptions_option/localization/fa_IR.inc
index f8cf5df..8909b2e 100644
--- a/plugins/subscriptions_option/localization/fa_IR.inc
+++ b/plugins/subscriptions_option/localization/fa_IR.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'استفاده از عضویت IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/fi_FI.inc b/plugins/subscriptions_option/localization/fi_FI.inc
index 904d028..7e8ee43 100644
--- a/plugins/subscriptions_option/localization/fi_FI.inc
+++ b/plugins/subscriptions_option/localization/fi_FI.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Käytä IMAP-tilauksia';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/fr_FR.inc b/plugins/subscriptions_option/localization/fr_FR.inc
index 0b2ea9f..9b06d46 100644
--- a/plugins/subscriptions_option/localization/fr_FR.inc
+++ b/plugins/subscriptions_option/localization/fr_FR.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Utiliser les abonnements IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/gl_ES.inc b/plugins/subscriptions_option/localization/gl_ES.inc
index 376b2d3..3b22d8d 100644
--- a/plugins/subscriptions_option/localization/gl_ES.inc
+++ b/plugins/subscriptions_option/localization/gl_ES.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Usar subscricións IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/he_IL.inc b/plugins/subscriptions_option/localization/he_IL.inc
index 897bdd5..c44a1ed 100644
--- a/plugins/subscriptions_option/localization/he_IL.inc
+++ b/plugins/subscriptions_option/localization/he_IL.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'שימוש ברישום לתיקיות IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/hu_HU.inc b/plugins/subscriptions_option/localization/hu_HU.inc
index 368997b..1fee1bb 100644
--- a/plugins/subscriptions_option/localization/hu_HU.inc
+++ b/plugins/subscriptions_option/localization/hu_HU.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'IMAP előfizetések használata.';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/hy_AM.inc b/plugins/subscriptions_option/localization/hy_AM.inc
index 1ecaa9a..8444788 100644
--- a/plugins/subscriptions_option/localization/hy_AM.inc
+++ b/plugins/subscriptions_option/localization/hy_AM.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Օգտագործել IMAP-ի բաժանորդագրությունները';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/id_ID.inc b/plugins/subscriptions_option/localization/id_ID.inc
index eda794f..4232379 100644
--- a/plugins/subscriptions_option/localization/id_ID.inc
+++ b/plugins/subscriptions_option/localization/id_ID.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Gunakan Langganan IMAP';
 ?>
diff --git a/plugins/subscriptions_option/localization/it_IT.inc b/plugins/subscriptions_option/localization/it_IT.inc
index 004311c..37a9ab2 100644
--- a/plugins/subscriptions_option/localization/it_IT.inc
+++ b/plugins/subscriptions_option/localization/it_IT.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Usa sottoscrizioni IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/ja_JP.inc b/plugins/subscriptions_option/localization/ja_JP.inc
index 6259284..4de8a70 100644
--- a/plugins/subscriptions_option/localization/ja_JP.inc
+++ b/plugins/subscriptions_option/localization/ja_JP.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'IMAP 購読リストを使う';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/ko_KR.inc b/plugins/subscriptions_option/localization/ko_KR.inc
index ea539dc..09f5634 100644
--- a/plugins/subscriptions_option/localization/ko_KR.inc
+++ b/plugins/subscriptions_option/localization/ko_KR.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'IMAP 구독 사용';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/lb_LU.inc b/plugins/subscriptions_option/localization/lb_LU.inc
index 100801e..8c1114e 100644
--- a/plugins/subscriptions_option/localization/lb_LU.inc
+++ b/plugins/subscriptions_option/localization/lb_LU.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'IMAP-Abonnementer benotzen';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/lt_LT.inc b/plugins/subscriptions_option/localization/lt_LT.inc
index b8fd0a1..1ff410f 100644
--- a/plugins/subscriptions_option/localization/lt_LT.inc
+++ b/plugins/subscriptions_option/localization/lt_LT.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Naudoti IMAP prenumeratas';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/lv_LV.inc b/plugins/subscriptions_option/localization/lv_LV.inc
index 7507075..1b22bd1 100644
--- a/plugins/subscriptions_option/localization/lv_LV.inc
+++ b/plugins/subscriptions_option/localization/lv_LV.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Izmantot IMAP abonēšanas iestatījumus';
 ?>
diff --git a/plugins/subscriptions_option/localization/nb_NO.inc b/plugins/subscriptions_option/localization/nb_NO.inc
index eaf0ff0..f27889b 100644
--- a/plugins/subscriptions_option/localization/nb_NO.inc
+++ b/plugins/subscriptions_option/localization/nb_NO.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Bruk IMAP-abonnementer';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/nl_NL.inc b/plugins/subscriptions_option/localization/nl_NL.inc
index 79f09c4..00a5899 100644
--- a/plugins/subscriptions_option/localization/nl_NL.inc
+++ b/plugins/subscriptions_option/localization/nl_NL.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Gebruik IMAP-abonneringen';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/nn_NO.inc b/plugins/subscriptions_option/localization/nn_NO.inc
index 882a9ad..c679eac 100644
--- a/plugins/subscriptions_option/localization/nn_NO.inc
+++ b/plugins/subscriptions_option/localization/nn_NO.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Bruk IMAP-abonnement';
 ?>
diff --git a/plugins/subscriptions_option/localization/pl_PL.inc b/plugins/subscriptions_option/localization/pl_PL.inc
index e6e7408..8aeed33 100644
--- a/plugins/subscriptions_option/localization/pl_PL.inc
+++ b/plugins/subscriptions_option/localization/pl_PL.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Używaj subskrypcji IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/pt_BR.inc b/plugins/subscriptions_option/localization/pt_BR.inc
index ee7da7d..d5d90a5 100644
--- a/plugins/subscriptions_option/localization/pt_BR.inc
+++ b/plugins/subscriptions_option/localization/pt_BR.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Usar função de inscrição em pastas IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/pt_PT.inc b/plugins/subscriptions_option/localization/pt_PT.inc
index abcfe32..8b46da7 100644
--- a/plugins/subscriptions_option/localization/pt_PT.inc
+++ b/plugins/subscriptions_option/localization/pt_PT.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Use subscrições IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/ro_RO.inc b/plugins/subscriptions_option/localization/ro_RO.inc
index ccbcda3..82053c1 100644
--- a/plugins/subscriptions_option/localization/ro_RO.inc
+++ b/plugins/subscriptions_option/localization/ro_RO.inc
@@ -15,6 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Utilizare abonări IMAP';
 ?>
diff --git a/plugins/subscriptions_option/localization/ru_RU.inc b/plugins/subscriptions_option/localization/ru_RU.inc
index 3d898b2..5cecfd8 100644
--- a/plugins/subscriptions_option/localization/ru_RU.inc
+++ b/plugins/subscriptions_option/localization/ru_RU.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Использовать IMAP подписки';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/sk_SK.inc b/plugins/subscriptions_option/localization/sk_SK.inc
index fe5463e..f65a508 100644
--- a/plugins/subscriptions_option/localization/sk_SK.inc
+++ b/plugins/subscriptions_option/localization/sk_SK.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Použi IMAP nastavenia';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/sl_SI.inc b/plugins/subscriptions_option/localization/sl_SI.inc
index 6e23f41..ea53eb2 100644
--- a/plugins/subscriptions_option/localization/sl_SI.inc
+++ b/plugins/subscriptions_option/localization/sl_SI.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Uporabi IMAP-naročnino';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/sr_CS.inc b/plugins/subscriptions_option/localization/sr_CS.inc
index 6d94cc2..3bce30b 100644
--- a/plugins/subscriptions_option/localization/sr_CS.inc
+++ b/plugins/subscriptions_option/localization/sr_CS.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Користите ИМАП Уписивање';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/sv_SE.inc b/plugins/subscriptions_option/localization/sv_SE.inc
index 9d2e3fb..2d03fe4 100644
--- a/plugins/subscriptions_option/localization/sv_SE.inc
+++ b/plugins/subscriptions_option/localization/sv_SE.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Använd IMAP-prenumerationer';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/tr_TR.inc b/plugins/subscriptions_option/localization/tr_TR.inc
index 4b2ca19..83bf384 100644
--- a/plugins/subscriptions_option/localization/tr_TR.inc
+++ b/plugins/subscriptions_option/localization/tr_TR.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'IMAP  Aboneliklerini kullan';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/vi_VN.inc b/plugins/subscriptions_option/localization/vi_VN.inc
index 4dd6ef9..c48a0f7 100644
--- a/plugins/subscriptions_option/localization/vi_VN.inc
+++ b/plugins/subscriptions_option/localization/vi_VN.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = 'Đăng ký dùng cách thức IMAP';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/zh_CN.inc b/plugins/subscriptions_option/localization/zh_CN.inc
index 94b9172..efa85b8 100644
--- a/plugins/subscriptions_option/localization/zh_CN.inc
+++ b/plugins/subscriptions_option/localization/zh_CN.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = '使用 IMAP 订阅';
-
 ?>
diff --git a/plugins/subscriptions_option/localization/zh_TW.inc b/plugins/subscriptions_option/localization/zh_TW.inc
index 9fd0f81..fe8524a 100644
--- a/plugins/subscriptions_option/localization/zh_TW.inc
+++ b/plugins/subscriptions_option/localization/zh_TW.inc
@@ -15,7 +15,5 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
-
 $labels['useimapsubscriptions']  = '使用IMAP訂閱';
-
 ?>
diff --git a/plugins/userinfo/localization/ar.inc b/plugins/userinfo/localization/ar.inc
index 680832a..92d5194 100644
--- a/plugins/userinfo/localization/ar.inc
+++ b/plugins/userinfo/localization/ar.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'معلومات المستخدم';
 $labels['lastlogin'] = 'أخر تسجيل دخول';
 $labels['defaultidentity'] = 'الهوية الافتراضية';
diff --git a/plugins/userinfo/localization/ar_SA.inc b/plugins/userinfo/localization/ar_SA.inc
index bd3399c..fbb44c5 100644
--- a/plugins/userinfo/localization/ar_SA.inc
+++ b/plugins/userinfo/localization/ar_SA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'معلومات المستخدم';
 $labels['created'] = 'أُنشئ في';
 $labels['lastlogin'] = 'آخر دخول';
diff --git a/plugins/userinfo/localization/ast.inc b/plugins/userinfo/localization/ast.inc
index a24deab..179c5ba 100644
--- a/plugins/userinfo/localization/ast.inc
+++ b/plugins/userinfo/localization/ast.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Información d\'usuariu';
 $labels['created'] = 'Creáu';
 $labels['lastlogin'] = 'Cabera conexón';
diff --git a/plugins/userinfo/localization/az_AZ.inc b/plugins/userinfo/localization/az_AZ.inc
index 10a5448..f262ea3 100644
--- a/plugins/userinfo/localization/az_AZ.inc
+++ b/plugins/userinfo/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Məlumat';
 $labels['created'] = 'Yaradılma tarixi';
 $labels['lastlogin'] = 'Sonuncu giriş';
diff --git a/plugins/userinfo/localization/be_BE.inc b/plugins/userinfo/localization/be_BE.inc
index 4770d48..724e816 100644
--- a/plugins/userinfo/localization/be_BE.inc
+++ b/plugins/userinfo/localization/be_BE.inc
@@ -15,9 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Асабістыя звесткі';
 $labels['created'] = 'Створаны';
 $labels['lastlogin'] = 'Апошні ўваход';
-$labels['defaultidentity'] = 'Стандартныя асабістыя звесткі';
+$labels['defaultidentity'] = 'Стандартная тоеснасць';
 ?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/bg_BG.inc b/plugins/userinfo/localization/bg_BG.inc
index aca1bba..078c89e 100644
--- a/plugins/userinfo/localization/bg_BG.inc
+++ b/plugins/userinfo/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Потребителска информация';
 $labels['created'] = 'Създаден';
 $labels['lastlogin'] = 'Последен вход';
diff --git a/plugins/userinfo/localization/br.inc b/plugins/userinfo/localization/br.inc
index 8336ed5..a751bd6 100644
--- a/plugins/userinfo/localization/br.inc
+++ b/plugins/userinfo/localization/br.inc
@@ -15,9 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Titouroù an arveriad';
 $labels['created'] = 'Krouet';
 $labels['lastlogin'] = 'Kennask diwezhañ';
-$labels['defaultidentity'] = 'Default Identity';
 ?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/bs_BA.inc b/plugins/userinfo/localization/bs_BA.inc
index c58752c..9dd0d25 100644
--- a/plugins/userinfo/localization/bs_BA.inc
+++ b/plugins/userinfo/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Korisničke informacije';
 $labels['created'] = 'Kreirano';
 $labels['lastlogin'] = 'Zadnja prijava';
diff --git a/plugins/userinfo/localization/ca_ES.inc b/plugins/userinfo/localization/ca_ES.inc
index 8b853ff..8c82c52 100644
--- a/plugins/userinfo/localization/ca_ES.inc
+++ b/plugins/userinfo/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Informació de l\'usuari/a';
 $labels['created'] = 'Creat';
 $labels['lastlogin'] = 'Última connexió';
diff --git a/plugins/userinfo/localization/cs_CZ.inc b/plugins/userinfo/localization/cs_CZ.inc
index fc0ed0e..761926c 100644
--- a/plugins/userinfo/localization/cs_CZ.inc
+++ b/plugins/userinfo/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Uživatel';
 $labels['created'] = 'Vytvořen';
 $labels['lastlogin'] = 'Naspoledy přihlášen';
diff --git a/plugins/userinfo/localization/cy_GB.inc b/plugins/userinfo/localization/cy_GB.inc
index cff92b8..3ce86a6 100644
--- a/plugins/userinfo/localization/cy_GB.inc
+++ b/plugins/userinfo/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Gwybodaeth defnyddiwr';
 $labels['created'] = 'Crëwyd';
 $labels['lastlogin'] = 'Mewngofnodiad diwethaf';
diff --git a/plugins/userinfo/localization/da_DK.inc b/plugins/userinfo/localization/da_DK.inc
index 4b534d2..be72a5b 100644
--- a/plugins/userinfo/localization/da_DK.inc
+++ b/plugins/userinfo/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Brugerinfo';
 $labels['created'] = 'Oprettet';
 $labels['lastlogin'] = 'Sidste login';
diff --git a/plugins/userinfo/localization/de_CH.inc b/plugins/userinfo/localization/de_CH.inc
index 4501bcf..695129a 100644
--- a/plugins/userinfo/localization/de_CH.inc
+++ b/plugins/userinfo/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Benutzerinfo';
 $labels['created'] = 'Erstellt';
 $labels['lastlogin'] = 'Letztes Login';
diff --git a/plugins/userinfo/localization/de_DE.inc b/plugins/userinfo/localization/de_DE.inc
index df1f7c0..8a1ab37 100644
--- a/plugins/userinfo/localization/de_DE.inc
+++ b/plugins/userinfo/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Benutzer-Information';
 $labels['created'] = 'angelegt';
 $labels['lastlogin'] = 'letzte Anmeldung';
diff --git a/plugins/userinfo/localization/el_GR.inc b/plugins/userinfo/localization/el_GR.inc
index 2ea902d..61fa25a 100644
--- a/plugins/userinfo/localization/el_GR.inc
+++ b/plugins/userinfo/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Πληροφορίες χρήστη ';
 $labels['created'] = 'Δημιουργηθηκε';
 $labels['lastlogin'] = 'Τελευταια συνδεση';
diff --git a/plugins/userinfo/localization/en_GB.inc b/plugins/userinfo/localization/en_GB.inc
index 79a6a65..d2951a9 100644
--- a/plugins/userinfo/localization/en_GB.inc
+++ b/plugins/userinfo/localization/en_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'User info';
 $labels['created'] = 'Created';
 $labels['lastlogin'] = 'Last Login';
diff --git a/plugins/userinfo/localization/eo.inc b/plugins/userinfo/localization/eo.inc
index 06af2d8..c776855 100644
--- a/plugins/userinfo/localization/eo.inc
+++ b/plugins/userinfo/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Informoj pri uzanto';
 $labels['created'] = 'Kreita';
 $labels['lastlogin'] = 'Lasta ensaluto';
diff --git a/plugins/userinfo/localization/es_AR.inc b/plugins/userinfo/localization/es_AR.inc
index 74d6dc4..fefbece 100644
--- a/plugins/userinfo/localization/es_AR.inc
+++ b/plugins/userinfo/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Información de usuario';
 $labels['created'] = 'Creado';
 $labels['lastlogin'] = 'Ultimo ingreso';
diff --git a/plugins/userinfo/localization/es_ES.inc b/plugins/userinfo/localization/es_ES.inc
index 821a069..6dde3c5 100644
--- a/plugins/userinfo/localization/es_ES.inc
+++ b/plugins/userinfo/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Información de usuario';
 $labels['created'] = 'Creado';
 $labels['lastlogin'] = 'Última conexión';
diff --git a/plugins/userinfo/localization/et_EE.inc b/plugins/userinfo/localization/et_EE.inc
index 9134358..64f53b2 100644
--- a/plugins/userinfo/localization/et_EE.inc
+++ b/plugins/userinfo/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Kasutaja info';
 $labels['created'] = 'Loodud';
 $labels['lastlogin'] = 'Viimane logimine';
diff --git a/plugins/userinfo/localization/eu_ES.inc b/plugins/userinfo/localization/eu_ES.inc
index e3172a5..38cce04 100644
--- a/plugins/userinfo/localization/eu_ES.inc
+++ b/plugins/userinfo/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Erabiltzailearen informazioa';
 $labels['created'] = 'Sortua';
 $labels['lastlogin'] = 'Azken saioa';
diff --git a/plugins/userinfo/localization/fa_AF.inc b/plugins/userinfo/localization/fa_AF.inc
index 0d130e9..8308a7f 100644
--- a/plugins/userinfo/localization/fa_AF.inc
+++ b/plugins/userinfo/localization/fa_AF.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'اطلاعات کاربر';
 $labels['created'] = 'ایجاد شد';
 $labels['lastlogin'] = 'آخرین ورود';
diff --git a/plugins/userinfo/localization/fa_IR.inc b/plugins/userinfo/localization/fa_IR.inc
index 3c39d71..3f2c395 100644
--- a/plugins/userinfo/localization/fa_IR.inc
+++ b/plugins/userinfo/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'اطلاعات کاربر';
 $labels['created'] = 'ایجاد شده';
 $labels['lastlogin'] = 'آخرین ورود';
diff --git a/plugins/userinfo/localization/fi_FI.inc b/plugins/userinfo/localization/fi_FI.inc
index b143d55..a068557 100644
--- a/plugins/userinfo/localization/fi_FI.inc
+++ b/plugins/userinfo/localization/fi_FI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Käyttäjätiedot';
 $labels['created'] = 'Luotu';
 $labels['lastlogin'] = 'Viimeisin kirjautuminen';
diff --git a/plugins/userinfo/localization/fr_FR.inc b/plugins/userinfo/localization/fr_FR.inc
index 448d081..828101c 100644
--- a/plugins/userinfo/localization/fr_FR.inc
+++ b/plugins/userinfo/localization/fr_FR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Info utilisateur';
 $labels['created'] = 'Date de création';
 $labels['lastlogin'] = 'Dernière connexion';
diff --git a/plugins/userinfo/localization/gl_ES.inc b/plugins/userinfo/localization/gl_ES.inc
index c66371a..860c926 100644
--- a/plugins/userinfo/localization/gl_ES.inc
+++ b/plugins/userinfo/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Información do usuario';
 $labels['created'] = 'Creado';
 $labels['lastlogin'] = 'Última conexión';
diff --git a/plugins/userinfo/localization/he_IL.inc b/plugins/userinfo/localization/he_IL.inc
index ef7f60a..6e7c3a9 100644
--- a/plugins/userinfo/localization/he_IL.inc
+++ b/plugins/userinfo/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'פרטי המשתמש';
 $labels['created'] = 'נוצר';
 $labels['lastlogin'] = 'הכמיסה האחרונה למערכת';
diff --git a/plugins/userinfo/localization/hr_HR.inc b/plugins/userinfo/localization/hr_HR.inc
index dcd3657..669d85c 100644
--- a/plugins/userinfo/localization/hr_HR.inc
+++ b/plugins/userinfo/localization/hr_HR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Informacije o korisniku';
 $labels['created'] = 'Stvoreno';
 $labels['lastlogin'] = 'Zadnja prijava (login)';
diff --git a/plugins/userinfo/localization/hu_HU.inc b/plugins/userinfo/localization/hu_HU.inc
index 8854f08..0b33344 100644
--- a/plugins/userinfo/localization/hu_HU.inc
+++ b/plugins/userinfo/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Felhasználói információ';
 $labels['created'] = 'Létrehozva';
 $labels['lastlogin'] = 'Utolsó bejelentkezés';
diff --git a/plugins/userinfo/localization/hy_AM.inc b/plugins/userinfo/localization/hy_AM.inc
index ea3667e..42add9d 100644
--- a/plugins/userinfo/localization/hy_AM.inc
+++ b/plugins/userinfo/localization/hy_AM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Օգտվողի տվյալներ';
 $labels['created'] = 'Ստեղծված';
 $labels['lastlogin'] = 'Վերջին մուտքը`';
diff --git a/plugins/userinfo/localization/ia.inc b/plugins/userinfo/localization/ia.inc
index 583ee60..4532d94 100644
--- a/plugins/userinfo/localization/ia.inc
+++ b/plugins/userinfo/localization/ia.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Information de usator';
 $labels['created'] = 'Create';
 $labels['lastlogin'] = 'Ultime initio de session';
diff --git a/plugins/userinfo/localization/id_ID.inc b/plugins/userinfo/localization/id_ID.inc
index c726536..aa3bb66 100644
--- a/plugins/userinfo/localization/id_ID.inc
+++ b/plugins/userinfo/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Informasi pengguna';
 $labels['created'] = 'Telah dibuat';
 $labels['lastlogin'] = 'Masuk Terakhir';
diff --git a/plugins/userinfo/localization/it_IT.inc b/plugins/userinfo/localization/it_IT.inc
index 97cbaff..76e0e15 100644
--- a/plugins/userinfo/localization/it_IT.inc
+++ b/plugins/userinfo/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Informazioni utente';
 $labels['created'] = 'Creato';
 $labels['lastlogin'] = 'Ultimo Login';
diff --git a/plugins/userinfo/localization/ja_JP.inc b/plugins/userinfo/localization/ja_JP.inc
index a9f11bd..c9a79e1 100644
--- a/plugins/userinfo/localization/ja_JP.inc
+++ b/plugins/userinfo/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'ユーザー情報';
 $labels['created'] = '作成日時';
 $labels['lastlogin'] = '最後のログイン';
diff --git a/plugins/userinfo/localization/km_KH.inc b/plugins/userinfo/localization/km_KH.inc
index bc9ca60..ce7c0a1 100644
--- a/plugins/userinfo/localization/km_KH.inc
+++ b/plugins/userinfo/localization/km_KH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'ព័តមានអ្នកប្រើប្រាស់';
 $labels['created'] = 'បាន​បង្កើត';
 $labels['lastlogin'] = 'ចុះឈ្មោះចូលចុងក្រោយ';
diff --git a/plugins/userinfo/localization/ko_KR.inc b/plugins/userinfo/localization/ko_KR.inc
index 781e030..5a95d2e 100644
--- a/plugins/userinfo/localization/ko_KR.inc
+++ b/plugins/userinfo/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = '사용자 정보';
 $labels['created'] = '생성됨';
 $labels['lastlogin'] = '마지막 로그인';
diff --git a/plugins/userinfo/localization/ku.inc b/plugins/userinfo/localization/ku.inc
index c03a482..7accf51 100644
--- a/plugins/userinfo/localization/ku.inc
+++ b/plugins/userinfo/localization/ku.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'nawnişani bakar henar';
 $labels['created'] = 'Hat afirandin';
 $labels['lastlogin'] = 'axrin hatna jurawa';
diff --git a/plugins/userinfo/localization/lb_LU.inc b/plugins/userinfo/localization/lb_LU.inc
index a4e4368..db2e0c8 100644
--- a/plugins/userinfo/localization/lb_LU.inc
+++ b/plugins/userinfo/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Benotzer-Info';
 $labels['created'] = 'Erstallt';
 $labels['lastlogin'] = 'Leschte Login';
diff --git a/plugins/userinfo/localization/lt_LT.inc b/plugins/userinfo/localization/lt_LT.inc
index f7651b3..a7a00d0 100644
--- a/plugins/userinfo/localization/lt_LT.inc
+++ b/plugins/userinfo/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Informacija apie naudotoją';
 $labels['created'] = 'Sukurtas';
 $labels['lastlogin'] = 'Paskutinį kartą prisijungė';
diff --git a/plugins/userinfo/localization/lv_LV.inc b/plugins/userinfo/localization/lv_LV.inc
index e5c227c..5bfb405 100644
--- a/plugins/userinfo/localization/lv_LV.inc
+++ b/plugins/userinfo/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Informācija par lietotāju';
 $labels['created'] = 'Izveidots';
 $labels['lastlogin'] = 'Pēdējā pieteikšanās';
diff --git a/plugins/userinfo/localization/ml_IN.inc b/plugins/userinfo/localization/ml_IN.inc
index a953512..7968bc7 100644
--- a/plugins/userinfo/localization/ml_IN.inc
+++ b/plugins/userinfo/localization/ml_IN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'ഉപയോക്താവിന്റെ വിവരം';
 $labels['created'] = 'നിര്‍മ്മിച്ചു';
 $labels['lastlogin'] = 'അവസാന പ്രവേശനം';
diff --git a/plugins/userinfo/localization/mr_IN.inc b/plugins/userinfo/localization/mr_IN.inc
index ba9943b..71a06ab 100644
--- a/plugins/userinfo/localization/mr_IN.inc
+++ b/plugins/userinfo/localization/mr_IN.inc
@@ -15,9 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'वापरकर्त्याची माहिती';
 $labels['created'] = 'निर्माण केलेले';
-$labels['lastlogin'] = 'Last Login';
-$labels['defaultidentity'] = 'Default Identity';
 ?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/nb_NO.inc b/plugins/userinfo/localization/nb_NO.inc
index 15e14bc..b998bb5 100644
--- a/plugins/userinfo/localization/nb_NO.inc
+++ b/plugins/userinfo/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Brukerinformasjon';
 $labels['created'] = 'Opprettet';
 $labels['lastlogin'] = 'Sist logget inn';
diff --git a/plugins/userinfo/localization/nl_NL.inc b/plugins/userinfo/localization/nl_NL.inc
index 46323d6..18ca916 100644
--- a/plugins/userinfo/localization/nl_NL.inc
+++ b/plugins/userinfo/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Gebruikersinformatie';
 $labels['created'] = 'Aangemaakt';
 $labels['lastlogin'] = 'Laatste aanmelding';
diff --git a/plugins/userinfo/localization/nn_NO.inc b/plugins/userinfo/localization/nn_NO.inc
index 06f4526..61acd19 100644
--- a/plugins/userinfo/localization/nn_NO.inc
+++ b/plugins/userinfo/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Brukarinfo';
 $labels['created'] = 'Laga';
 $labels['lastlogin'] = 'Sist logga inn';
diff --git a/plugins/userinfo/localization/pl_PL.inc b/plugins/userinfo/localization/pl_PL.inc
index 6f25687..0f68ae8 100644
--- a/plugins/userinfo/localization/pl_PL.inc
+++ b/plugins/userinfo/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Informacje';
 $labels['created'] = 'Utworzony';
 $labels['lastlogin'] = 'Ostatnie logowanie';
diff --git a/plugins/userinfo/localization/pt_BR.inc b/plugins/userinfo/localization/pt_BR.inc
index 00dd6b8..b261f67 100644
--- a/plugins/userinfo/localization/pt_BR.inc
+++ b/plugins/userinfo/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Informações do usuário';
 $labels['created'] = 'Criado';
 $labels['lastlogin'] = 'Último Login';
diff --git a/plugins/userinfo/localization/pt_PT.inc b/plugins/userinfo/localization/pt_PT.inc
index a24b9b7..85b3e82 100644
--- a/plugins/userinfo/localization/pt_PT.inc
+++ b/plugins/userinfo/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Informação do utilizador';
 $labels['created'] = 'Criado';
 $labels['lastlogin'] = 'Último acesso';
diff --git a/plugins/userinfo/localization/ro_RO.inc b/plugins/userinfo/localization/ro_RO.inc
index b067b1a..64e0b36 100644
--- a/plugins/userinfo/localization/ro_RO.inc
+++ b/plugins/userinfo/localization/ro_RO.inc
@@ -15,9 +15,8 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
-$labels['userinfo'] = 'Informatii utilisator';
-$labels['created'] = 'Data creatiei';
-$labels['lastlogin'] = 'Ultima conectare';
-$labels['defaultidentity'] = 'Identitate principala';
+$labels['userinfo'] = 'Informații utilizator';
+$labels['created'] = 'Data creării';
+$labels['lastlogin'] = 'Ultima autentificare';
+$labels['defaultidentity'] = 'Identitate principală';
 ?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/ru_RU.inc b/plugins/userinfo/localization/ru_RU.inc
index 166349d..ca449d8 100644
--- a/plugins/userinfo/localization/ru_RU.inc
+++ b/plugins/userinfo/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Информация';
 $labels['created'] = 'Создан';
 $labels['lastlogin'] = 'Последний вход';
diff --git a/plugins/userinfo/localization/sk_SK.inc b/plugins/userinfo/localization/sk_SK.inc
index 6a942e4..f6b0c63 100644
--- a/plugins/userinfo/localization/sk_SK.inc
+++ b/plugins/userinfo/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Užívateľské informácie';
 $labels['created'] = 'Vytvorené';
 $labels['lastlogin'] = 'Posledné prihlásenie';
diff --git a/plugins/userinfo/localization/sl_SI.inc b/plugins/userinfo/localization/sl_SI.inc
index f4712cf..a427a09 100644
--- a/plugins/userinfo/localization/sl_SI.inc
+++ b/plugins/userinfo/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Podatki o uporabniku';
 $labels['created'] = 'Ustvarjen';
 $labels['lastlogin'] = 'Zadnja prijava';
diff --git a/plugins/userinfo/localization/sr_CS.inc b/plugins/userinfo/localization/sr_CS.inc
index b2e585c..70271e5 100644
--- a/plugins/userinfo/localization/sr_CS.inc
+++ b/plugins/userinfo/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Подаци о кориснику';
 $labels['created'] = 'Направљено';
 $labels['lastlogin'] = 'Последњи Логин';
diff --git a/plugins/userinfo/localization/sv_SE.inc b/plugins/userinfo/localization/sv_SE.inc
index 9c9a4e3..5583a4e 100644
--- a/plugins/userinfo/localization/sv_SE.inc
+++ b/plugins/userinfo/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Användarinfo';
 $labels['created'] = 'Skapad';
 $labels['lastlogin'] = 'Senast inloggad';
diff --git a/plugins/userinfo/localization/ti.inc b/plugins/userinfo/localization/ti.inc
index 3775561..3799f66 100644
--- a/plugins/userinfo/localization/ti.inc
+++ b/plugins/userinfo/localization/ti.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'ሓብሬታ በዓል ዋና ';
 $labels['created'] = 'እዋን ፍጥረት';
 $labels['lastlogin'] = 'እዋን እታው';
diff --git a/plugins/userinfo/localization/tr_TR.inc b/plugins/userinfo/localization/tr_TR.inc
index ceddca1..5d876f4 100644
--- a/plugins/userinfo/localization/tr_TR.inc
+++ b/plugins/userinfo/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Kullanıcı bilgisi';
 $labels['created'] = 'Oluşturuldu';
 $labels['lastlogin'] = 'Son Giriş';
diff --git a/plugins/userinfo/localization/uk_UA.inc b/plugins/userinfo/localization/uk_UA.inc
index 2de8fc4..91c5670 100644
--- a/plugins/userinfo/localization/uk_UA.inc
+++ b/plugins/userinfo/localization/uk_UA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Інформація';
 $labels['created'] = 'Створено';
 $labels['lastlogin'] = 'Останній захід';
diff --git a/plugins/userinfo/localization/vi_VN.inc b/plugins/userinfo/localization/vi_VN.inc
index 11e7252..2a87163 100644
--- a/plugins/userinfo/localization/vi_VN.inc
+++ b/plugins/userinfo/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = 'Thông tin người dùng';
 $labels['created'] = 'Được tạo';
 $labels['lastlogin'] = 'Lần đăng nhập cuối';
diff --git a/plugins/userinfo/localization/zh_CN.inc b/plugins/userinfo/localization/zh_CN.inc
index 1445d30..b497c10 100644
--- a/plugins/userinfo/localization/zh_CN.inc
+++ b/plugins/userinfo/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = '用户信息';
 $labels['created'] = '创建于';
 $labels['lastlogin'] = '最近登录';
diff --git a/plugins/userinfo/localization/zh_TW.inc b/plugins/userinfo/localization/zh_TW.inc
index b9caef9..811cbb9 100644
--- a/plugins/userinfo/localization/zh_TW.inc
+++ b/plugins/userinfo/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
-
 $labels['userinfo'] = '使用者資訊';
 $labels['created'] = '建立時間';
 $labels['lastlogin'] = '上次登入';
diff --git a/plugins/vcard_attachments/localization/ar.inc b/plugins/vcard_attachments/localization/ar.inc
index b7f5473..2d40d9b 100644
--- a/plugins/vcard_attachments/localization/ar.inc
+++ b/plugins/vcard_attachments/localization/ar.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'إضافة vCard إلى دفتر العناوين';
 $labels['vcardsavefailed'] = 'غير قادر على حفظ بصيغة vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ar_SA.inc b/plugins/vcard_attachments/localization/ar_SA.inc
index 0e12627..4746189 100644
--- a/plugins/vcard_attachments/localization/ar_SA.inc
+++ b/plugins/vcard_attachments/localization/ar_SA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'إضافة صيغة vCard إلى دفتر العناوين';
 $labels['vcardsavefailed'] = 'غير قادر على الحفظ بصيغة vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/az_AZ.inc b/plugins/vcard_attachments/localization/az_AZ.inc
index 5d32d92..7329c7f 100644
--- a/plugins/vcard_attachments/localization/az_AZ.inc
+++ b/plugins/vcard_attachments/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'vCard-ı kontakta daxil et';
 $labels['vcardsavefailed'] = 'vCard-ı saxlamaq alınmadı';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/be_BE.inc b/plugins/vcard_attachments/localization/be_BE.inc
index 1fb1416..57a48e1 100644
--- a/plugins/vcard_attachments/localization/be_BE.inc
+++ b/plugins/vcard_attachments/localization/be_BE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Дадаць vCard у адрасную кнігу';
 $labels['vcardsavefailed'] = 'Немагчыма захаваць vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/bg_BG.inc b/plugins/vcard_attachments/localization/bg_BG.inc
index 2e5c78c..7e0b174 100644
--- a/plugins/vcard_attachments/localization/bg_BG.inc
+++ b/plugins/vcard_attachments/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Добавяне на vCard към адресната книга';
 $labels['vcardsavefailed'] = 'Невъзможен запис на vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/bs_BA.inc b/plugins/vcard_attachments/localization/bs_BA.inc
index 2b15e3a..32304d6 100644
--- a/plugins/vcard_attachments/localization/bs_BA.inc
+++ b/plugins/vcard_attachments/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Dodaj vCard u adresar';
 $labels['vcardsavefailed'] = 'Nije moguće sačuvati vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ca_ES.inc b/plugins/vcard_attachments/localization/ca_ES.inc
index 6ea53b8..c09315d 100644
--- a/plugins/vcard_attachments/localization/ca_ES.inc
+++ b/plugins/vcard_attachments/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Afegeix la vCard a la llibreta d\'adreces';
 $labels['vcardsavefailed'] = 'No s\'ha pogut desar la vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/cs_CZ.inc b/plugins/vcard_attachments/localization/cs_CZ.inc
index c1b32bd..372d650 100644
--- a/plugins/vcard_attachments/localization/cs_CZ.inc
+++ b/plugins/vcard_attachments/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Přidat vCard do adresáře';
 $labels['vcardsavefailed'] = 'Nelze uložit vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/cy_GB.inc b/plugins/vcard_attachments/localization/cy_GB.inc
index 25030d8..814ed0b 100644
--- a/plugins/vcard_attachments/localization/cy_GB.inc
+++ b/plugins/vcard_attachments/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Ychwanegu vCard i\'r llyfr cyfeiriadau';
 $labels['vcardsavefailed'] = 'Methwyd cadw\'r vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/da_DK.inc b/plugins/vcard_attachments/localization/da_DK.inc
index 76f1c81..3107246 100644
--- a/plugins/vcard_attachments/localization/da_DK.inc
+++ b/plugins/vcard_attachments/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Tilføj vCard til adressebogen';
 $labels['vcardsavefailed'] = 'Kan ikke gemme dette vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/de_CH.inc b/plugins/vcard_attachments/localization/de_CH.inc
index a4e2904..edee86f 100644
--- a/plugins/vcard_attachments/localization/de_CH.inc
+++ b/plugins/vcard_attachments/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Kontakt im Adressbuch speichern';
 $labels['vcardsavefailed'] = 'Der Kontakt konnte nicht gespeichert werden';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/de_DE.inc b/plugins/vcard_attachments/localization/de_DE.inc
index a4e2904..edee86f 100644
--- a/plugins/vcard_attachments/localization/de_DE.inc
+++ b/plugins/vcard_attachments/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Kontakt im Adressbuch speichern';
 $labels['vcardsavefailed'] = 'Der Kontakt konnte nicht gespeichert werden';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/el_GR.inc b/plugins/vcard_attachments/localization/el_GR.inc
index 820523b..a59f6f5 100644
--- a/plugins/vcard_attachments/localization/el_GR.inc
+++ b/plugins/vcard_attachments/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Προσθήκη vCard στο βιβλίο διευθύνσεων';
 $labels['vcardsavefailed'] = 'Δεν είναι δυνατή η αποθήκευση του vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/en_GB.inc b/plugins/vcard_attachments/localization/en_GB.inc
index 34c5eeb..ac21ef9 100644
--- a/plugins/vcard_attachments/localization/en_GB.inc
+++ b/plugins/vcard_attachments/localization/en_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Add vCard to addressbook';
 $labels['vcardsavefailed'] = 'Unable to save vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/eo.inc b/plugins/vcard_attachments/localization/eo.inc
index 79f1aef..bcdfbb0 100644
--- a/plugins/vcard_attachments/localization/eo.inc
+++ b/plugins/vcard_attachments/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Aldoni vCard al adresaro';
 $labels['vcardsavefailed'] = 'vCard ne konserveblas';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/es_AR.inc b/plugins/vcard_attachments/localization/es_AR.inc
index 1c15d65..ee2f0c8 100644
--- a/plugins/vcard_attachments/localization/es_AR.inc
+++ b/plugins/vcard_attachments/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Agregar vCard a la libreta de direcciones';
 $labels['vcardsavefailed'] = 'Imposible guardar vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/es_ES.inc b/plugins/vcard_attachments/localization/es_ES.inc
index 8e92f81..8c777d2 100644
--- a/plugins/vcard_attachments/localization/es_ES.inc
+++ b/plugins/vcard_attachments/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Añadir la tarjeta a la libreta de direcciones';
 $labels['vcardsavefailed'] = 'No ha sido posible guardar la tarjeta';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/et_EE.inc b/plugins/vcard_attachments/localization/et_EE.inc
index a18c568..73d2070 100644
--- a/plugins/vcard_attachments/localization/et_EE.inc
+++ b/plugins/vcard_attachments/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Lisa vCard aadressiraamatusse';
 $labels['vcardsavefailed'] = 'vCard salvestamine nurjus';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/eu_ES.inc b/plugins/vcard_attachments/localization/eu_ES.inc
index ca9d224..f60ac6e 100644
--- a/plugins/vcard_attachments/localization/eu_ES.inc
+++ b/plugins/vcard_attachments/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Gehitu vCard helbide-liburura';
 $labels['vcardsavefailed'] = 'Ezin da vCard gorde';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/fa_IR.inc b/plugins/vcard_attachments/localization/fa_IR.inc
index 0612802..ea93d8c 100644
--- a/plugins/vcard_attachments/localization/fa_IR.inc
+++ b/plugins/vcard_attachments/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'افزودن vCard به دفترچه آدرس';
 $labels['vcardsavefailed'] = 'ناتوان در ذخیره vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/fi_FI.inc b/plugins/vcard_attachments/localization/fi_FI.inc
index f063f16..58aceb1 100644
--- a/plugins/vcard_attachments/localization/fi_FI.inc
+++ b/plugins/vcard_attachments/localization/fi_FI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Lisää vCard osoitekirjaan';
 $labels['vcardsavefailed'] = 'vCardin tallennus epäonnistui';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/fr_FR.inc b/plugins/vcard_attachments/localization/fr_FR.inc
index 3bbf7d3..243f6ae 100644
--- a/plugins/vcard_attachments/localization/fr_FR.inc
+++ b/plugins/vcard_attachments/localization/fr_FR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Ajouter la vCard au carnet d\'adresses';
 $labels['vcardsavefailed'] = 'Impossible d\'enregistrer la vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/gl_ES.inc b/plugins/vcard_attachments/localization/gl_ES.inc
index 03b8de2..af6f284 100644
--- a/plugins/vcard_attachments/localization/gl_ES.inc
+++ b/plugins/vcard_attachments/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Engadir vCard ao caderno de enderezos';
 $labels['vcardsavefailed'] = 'Non foi posible gardar a vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/he_IL.inc b/plugins/vcard_attachments/localization/he_IL.inc
index 2f834be..4a0a4cd 100644
--- a/plugins/vcard_attachments/localization/he_IL.inc
+++ b/plugins/vcard_attachments/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'הוספת כרטיס ביקור בפורמט vCard לספר הכתובות';
 $labels['vcardsavefailed'] = 'לא ניתן לשמור את כרטיס הביקור  vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/hr_HR.inc b/plugins/vcard_attachments/localization/hr_HR.inc
index 74319a5..93fc17c 100644
--- a/plugins/vcard_attachments/localization/hr_HR.inc
+++ b/plugins/vcard_attachments/localization/hr_HR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Dodaj vCard u imenik';
 $labels['vcardsavefailed'] = 'Ne mogu pohraniti vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/hu_HU.inc b/plugins/vcard_attachments/localization/hu_HU.inc
index ca0a37f..e4d609f 100644
--- a/plugins/vcard_attachments/localization/hu_HU.inc
+++ b/plugins/vcard_attachments/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'vCard hozzáadása a címjegyzékhez';
 $labels['vcardsavefailed'] = 'Sikertelen a vCard mentése';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/hy_AM.inc b/plugins/vcard_attachments/localization/hy_AM.inc
index 878b11d..d565882 100644
--- a/plugins/vcard_attachments/localization/hy_AM.inc
+++ b/plugins/vcard_attachments/localization/hy_AM.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Ավելացնել vCard-ը հասցեագրքում';
 $labels['vcardsavefailed'] = 'vCard-ի պահպանումը ձախողվեց';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/id_ID.inc b/plugins/vcard_attachments/localization/id_ID.inc
index b66c975..ea3a31a 100644
--- a/plugins/vcard_attachments/localization/id_ID.inc
+++ b/plugins/vcard_attachments/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Tambahkan vCard ke buku alamat';
 $labels['vcardsavefailed'] = 'Tidak dapat menyimpan vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/it_IT.inc b/plugins/vcard_attachments/localization/it_IT.inc
index f6c0590..fbe498f 100644
--- a/plugins/vcard_attachments/localization/it_IT.inc
+++ b/plugins/vcard_attachments/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Aggiungi vCard alla Agenda';
 $labels['vcardsavefailed'] = 'Abilita a salvare vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ja_JP.inc b/plugins/vcard_attachments/localization/ja_JP.inc
index ede2542..4cd738b 100644
--- a/plugins/vcard_attachments/localization/ja_JP.inc
+++ b/plugins/vcard_attachments/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'vCardをアドレス帳に追加';
 $labels['vcardsavefailed'] = 'vCardを保存できませんでした。';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/km_KH.inc b/plugins/vcard_attachments/localization/km_KH.inc
index 84d226b..f3909e0 100644
--- a/plugins/vcard_attachments/localization/km_KH.inc
+++ b/plugins/vcard_attachments/localization/km_KH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'បន្ថែម vCard ទៅសៀវភៅកត់ត្រា';
 $labels['vcardsavefailed'] = 'មិនអាចរក្សាទុក vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ko_KR.inc b/plugins/vcard_attachments/localization/ko_KR.inc
index 68277d2..b9b6906 100644
--- a/plugins/vcard_attachments/localization/ko_KR.inc
+++ b/plugins/vcard_attachments/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = '주소록에 vCard를 추가';
 $labels['vcardsavefailed'] = 'vCard 저장이 불가능함';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/lb_LU.inc b/plugins/vcard_attachments/localization/lb_LU.inc
index e38111a..005650f 100644
--- a/plugins/vcard_attachments/localization/lb_LU.inc
+++ b/plugins/vcard_attachments/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'vCard an d\'Adressbuch setzen';
 $labels['vcardsavefailed'] = 'vCard kann net gespäichert ginn';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/lt_LT.inc b/plugins/vcard_attachments/localization/lt_LT.inc
index 8cbb1af..468a9da 100644
--- a/plugins/vcard_attachments/localization/lt_LT.inc
+++ b/plugins/vcard_attachments/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Įtraukti vizitinę kortelę į adresų knygą';
 $labels['vcardsavefailed'] = 'Įrašyti vizitinės kortelės nepavyko';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/lv_LV.inc b/plugins/vcard_attachments/localization/lv_LV.inc
index 5d5cc6d..079e4f8 100644
--- a/plugins/vcard_attachments/localization/lv_LV.inc
+++ b/plugins/vcard_attachments/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Pievienot vizītkarti adrešu grāmatai';
 $labels['vcardsavefailed'] = 'Nevarēja saglabāt vizītkarti';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ml_IN.inc b/plugins/vcard_attachments/localization/ml_IN.inc
index 1e889ee..0b77865 100644
--- a/plugins/vcard_attachments/localization/ml_IN.inc
+++ b/plugins/vcard_attachments/localization/ml_IN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'വിലാസപുസ്തകത്തിലേക്ക് വികാര്‍ഡ് ചേര്‍ക്കുക';
 $labels['vcardsavefailed'] = 'വികാര്‍ഡ് ചേര്‍ക്കാന്‍ പറ്റിയില്ല';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/mr_IN.inc b/plugins/vcard_attachments/localization/mr_IN.inc
index c4c5bd4..8dcf3c4 100644
--- a/plugins/vcard_attachments/localization/mr_IN.inc
+++ b/plugins/vcard_attachments/localization/mr_IN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'व्हीकार्ड पत्ते नोंदवहीत समाविष्ट करा';
 $labels['vcardsavefailed'] = 'व्हीकार्ड जतन करण्यास असमर्थ';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/nb_NO.inc b/plugins/vcard_attachments/localization/nb_NO.inc
index 8c531d0..5f61392 100644
--- a/plugins/vcard_attachments/localization/nb_NO.inc
+++ b/plugins/vcard_attachments/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Legg til vCard i adresseboken';
 $labels['vcardsavefailed'] = 'Ikke i stand til å lagre vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/nl_NL.inc b/plugins/vcard_attachments/localization/nl_NL.inc
index b7bdcaa..748d621 100644
--- a/plugins/vcard_attachments/localization/nl_NL.inc
+++ b/plugins/vcard_attachments/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Voeg vCard toe aan adresboek';
 $labels['vcardsavefailed'] = 'Kan vCard niet opslaan';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/nn_NO.inc b/plugins/vcard_attachments/localization/nn_NO.inc
index e7723fb..09803d5 100644
--- a/plugins/vcard_attachments/localization/nn_NO.inc
+++ b/plugins/vcard_attachments/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Legg til vCard i adresseboka';
 $labels['vcardsavefailed'] = 'Klarte ikkje lagra vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/pl_PL.inc b/plugins/vcard_attachments/localization/pl_PL.inc
index 544766f..8da9436 100644
--- a/plugins/vcard_attachments/localization/pl_PL.inc
+++ b/plugins/vcard_attachments/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Dodaj wizytówkę (vCard) do kontaktów';
 $labels['vcardsavefailed'] = 'Nie można zapisać wizytówki (vCard)';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/pt_BR.inc b/plugins/vcard_attachments/localization/pt_BR.inc
index 5741dde..3244bba 100644
--- a/plugins/vcard_attachments/localization/pt_BR.inc
+++ b/plugins/vcard_attachments/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Adicionar o vCard ao Catálogo de Endereços';
 $labels['vcardsavefailed'] = 'Impossível salvar o vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/pt_PT.inc b/plugins/vcard_attachments/localization/pt_PT.inc
index 15674b0..9e5e110 100644
--- a/plugins/vcard_attachments/localization/pt_PT.inc
+++ b/plugins/vcard_attachments/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Adicionar o vCard ao Livro de Endereços';
 $labels['vcardsavefailed'] = 'Não foi possível guardar o vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ro_RO.inc b/plugins/vcard_attachments/localization/ro_RO.inc
index 7bc02fb..9aa9b07 100644
--- a/plugins/vcard_attachments/localization/ro_RO.inc
+++ b/plugins/vcard_attachments/localization/ro_RO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Adaugă vCard la agendă';
 $labels['vcardsavefailed'] = 'Nu pot salva vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ru_RU.inc b/plugins/vcard_attachments/localization/ru_RU.inc
index 1c3d556..985cda4 100644
--- a/plugins/vcard_attachments/localization/ru_RU.inc
+++ b/plugins/vcard_attachments/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Добавить в контакты';
 $labels['vcardsavefailed'] = 'Не удалось сохранить vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/si_LK.inc b/plugins/vcard_attachments/localization/si_LK.inc
index 88ce60b..87da90e 100644
--- a/plugins/vcard_attachments/localization/si_LK.inc
+++ b/plugins/vcard_attachments/localization/si_LK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'vCard පත ලිපින පොතට එක් කරන්න';
 $labels['vcardsavefailed'] = 'vCard පත සුරැකීම අසාර්ථකයි';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/sk_SK.inc b/plugins/vcard_attachments/localization/sk_SK.inc
index 50697f1..17aecb2 100644
--- a/plugins/vcard_attachments/localization/sk_SK.inc
+++ b/plugins/vcard_attachments/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Pridať vCard do adresára';
 $labels['vcardsavefailed'] = 'Nemôžem uložiť vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/sl_SI.inc b/plugins/vcard_attachments/localization/sl_SI.inc
index d6fc1b8..3f5053d 100644
--- a/plugins/vcard_attachments/localization/sl_SI.inc
+++ b/plugins/vcard_attachments/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Dodaj vCard med Stike.';
 $labels['vcardsavefailed'] = 'Stika vCard ni bilo mogoče shraniti.';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/sr_CS.inc b/plugins/vcard_attachments/localization/sr_CS.inc
index c873eb8..d6cc942 100644
--- a/plugins/vcard_attachments/localization/sr_CS.inc
+++ b/plugins/vcard_attachments/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Додај вЦард у Адресар';
 $labels['vcardsavefailed'] = 'немоћан сачувати вчард';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/sv_SE.inc b/plugins/vcard_attachments/localization/sv_SE.inc
index 05620c7..2d0d928 100644
--- a/plugins/vcard_attachments/localization/sv_SE.inc
+++ b/plugins/vcard_attachments/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Lägg till vCard i adressbok';
 $labels['vcardsavefailed'] = 'Kunde inte spara vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/tr_TR.inc b/plugins/vcard_attachments/localization/tr_TR.inc
index ade7b49..f524433 100644
--- a/plugins/vcard_attachments/localization/tr_TR.inc
+++ b/plugins/vcard_attachments/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Vcard\'ı adres deferine ekle';
 $labels['vcardsavefailed'] = 'vCard kaydedilemedi';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/uk_UA.inc b/plugins/vcard_attachments/localization/uk_UA.inc
index a0190e6..b61ffc5 100644
--- a/plugins/vcard_attachments/localization/uk_UA.inc
+++ b/plugins/vcard_attachments/localization/uk_UA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Додати vCard до контактів';
 $labels['vcardsavefailed'] = 'Не вдалось зберегти vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/vi_VN.inc b/plugins/vcard_attachments/localization/vi_VN.inc
index 19597a8..d63ad96 100644
--- a/plugins/vcard_attachments/localization/vi_VN.inc
+++ b/plugins/vcard_attachments/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = 'Thêm vCard vào sổ địa chỉ';
 $labels['vcardsavefailed'] = 'Không thể lưu vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/zh_CN.inc b/plugins/vcard_attachments/localization/zh_CN.inc
index fb48762..b619210 100644
--- a/plugins/vcard_attachments/localization/zh_CN.inc
+++ b/plugins/vcard_attachments/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = '添加 vCard 至地址簿中';
 $labels['vcardsavefailed'] = '无法保存 vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/zh_TW.inc b/plugins/vcard_attachments/localization/zh_TW.inc
index 18ef8e4..639593b 100644
--- a/plugins/vcard_attachments/localization/zh_TW.inc
+++ b/plugins/vcard_attachments/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
-
 $labels['addvcardmsg'] = '加入 vCard 到通訊錄';
 $labels['vcardsavefailed'] = '無法儲存 vCard';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ar.inc b/plugins/zipdownload/localization/ar.inc
index 83c0bc0..c5857c9 100644
--- a/plugins/zipdownload/localization/ar.inc
+++ b/plugins/zipdownload/localization/ar.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'تنزيل كل المرفقات';
 $labels['downloadfolder'] = 'تنزيل المجلد';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ar_SA.inc b/plugins/zipdownload/localization/ar_SA.inc
index 11593d3..dd5f5f3 100644
--- a/plugins/zipdownload/localization/ar_SA.inc
+++ b/plugins/zipdownload/localization/ar_SA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'تحميل جميع المرفقات';
 $labels['downloadfolder'] = 'تحميل المجلد';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/az_AZ.inc b/plugins/zipdownload/localization/az_AZ.inc
index 73de9b9..af785b4 100644
--- a/plugins/zipdownload/localization/az_AZ.inc
+++ b/plugins/zipdownload/localization/az_AZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Bütün qoşmaları endir';
 $labels['downloadfolder'] = 'Qovluğu endir';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/be_BE.inc b/plugins/zipdownload/localization/be_BE.inc
index ee3e04a..7c6fb38 100644
--- a/plugins/zipdownload/localization/be_BE.inc
+++ b/plugins/zipdownload/localization/be_BE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Спампаваць усе далучэнні';
 $labels['downloadfolder'] = 'Спампаваць папку';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/bg_BG.inc b/plugins/zipdownload/localization/bg_BG.inc
index 0e8d12c..69f91f6 100644
--- a/plugins/zipdownload/localization/bg_BG.inc
+++ b/plugins/zipdownload/localization/bg_BG.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Изтегляне на всички прикачени файлове';
 $labels['downloadfolder'] = 'Изтегляне на папка';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/br.inc b/plugins/zipdownload/localization/br.inc
index 29d4d7a..0d7da38 100644
--- a/plugins/zipdownload/localization/br.inc
+++ b/plugins/zipdownload/localization/br.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Pellgargañ an holl stagadennoù';
 $labels['downloadfolder'] = 'Pellgargañ an teuliad';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/bs_BA.inc b/plugins/zipdownload/localization/bs_BA.inc
index 64fd83a..ea72831 100644
--- a/plugins/zipdownload/localization/bs_BA.inc
+++ b/plugins/zipdownload/localization/bs_BA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Preuzmi sve priloge';
 $labels['downloadfolder'] = 'Preuzmi folder';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ca_ES.inc b/plugins/zipdownload/localization/ca_ES.inc
index c51efd0..665c53a 100644
--- a/plugins/zipdownload/localization/ca_ES.inc
+++ b/plugins/zipdownload/localization/ca_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Descarregar tots els adjunts';
 $labels['downloadfolder'] = 'Descarregar carpeta';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/cs_CZ.inc b/plugins/zipdownload/localization/cs_CZ.inc
index 4d7db47..d96b1f5 100644
--- a/plugins/zipdownload/localization/cs_CZ.inc
+++ b/plugins/zipdownload/localization/cs_CZ.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Stáhnout všechny přílohy';
 $labels['downloadfolder'] = 'Stáhnout složku';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/cy_GB.inc b/plugins/zipdownload/localization/cy_GB.inc
index 89956ea..3c9fc75 100644
--- a/plugins/zipdownload/localization/cy_GB.inc
+++ b/plugins/zipdownload/localization/cy_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Llwytho lawr holl atodiadau';
 $labels['downloadfolder'] = 'Ffolder llwytho lawr';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/da_DK.inc b/plugins/zipdownload/localization/da_DK.inc
index bf927bc..9e29018 100644
--- a/plugins/zipdownload/localization/da_DK.inc
+++ b/plugins/zipdownload/localization/da_DK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Download alle som .zip-fil';
 $labels['downloadfolder'] = 'Download folder som .zip-fil';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/de_CH.inc b/plugins/zipdownload/localization/de_CH.inc
index 2d31a61..978c221 100644
--- a/plugins/zipdownload/localization/de_CH.inc
+++ b/plugins/zipdownload/localization/de_CH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Alle Anhänge herunterladen';
 $labels['downloadfolder'] = 'Ordner herunterladen';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/de_DE.inc b/plugins/zipdownload/localization/de_DE.inc
index 2d31a61..978c221 100644
--- a/plugins/zipdownload/localization/de_DE.inc
+++ b/plugins/zipdownload/localization/de_DE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Alle Anhänge herunterladen';
 $labels['downloadfolder'] = 'Ordner herunterladen';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/el_GR.inc b/plugins/zipdownload/localization/el_GR.inc
index 9ff390f..2a12b5d 100644
--- a/plugins/zipdownload/localization/el_GR.inc
+++ b/plugins/zipdownload/localization/el_GR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Λυψη ολων των συννημενων';
 $labels['downloadfolder'] = 'Λυψη φακελου';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/en_GB.inc b/plugins/zipdownload/localization/en_GB.inc
index 1a9a329..48a8d9b 100644
--- a/plugins/zipdownload/localization/en_GB.inc
+++ b/plugins/zipdownload/localization/en_GB.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Download all attachments';
 $labels['downloadfolder'] = 'Download folder';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/eo.inc b/plugins/zipdownload/localization/eo.inc
index b4571e4..bc6ef9d 100644
--- a/plugins/zipdownload/localization/eo.inc
+++ b/plugins/zipdownload/localization/eo.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Elŝuti ĉiujn kunsendaĵojn';
 $labels['downloadfolder'] = 'Elŝuti dosierujon';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/es_AR.inc b/plugins/zipdownload/localization/es_AR.inc
index ee6a7ea..9f20f55 100644
--- a/plugins/zipdownload/localization/es_AR.inc
+++ b/plugins/zipdownload/localization/es_AR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Descargar Todo';
 $labels['downloadfolder'] = 'Descargar carpeta';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/es_ES.inc b/plugins/zipdownload/localization/es_ES.inc
index 53404d7..22db2cd 100644
--- a/plugins/zipdownload/localization/es_ES.inc
+++ b/plugins/zipdownload/localization/es_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Descargar todos los adjuntos';
 $labels['downloadfolder'] = 'Descargar carpeta';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/et_EE.inc b/plugins/zipdownload/localization/et_EE.inc
index 9b4dd56..969658b 100644
--- a/plugins/zipdownload/localization/et_EE.inc
+++ b/plugins/zipdownload/localization/et_EE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Laadi alla kõik manused';
 $labels['downloadfolder'] = 'Allalaadimiste kaust';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/eu_ES.inc b/plugins/zipdownload/localization/eu_ES.inc
index 8707197..0be09c8 100644
--- a/plugins/zipdownload/localization/eu_ES.inc
+++ b/plugins/zipdownload/localization/eu_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Deskargatu eranskin guztiak';
 $labels['downloadfolder'] = 'Deskargatu karpeta';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fa_AF.inc b/plugins/zipdownload/localization/fa_AF.inc
index 65405d5..57bb55e 100644
--- a/plugins/zipdownload/localization/fa_AF.inc
+++ b/plugins/zipdownload/localization/fa_AF.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'بارگزاری همه ضمیمه ها';
 $labels['downloadfolder'] = 'بارگزاری  پوشه';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fa_IR.inc b/plugins/zipdownload/localization/fa_IR.inc
index b9ff0cc..46007a0 100644
--- a/plugins/zipdownload/localization/fa_IR.inc
+++ b/plugins/zipdownload/localization/fa_IR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'بارگیری همه پیوست‌ها';
 $labels['downloadfolder'] = 'بارگیری پوشه';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fi_FI.inc b/plugins/zipdownload/localization/fi_FI.inc
index 82c766a..7e2c313 100644
--- a/plugins/zipdownload/localization/fi_FI.inc
+++ b/plugins/zipdownload/localization/fi_FI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Lataa kaikki liitteet';
 $labels['downloadfolder'] = 'Lataa kansio';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fr_FR.inc b/plugins/zipdownload/localization/fr_FR.inc
index be6e7ce..993e142 100644
--- a/plugins/zipdownload/localization/fr_FR.inc
+++ b/plugins/zipdownload/localization/fr_FR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Télécharger toutes les pièces jointes';
 $labels['downloadfolder'] = 'Télécharger le répertoire';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/gl_ES.inc b/plugins/zipdownload/localization/gl_ES.inc
index 7569aec..599c8ff 100644
--- a/plugins/zipdownload/localization/gl_ES.inc
+++ b/plugins/zipdownload/localization/gl_ES.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Descargar tódolos adxuntos';
 $labels['downloadfolder'] = 'Descargar o cartafol';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/he_IL.inc b/plugins/zipdownload/localization/he_IL.inc
index e0ed635..0df6191 100644
--- a/plugins/zipdownload/localization/he_IL.inc
+++ b/plugins/zipdownload/localization/he_IL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'להוריד את כל הצרופות';
 $labels['downloadfolder'] = 'תיקיית צרופות';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/hu_HU.inc b/plugins/zipdownload/localization/hu_HU.inc
index f705195..85179e5 100644
--- a/plugins/zipdownload/localization/hu_HU.inc
+++ b/plugins/zipdownload/localization/hu_HU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Összes csatolmány letöltése';
 $labels['downloadfolder'] = 'Könyvtár letöltése';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/id_ID.inc b/plugins/zipdownload/localization/id_ID.inc
index f61e89f..2ff3c87 100644
--- a/plugins/zipdownload/localization/id_ID.inc
+++ b/plugins/zipdownload/localization/id_ID.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Unduh semua lampiran';
 $labels['downloadfolder'] = 'Folder download';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/it_IT.inc b/plugins/zipdownload/localization/it_IT.inc
index 776dae8..882e354 100644
--- a/plugins/zipdownload/localization/it_IT.inc
+++ b/plugins/zipdownload/localization/it_IT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Scarica tutti gli allegati';
 $labels['downloadfolder'] = 'Scarica cartella';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ja_JP.inc b/plugins/zipdownload/localization/ja_JP.inc
index 3fcc76b..a038880 100644
--- a/plugins/zipdownload/localization/ja_JP.inc
+++ b/plugins/zipdownload/localization/ja_JP.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'すべての添付ファイルをダウンロード';
 $labels['downloadfolder'] = 'ダウンロード先のフォルダー';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/km_KH.inc b/plugins/zipdownload/localization/km_KH.inc
index cd48bc8..9a4593e 100644
--- a/plugins/zipdownload/localization/km_KH.inc
+++ b/plugins/zipdownload/localization/km_KH.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'ទាញយក ឯកសារភ្ជាប់ទាំងអស់';
 $labels['downloadfolder'] = 'ទាញយក ថតឯកសារ';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ko_KR.inc b/plugins/zipdownload/localization/ko_KR.inc
index 625be7a..cae8313 100644
--- a/plugins/zipdownload/localization/ko_KR.inc
+++ b/plugins/zipdownload/localization/ko_KR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = '모든 첨부파일을 다운로드';
 $labels['downloadfolder'] = '다운로드 폴더';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/lb_LU.inc b/plugins/zipdownload/localization/lb_LU.inc
index 9aa9153..434b064 100644
--- a/plugins/zipdownload/localization/lb_LU.inc
+++ b/plugins/zipdownload/localization/lb_LU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'All d\'Unhäng eroflueden';
 $labels['downloadfolder'] = 'Dossier eroflueden';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/lt_LT.inc b/plugins/zipdownload/localization/lt_LT.inc
index 27f8d97..9b4a133 100644
--- a/plugins/zipdownload/localization/lt_LT.inc
+++ b/plugins/zipdownload/localization/lt_LT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Atsisiųsti visus priedus';
 $labels['downloadfolder'] = 'Atsisiųsti aplanką';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/lv_LV.inc b/plugins/zipdownload/localization/lv_LV.inc
index 8f58f92..b23417a 100644
--- a/plugins/zipdownload/localization/lv_LV.inc
+++ b/plugins/zipdownload/localization/lv_LV.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Lejupielādēt visus pielikumus';
 $labels['downloadfolder'] = 'Lejupielādēt mapi';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/nb_NO.inc b/plugins/zipdownload/localization/nb_NO.inc
index 5cbde56..a0b076b 100644
--- a/plugins/zipdownload/localization/nb_NO.inc
+++ b/plugins/zipdownload/localization/nb_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Last ned alle vedlegg';
 $labels['downloadfolder'] = 'Nedlastningsmappe';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/nl_NL.inc b/plugins/zipdownload/localization/nl_NL.inc
index 4e69115..43aa442 100644
--- a/plugins/zipdownload/localization/nl_NL.inc
+++ b/plugins/zipdownload/localization/nl_NL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Alle bijlagen downloaden';
 $labels['downloadfolder'] = 'Map downloaden';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/nn_NO.inc b/plugins/zipdownload/localization/nn_NO.inc
index 5cbde56..a0b076b 100644
--- a/plugins/zipdownload/localization/nn_NO.inc
+++ b/plugins/zipdownload/localization/nn_NO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Last ned alle vedlegg';
 $labels['downloadfolder'] = 'Nedlastningsmappe';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/pl_PL.inc b/plugins/zipdownload/localization/pl_PL.inc
index 78a7629..7cf192e 100644
--- a/plugins/zipdownload/localization/pl_PL.inc
+++ b/plugins/zipdownload/localization/pl_PL.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Pobierz wszystkie jako ZIP';
 $labels['downloadfolder'] = 'Pobierz folder';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/pt_BR.inc b/plugins/zipdownload/localization/pt_BR.inc
index 4612e25..86dee11 100644
--- a/plugins/zipdownload/localization/pt_BR.inc
+++ b/plugins/zipdownload/localization/pt_BR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Baixar todos os anexos';
 $labels['downloadfolder'] = 'Pasta de baixar arquivos';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/pt_PT.inc b/plugins/zipdownload/localization/pt_PT.inc
index bd77e81..4b74419 100644
--- a/plugins/zipdownload/localization/pt_PT.inc
+++ b/plugins/zipdownload/localization/pt_PT.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Guardar todos os anexos';
 $labels['downloadfolder'] = 'Guardar pasta';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ro_RO.inc b/plugins/zipdownload/localization/ro_RO.inc
index 925c757..a676799 100644
--- a/plugins/zipdownload/localization/ro_RO.inc
+++ b/plugins/zipdownload/localization/ro_RO.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
-$labels['downloadall'] = 'Descarca toate atasamentele.';
-$labels['downloadfolder'] = 'Dosar de descărcare';
+$labels['downloadall'] = 'Descarcă toate atașamentele';
+$labels['downloadfolder'] = 'Descarcă dosar';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ru_RU.inc b/plugins/zipdownload/localization/ru_RU.inc
index 2054634..b6286a1 100644
--- a/plugins/zipdownload/localization/ru_RU.inc
+++ b/plugins/zipdownload/localization/ru_RU.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Загрузить все вложения';
 $labels['downloadfolder'] = 'Загрузить папку';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sk_SK.inc b/plugins/zipdownload/localization/sk_SK.inc
index fc02481..86c2b9a 100644
--- a/plugins/zipdownload/localization/sk_SK.inc
+++ b/plugins/zipdownload/localization/sk_SK.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Stiahnuť všetky prílohy';
 $labels['downloadfolder'] = 'Priečinok na sťahovanie';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sl_SI.inc b/plugins/zipdownload/localization/sl_SI.inc
index 2d1da0b..07caeac 100644
--- a/plugins/zipdownload/localization/sl_SI.inc
+++ b/plugins/zipdownload/localization/sl_SI.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Prenesi vse priponke';
 $labels['downloadfolder'] = 'Prenesi mapo';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sr_CS.inc b/plugins/zipdownload/localization/sr_CS.inc
index 039a289..55d64b9 100644
--- a/plugins/zipdownload/localization/sr_CS.inc
+++ b/plugins/zipdownload/localization/sr_CS.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Преузми све прилоге';
 $labels['downloadfolder'] = 'Фасцикла за преузимање';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sv_SE.inc b/plugins/zipdownload/localization/sv_SE.inc
index d674e62..d9c4f5d 100644
--- a/plugins/zipdownload/localization/sv_SE.inc
+++ b/plugins/zipdownload/localization/sv_SE.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Hämta alla bifogade filer';
 $labels['downloadfolder'] = 'Hämta katalog';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/tr_TR.inc b/plugins/zipdownload/localization/tr_TR.inc
index 0a5ba7c..a4dbec5 100644
--- a/plugins/zipdownload/localization/tr_TR.inc
+++ b/plugins/zipdownload/localization/tr_TR.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Tüm ek dosyaları indir';
 $labels['downloadfolder'] = 'klasörü indir';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/uk_UA.inc b/plugins/zipdownload/localization/uk_UA.inc
index 9e68e19..6232e9a 100644
--- a/plugins/zipdownload/localization/uk_UA.inc
+++ b/plugins/zipdownload/localization/uk_UA.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Завантажити всі вкладення';
 $labels['downloadfolder'] = 'Завантажити теку';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/vi_VN.inc b/plugins/zipdownload/localization/vi_VN.inc
index 06ae673..b9fdd3e 100644
--- a/plugins/zipdownload/localization/vi_VN.inc
+++ b/plugins/zipdownload/localization/vi_VN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = 'Tải tất cả đính kèm về';
 $labels['downloadfolder'] = 'Tải giữ liệu về';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/zh_CN.inc b/plugins/zipdownload/localization/zh_CN.inc
index 2efec2f..dfa8db3 100644
--- a/plugins/zipdownload/localization/zh_CN.inc
+++ b/plugins/zipdownload/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = '下载全部附件';
 $labels['downloadfolder'] = '下载文件夹';
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/zh_TW.inc b/plugins/zipdownload/localization/zh_TW.inc
index dab103b..44107c6 100644
--- a/plugins/zipdownload/localization/zh_TW.inc
+++ b/plugins/zipdownload/localization/zh_TW.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
-
 $labels['downloadall'] = '下載所有附件';
 $labels['downloadfolder'] = '下載資料夾';
 ?>
\ No newline at end of file
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index 84369bd..4100f7c 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'مرحباً بكم في $product';
 $labels['username']  = 'اسم المستخدم';
 $labels['password']  = 'كلمة المرور';
@@ -31,10 +29,8 @@
 $labels['sent']   = 'المرسل';
 $labels['trash']  = 'المهملات';
 $labels['junk']   = 'غير المرغوب';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'الموضوع';
 $labels['from']    = 'المرسل';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'المستقبل';
 $labels['cc']      = 'نسخة';
 $labels['bcc']     = 'نسخة مخفية';
@@ -45,19 +41,15 @@
 $labels['priority'] = 'الأولوية';
 $labels['organization'] = 'المنظمة';
 $labels['readstatus'] = 'حالة القراءة';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'مجلدات';
 $labels['messagesfromto'] = 'الرسالة $from إلى $to من مجموع $count';
 $labels['threadsfromto'] = 'جهات الإتصال $from إلى $to من مجموع $count';
 $labels['messagenrof'] = 'الرسالة $nr من $count';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'نسخ';
 $labels['move']     = 'نقل';
 $labels['moveto']   = 'نقل إلى...';
 $labels['download'] = 'تنزيل';
 $labels['open']     = 'فتح';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'اسم الملف';
 $labels['filesize'] = 'حجم الملف';
 $labels['addtoaddressbook'] = 'إضافة إلى دفتر العناوين';
@@ -168,7 +160,6 @@
 $labels['folderactions'] = 'إجراءات المجلد...';
 $labels['compact'] = 'ضغط';
 $labels['empty'] = 'تفريغ';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'المساحة المستخدمة';
 $labels['unknown']  = 'مجهول';
 $labels['unlimited']  = 'غير محدود';
@@ -176,13 +167,8 @@
 $labels['resetsearch']  = 'استعادة البحث للافتراضي';
 $labels['searchmod']  = 'أماكن البحث';
 $labels['msgtext']  = 'كامل الرسالة';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-$labels['namex'] = 'Name';
 $labels['openinextwin'] = 'افتح في نافذة جديدة';
 $labels['emlsave'] = 'تنزيل (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'تعديل كجديد';
 $labels['send']           = 'ارسل';
 $labels['sendmessage']    = 'إرسال الرسالة الآن';
@@ -215,8 +201,6 @@
 $labels['alwaysshow'] = 'دائماً أظهر الصّور القادمة من $sender';
 $labels['isdraft']    = 'هذه مسودّة رسالة';
 $labels['andnmore']   = '$nr المزيد ...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'نص مجرد';
 $labels['savesentmessagein'] = 'احفظ الرسالة المُرسلة في';
@@ -299,7 +283,6 @@
 $labels['print']          = 'طباعة';
 $labels['export']         = 'تصدير';
 $labels['exportall']      = 'تصدير الكل';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'صدّر المراسلين بنسق vCard';
 $labels['newcontactgroup'] = 'إنشاء مجموعة مراسلين جديدة';
 $labels['grouprename']    = 'تغيير اسم المجموعة';
@@ -311,19 +294,13 @@
 $labels['lastpage']       = 'عرض المجموعة الأخيرة';
 $labels['group'] = 'مجموعة';
 $labels['groups'] = 'المجموعات';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'العناوين الشخصية';
 $labels['searchsave'] = 'حفظ البحث';
 $labels['searchdelete'] = 'حذف البحث';
 $labels['import'] = 'استورد';
 $labels['importcontacts'] = 'استورد المراسلين';
 $labels['importfromfile'] = 'استورد من ملف:';
-$labels['importtarget'] = 'Add contacts to';
 $labels['importreplace'] = 'استبدل دفتر العناوين بأكمله';
-$labels['importgroups'] = 'Import group assignments';
-$labels['importgroupsall'] = 'All (create groups if necessary)';
-$labels['importgroupsexisting'] = 'Only for existing groups';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'تم';
 $labels['settingsfor'] = 'إعدادات';
 $labels['about'] = 'نبذة';
@@ -338,7 +315,6 @@
 $labels['preferhtml'] = 'تفضيل صيغة HTML';
 $labels['defaultcharset'] = 'ترميز المحارف الافتراضي';
 $labels['htmlmessage'] = 'رسالة بنسق HTML';
-$labels['messagepart'] = 'Part';
 $labels['digitalsig'] = 'التوقيع الالكتروني';
 $labels['dateformat'] = 'نسق التاريخ';
 $labels['timeformat'] = 'نسق الوقت';
@@ -354,9 +330,7 @@
 $labels['composeextwin'] = 'أرسال عن طريق نافذة جديدة';
 $labels['htmleditor'] = 'إنشاء رسائل بنسق HTML';
 $labels['htmlonreply'] = 'حال الرد على الرسائل بصيغة HTML فقط';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'توقيع HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'إظهار قسم المعاينة';
 $labels['skin'] = 'شكل الواجهة';
 $labels['logoutclear'] = 'إفراغ سلة المحذوفات عند الخروج';
@@ -374,14 +348,12 @@
 $labels['flagfordeletion'] = 'وضع علامة على الرسالة لحذفها بدلاً منحذفها';
 $labels['skipdeleted'] = 'لا تظهر الرسائل المحذوفة';
 $labels['deletealways'] = 'حذف الرسائل مباشرة، إن تعذر نقلها إلىالمهملات';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'إظهار الصور الخارجية المدمجة';
 $labels['fromknownsenders'] = 'للمرسلين المعلومين';
 $labels['always'] = 'دائماً';
 $labels['showinlineimages'] = 'إظهار الصّور المرفقة أسفل الرسالة';
 $labels['autosavedraft']  = 'حفظ المسودة تلقائياً';
 $labels['everynminutes']  = 'كل $n دقيقة';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'أبداً';
 $labels['immediately']  = 'حالاً';
 $labels['messagesdisplaying'] = 'إظهار الرسائل';
@@ -395,15 +367,12 @@
 $labels['focusonnewmessage'] = 'التركيز على نافذة المتصفح عند وجود رسالةجديدة';
 $labels['checkallfolders'] = 'التحقق من وجود رسائل جديدة في جميعالمجلدات';
 $labels['displaynext'] = 'إظهار الرسالة التالية بعد حذف/نقلالرسالة الحالية';
-$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'الخيارات الأساسية';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'قسم';
 $labels['maintenance'] = 'الصيانة';
 $labels['newmessage'] = 'رسالة جديدة';
 $labels['signatureoptions'] = 'خيارات التوقيع';
 $labels['whenreplying'] = 'عند الرد';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'بدء رسالة جديدة ووضع النص أعلى الأصلية';
 $labels['replybottomposting'] = 'بدء رسالة جديدة ووضع النص أسفل الأصلية';
 $labels['replyremovesignature'] = 'إزالة التوقيع من الرسالة عند الرد';
@@ -416,20 +385,13 @@
 $labels['reqmdn'] = 'طلب إشعار استلام دائماً';
 $labels['reqdsn'] = 'طلب تنويه لحالة التوصيل دائماً';
 $labels['replysamefolder'] = 'وضع الردود في المجلد الذي يحوي الرسالةالمردود عليها';
-$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'تجاهل عنوان البريد الإلكتروني البديل فيالتكملة التلقائية';
-$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = 'تحقق من الإملاء قبل إرسال الرسائل';
 $labels['spellcheckoptions'] = 'خيارات التدقيق الإملاءي';
 $labels['spellcheckignoresyms'] = 'تجاهل الكلمات التي تحتوي رموز';
 $labels['spellcheckignorenums'] = 'تجاهل الكلمات التي تحتوي أرقام';
 $labels['spellcheckignorecaps'] = 'تجاهل الكلمات التي بها أحرف كبيرة';
 $labels['addtodict'] = 'إضافة إلى القامس';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'مجلد';
 $labels['folders']  = 'مجلدات';
 $labels['foldername']  = 'اسم المجلد';
@@ -454,7 +416,6 @@
 $labels['sortasc']  = 'ترتيب تصاعدي';
 $labels['sortdesc'] = 'ترتيب تنازلي';
 $labels['undo'] = 'تراجع';
-$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'إضافة';
 $labels['version'] = 'النسخة';
 $labels['source'] = 'المصدر';
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index 41952ea..7d9a7ac 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'فشل تسجيل الدخول';
 $messages['cookiesdisabled'] = 'المتصفح الخاص بك لا يقبل الكوكيز';
 $messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية أو أنها غيرصالحة';
@@ -24,17 +22,12 @@
 $messages['servererror'] = 'خطأ في الخادم!';
 $messages['servererrormsg'] = 'خطأ خادم: $msg';
 $messages['dberror'] = 'خطأ في قاعدة البيانات!';
-$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'تعذر تنفيذ العملية. المجلد للقراءة فقط.';
 $messages['errornoperm'] = 'تعذر تنفيذ العملية. ليست لديك الصلاحية.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'طلب غير صالح! لم تحفظ أية بيانات.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'لم يعثر على أية رسائل في صندوق البريد هذا';
 $messages['loggedout'] = 'قمت بإنهاء هذه الجلسة بنجاح. إلى اللقاء!';
 $messages['mailboxempty'] = 'صندوق البريد فارغ';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'جاري العمل...';
 $messages['uploading'] = 'جاري رفع الملف...';
 $messages['uploadingmany'] = 'جاري تحميل الملفات...';
@@ -55,8 +48,6 @@
 $messages['contactsearchonly'] = 'اكتب بعض كلمات البحث للعثور علىالمُراسلين';
 $messages['sendingfailed'] = 'فشل إرسال الرسالة';
 $messages['senttooquickly'] = 'رجاء انتظر $sec ثوان قبل إرسال هذه الرسالة';
-$messages['errorsavingsent'] = 'حدث خطأ أثناء حفظ الرسالة المُرسلة';
-$messages['errorsaving'] = 'حدث خطأ أثناء الحفظ';
 $messages['errormoving'] = 'تعذر نقل هذه الرسالة';
 $messages['errorcopying'] = 'تعذر نسخ الرسائل';
 $messages['errordeleting'] = 'تعذر حذف هذه الرسالة';
@@ -100,36 +91,26 @@
 $messages['messageopenerror'] = 'تعذرت قراءة الرسالة من الخادم';
 $messages['fileuploaderror'] = 'فشل رفع الملف';
 $messages['filesizeerror'] = 'حجم الملف الذي تحاول رفعه أكبر من الحجمالأقصى $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'لا يمكن تعديل مصدر العنوان هذا';
 $messages['errorsavingcontact'] = 'تعذر حفظ عنوان المراسل';
 $messages['movingmessage'] = 'جاري نقل الرسالة...';
 $messages['copyingmessage'] = 'جاري نسخ الرسالة...';
 $messages['copyingcontact'] = 'جاري نسخ المُراسلين...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'جاري حذف الرسائل...';
 $messages['markingmessage'] = 'جاري تحديد الرسائل...';
 $messages['addingmember'] = 'جاري إضافة المُراسلين إلى المجموعة...';
 $messages['removingmember'] = 'جاري إزالة المراسلين من المجموعة...';
 $messages['receiptsent'] = 'أرسل إيصال الاستلام بنجاح';
 $messages['errorsendingreceipt'] = 'تعذر إرسال إيصال الاستلام';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'لا يمكن حذف هذا السجل حيث أنه الوحيدالمتبقي.';
 $messages['forbiddencharacter'] = 'اسم المجلّد يحتوي حروفاً ممنوعة';
 $messages['selectimportfile'] = 'رجاء اختر ملفاً لرفعه';
 $messages['addresswriterror'] = 'دفتر العناوين المحدد غير قابل للكتابة';
 $messages['contactaddedtogroup'] = 'تمت إضافة المراسلين إلى هذه المجموعةبنجاح';
 $messages['contactremovedfromgroup'] = 'تمت إزالة المراسلين من هذه المجموعةبنجاح';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'جاري الاستيراد، رجاء انتظر...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>تم استيراد $inserted مراسلين بنجاح، وتجاهل$skipped موجودين مسبقاً</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>تم تجاهل $skipped عناصر موجودة</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'العملية ممنوعة!';
 $messages['nofromaddress'] = 'عنوان البريد الالكتروني غير محدد فيالهويّة المنتقاة';
 $messages['editorwarning'] = 'يتسبب الانتقال إلى محرر النص البسيط بضياع جميع التنسيق. هل تريد الاستمرار؟';
@@ -143,7 +124,6 @@
 $messages['emailformaterror'] = 'عنوان بريد إلكتروني غير صالح: $email';
 $messages['toomanyrecipients'] = 'عدد المرسل إليهم كبير. قلص العدد إلى $max.';
 $messages['maxgroupmembersreached'] = 'عدد أعضاء المجموعة أكثر من $max';
-$messages['internalerror'] = 'حدث خطأ داخلي. الرجاء المحاولة مرة أخرى';
 $messages['contactdelerror'] = 'تعذر حذف أسماء جهات الإتصال';
 $messages['contactdeleted'] = 'تم حذف أسماء جهات الإتصال بنجاح';
 $messages['contactrestoreerror'] = 'تعذر استعادة المُراسل المحذوف.';
@@ -169,6 +149,4 @@
 $messages['mispellingsfound'] = 'عُثر على أخطاء إملائية في الرسالة';
 $messages['parentnotwritable'] = 'تعذر إنشاء/نقل المجلد إلى المجلد المحدد.ليست لديك الصلاحية.';
 $messages['messagetoobig'] = 'جزء الرسالة أكبر بكثير مما يمكن معالجته.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index b6b089d..7a60238 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Bienllegáu a $product';
 $labels['username']  = 'Usuariu';
 $labels['password']  = 'Clave';
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index 3c68a95..35a850e 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = '¡Hebo un fallu!';
 $messages['loginfailed']  = 'Contraseña o nome d\'usuariu incorreutu.';
 $messages['cookiesdisabled'] = 'El to navegador nun aceuta "cookies';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Introduz dalgún criteriu pa guetar contautos';
 $messages['sendingfailed'] = 'Falló l\'unviu del mensaxe';
 $messages['senttooquickly'] = 'Por favor espera $sec segundu/os enantes d\'unviar esti mensaxe.';
-$messages['errorsavingsent'] = 'Hebo un fallu al guardar el mensaxe unviáu.';
-$messages['errorsaving'] = 'Falló al guardase.';
 $messages['errormoving'] = 'Nun pudo movese el/los mensaxe(s).';
 $messages['errorcopying'] = 'Nun pudo copiase el/los mensaxe(s).';
 $messages['errordeleting'] = 'Nun pudo desaniciase el/los mensaxe(s)';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Direición de corréu incorreuta: $email';
 $messages['toomanyrecipients'] = 'Hai munchos destinatarios. Amenorga\'l númberu de destinatarios a $max.';
 $messages['maxgroupmembersreached'] = 'El númberu de miembros del grupu perpasa\'l máximu de $max.';
-$messages['internalerror'] = 'Hebo un fallu internu. Por favor, inténtalo de nueves.';
 $messages['contactdelerror'] = 'Nun pudo desaniciase el/los contautu(os).';
 $messages['contactdeleted'] = 'Contautu(os) desaniciáu(os) correchamente.';
 $messages['contactrestoreerror'] = 'Nun pudieron restaurase los contautos desaniciaos.';
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 935cb54..60930a4 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '$product-a xoş gəldiniz!';
 $labels['username']  = 'İstifadəçi adı';
 $labels['password']  = 'Şifrə';
@@ -31,7 +29,7 @@
 $labels['sent']   = 'Göndərilənlər';
 $labels['trash']  = 'Səbət';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = 'Xüsusi qovluqlar üçün real adları göstər';
 $labels['subject'] = 'Mövzu';
 $labels['from']    = 'Kimdən';
 $labels['sender']  = 'Göndərən';
@@ -139,7 +137,7 @@
 $labels['unread'] = 'Oxunmamışları';
 $labels['flagged'] = 'İşarəliləri';
 $labels['unanswered'] = 'Cavabsızları';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = 'Qoşma ilə';
 $labels['deleted'] = 'Silinmişləri';
 $labels['undeleted'] = 'Silinməyib';
 $labels['invert'] = 'İnvertliləri';
@@ -168,7 +166,7 @@
 $labels['folderactions'] = 'Qovluq işləri...';
 $labels['compact'] = 'Sıx';
 $labels['empty'] = 'Boşalt';
-$labels['importmessages'] = 'Import messages';
+$labels['importmessages'] = 'Mesajların idxalı';
 $labels['quota'] = 'Disk istifadəsi';
 $labels['unknown']  = 'naməlum';
 $labels['unlimited']  = 'limitsiz';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'Axtarış variantları';
 $labels['msgtext']  = 'Bütün məktub';
 $labels['body']  = 'Mətn';
-$labels['type'] = 'Type';
+$labels['type'] = 'Növ';
+$labels['namex'] = 'Ad';
 $labels['openinextwin'] = 'Yeni pəncərədə aç';
 $labels['emlsave'] = 'Saxla (.eml)';
 $labels['changeformattext'] = 'Sadə mətn formatında göstər';
@@ -310,14 +309,13 @@
 $labels['lastpage']       = 'Sonuncunu göstər';
 $labels['group'] = 'Qrup';
 $labels['groups'] = 'Qruplar';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Qrup üzvlərinin siyahısı';
 $labels['personaladrbook'] = 'Şəxsi ünvanlar';
 $labels['searchsave'] = 'Sorğunu saxla';
 $labels['searchdelete'] = 'Sorğunu sil';
 $labels['import'] = 'İdxal';
 $labels['importcontacts'] = 'Ünvanların idxalı';
 $labels['importfromfile'] = 'Fayldan idxal:';
-$labels['importtarget'] = 'Əlaqə kitabçasına yeni kontaktları əlavə et';
 $labels['importreplace'] = 'Ünvan kitabçasını dəyiş';
 $labels['importdesc'] = 'Siz kontaktları mövcud ünvan kitabçasından yükləyə bilərsiniz. <br/> Hal-hazırda biz ünvanların idxalını <a href="http://az.wikipedia.org/wiki/VCard">vCard</a> və ya CSV (vergüllə bölünmüş) formatında olan vizit kartları dəstəkləyirik.';
 $labels['done'] = 'Bitdi';
@@ -352,7 +350,7 @@
 $labels['htmlonreply'] = 'yalnız HTML mesajlar ilə cavab';
 $labels['htmlonreplyandforward'] = 'HTML məktuba cavab və yönəltmə zamanı';
 $labels['htmlsignature'] = 'HTML imza';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'E-poçt ünvanları displey adları ilə göstər';
 $labels['previewpane'] = 'Prevyu paneli göstər';
 $labels['skin'] = 'İnterfeys stili';
 $labels['logoutclear'] = 'Poçtdan çıxan zaman səbəti təmizlə';
@@ -422,7 +420,7 @@
 $labels['spellcheckignorecaps'] = 'Böyük hərfləri olan sözlərdən keç';
 $labels['addtodict'] = 'Lüğətə əlavə et';
 $labels['mailtoprotohandler'] = 'mailto: keçid üçün protokol qeyd et';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'Handle popapsı standart pəncərələr kimi';
 $labels['forwardmode'] = 'Məktubların yönəldilməsi';
 $labels['inline'] = 'mətndə';
 $labels['asattachment'] = 'fayl kimi';
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index 31b4f6a..ddab8d7 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Xəta baş verdi!';
 $messages['loginfailed']  = 'Giriş uğursuz oldu.';
 $messages['cookiesdisabled'] = 'Sizin brauzer kukiləri qəbul etmir.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Kontaqların axtarışı üçün şərti daxil edin';
 $messages['sendingfailed'] = 'Məktub göndərilmədi';
 $messages['senttooquickly'] = 'Məktub göndərmək üçün $sec saniyə gözləmək gərəkir';
-$messages['errorsavingsent'] = 'Göndərilən məktub saxlanılan zaman xəta baş verdi';
-$messages['errorsaving'] = 'Saxlanma prosesi zamanı problem baş verdi';
 $messages['errormoving'] = 'Məktubu (məktubları) köçürmək alnmadı';
 $messages['errorcopying'] = 'Məktubu (məktubları) kopyalamaq alınmadı';
 $messages['errordeleting'] = 'Məktubu (məktubları) silmək alınmadı';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Səhv ünvan: $email';
 $messages['toomanyrecipients'] = 'Qəbul edənlər həddindən artıq çoxdur. Lütfən, $max qədər azaldın.';
 $messages['maxgroupmembersreached'] = 'Qrupun ölçüsü imkan verilən maksimumdan artıqdır - $max';
-$messages['internalerror'] = 'Daxili xəta baş verdi. Lütfən, bir daha cəhd edin';
 $messages['contactdelerror'] = 'Kontak(lar)ı silmək alınmadı';
 $messages['contactdeleted'] = 'Kontak(lar) uğurla silindi';
 $messages['contactrestoreerror'] = 'Silinmiş kontakt(lar)ın bərpası alınmadı';
diff --git a/program/localization/be_BE/labels.inc b/program/localization/be_BE/labels.inc
index 82fb111..b5a3ed6 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Вітаем у $product';
 $labels['username']  = 'Карыстальнік';
 $labels['password']  = 'Пароль';
@@ -31,7 +29,7 @@
 $labels['sent']   = 'Дасланыя';
 $labels['trash']  = 'Сметніца';
 $labels['junk']   = 'Спам';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = 'Паказваць сапраўдныя імёны для адмысловых папак';
 $labels['subject'] = 'Тэма';
 $labels['from']    = 'Ад каго';
 $labels['sender']  = 'Адпраўнік';
@@ -45,29 +43,29 @@
 $labels['priority'] = 'Прыярытэт';
 $labels['organization'] = 'Установа';
 $labels['readstatus'] = 'Не прачытанае';
-$labels['listoptions'] = 'List options...';
+$labels['listoptions'] = 'Параметры спісу...';
 $labels['mailboxlist'] = 'Тэчкі';
-$labels['messagesfromto'] = 'Messages $from to $to of $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
-$labels['messagenrof'] = 'Message $nr of $count';
-$labels['fromtoshort'] = '$from – $to of $count';
+$labels['messagesfromto'] = 'Паведамленні $from—$to з $count';
+$labels['threadsfromto'] = 'Абмеркаванні $from—$to з $count';
+$labels['messagenrof'] = 'Паведамленне $nr з $count';
+$labels['fromtoshort'] = '$from—$to з $count';
 $labels['copy']     = 'Капіраваць';
 $labels['move']     = 'Перамясціць';
 $labels['moveto']   = 'Перамясціць у...';
 $labels['download'] = 'Спампаваць';
-$labels['open']     = 'Open';
+$labels['open']     = 'Адчыніць';
 $labels['showattachment'] = 'Паказаць';
-$labels['showanyway'] = 'Show it anyway';
+$labels['showanyway'] = 'Усё адно паказваць';
 $labels['filename'] = 'Імя файла';
 $labels['filesize'] = 'Памер файла';
 $labels['addtoaddressbook'] = 'Дадаць у адрасную кнігу';
-$labels['sun'] = 'Ндз';
-$labels['mon'] = 'Пн';
-$labels['tue'] = 'Аўт';
-$labels['wed'] = 'Сер';
-$labels['thu'] = 'Чц';
-$labels['fri'] = 'Пт';
-$labels['sat'] = 'Сб';
+$labels['sun'] = 'нд';
+$labels['mon'] = 'пн';
+$labels['tue'] = 'аў';
+$labels['wed'] = 'ср';
+$labels['thu'] = 'чц';
+$labels['fri'] = 'пт';
+$labels['sat'] = 'сб';
 $labels['sunday']    = 'нядзеля';
 $labels['monday']    = 'панядзелак';
 $labels['tuesday']   = 'аўторак';
@@ -75,411 +73,411 @@
 $labels['thursday']  = 'чацвер';
 $labels['friday']    = 'пятніца';
 $labels['saturday']  = 'субота';
-$labels['jan']	= 'Jan';
-$labels['feb']	= 'Feb';
-$labels['mar']	= 'Mar';
-$labels['apr']	= 'Apr';
-$labels['may']	= 'May';
-$labels['jun']	= 'Jun';
-$labels['jul'] 	= 'Jul';
-$labels['aug']	= 'Aug';
-$labels['sep']	= 'Sep';
-$labels['oct']	= 'Oct';
-$labels['nov']	= 'Nov';
-$labels['dec']	= 'Dec';
-$labels['longjan']	= 'January';
-$labels['longfeb']	= 'February';
-$labels['longmar']	= 'March';
-$labels['longapr']	= 'April';
-$labels['longmay']	= 'May';
-$labels['longjun']	= 'June';
-$labels['longjul']	= 'July';
-$labels['longaug']	= 'August';
-$labels['longsep']	= 'September';
-$labels['longoct']	= 'October';
-$labels['longnov']	= 'November';
-$labels['longdec']	= 'December';
-$labels['today'] = 'Today';
-$labels['refresh']          = 'Refresh';
-$labels['checkmail']        = 'Check for new messages';
-$labels['compose']          = 'Compose';
-$labels['writenewmessage']  = 'Create a new message';
-$labels['reply']            = 'Reply';
-$labels['replytomessage']   = 'Reply to sender';
-$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
-$labels['forwardmessage']   = 'Forward the message';
-$labels['deletemessage']    = 'Delete message';
-$labels['movemessagetotrash'] = 'Move message to trash';
-$labels['printmessage']     = 'Print this message';
-$labels['previousmessage']  = 'Show previous message';
-$labels['firstmessage']     = 'Show first message';
-$labels['nextmessage']      = 'Show next message';
-$labels['lastmessage']      = 'Show last message';
-$labels['backtolist']       = 'Back to message list';
-$labels['viewsource']       = 'Show source';
-$labels['mark']             = 'Mark';
-$labels['markmessages']     = 'Mark messages';
-$labels['markread']         = 'As read';
-$labels['markunread']       = 'As unread';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
-$labels['select'] = 'Select';
-$labels['all'] = 'All';
-$labels['none'] = 'None';
-$labels['currpage'] = 'Current page';
-$labels['unread'] = 'Unread';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
-$labels['filter'] = 'Filter';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
-$labels['nonesort'] = 'None';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
-$labels['compact'] = 'Compact';
-$labels['empty'] = 'Empty';
-$labels['importmessages'] = 'Import messages';
-$labels['quota'] = 'Disk usage';
-$labels['unknown']  = 'unknown';
-$labels['unlimited']  = 'unlimited';
-$labels['quicksearch']  = 'Quick search';
-$labels['resetsearch']  = 'Reset search';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-$labels['namex'] = 'Name';
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
-$labels['sendmessage']    = 'Send message';
-$labels['savemessage']    = 'Save as draft';
-$labels['addattachment']  = 'Attach a file';
-$labels['charset']        = 'Charset';
-$labels['editortype']     = 'Editor type';
-$labels['returnreceipt']  = 'Return receipt';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
-$labels['checkspelling'] = 'Check spelling';
-$labels['resumeediting'] = 'Resume editing';
-$labels['revertto']      = 'Revert to';
-$labels['attach'] = 'Attach';
-$labels['attachments'] = 'Attachments';
-$labels['upload'] = 'Upload';
-$labels['uploadprogress'] = '$percent ($current from $total)';
-$labels['close']  = 'Close';
-$labels['messageoptions']  = 'Message options...';
-$labels['low']     = 'Low';
-$labels['lowest']  = 'Lowest';
-$labels['normal']  = 'Normal';
-$labels['high']    = 'High';
-$labels['highest'] = 'Highest';
-$labels['nosubject']  = '(no subject)';
-$labels['showimages'] = 'Display images';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['jan']	= 'сту';
+$labels['feb']	= 'лют';
+$labels['mar']	= 'сак';
+$labels['apr']	= 'кра';
+$labels['may']	= 'май';
+$labels['jun']	= 'чэр';
+$labels['jul'] 	= 'ліп';
+$labels['aug']	= 'жні';
+$labels['sep']	= 'вер';
+$labels['oct']	= 'кас';
+$labels['nov']	= 'ліс';
+$labels['dec']	= 'сне';
+$labels['longjan']	= 'студзень';
+$labels['longfeb']	= 'люты';
+$labels['longmar']	= 'сакавік';
+$labels['longapr']	= 'красавік';
+$labels['longmay']	= 'май';
+$labels['longjun']	= 'чэрвень';
+$labels['longjul']	= 'ліпень';
+$labels['longaug']	= 'жнівень';
+$labels['longsep']	= 'верасень';
+$labels['longoct']	= 'кастрычнік';
+$labels['longnov']	= 'лістапад';
+$labels['longdec']	= 'снежань';
+$labels['today'] = 'сёння';
+$labels['refresh']          = 'Абнавіць';
+$labels['checkmail']        = 'Праверыць новыя паведамленні';
+$labels['compose']          = 'Скласці';
+$labels['writenewmessage']  = 'Скласці новае паведамленне';
+$labels['reply']            = 'Адказаць';
+$labels['replytomessage']   = 'Адказаць адпраўніку';
+$labels['replytoallmessage'] = 'Адказаць па спісе альбо адпраўніку і ўсім атрымальнікам';
+$labels['replyall']         = 'Адказаць усім';
+$labels['replylist']        = 'Адказаць у спіс рассылкі';
+$labels['forward']          = 'Пераслаць';
+$labels['forwardinline']    = 'Пераслаць у целе ліста';
+$labels['forwardattachment'] = 'Пераслаць як далучэнне';
+$labels['forwardmessage']   = 'Пераслаць гэтае паведамленне';
+$labels['deletemessage']    = 'Выдаліць паведамленне';
+$labels['movemessagetotrash'] = 'Перамясціць паведамленне ў сметніцу';
+$labels['printmessage']     = 'Раздрукаваць гэтае паведамленне';
+$labels['previousmessage']  = 'Паказаць папярэдняе паведамленне';
+$labels['firstmessage']     = 'Паказаць першае паведамленне';
+$labels['nextmessage']      = 'Паказаць наступнае паведамленне';
+$labels['lastmessage']      = 'Паказаць апошняе паведамленне';
+$labels['backtolist']       = 'Назад да спіса паведамленняў';
+$labels['viewsource']       = 'Паказаць жарало';
+$labels['mark']             = 'Пазначыць';
+$labels['markmessages']     = 'Пазначыць паведамленні';
+$labels['markread']         = 'Як прачытаныя';
+$labels['markunread']       = 'Як непрачытаныя';
+$labels['markflagged']      = 'Устанавіць флаг';
+$labels['markunflagged']    = 'Зняць флаг';
+$labels['moreactions']      = 'Больш дзеянняў...';
+$labels['more']             = 'Больш';
+$labels['back']             = 'Назад';
+$labels['options']          = 'Параметры';
+$labels['select'] = 'Выбраць';
+$labels['all'] = 'Усе';
+$labels['none'] = 'Жаднага';
+$labels['currpage'] = 'Бягучая старонка';
+$labels['unread'] = 'Непрачытаныя';
+$labels['flagged'] = 'З флагам';
+$labels['unanswered'] = 'Неадказаныя';
+$labels['withattachment'] = 'З далучэннямі';
+$labels['deleted'] = 'Выдаленыя';
+$labels['undeleted'] = 'Нявыдаленыя';
+$labels['invert'] = 'Інвертаваць';
+$labels['filter'] = 'Фільтр';
+$labels['list'] = 'Спіс';
+$labels['threads'] = 'Абмеркаванні';
+$labels['expand-all'] = 'Развінуць усё';
+$labels['expand-unread'] = 'Развінуць непрачытаныя';
+$labels['collapse-all'] = 'Звінуць усё';
+$labels['threaded'] = 'Абмеркаванні';
+$labels['autoexpand_threads'] = 'Развінуць абмеркаванні';
+$labels['do_expand'] = 'усе абмеркаванні';
+$labels['expand_only_unread'] = 'толькі з непрачытанымі паведамленнямі';
+$labels['fromto'] = 'Ад/Да';
+$labels['flag'] = 'Флаг';
+$labels['attachment'] = 'Далучэнне';
+$labels['nonesort'] = 'Адсутнічае';
+$labels['sentdate'] = 'Дата адпраўкі';
+$labels['arrival'] = 'Дата атрымання';
+$labels['asc'] = 'на ўзрастанне';
+$labels['desc'] = 'на змяншчэнне';
+$labels['listcolumns'] = 'Слупкі';
+$labels['listsorting'] = 'Сартаваць паводле';
+$labels['listorder'] = 'Парадак сартавання';
+$labels['listmode'] = 'Тып спісу';
+$labels['folderactions'] = 'Аперацыі з папкай...';
+$labels['compact'] = 'Сціснуць';
+$labels['empty'] = 'Спаражніць';
+$labels['importmessages'] = 'Імпартаваць паведамленні';
+$labels['quota'] = 'Квота';
+$labels['unknown']  = 'невядома';
+$labels['unlimited']  = 'без абмежаванняў';
+$labels['quicksearch']  = 'Хуткі пошук';
+$labels['resetsearch']  = 'Скінуць пошук';
+$labels['searchmod']  = 'Мадыфікатары пошуку';
+$labels['msgtext']  = 'Усё паведамленне';
+$labels['body']  = 'Цела';
+$labels['type'] = 'Тып';
+$labels['namex'] = 'Імя';
+$labels['openinextwin'] = 'Адчыніць у новым акне';
+$labels['emlsave'] = 'Спампаваць (.eml)';
+$labels['changeformattext'] = 'Паказаць як просты тэкст';
+$labels['changeformathtml'] = 'Паказаць як HTML';
+$labels['editasnew']      = 'Адрэдагаваць як новае';
+$labels['send']           = 'Адправіць';
+$labels['sendmessage']    = 'Адправіць паведамленне';
+$labels['savemessage']    = 'Захаваць як чарнавік';
+$labels['addattachment']  = 'Далучыць файл';
+$labels['charset']        = 'Кадзіроўка';
+$labels['editortype']     = 'Рэдактар';
+$labels['returnreceipt']  = 'Пацверджанне атрымання';
+$labels['dsn']            = 'Апавяшчэнне пра дастаўку';
+$labels['mailreplyintro'] = '$sender пісаў $date:';
+$labels['originalmessage'] = 'Арыгінальнае паведамленне';
+$labels['editidents']    = 'Рэдагаваць тоеснасці';
+$labels['spellcheck']    = 'Правапіс';
+$labels['checkspelling'] = 'Праверыць правапіс';
+$labels['resumeediting'] = 'Працягнуць рэдагаванне';
+$labels['revertto']      = 'Адкаціцца на';
+$labels['attach'] = 'Далучыць';
+$labels['attachments'] = 'Далучэнні';
+$labels['upload'] = 'Запампаваць';
+$labels['uploadprogress'] = '$percent ($current з $total)';
+$labels['close']  = 'Зачыніць';
+$labels['messageoptions']  = 'Параметры паведамлення...';
+$labels['low']     = 'Нізкі';
+$labels['lowest']  = 'Найнізшы';
+$labels['normal']  = 'Звычайны';
+$labels['high']    = 'Высокі';
+$labels['highest'] = 'Найвышшы';
+$labels['nosubject']  = '(без тэмы)';
+$labels['showimages'] = 'Паказваць відарысы';
+$labels['alwaysshow'] = 'Заўсёды паказваць відарысы ад $sender';
+$labels['isdraft']    = 'Гэта чарнавік.';
+$labels['andnmore']   = 'яшчэ $nr...';
+$labels['togglemoreheaders'] = 'Паказаць больш загалоўкаў паведамлення';
+$labels['togglefullheaders'] = 'Паказаць неапрацаваныя загалоўкі паведамлення';
 $labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'Plain text';
-$labels['savesentmessagein'] = 'Save sent message in';
-$labels['dontsave'] = 'don\'t save';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
-$labels['addcc'] = 'Add Cc';
-$labels['addbcc'] = 'Add Bcc';
-$labels['addreplyto'] = 'Add Reply-To';
-$labels['addfollowupto'] = 'Add Followup-To';
-$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
-$labels['receiptread'] = 'Return Receipt (read)';
-$labels['yourmessage'] = 'This is a Return Receipt for your message';
-$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
-$labels['name']         = 'Display Name';
-$labels['firstname']    = 'First Name';
-$labels['surname']      = 'Last Name';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
-$labels['email']        = 'Email';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
+$labels['plaintoggle'] = 'Звычайны тэкст';
+$labels['savesentmessagein'] = 'Захаваць паведамленне ў';
+$labels['dontsave'] = 'не захоўваць';
+$labels['maxuploadsize'] = 'Максімальна дазволены памер файла — $size';
+$labels['addcc'] = 'Копія';
+$labels['addbcc'] = 'Схаваная копія';
+$labels['addreplyto'] = 'Адказаць-на';
+$labels['addfollowupto'] = 'Групавы-адказ-на';
+$labels['mdnrequest'] = 'Адпраўнік пажадаў даведацца аб прачытанні гэтага паведамлення. Апавясціць адпраўніка?';
+$labels['receiptread'] = 'Пацверджанне атрымання (прачытання)';
+$labels['yourmessage'] = 'Гэта пацверджанне аб атрыманні вашага паведамлення';
+$labels['receiptnote'] = 'Заўвага: Гэтае пацверджанне значыць адно, што паведамленне было адлюстравана на экране кампутара адрасата. Няма гарантыі, што атрымальнік прачытаў альбо зразумеў змест паведамлення.';
+$labels['name']         = 'Экраннае імя';
+$labels['firstname']    = 'Імя';
+$labels['surname']      = 'Прозвішча';
+$labels['middlename']   = 'Другое імя';
+$labels['nameprefix']   = 'Прэфікс';
+$labels['namesuffix']   = 'Суфікс';
+$labels['nickname']     = 'Мянушка';
+$labels['jobtitle']     = 'Пасада';
+$labels['department']   = 'Аддзел';
+$labels['gender']       = 'Пол';
+$labels['maidenname']   = 'Дзявоцкае прозвішча';
+$labels['email']        = 'Эл. пошта';
+$labels['phone']        = 'Тэлефон';
+$labels['address']      = 'Адрас';
+$labels['street']       = 'Вуліца';
+$labels['locality']     = 'Горад';
+$labels['zipcode']      = 'Індэкс';
+$labels['region']       = 'Рэгіён';
+$labels['country']      = 'Краіна';
+$labels['birthday']     = 'Дзень народзінаў';
+$labels['anniversary']  = 'Юбілей';
+$labels['website']      = 'Вэб-сайт';
 $labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
-$labels['addcontact'] = 'Add new contact';
-$labels['editcontact'] = 'Edit contact';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-$labels['edit']   = 'Edit';
-$labels['cancel'] = 'Cancel';
-$labels['save']   = 'Save';
-$labels['delete'] = 'Delete';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
-$labels['newcontact']     = 'Create new contact card';
-$labels['deletecontact']  = 'Delete selected contacts';
-$labels['composeto']      = 'Compose mail to';
-$labels['contactsfromto'] = 'Contacts $from to $to of $count';
-$labels['print']          = 'Print';
-$labels['export']         = 'Export';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
-$labels['previouspage']   = 'Show previous page';
-$labels['firstpage']      = 'Show first page';
-$labels['nextpage']       = 'Show next page';
-$labels['lastpage']       = 'Show last page';
-$labels['group'] = 'Group';
-$labels['groups'] = 'Groups';
-$labels['listgroup'] = 'List group members';
-$labels['personaladrbook'] = 'Personal Addresses';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add contacts to';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importgroups'] = 'Import group assignments';
-$labels['importgroupsall'] = 'All (create groups if necessary)';
-$labels['importgroupsexisting'] = 'Only for existing groups';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
-$labels['settingsfor'] = 'Settings for';
-$labels['about'] = 'About';
-$labels['preferences'] = 'Preferences';
-$labels['userpreferences'] = 'User preferences';
-$labels['editpreferences'] = 'Edit user preferences';
-$labels['identities'] = 'Identities';
-$labels['manageidentities'] = 'Manage identities for this account';
-$labels['newidentity'] = 'New identity';
-$labels['newitem'] = 'New item';
-$labels['edititem'] = 'Edit item';
-$labels['preferhtml'] = 'Display HTML';
-$labels['defaultcharset'] = 'Default Character Set';
-$labels['htmlmessage'] = 'HTML Message';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
-$labels['prettydate'] = 'Pretty dates';
-$labels['setdefault']  = 'Set default';
-$labels['autodetect']  = 'Auto';
-$labels['language']  = 'Language';
-$labels['timezone']  = 'Time zone';
-$labels['pagesize']  = 'Rows per page';
-$labels['signature'] = 'Signature';
-$labels['dstactive']  = 'Daylight saving time';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
-$labels['htmleditor'] = 'Compose HTML messages';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
-$labels['htmlsignature'] = 'HTML signature';
-$labels['showemail'] = 'Show email address with display name';
-$labels['previewpane'] = 'Show preview pane';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
-$labels['uisettings'] = 'User Interface';
-$labels['serversettings'] = 'Server Settings';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
-$labels['askuser'] = 'ask me';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
-$labels['showinlineimages'] = 'Display attached images below the message';
-$labels['autosavedraft']  = 'Automatically save draft';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
-$labels['never']  = 'never';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['notes'] = 'Зацемкі';
+$labels['male']   = 'мужчына';
+$labels['female'] = 'жанчына';
+$labels['manager'] = 'Кіраўнік';
+$labels['assistant'] = 'Асістэнт';
+$labels['spouse'] = 'Жонка';
+$labels['allfields'] = 'Усе палі';
+$labels['search'] = 'Пошук';
+$labels['advsearch'] = 'Пашыраны пошук';
+$labels['advanced'] = 'Дадаткова';
+$labels['other'] = 'Іншае';
+$labels['typehome']   = 'Дом';
+$labels['typework']   = 'Праца';
+$labels['typeother']  = 'Іншае';
+$labels['typemobile']  = 'Мабільны';
+$labels['typemain']  = 'Асноўны';
+$labels['typehomefax']  = 'Дамашні факс';
+$labels['typeworkfax']  = 'Працоўны факс';
+$labels['typecar']  = 'Аўта';
+$labels['typepager']  = 'Пэйджар';
+$labels['typevideo']  = 'Відэа';
+$labels['typeassistant']  = 'Асістэнт';
+$labels['typehomepage']  = 'Дамашняя старонка';
+$labels['typeblog'] = 'Блог';
+$labels['typeprofile'] = 'Профіль';
+$labels['addfield'] = 'Дадаць поле...';
+$labels['addcontact'] = 'Дадаць новы кантакт';
+$labels['editcontact'] = 'Рэдагаваць кантакт';
+$labels['contacts'] = 'Кантакты';
+$labels['contactproperties'] = 'Уласцівасці кантакта';
+$labels['personalinfo'] = 'Асабістыя звесткі';
+$labels['edit']   = 'Рэдагаваць';
+$labels['cancel'] = 'Скасаваць';
+$labels['save']   = 'Захаваць';
+$labels['delete'] = 'Выдаліць';
+$labels['rename'] = 'Перайменаваць';
+$labels['addphoto'] = 'Дадаць';
+$labels['replacephoto'] = 'Замяніць';
+$labels['uploadphoto'] = 'Запампаваць фота';
+$labels['newcontact']     = 'Стварыць новую картку кантакта';
+$labels['deletecontact']  = 'Выдаліць абраных кантактаў';
+$labels['composeto']      = 'Скласці ліст да';
+$labels['contactsfromto'] = 'Кантакты $from—$to з $count';
+$labels['print']          = 'Друкаваць';
+$labels['export']         = 'Экспарт';
+$labels['exportall']      = 'Экспартаваць усё';
+$labels['exportsel']      = 'Экспартаваць абранае';
+$labels['exportvcards']   = 'Экспартаваць кантакты ў фармаце vCard';
+$labels['newcontactgroup'] = 'Стварыць новую групу кантактаў';
+$labels['grouprename']    = 'Перайменаваць групу';
+$labels['groupdelete']    = 'Выдаліць групу';
+$labels['groupremoveselected'] = 'Выдаліць абраных кантакаў з групы';
+$labels['previouspage']   = 'Папярэдняя старонка';
+$labels['firstpage']      = 'Першая старонка';
+$labels['nextpage']       = 'Наступная старонка';
+$labels['lastpage']       = 'Апошняя старонка';
+$labels['group'] = 'Група';
+$labels['groups'] = 'Групы';
+$labels['listgroup'] = 'Паказаць сяброў групы';
+$labels['personaladrbook'] = 'Асабістыя адрасы';
+$labels['searchsave'] = 'Захаваць запытанне';
+$labels['searchdelete'] = 'Выдаліць запытанне';
+$labels['import'] = 'Імпарт';
+$labels['importcontacts'] = 'Імпартаваць кантакты';
+$labels['importfromfile'] = 'Імпартаваць з файла:';
+$labels['importtarget'] = 'Дадаць канактаў у';
+$labels['importreplace'] = 'Замяніць адрасную кнігу цалкам';
+$labels['importgroups'] = 'Імпартаваць прызначэнні групы';
+$labels['importgroupsall'] = 'Усе (стварыць групы пры неабходнасці)';
+$labels['importgroupsexisting'] = 'Толькі для існуючых груп';
+$labels['importdesc'] = 'Кантакты можна запампаваць з існуючай адраснай кнігі.<br/>На дадзены момант падтрымліваюцца адрасы ў фарматах <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>  і CSV (значэнні цераз коску).';
+$labels['done'] = 'Гатова';
+$labels['settingsfor'] = 'Настаўленні для';
+$labels['about'] = 'Апісанне';
+$labels['preferences'] = 'Параметры';
+$labels['userpreferences'] = 'Параметры карыстальніка';
+$labels['editpreferences'] = 'Рэдагаваць параметры карыстальніка';
+$labels['identities'] = 'Тоеснасці';
+$labels['manageidentities'] = 'Парадкаваць тоеснасці для гэтага ўліковага запісу';
+$labels['newidentity'] = 'Новая тоеснасць';
+$labels['newitem'] = 'Новы элемент';
+$labels['edititem'] = 'Рэдагаваць элемент';
+$labels['preferhtml'] = 'Паказаць HTML';
+$labels['defaultcharset'] = 'Стандартная кадзіроўка';
+$labels['htmlmessage'] = 'Паведамленне ў HTML';
+$labels['messagepart'] = 'Часць';
+$labels['digitalsig'] = 'Электронны подпіс';
+$labels['dateformat'] = 'Фармат даты';
+$labels['timeformat'] = 'Фармат  часу';
+$labels['prettydate'] = 'Даты ў зручным фармаце';
+$labels['setdefault']  = 'Зрабіць стандартам';
+$labels['autodetect']  = 'Аўтаматычна';
+$labels['language']  = 'Мова';
+$labels['timezone']  = 'Часавая зона';
+$labels['pagesize']  = 'Радкоў на старонку';
+$labels['signature'] = 'Подпіс';
+$labels['dstactive']  = 'Летні/зімовы час';
+$labels['showinextwin'] = 'Адчыняць паведамленне ў новым акне';
+$labels['composeextwin'] = 'Складаць у новым акне';
+$labels['htmleditor'] = 'Складаць паведамленні ў HTML';
+$labels['htmlonreply'] = 'у адказ на паведамленні ў HTML';
+$labels['htmlonreplyandforward'] = 'пры перасылцы альбо ў адказ на паведамленні ў HTML';
+$labels['htmlsignature'] = 'Подпіс у HTML';
+$labels['showemail'] = 'Паказваць адрас электроннай пошты разам з экранным імем';
+$labels['previewpane'] = 'Панэль прагляду';
+$labels['skin'] = 'Тэма інтэрфейсу';
+$labels['logoutclear'] = 'Ачышчаць Сметніцу па выхадзе';
+$labels['logoutcompact'] = 'Сціскаць Атрыманыя па выхадзе';
+$labels['uisettings'] = 'Інтэрфейс карыстальніка';
+$labels['serversettings'] = 'Настаўленні сервера';
+$labels['mailboxview'] = 'Выгляд скрынкі';
+$labels['mdnrequests'] = 'Пры запытанні пацверджанняў аб атрыманні';
+$labels['askuser'] = 'спытаць мяне';
+$labels['autosend'] = 'адправіць пацверджанне';
+$labels['autosendknown'] = 'адпраўляць пацверджанне маім кантактам, іначай спытаць';
+$labels['autosendknownignore'] = 'адпраўляць пацверджанне маім кантактам, іначай ігнараваць';
+$labels['ignore'] = 'ігнараваць';
+$labels['readwhendeleted'] = 'Пазначаць паведамленне як прачытанае па выдаленні';
+$labels['flagfordeletion'] = 'Толькі пазначаць паведамленне на выдаленне, не выдаляць';
+$labels['skipdeleted'] = 'Не паказваць выдаленыя паведамленні';
+$labels['deletealways'] = 'Як не ўдалося перамясціць паведамленні ў Сметніцу, выдаліць іх';
+$labels['deletejunk'] = 'Адразу выдаляць паведамленні ў Спаме';
+$labels['showremoteimages'] = 'Паказваць вонкавыя відарысы';
+$labels['fromknownsenders'] = 'ад вядомых адпраўнікоў';
+$labels['always'] = 'заўсёды';
+$labels['showinlineimages'] = 'Паказваць далучаныя відарысы пад паведамленнем';
+$labels['autosavedraft']  = 'Аўтаматычна захоўваць чарнавікі';
+$labels['everynminutes']  = 'кожныя $n мінут(аў)';
+$labels['refreshinterval']  = 'Абнаўленне (праверка новых паведамленняў і г. д.)';
+$labels['never']  = 'ніколі';
+$labels['immediately']  = 'імгненна';
+$labels['messagesdisplaying'] = 'Адлюстраванне  паведамленняў';
+$labels['messagescomposition'] = 'Складанне паведамленняў';
+$labels['mimeparamfolding'] = 'Імёны далучэнняў';
+$labels['2231folding'] = 'Поўны RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-$labels['folder']  = 'Folder';
+$labels['2047folding'] = 'Поўны RFC 2047 (інш.)';
+$labels['force7bit'] = 'Ужываць MIME-кадзіроўку для 8-бітных знакаў';
+$labels['advancedoptions'] = 'Дадатковыя параметры';
+$labels['focusonnewmessage'] = 'Актываваць акно браўзера пры новым паведамленні';
+$labels['checkallfolders'] = 'Правяраць усе папкі на новыя паведамленні';
+$labels['displaynext'] = 'Па выдаленні/перамяшчэнні паведамлення паказваць наступнае паведамленне';
+$labels['defaultfont'] = 'Стандартны шрыфт паведамлення ў HTML';
+$labels['mainoptions'] = 'Асноўныя параметры';
+$labels['browseroptions'] = 'Параметры браўзера';
+$labels['section'] = 'Секцыя';
+$labels['maintenance'] = 'Абслугоўванне';
+$labels['newmessage'] = 'Новае паведамленне';
+$labels['signatureoptions'] = 'Параметры подпісу';
+$labels['whenreplying'] = 'Адказваючы';
+$labels['replyempty'] = 'не цытаваць зыходнае паведамленне';
+$labels['replytopposting'] = 'пачынаць новае паведамленне над цытаваным';
+$labels['replybottomposting'] = 'пачынаць новае паведамленне пад цытаваным';
+$labels['replyremovesignature'] = 'Адказваючы, выдаліць стары подпіс з паведамлення';
+$labels['autoaddsignature'] = 'Аўтаматычна дадаваць подпіс';
+$labels['newmessageonly'] = 'толькі ў новых паведамленнях';
+$labels['replyandforwardonly'] = 'толькі ў адказах і перасылках';
+$labels['insertsignature'] = 'Уставіць подпіс';
+$labels['previewpanemarkread']  = 'Пазначаць прагледжаныя паведамленні як прачытаныя';
+$labels['afternseconds']  = 'пасля $n секунд';
+$labels['reqmdn'] = 'Заўсёды запытваць пацверджанне аб атрыманні';
+$labels['reqdsn'] = 'Заўсёды запытваць апавяшчэнне аб дастаўцы';
+$labels['replysamefolder'] = 'Складваць адказы ў папку зыходнага паведамлення';
+$labels['defaultabook'] = 'Стандартная адрасная кніга';
+$labels['autocompletesingle'] = 'Прапускаць альтэрнатыўныя адрасы пры аўдадапаўненні';
+$labels['listnamedisplay'] = 'Выводзіць спіс кантактаў як';
+$labels['spellcheckbeforesend'] = 'Правяраць правапіс перад адпраўкай';
+$labels['spellcheckoptions'] = 'Параметры праверкі правапісу';
+$labels['spellcheckignoresyms'] = 'Ігнараваць словы з сімваламі';
+$labels['spellcheckignorenums'] = 'Ігнараваць словы з лікамі';
+$labels['spellcheckignorecaps'] = 'Ігнараваць словы з усімі літарамі ў верхнім рэгістры';
+$labels['addtodict'] = 'Дадаць у слоўнік';
+$labels['mailtoprotohandler'] = 'Зарэгістраваць апрацоўніка для спасылак mailto:';
+$labels['standardwindows'] = 'Успрымаць вокны-бурбалкі як звычайныя вокны';
+$labels['forwardmode'] = 'Перасылка паведамленняў';
+$labels['inline'] = 'у тэксце';
+$labels['asattachment'] = 'як далучэнне';
+$labels['folder']  = 'Папка';
 $labels['folders']  = 'Тэчкі';
-$labels['foldername']  = 'Folder name';
-$labels['subscribed']  = 'Subscribed';
-$labels['messagecount'] = 'Messages';
-$labels['create']  = 'Create';
-$labels['createfolder']  = 'Create new folder';
-$labels['managefolders']  = 'Manage folders';
-$labels['specialfolders'] = 'Special Folders';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
-$labels['sortby'] = 'Sort by';
-$labels['sortasc']  = 'Sort ascending';
-$labels['sortdesc'] = 'Sort descending';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
+$labels['foldername']  = 'Назва папкі';
+$labels['subscribed']  = 'Падпісаная';
+$labels['messagecount'] = 'Паведамленні';
+$labels['create']  = 'Стварыць';
+$labels['createfolder']  = 'Стварыць новую папку';
+$labels['managefolders']  = 'Парадкаваць папкі';
+$labels['specialfolders'] = 'Адмысловыя папкі';
+$labels['properties'] = 'Уласцівасці';
+$labels['folderproperties'] = 'Уласцівасці папкі';
+$labels['parentfolder'] = 'Бацькоўская папка';
+$labels['location'] = 'Размяшчэнне';
+$labels['info'] = 'Звесткі';
+$labels['getfoldersize'] = 'Пстрыкніце, каб даведацца памер папкі';
+$labels['changesubscription'] = 'Пстрыкніце, каб змяніць падпіску';
+$labels['foldertype'] = 'Тып папкі';
+$labels['personalfolder']  = 'Асабістая папка';
+$labels['otherfolder']  = 'Папка іншага карыстальніка';
+$labels['sharedfolder']  = 'Публічная папка';
+$labels['sortby'] = 'Сартаваць паводле';
+$labels['sortasc']  = 'Сартаваць на ўзрастанне';
+$labels['sortdesc'] = 'Сартаваць на змяншчэнне';
+$labels['undo'] = 'Адмяніць';
+$labels['installedplugins'] = 'Устаноўленыя плагіны';
+$labels['plugin'] = 'Плагін';
+$labels['version'] = 'Версія';
+$labels['source'] = 'Крыніца';
+$labels['license'] = 'Ліцэнзія';
+$labels['support'] = 'Падтрымка';
+$labels['B'] = 'Б';
+$labels['KB'] = 'КБ';
+$labels['MB'] = 'МБ';
+$labels['GB'] = 'ГБ';
+$labels['unicode'] = 'Юнікод';
+$labels['english'] = 'англійская';
+$labels['westerneuropean'] = 'заходне-еўрапейская';
+$labels['easterneuropean'] = 'усходне-еўрапейская';
+$labels['southeasterneuropean'] = 'паўднёва-еўрапейская';
+$labels['baltic'] = 'балтыйская';
+$labels['cyrillic'] = 'кірыліца';
+$labels['arabic'] = 'арабская';
+$labels['greek'] = 'грэцкая';
+$labels['hebrew'] = 'габрэйская';
+$labels['turkish'] = 'турэцкая';
+$labels['nordic'] = 'паўночная';
+$labels['thai'] = 'тайская';
+$labels['celtic'] = 'кельцкая';
+$labels['vietnamese'] = 'в\'етнамская';
+$labels['japanese'] = 'японская';
+$labels['korean'] = 'карэйская';
+$labels['chinese'] = 'кітайская';
 ?>
diff --git a/program/localization/be_BE/messages.inc b/program/localization/be_BE/messages.inc
index 5d3d823..4b2f07a 100644
--- a/program/localization/be_BE/messages.inc
+++ b/program/localization/be_BE/messages.inc
@@ -15,160 +15,159 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
-$messages['loginfailed']  = 'Збой уваходу.';
-$messages['cookiesdisabled'] = 'Ваш азіральнік не падтрымлівае кукіс.';
-$messages['sessionerror'] = 'Ваша сесія не дзейсная ці састарэла.';
-$messages['storageerror'] = 'Connection to storage server failed.';
+$messages['errortitle']  = 'Здарылася памылка!';
+$messages['loginfailed']  = 'Не ўдалося ўвайсці.';
+$messages['cookiesdisabled'] = 'Ваш браўзер не падтрымлівае кукіс.';
+$messages['sessionerror'] = 'Ваша сесія невалідная альбо састарэла.';
+$messages['storageerror'] = 'Не ўдалося злучыцца з серверам-сховішчам.';
 $messages['servererror'] = 'Памылка сервера!';
 $messages['servererrormsg'] = 'Памылка сервера: $msg';
 $messages['dberror'] = 'Памылка базы даных!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Немагчыма выканаць аперацыю. Тэчка даступна толькі для чытання.';
-$messages['errornoperm'] = 'Немагчыма выканаць аперацыю. Адмоўлена ў доступе.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Не дзейсны запыт! Даныя не захаваныя.';
-$messages['invalidhost'] = 'Invalid server name.';
-$messages['nomessagesfound'] = 'No messages found in this mailbox.';
-$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
-$messages['mailboxempty'] = 'Mailbox is empty.';
-$messages['refreshing'] = 'Refreshing...';
-$messages['loading'] = 'Loading...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
-$messages['loadingdata'] = 'Loading data...';
-$messages['checkingmail'] = 'Checking for new messages...';
-$messages['sendingmessage'] = 'Sending message...';
-$messages['messagesent'] = 'Message sent successfully.';
-$messages['savingmessage'] = 'Saving message...';
-$messages['messagesaved'] = 'Message saved to Drafts.';
-$messages['successfullysaved'] = 'Successfully saved.';
-$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
-$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
-$messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
-$messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
-$messages['nocontactsfound'] = 'No contacts found.';
-$messages['contactnotfound'] = 'The requested contact was not found.';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
-$messages['sendingfailed'] = 'Failed to send message.';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'An error occured while saving.';
-$messages['errormoving'] = 'Could not move the message(s).';
-$messages['errorcopying'] = 'Could not copy the message(s).';
-$messages['errordeleting'] = 'Could not delete the message(s).';
-$messages['errormarking'] = 'Could not mark the message(s).';
-$messages['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
-$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
-$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
-$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
-$messages['formincomplete'] = 'The form was not completely filled out.';
-$messages['noemailwarning'] = 'Please enter a valid email address.';
-$messages['nonamewarning']  = 'Please enter a name.';
-$messages['nopagesizewarning'] = 'Please enter a page size.';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
-$messages['norecipientwarning'] = 'Please enter at least one recipient.';
-$messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
-$messages['nobodywarning'] = 'Send this message without text?';
-$messages['notsentwarning'] = 'Message has not been sent. Do you want to discard your message?';
-$messages['noldapserver'] = 'Please select an ldap server to search.';
-$messages['nosearchname'] = 'Please enter a contact name or email address.';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
-$messages['searchsuccessful'] = '$nr messages found.';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
-$messages['searchnomatch'] = 'Search returned no matches.';
-$messages['searching'] = 'Searching...';
-$messages['checking'] = 'Checking...';
-$messages['nospellerrors'] = 'No spelling errors found.';
-$messages['folderdeleted'] = 'Folder successfully deleted.';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
-$messages['deletedsuccessfully'] = 'Successfully deleted.';
-$messages['converting'] = 'Removing formatting...';
-$messages['messageopenerror'] = 'Could not load message from server.';
-$messages['fileuploaderror'] = 'File upload failed.';
-$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
-$messages['sourceisreadonly'] = 'This address source is read only.';
-$messages['errorsavingcontact'] = 'Could not save the contact address.';
-$messages['movingmessage'] = 'Moving message(s)...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
-$messages['errorsendingreceipt'] = 'Could not send the receipt.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
-$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
+$messages['requesttimedout'] = 'Час запросу выйшаў';
+$messages['errorreadonly'] = 'Не ўдалося выканаць аперацыю. Папка даступна толькі для чытання.';
+$messages['errornoperm'] = 'Не ўдалося выканаць аперацыю. Адмоўлена ў доступе.';
+$messages['erroroverquota'] = 'Не ўдалося выканаць аперацыю. Няма свабоднай прасторы на дыску.';
+$messages['erroroverquotadelete'] = 'Няма свабоднай прасторы на дыску. Націсніце SHIFT+DEL, каб выдаліць паведамленне.';
+$messages['invalidrequest'] = 'Невалідны запрос! Дадзеныя не захаваныя.';
+$messages['invalidhost'] = 'Няслушнае імя сервера.';
+$messages['nomessagesfound'] = 'Паведамленняў у гэтай скрынцы не знойдзена';
+$messages['loggedout'] = 'Сесія скасавана. Да пабачэння!';
+$messages['mailboxempty'] = 'У скрынцы пуста.';
+$messages['refreshing'] = 'Абнаўляецца...';
+$messages['loading'] = 'Загружаецца...';
+$messages['uploading'] = 'Файл запампоўваюцца...';
+$messages['uploadingmany'] = 'Файлы запампоўваюцца...';
+$messages['loadingdata'] = 'Загружаюцца даныя...';
+$messages['checkingmail'] = 'Праверка новых паведамленняў...';
+$messages['sendingmessage'] = 'Паведамленне адпраўляецца...';
+$messages['messagesent'] = 'Паведамленні адпраўлены.';
+$messages['savingmessage'] = 'Паведамленне захоўваецца...';
+$messages['messagesaved'] = 'Паведамленне захавана ў Чарнавікі.';
+$messages['successfullysaved'] = 'Захавана.';
+$messages['addedsuccessfully'] = 'Кантакт дададзены ў адрасную кнігу.';
+$messages['contactexists'] = 'Кантакт з такім самым адрасам эл. пошты ўжо існуе.';
+$messages['contactnameexists'] = 'Кантакт з такім самым імем ужо існуе.';
+$messages['blockedimages'] = 'Дзеля забеспячэння вашай прыватнасці знешнія відарысы ў гэтым паведамленні заблакіраваныя.';
+$messages['encryptedmessage'] = 'Гэта зашыфраванае паведамленне. Яно не можа быць адлюстравана. Выбачайце!';
+$messages['nocontactsfound'] = 'Кантактаў не знойдзена.';
+$messages['contactnotfound'] = 'Запытаны кантакт не знойдзены.';
+$messages['contactsearchonly'] = 'Задайце выраз для пошука кантактаў';
+$messages['sendingfailed'] = 'Не ўдалося адправіць паведамленне.';
+$messages['senttooquickly'] = 'Пачакайце $sec секунд(ы) перад адпраўкай гэтага паведамлення.';
+$messages['errorsavingsent'] = 'Не ўдалося захаваць адпраўленае паведамленне.';
+$messages['errorsaving'] = 'Не ўдалося захаваць.';
+$messages['errormoving'] = 'Не ўдалося перамясціць паведамлення(ў).';
+$messages['errorcopying'] = 'Не ўдалося скапіяваць паведамлення(ў).';
+$messages['errordeleting'] = 'Не ўдалося выдаліць паведамлення(ў).';
+$messages['errormarking'] = 'Не ўдалося пазначыць паведамлення(ў).';
+$messages['deletecontactconfirm']  = 'Напраўду выдаліць абраны(я) кантакты?';
+$messages['deletegroupconfirm']  = 'Напраўду выдаліць абраную групу?';
+$messages['deletemessagesconfirm'] = 'Напраўду выдаліць абранае(ыя) паведамленне?';
+$messages['deletefolderconfirm']  = 'Напраўду выдаліць гэтую папку?';
+$messages['purgefolderconfirm']  = 'Напраўду выдаліць усе паведамленні з гэтай папкі?';
+$messages['contactdeleting'] = 'Кантакт(ы) выдаляюцца...';
+$messages['groupdeleting'] = 'Група выдаляецца...';
+$messages['folderdeleting'] = 'Папка выдаляецца...';
+$messages['foldermoving'] = 'Папка перамяшчаецца...';
+$messages['foldersubscribing'] = 'Папка падпісваецца...';
+$messages['folderunsubscribing'] = 'Папка адпісваецца...';
+$messages['formincomplete'] = 'Фармуляр запоўнены не да канца.';
+$messages['noemailwarning'] = 'Задайце слушны адрас электроннай пошты.';
+$messages['nonamewarning']  = 'Задайце імя.';
+$messages['nopagesizewarning'] = 'Задайце памер старонкі.';
+$messages['nosenderwarning'] = 'Задайце адрас эл. пошты адпраўніка.';
+$messages['norecipientwarning'] = 'Задайце хаця-б аднаго атрымальніка.';
+$messages['nosubjectwarning']  = 'Тэма ліста не зададзена. Ці жадаеце задаць яе зараз?';
+$messages['nobodywarning'] = 'Адправіць гэта паведамленне без тэксту?';
+$messages['notsentwarning'] = 'Паведамленне не адпраўлена. Жадаеце скасаваць сваё паведамленне?';
+$messages['noldapserver'] = 'Задайце ldap-сервер для пошуку.';
+$messages['nosearchname'] = 'Задайце імя кантакта альбо адрас электроннай пошты.';
+$messages['notuploadedwarning'] = 'Не ўсе далучэнні пакуль яшчэ запампаваныя. Пачакайце альбо скасуйце аперацыю.';
+$messages['searchsuccessful'] = 'Знойдзена $nr паведамленняў.';
+$messages['contactsearchsuccessful'] = 'Знойдзена $nr кантактаў.';
+$messages['searchnomatch'] = 'Пошук не даў выніку.';
+$messages['searching'] = 'Ідзе пошук...';
+$messages['checking'] = 'Ідзе праверка...';
+$messages['nospellerrors'] = 'Памылак правапісання не выяўлена.';
+$messages['folderdeleted'] = 'Папка выдалена.';
+$messages['foldersubscribed'] = 'Папка падпісана.';
+$messages['folderunsubscribed'] = 'Папка адпісана.';
+$messages['folderpurged'] = 'Папка ачышчана.';
+$messages['folderexpunged'] = 'Папка сціснута. ';
+$messages['deletedsuccessfully'] = 'Выдалена.';
+$messages['converting'] = 'Фарматаванне выдаляецца...';
+$messages['messageopenerror'] = 'Не ўдалося загрузіць паведамленне з сервера.';
+$messages['fileuploaderror'] = 'Не ўдалося запампаваць файл.';
+$messages['filesizeerror'] = 'Запампаваны файл перавышае максімальна дазволены памер $size.';
+$messages['copysuccess'] = '$nr кантактаў скапіявана.';
+$messages['movesuccess'] = '$nr кантактаў перамешчана.';
+$messages['copyerror'] = 'Не ўдалося скапіяваць ніводнага кантакта.';
+$messages['moveerror'] = 'Не ўдалося перамясціць ніводнага кантакта.';
+$messages['sourceisreadonly'] = 'Гэтая крыніца адрасоў толькі для чытання.';
+$messages['errorsavingcontact'] = 'Не ўдалося захаваць адрас кантакта.';
+$messages['movingmessage'] = 'Паведамленні(е) перамяшчаюцца...';
+$messages['copyingmessage'] = 'Паведамленні(е) капіююцца...';
+$messages['copyingcontact'] = 'Кантакт(ы) капіююцца...';
+$messages['movingcontact'] = 'Кантакт(ы) перамяшчаюцца...';
+$messages['deletingmessage'] = 'Паведамленні(е) выдаляюцца...';
+$messages['markingmessage'] = 'Паведамленні(е) пазначаюцца...';
+$messages['addingmember'] = 'Кантакт(ы) дадаюцца ў групу...';
+$messages['removingmember'] = 'Кантакт(ы) выдаляюцца з групы...';
+$messages['receiptsent'] = 'Пацверджанне аб прачытанні адпраўлена.';
+$messages['errorsendingreceipt'] = 'Не ўдалося адправіць пацверджання.';
+$messages['deleteidentityconfirm'] = 'Напраўду выдаліць гэтую тоеснасць?';
+$messages['nodeletelastidentity'] = 'Гэтую тоеснасць выдаліць няможна, бо апошняя.';
+$messages['forbiddencharacter'] = 'Назва папкі змяшчае забаронены знак.';
+$messages['selectimportfile'] = 'Абярыце файл на запампоўку.';
+$messages['addresswriterror'] = 'Абраная адрасная кніга ёсць толькі-для-чытання.';
+$messages['contactaddedtogroup'] = 'Кантакты дададзены ў групу.';
+$messages['contactremovedfromgroup'] = 'Кантакты выдаленыя з групы.';
+$messages['nogroupassignmentschanged'] = 'Усе прызначэнні групы засталіся без зменаў.';
+$messages['importwait'] = 'Ідзе імпартаванне. Чакайце...';
+$messages['importformaterror'] = 'Імпартаванне не ўдалося! Запампаваны файл не ўтрымоўвае слушных даных на імпарт.';
+$messages['importconfirm'] = '<b>$inserted кантактаў імпартаваныя</b>';
+$messages['importconfirmskipped'] = '<b>Прапушчана $skipped існуючых запісаў</b>';
+$messages['importmessagesuccess'] = '$nr паведамленняў імпартавана';
+$messages['importmessageerror'] = 'Не ўдалося імпартаваць! Запампаваны файл не ёсць слушным паведамленнем альбо файлам паштовай скрынкі';
+$messages['opnotpermitted'] = 'Аперацыя не дазволеная!';
+$messages['nofromaddress'] = 'У абранай тоеснасці не стае адрасу эл. пошты.';
+$messages['editorwarning'] = 'Змена рэдактара прывядзе да страты фарматавання. Працягнуць?';
+$messages['httpreceivedencrypterror'] = 'Важная памылка ў канфігурацыі. Неадкладна скантактуйцеся з адміністратарам. <b>Паведамленне не можа быць адпраўлена.</b>';
+$messages['smtpconnerror'] = 'Памылка SMTP ($code): Не ўдалося злучыцца з серверам.';
+$messages['smtpautherror'] = 'Памылка SMTP ($code): Аўтэтыфікацыя не ўдалася.';
+$messages['smtpfromerror'] = 'Памылка SMTP ($code): Не ўдалося задаць адпраўніка "$from" ($msg).';
+$messages['smtptoerror'] = 'Памылка STMP ($code): Не ўдалося задаць атрымальніка "$to" ($msg).';
+$messages['smtprecipientserror'] = 'Памылка STMP: Не ўдалося прачытаць спіс атрымальнікаў.';
+$messages['smtperror'] = 'Памылка SMTP: $msg';
+$messages['emailformaterror'] = 'Няслушны адрас эл. пошты: $email';
+$messages['toomanyrecipients'] = 'Замнога атрымальнікаў. Зменшыце лік атрымальнікаў да $max.';
+$messages['maxgroupmembersreached'] = 'Лік сяброў групы перавышае максімум — $max.';
+$messages['internalerror'] = 'Унутраная памылка. Паспрабуйце яшчэ раз.';
+$messages['contactdelerror'] = 'Не ўдалося выдаліць кантакта(ў).';
+$messages['contactdeleted'] = 'Кантакт(ы) выдалены.';
+$messages['contactrestoreerror'] = 'Не ўдалося аднавіць выдаленыя кантакт(ы).';
+$messages['contactrestored'] = 'Кантакт(ы) адноўлены.';
+$messages['groupdeleted'] = 'Група выдалена.';
+$messages['grouprenamed'] = 'Група перайменавана.';
+$messages['groupcreated'] = 'Група створана.';
+$messages['savedsearchdeleted'] = 'Захаванае запытанне выдалена.';
+$messages['savedsearchdeleteerror'] = 'Не ўдалося выдаліць захаванае запытанне.';
+$messages['savedsearchcreated'] = 'Захаванае запытанне створана.';
+$messages['savedsearchcreateerror'] = 'Не ўдалося стварыць захаванае запытанне.';
+$messages['messagedeleted'] = 'Паведамленні(е) выдалены.';
+$messages['messagemoved'] = 'Паведамленні(е) перамешчаны.';
+$messages['messagecopied'] = 'Паведамленні(е) скапіяваны.';
+$messages['messagemarked'] = 'Паведамленні(е) пазначаны.';
+$messages['autocompletechars'] = 'Увядзіце мінімум $min знакаў для аўтадапаўнення.';
+$messages['autocompletemore'] = 'Больш адпаведных запісаў знойдзена. Увядзіце больш знакаў.';
+$messages['namecannotbeempty'] = 'Назва не можа быць пустой.';
+$messages['nametoolong'] = 'Назва задаўгая.';
+$messages['folderupdated'] = 'Папка абноўлена.';
+$messages['foldercreated'] = 'Папка створана.';
+$messages['invalidimageformat'] = 'Няслушны фармат відарысу.';
+$messages['mispellingsfound'] = 'У паведамленні выяўлены правапісныя памылкі.';
+$messages['parentnotwritable'] = 'Не ўдалося стварыць/перамясціць папку ў абраным месцы. Няма доступу.';
+$messages['messagetoobig'] = 'Гэтая часць паведамлення завялікая, каб яе апрацаваць.';
+$messages['attachmentvalidationerror'] = 'УВАГА! Гэтае далучэнне ёсць падазроным, бо тып ягоны не супадае з заяўленым тыпам у паведамленні. Калі вы не давяраеце гэтаму адпраўніку, не адчыняйце яго ў браўзеры, таму што яно можа ўтрымліваць шкоднае змесціва.<br/><br/><em>Чаканы: $expected; знойдзены: $detected<em>';
+$messages['noscriptwarning'] = 'Увага: Служба вымагае Javascript’у! Каб карыстацца ёй, трэба ўключыць Javascript у настаўленнях браўзера.';
 ?>
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 3233e0e..29c99e8 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Добре дошли в $product';
 $labels['username']  = 'Потребител';
 $labels['password']  = 'Парола';
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index 0148027..210eda1 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Възникна грешка!';
 $messages['loginfailed']  = 'Неуспешно установяване на самоличност.';
 $messages['cookiesdisabled'] = 'Вашият браузър не приема cookies.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Използвайте полето за да търсите контакти';
 $messages['sendingfailed'] = 'Неуспешно изпращане на писмо.';
 $messages['senttooquickly'] = 'Моля изчакайте $sec секунди преди да изпратите писмото.';
-$messages['errorsavingsent'] = 'Възникна грешка при записване на изпратеното писмо.';
-$messages['errorsaving'] = 'Възникна грешка при записването.';
 $messages['errormoving'] = 'Писмото не може да бъде преместено.';
 $messages['errorcopying'] = 'Писмото не може да бъде копирано.';
 $messages['errordeleting'] = 'Писмото не може да бъде изтрито.';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Невалиден e-mail адрес: $email';
 $messages['toomanyrecipients'] = 'Прекалено много адреси за изпращане (максимум: $max).';
 $messages['maxgroupmembersreached'] = 'Броят на членовете на групата е повече от максималния: $max.';
-$messages['internalerror'] = 'Възникна вътрешна грешка. Моля опитайте отново.';
 $messages['contactdelerror'] = 'Невъзможно изтриване на контакти.';
 $messages['contactdeleted'] = 'Контактът беше изтрит успешно.';
 $messages['contactrestoreerror'] = 'Неуспешно възстановяване на изтрите контакти.';
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index 45c08ee..c0b7ad3 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'স্বাগতম';
 $labels['username']  = 'গ্রাহক নাম (username)';
 $labels['password']  = 'গোপোন শব্দ (password)';
@@ -31,33 +29,22 @@
 $labels['sent']   = 'প্রেরিত(পাঠানো মেইল)';
 $labels['trash']  = 'ডাস্টবিন';
 $labels['junk']   = 'আজেবাজে মেইল';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'বিষয়';
 $labels['from']    = 'প্রেরক';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'প্রাপক';
 $labels['cc']      = 'অনুলিপির ঠিকানা';
 $labels['bcc']     = 'নাজানিয়ে অনুলিপির ঠিকানা';
 $labels['replyto'] = 'উত্তর পাঠানোর ঠিকানা';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'তারিখ';
 $labels['size']    = 'সাইজ';
 $labels['priority'] = 'গুরুত্ব';
 $labels['organization'] = 'কোম্পানি';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'ফোল্ডার/মেইলবক্স';
 $labels['messagesfromto'] = '$count মেইলের মধ্যে, $from হতে $to দেখানো হচ্ছে';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr #মেইল/চিঠি , $count এর মধ্যে';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'অনুলিপির ঠিকানা';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'সরিয়ে ফেলুন..';
 $labels['download'] = 'ডাউনলোড';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'ফাইলের নাম';
 $labels['filesize'] = 'ফাইলের সাইজ';
 $labels['addtoaddressbook'] = 'ঠিকানার বইতে ঢুকান';
@@ -100,18 +87,11 @@
 $labels['longnov']	= 'নবেমবার (November)';
 $labels['longdec']	= 'দিশেমবার (December)';
 $labels['today'] = 'আজকে';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'দেখুন নতুন কোনো মেইল/চিঠি এলো কিনা';
 $labels['compose']          = 'নতুন মেইল/চিঠি লিখুন';
 $labels['writenewmessage']  = 'নতুন মেইল/চিঠি লিখুন';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'শুধু প্রেরকের কাছে উত্তর পাঠান';
 $labels['replytoallmessage'] = 'প্রেরক ও এই চিঠির অন্যান্য প্রাপকদের কাছে উত্তর পাঠান';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'মেইল/চিঠি এগিয়ে দিন';
 $labels['deletemessage']    = 'মেইল/চিঠি ছিড়ে ফেলুন';
 $labels['movemessagetotrash'] = 'মেইল/চিঠি ডাস্টবিনে ফেলুন';
@@ -122,88 +102,39 @@
 $labels['lastmessage']      = 'শেষ মেইল/চিঠিটি দেখুন';
 $labels['backtolist']       = 'মেইল/চিঠির তালিকায় ফিরে যান';
 $labels['viewsource']       = 'মূল উৎসদেখুন';
-$labels['mark']             = 'Mark';
 $labels['markmessages']     = 'মেইল/চিঠি (গুলো)';
 $labels['markread']         = 'পড়া শেষ (read)';
 $labels['markunread']       = 'নাদেখা (unread)';
 $labels['markflagged']      = 'দাগানো (flagged)';
 $labels['markunflagged']    = 'দাগহীন (unflagged)';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'বেছেনিন';
 $labels['all'] = 'সবগুলো';
 $labels['none'] = 'কোনোটাই না';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'নাদেখা (unread)';
 $labels['flagged'] = 'দাগানো (flagged)';
 $labels['unanswered'] = 'উত্তর না দেওয়া গুলো';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
 $labels['filter'] = 'ছাকনি';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'কোনোটাই না';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'টাইটকরুন';
 $labels['empty'] = 'খালিকরুন';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'ডিস্ক এ খালি যায়গা';
 $labels['unknown']  = 'অজানা';
 $labels['unlimited']  = 'সীমাহীন';
 $labels['quicksearch']  = 'ঝটকরে খোজা';
 $labels['resetsearch']  = 'নতুনকরে খুজুন';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'নতুন উইন্ডো তে দেখুন';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'এখুনি মেইল / চিঠিটি পাঠান';
 $labels['savemessage']    = 'খসড়া হিসাবে জমা করে রাখুন';
 $labels['addattachment']  = 'একটা ফাইল জুড়ে দিন চিঠির সাথে';
 $labels['charset']        = 'Charset';
 $labels['editortype']     = 'Editor type';
 $labels['returnreceipt']  = 'ফিরতি রসিদ';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Check spelling';
 $labels['resumeediting'] = 'Resume editing';
 $labels['revertto']      = 'Revert to';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'জুড়ে দেওয়া ফাইল (Attachments)';
 $labels['upload'] = 'উঠায় দেন';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'বন্ধ করুন';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'Low';
 $labels['lowest']  = 'Lowest';
 $labels['normal']  = 'Normal';
@@ -212,10 +143,6 @@
 $labels['nosubject']  = '(বিষয়হীন)';
 $labels['showimages'] = 'ছবি দেখান';
 $labels['alwaysshow'] = 'সবসময় $sender এর কাছে থেকে পাওয়া ছবিগুলো দেখানো হোক';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'খালি লেখা দেখুন';
 $labels['savesentmessagein'] = 'পাঠানো চিঠি/মেইল জমা করুন >>';
@@ -224,7 +151,6 @@
 $labels['addcc'] = 'অনুলিপির ঠিকানা ঢুকান';
 $labels['addbcc'] = 'নাজানিয়ে অনুলিপির ঠিকানা ঢুকান';
 $labels['addreplyto'] = 'উত্তর পাঠানোর ঠিকানা ঢুকান';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'প্রাপক আপনার কাছে মেইল/চিঠিটা যে পেয়েছেন তার ফিরতি রসিদ চেয়েছেন। আপনি কি ফিরতি রসিদ টা পাঠাবেন?';
 $labels['receiptread'] = 'মেইল/চিঠি যে পেয়েছেন তার ফিরতি রসিদ';
 $labels['yourmessage'] = 'নিচে রয়েছে আপনার চিঠিটা যে প্রাপক পেয়েছেন তার রসিদ';
@@ -232,97 +158,32 @@
 $labels['name']         = 'নাম';
 $labels['firstname']    = 'নামের প্রথমাংশ';
 $labels['surname']      = 'নামের শেষাংশ';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'ই-মেইল/চিঠি';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'নতুন ঠিকানা ঢুকান';
 $labels['editcontact'] = 'একটা ঠিকানা বদলান';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'বদলান';
 $labels['cancel'] = 'বাতিল';
 $labels['save']   = 'জমা দিন';
 $labels['delete'] = 'ফেলে দিন';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'একটা নতুন ঠিকানার কার্ড বানান';
 $labels['deletecontact']  = 'বেছে নেওয়া ঠিকানা গুলো ফেলে দিন';
 $labels['composeto']      = 'চিঠি পাঠাবেন কার কাছে?';
 $labels['contactsfromto'] = '$count ঠিকানার মধ্যে $from থেকে $to টা';
 $labels['print']          = 'প্রিন্ট করুন';
 $labels['export']         = 'রপ্তানি করুন';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'রপ্তানি করুন vCard আকারে';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'আগের গুলো দেখান';
 $labels['firstpage']      = 'প্রথম গুলো দেখান';
 $labels['nextpage']       = 'পরের গুলো দেখান';
 $labels['lastpage']       = 'শেষের গুলো দেখান';
-$labels['group'] = 'Group';
 $labels['groups'] = 'গ্রুপ';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'নিজের ঠিকানা';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
 $labels['import'] = 'আমদানি করুন';
 $labels['importcontacts'] = 'ঠিকানা আমদানি করুন';
 $labels['importfromfile'] = 'ফাইলের থেকে ঠিকানা আমদানি করুন';
-$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'পুরো ঠিকানার বইটি খালি করে নতুন ঠিকানা গুলো ভরুন';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'শেষ';
 $labels['settingsfor'] = 'খুটিনাটি';
-$labels['about'] = 'About';
 $labels['preferences'] = 'পছন্দ';
 $labels['userpreferences'] = 'গ্রাহক পছন্দ';
 $labels['editpreferences'] = 'গ্রাহক পছন্দ বদলান';
@@ -332,12 +193,7 @@
 $labels['newitem'] = 'নতুন জিনিষ';
 $labels['edititem'] = 'জিনিষ বদলান';
 $labels['preferhtml'] = 'HTML এ দেখি';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML মেইল/চিঠি';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'তারিখ ভালো করে দেখা যাবে';
 $labels['setdefault']  = 'এইটাই আসল';
 $labels['autodetect']  = 'কম্পুটার নিজেনিজি বেছে নেবে';
@@ -346,13 +202,8 @@
 $labels['pagesize']  = 'প্রতি পৃষ্ঠায় লাইন সংখ্যা';
 $labels['signature'] = 'স্বাক্ষর';
 $labels['dstactive']  = 'Daylight saving time';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML এ মেইল/চিঠি লিখুন';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML এ স্বাক্ষর';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ছোটোকরে দেখার জায়গা';
 $labels['skin'] = 'মেইলবক্স এর পুরোটার চেহারা';
 $labels['logoutclear'] = 'বেরহবার সময় ডাস্টবিন অটোমেটিক খালি হবে';
@@ -363,69 +214,26 @@
 $labels['mdnrequests'] = 'প্রেরক নোটিশ পাঠালে কি করা হবে?';
 $labels['askuser'] = 'আমি গ্রাহক, আমাকে জিজ্ঞাসা করুন';
 $labels['autosend'] = 'কম্পুটার নিজেনিজি ফিরতি নোটিশ পাঠায় দেবে';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'পাত্তা দেওয়া হবেনা';
 $labels['readwhendeleted'] = 'ফেলে দেবার সময় মেইল/চিঠি পড়া হয়ে গেছে হিসাবে ধরে নেওয়া হবে';
 $labels['flagfordeletion'] = 'একেবারেই ফেলে না দিয়ে মেইল/চিঠি গুলোকে দাগিয়ে রাখুন ফেলে দেবার জন্যে';
 $labels['skipdeleted'] = 'ফেলে দেওয়া মেইল/চিঠি দেখানোর দরকার নেই';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'মেইলে অন্য ওয়েবসাইট থেকে আসা ছবি থাকলে তা দেখা যাবে';
 $labels['fromknownsenders'] = 'পরিচিত প্রেরক এর ক্ষেত্রে';
 $labels['always'] = 'সবসময়';
 $labels['showinlineimages'] = 'মেইলের সাথে জোড়া লাগানো ছবি, মেইলের নিচে দেখা যাবে';
 $labels['autosavedraft']  = 'নিজেনিজি খসড়া জমা হয়ে যাবে';
 $labels['everynminutes']  = 'প্রতি $n মিনিটে';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'কখোনোই না';
-$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'মেইল/চিঠি দেখা যাচ্ছে';
 $labels['messagescomposition'] = 'মেইল/চিঠি লেখা হচ্ছে';
 $labels['mimeparamfolding'] = 'জুড়ে দেওয়া জিনিষের নাম';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'জটিল বিষয়';
 $labels['focusonnewmessage'] = 'নতুন মেইল এলেই তা হাইলাইট হয়ে যাবে';
 $labels['checkallfolders'] = 'সবগুলো মেইলবক্সে নতুন চিঠি খোজা হবে';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'ফোল্ডার/মেইলবক্স';
 $labels['folders']  = 'ফোল্ডার/মেইলবক্স';
 $labels['foldername']  = 'ফোল্ডার/মেইলবক্স এর নাম';
@@ -435,47 +243,11 @@
 $labels['createfolder']  = 'নতুন ফোল্ডার / মেইলবক্স প্রস্তুত করুন';
 $labels['managefolders']  = 'ফোল্ডার/মেইলবক্স গুলো কে গুছান';
 $labels['specialfolders'] = 'বিশেষ ফোল্ডার/মেইলবক্স';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'সাজান';
 $labels['sortasc']  = 'কম থেকে বেশি হিসাবে সাজান';
 $labels['sortdesc'] = 'বেশি থেকে কম হিসাবে সাজান';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
 $labels['B'] = 'বাইট';
 $labels['KB'] = 'কিলোবাইট';
 $labels['MB'] = 'মেগাবাইট';
 $labels['GB'] = 'গিগাবাইট';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index ac959ee..ac744ed 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -15,29 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'ঢোকা গেল না';
 $messages['cookiesdisabled'] = 'আপনার ব্রাউজার, কুকি গ্রহন করে না';
 $messages['sessionerror'] = 'আপনার সেশন শেষ';
 $messages['storageerror'] = 'মেইল সারভার এর সাথে যোগাযোগ করা গেল না';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'এই মেইলবক্সে কোনো চিঠি নাই';
 $messages['loggedout'] = 'আপনের সেশন ঠিকঠাক মতো শেষ হইছে। শুভবিদায়।';
 $messages['mailboxempty'] = 'মেইলবক্স খালি';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'কম্পুটার কাজ করতেছে . .';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'কম্পুটার তথ্য আনছে আপনার জন্য..';
 $messages['checkingmail'] = 'নতুন চিঠি আসছে কিনা তা দেখা হচ্ছে';
 $messages['sendingmessage'] = 'চিঠি পাঠায় দেওয়া হচ্ছে';
@@ -47,31 +32,20 @@
 $messages['successfullysaved'] = 'ঠিকঠাকমতো জমা হয়ে গিয়েছে';
 $messages['addedsuccessfully'] = 'নতুন ঠিকানা ঠিকঠাক মতো ঢোকানো হয়ে গেছে';
 $messages['contactexists'] = 'একই ই-মেইল এ আরেকটা নাম ঠিকানা তালিকায় আছে';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'আপনার গোপনীয়তা রক্ষার জন্য আমরা ছবি গুলো সরিয়ে রেখেছি';
 $messages['encryptedmessage'] = 'এটা একটি গোপন (encrypted) চিঠি। এটা আপনাকে দেখানো যাবে না। দু্ঃখিত।';
 $messages['nocontactsfound'] = 'কোনো ঠিকানা পাওয়া গেলনা। দু্ঃখিত।';
 $messages['contactnotfound'] = 'আপনি যে ঠিকানা খুজছেন সেটা পাওয়া গেল না';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'চিঠি পাঠানো গেলনা';
 $messages['senttooquickly'] = 'এই চিঠি পাঠানোর আগে, দয়া করে $sec সেকেন্ড';
-$messages['errorsavingsent'] = 'প্রেরিত চিঠি হিসাবে জমা রাখার সময় একটা ঝামেলা হয়েছে';
-$messages['errorsaving'] = 'জমা করার সময় একটা ঝামেলা হয়েছে';
 $messages['errormoving'] = 'চিঠিটা সরানো গেলো না';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'চিঠিটা ফেলানো গেলো না';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'আপনি কি আসলেই এই ঠিকানা(গুলো) ফেলো দিতে চান?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'আপনি কি আসলেই এই চিঠি(গুলো) ফেলো দিতে চান?';
 $messages['deletefolderconfirm']  = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স ফেলো দিতে চান?';
 $messages['purgefolderconfirm']  = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স এর সব চিঠি ফেলো দিতে চান?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'ফোল্ডার/মেইলবক্স ফেলে দেওয়া হচ্ছে';
 $messages['foldermoving'] = 'ফোল্ডার/মেইলবক্স সরানো হচ্ছে';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'আপনি সবগুলো জিনিষ লেখেননি';
 $messages['noemailwarning'] = 'একটি সঠিক ই-মেইল লিখুন';
 $messages['nonamewarning']  = 'দয়া করে নামটি লিখুন';
@@ -83,92 +57,29 @@
 $messages['notsentwarning'] = 'চিঠি পাঠানো হয়নি। চিঠিটা কি বাতিল করে দেবেন?';
 $messages['noldapserver'] = 'দয়া করে একটি এল্ডাপ সারভার বেছে নিন সার্চ করার জন্যে';
 $messages['nosearchname'] = 'দয়া করে একজনের নাম অথবা ই-মেইল লিখুন';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr টা চিঠি পাওয়া গেছে';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'খুজে কিছু পাওয়া গেলোনা';
 $messages['searching'] = 'খুজছি ....';
 $messages['checking'] = 'দেখছি ...';
 $messages['nospellerrors'] = 'No spelling errors found';
 $messages['folderdeleted'] = 'ফোল্ডার/মেইলবক্স ঠিকঠাকমতো ফেলানো হয়ে গেছে';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'ঠিকঠাকমতো ফেলানো হয়ে গেছে';
 $messages['converting'] = 'বিন্যাস (formatting) সরানো হচ্ছে ..';
 $messages['messageopenerror'] = 'সারভার থেকে চিঠি আনা গেলোনা';
 $messages['fileuploaderror'] = 'ফাইলটা সারভারে উঠানো গেলোনা';
 $messages['filesizeerror'] = 'যে ফাইলটা উঠানোর চেষ্টা করলেন সেটি সর্বোচ্চ সাইজ $size এর থেকে বেশি';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'এইঠিকানাটা খালি পড়ার জন্যে';
 $messages['errorsavingcontact'] = 'ঠিকানা জমা রাখা গেলোনা';
 $messages['movingmessage'] = 'চিঠি সরানো হচ্ছে..';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'ঠিকঠাক মতো ফিরতি রশিদ পাঠানো হয়েছে';
 $messages['errorsendingreceipt'] = 'রশিদ পাঠানো গেলোনা';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'আপনি এই পরিচিতি ফেলতে পারবেন না কারন এইটায় বর্তমানে আপনার একমাত্র পরিচিতি।';
 $messages['forbiddencharacter'] = 'ফোল্ডার এর নামের মধ্যে নিষিদ্ধ অক্ষর আছে';
 $messages['selectimportfile'] = 'একটা ফাইল বেছে নিন তোলার জন্য';
 $messages['addresswriterror'] = 'বেছে নেওয়া ঠিকানার বইটিতে লেখাযায় না';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'আমদানি করা হচ্ছে। একটু অপেক্ষা করুন...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>ঠিকমতো $inserted ঠিকানা আমদানি করা গেছে, $skipped ঠিকানা আগের থেকেই ছিলো বলে তাদের টা যা ছিলো তাই রাখা হয়েছে</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'এই কাজটা করার অনুমতি নাই আপনার';
 $messages['nofromaddress'] = 'বেছে নেওয়া যে পরিচিতিটা, তাতে ই-মেইল নেই';
 $messages['editorwarning'] = 'যদি আপনি শুধু লেখার স্টাইলে যান তাহলে বর্তমানের কোনো বিন্যাস হারিয়ে যাবে';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 8b609d6..d503d1f 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Degemer mat war $product';
 $labels['username']  = 'Anv an arveriad';
 $labels['password']  = 'Ger-Tremen';
@@ -31,15 +29,12 @@
 $labels['sent']   = 'Kaset';
 $labels['trash']  = 'Pod-lastez';
 $labels['junk']   = 'Stroboù';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Sujed';
 $labels['from']    = 'Eus';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Da';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Cci';
 $labels['replyto'] = 'Respont-da';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Deiz';
 $labels['size']    = 'Ment';
 $labels['priority'] = 'Kentwir';
@@ -55,7 +50,6 @@
 $labels['move']     = 'Dilec\'hiañ';
 $labels['moveto']   = 'Dilec\'hiañ da...';
 $labels['download'] = 'Pellgargañ';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'Diskouez';
 $labels['showanyway'] = 'Diskouez anezhañ memestra';
 $labels['filename'] = 'Anv ar restr';
@@ -109,12 +103,8 @@
 $labels['replytoallmessage'] = 'Respont d\'an holl';
 $labels['replyall']         = 'Respont d\'an holl';
 $labels['replylist']        = 'Respont d\'ar roll';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'Treuzkas ar c\'hemennad';
 $labels['deletemessage']    = 'Dilec\'hiañ ar c\'hemennad er pod-lastez';
-$labels['movemessagetotrash'] = 'Move message to trash';
 $labels['printmessage']     = 'Moulañ ar c\'hemennad-se';
 $labels['previousmessage']  = 'Gwelout ar c"hemennad a-raok';
 $labels['firstmessage']     = 'Gwelout ar c\'hemennad kentañ';
@@ -122,88 +112,30 @@
 $labels['lastmessage']      = 'Gwelout ar c\'hemennad diwezhañ';
 $labels['backtolist']       = 'Distreiñ el listenn kemennadoù';
 $labels['viewsource']       = 'Gwelout an tarzh';
-$labels['mark']             = 'Mark';
-$labels['markmessages']     = 'Mark messages';
-$labels['markread']         = 'As read';
-$labels['markunread']       = 'As unread';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'Diuzañ';
 $labels['all'] = 'An holl';
 $labels['none'] = 'Ebet';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Na lennet';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
-$labels['filter'] = 'Filter';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'Ebet';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Stummaat';
 $labels['empty'] = 'Skarzhañ';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Implijadur pladenn';
 $labels['unknown']  = 'Dianav';
 $labels['unlimited']  = 'didermen';
 $labels['quicksearch']  = 'Klask prim';
 $labels['resetsearch']  = 'Aderaouekaat ar glask';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Kas ar c\'hemennad diouzhtu';
 $labels['savemessage']    = 'Gwarediñ ar brouilhed-se';
 $labels['addattachment']  = 'Stagañ ur restr';
 $labels['charset']        = 'Engodadur';
 $labels['editortype']     = 'Furmad aozer';
 $labels['returnreceipt']  = 'Testeni degemer';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Gwiriañ ar reizhskrivadur';
 $labels['resumeediting'] = 'Distreiñ en aozer';
 $labels['revertto']      = 'Distreiñ en/r';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Restroù staget';
 $labels['upload'] = 'Stagañ';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'Serriñ';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'Izel';
 $labels['lowest']  = 'An izelañ';
 $labels['normal']  = 'Reizh';
@@ -211,118 +143,31 @@
 $labels['highest'] = 'An uhelañ';
 $labels['nosubject']  = '(n\'eus ket sujed)';
 $labels['showimages'] = 'Diskouez ar skeudennoù';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'testenn kriz';
-$labels['savesentmessagein'] = 'Save sent message in';
-$labels['dontsave'] = 'don\'t save';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
-$labels['addcc'] = 'Add Cc';
-$labels['addbcc'] = 'Add Bcc';
-$labels['addreplyto'] = 'Add Reply-To';
-$labels['addfollowupto'] = 'Add Followup-To';
-$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
-$labels['receiptread'] = 'Return Receipt (read)';
-$labels['yourmessage'] = 'This is a Return Receipt for your message';
-$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
 $labels['name']         = 'Anv da ziskouez';
 $labels['firstname']    = 'Raganv';
 $labels['surname']      = 'Anv';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'Postel elektronek';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Ouzhpennañ an darempred diuzet en hor c\'harned chomlec\'hioù';
 $labels['editcontact'] = 'Cheñch an darempred';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'Cheñch';
 $labels['cancel'] = 'Nullañ';
 $labels['save']   = 'Gwarediñ';
 $labels['delete'] = 'Dilemel';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'Krouiñ un darempred nevez';
 $labels['deletecontact']  = 'Dilemel an darempredoù diuzet';
 $labels['composeto']      = 'Skrivañ ur c\'hemennad ouzh';
 $labels['contactsfromto'] = 'Darempredoù eus $from ouzh $to war $count';
 $labels['print']          = 'Moulañ';
 $labels['export']         = 'Ezporzhiañ';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'Diskouez pajenn a-raok';
 $labels['firstpage']      = 'Gwelout ar bajenn gentañ';
 $labels['nextpage']       = 'Diskouez pajenn da heul';
 $labels['lastpage']       = 'Gwelout ar bajenn diwezhañ';
-$labels['group'] = 'Group';
 $labels['groups'] = 'Strolladoù';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Chomlec\'h personel';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
 $labels['settingsfor'] = 'Arventennoù evit';
-$labels['about'] = 'About';
 $labels['preferences'] = 'Dibarzhioù';
 $labels['userpreferences'] = 'Dibarzhioù implijer';
 $labels['editpreferences'] = 'Cheñch dibarzhioù implijer';
@@ -332,150 +177,28 @@
 $labels['newitem'] = 'Elfenn nevez';
 $labels['edititem'] = 'Cheñch an elfenn';
 $labels['preferhtml'] = 'Diskouez en HTML';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Kemennad en HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Diskouez berr deizioù';
 $labels['setdefault']  = 'Arventennoù dre ziouer';
-$labels['autodetect']  = 'Auto';
 $labels['language']  = 'Yezh';
 $labels['timezone']  = 'Gwerzhid-eur';
 $labels['pagesize']  = 'Niver a linenn dre bajenn';
 $labels['signature'] = 'Sinadur';
 $labels['dstactive']  = 'Eur an hañv';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Sevel ur c\'hemennad er furmad HTML';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Sinadur HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Diskouez panel alberz';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
-$labels['uisettings'] = 'User Interface';
-$labels['serversettings'] = 'Server Settings';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
-$labels['askuser'] = 'ask me';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
-$labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'Gwarediñ emgefre brouilhedoù';
 $labels['everynminutes']  = 'Bep $n munutoù';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'ebet';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Renkell';
 $labels['folders']  = 'Teuliadoù';
 $labels['foldername']  = 'Anv ar renkell';
 $labels['subscribed']  = 'Koumananer';
-$labels['messagecount'] = 'Messages';
 $labels['create']  = 'Krouiñ';
 $labels['createfolder']  = 'Krouiñ ur renkell nevez';
 $labels['managefolders']  = 'Aozañ ar renkelloù';
-$labels['specialfolders'] = 'Special Folders';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'Rummañ dre';
 $labels['sortasc']  = 'Rumm diagentad';
 $labels['sortdesc'] = 'Rumm diskennad';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/br/messages.inc b/program/localization/br/messages.inc
index 82ffdc0..7f724a2 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Degouezhet ez eus bet ur fazi !';
 $messages['loginfailed']  = 'C\'hwitadenn war kennaskañ';
 $messages['cookiesdisabled'] = 'N\'eus ket c\'hoant toupinoù Hor merder';
@@ -24,20 +23,10 @@
 $messages['servererror'] = 'Fazi dafariad !';
 $messages['servererrormsg'] = 'Fazi dafariad : $msg';
 $messages['dberror'] = 'Fazi stlennvon !';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Kemennadoù ebet er voest lizhiri';
 $messages['loggedout'] = 'Digevreet hoc\'h eus mat. Kenavo !';
 $messages['mailboxempty'] = 'Boest lizhiri dileun';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'O kargañ...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'O kargañ roadennoù...';
 $messages['checkingmail'] = 'O Gwiriañ kemennadoù nevez...';
 $messages['sendingmessage'] = 'O kas ar c\'hemennad...';
@@ -47,128 +36,38 @@
 $messages['successfullysaved'] = 'Gwarediñ graet';
 $messages['addedsuccessfully'] = 'Darempred ouzhpennet er c\'harned chomlec\'hioù';
 $messages['contactexists'] = 'Bout a ra un darempred gant memes postel elektronek';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Evit gwarantiñ hoc\'h buhez prevez, stanket eo bet skeudennoù pell er c\'hemennad-se.';
 $messages['encryptedmessage'] = 'Rineget eo ar c\'hemennad, ha ne c\'hall ket bezañ diskouez. Ma Digarezit !';
 $messages['nocontactsfound'] = 'N\'eo ket bet kavet darempred ebet';
 $messages['contactnotfound'] = 'N\'eo ket bet kavet an darempred goulennet';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'N\'eo ket bet kaset ar c\'hemennad';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'Fazi en deus graet reuz en hoc\'h gwarediñ';
 $messages['errormoving'] = 'N\'eus ket tu da zilec\'hiañ ar c\'hemennad';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'N\'eus ket tu da zilemel ar c\'hemennad';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'C\'hoant hoc\'h eus da zilemel an darempred(où) diuzet ?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'C\'hoant hoc\'h eus da zilemel ar c\'hemennad(où) diuzet ?';
 $messages['deletefolderconfirm']  = 'C\'hoant hoc\'h eus da skarzhañ ar renkell-se ?';
 $messages['purgefolderconfirm']  = 'C\'hoant hoc\'h eus da skarzhañ an holl kemennad eus ar renkell-se ?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'N\'eo ket leuniet ar furmskrid penn-da-benn';
 $messages['noemailwarning'] = 'Termenit ur postel elektronek mat mar plij ganeoc\'h';
 $messages['nonamewarning']  = 'Termenit un anv mar plij ganeoc\'h';
 $messages['nopagesizewarning'] = 'Termenit ur ment pajenn mar plij ganeoc\'h';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Ouzhpennit ur resever da nebeutañ mar plij ganeoc\'h';
 $messages['nosubjectwarning']  = 'Dileun eo ar maezienn « Sujed » . C\'hoant hoc\'h eus da leuniañ anezhiñ diouzhtu ?';
 $messages['nobodywarning'] = 'Kas ar c\'hemennad hep testenn ?';
 $messages['notsentwarning'] = 'N\'eo ket bet kaset ar c\'hemennad. C\'hoant hoc\'h eus dilezel ar c\'hemennad-se ?';
 $messages['noldapserver'] = 'Dizuit ur servijer LDAP evit ar glask';
 $messages['nosearchname'] = 'Skrivit un anv darempred pe ur postel elektronek';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr kemennad kavet';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Disoc\'h ebet gant ar glask';
 $messages['searching'] = 'O klask...';
 $messages['checking'] = 'O gwiriañ...';
 $messages['nospellerrors'] = 'Fazi ebet kavet';
 $messages['folderdeleted'] = 'Renkell skarzhet';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Dilemet mat';
 $messages['converting'] = 'O tilemel furmaozañ...';
 $messages['messageopenerror'] = 'N\'us ket tu da gargañ ar c\'hemennad adalek ar servijer';
 $messages['fileuploaderror'] = 'Fazi o treuzkas ar restr';
 $messages['filesizeerror'] = 'Re vras eo ar restr treuzkaset $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Lenn hepken eo an tarzh chomlec\'h se';
 $messages['errorsavingcontact'] = 'Ne c\'haller ket gwarediñ chomlec\'h darempred';
-$messages['movingmessage'] = 'Moving message(s)...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
-$messages['errorsendingreceipt'] = 'Could not send the receipt.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
-$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index fd3495a..df58d8d 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Dobrodošli u $product';
 $labels['username']  = 'Korisnik';
 $labels['password']  = 'Šifra';
@@ -178,6 +176,7 @@
 $labels['msgtext']  = 'Cijela poruka';
 $labels['body']  = 'Tijelo';
 $labels['type'] = 'Vrsta';
+$labels['namex'] = 'Ime';
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Preuzmi (.eml)';
 $labels['changeformattext'] = 'Prikaži kao obični tekst';
@@ -317,8 +316,11 @@
 $labels['import'] = 'Uvoz';
 $labels['importcontacts'] = 'Uvoz kontakata';
 $labels['importfromfile'] = 'Uvoz iz datoteke:';
-$labels['importtarget'] = 'Dodaj novi kontakt u adresar:';
+$labels['importtarget'] = 'Dodaj kontakte u';
 $labels['importreplace'] = 'Zamijeni cijeli adresar';
+$labels['importgroups'] = 'Uvezi grupne zadatke';
+$labels['importgroupsall'] = 'Sve (kreiraj grupe ako je potrebno)';
+$labels['importgroupsexisting'] = 'Samo za postojeće grupe';
 $labels['importdesc'] = 'Kontakte možete dodati iz postojećeg adresara.<br/>Trenutno podržavamo uvoz adresara u formatima <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ili CSV (comma-separated).';
 $labels['done'] = 'Završeno';
 $labels['settingsfor'] = 'Podešavanja za';
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 711cdfa..3424013 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Desila se greška!';
 $messages['loginfailed']  = 'Prijava nije uspjela.';
 $messages['cookiesdisabled'] = 'Vaš preglednik ne prihvata kolačiće.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Unesite neki pojam za pretragu';
 $messages['sendingfailed'] = 'Greška pri slanju poruke.';
 $messages['senttooquickly'] = 'Molimo sačekajte $sec sekundi prije slanja ove poruke.';
-$messages['errorsavingsent'] = 'Desila se greška pri snimanju poslane poruke.';
-$messages['errorsaving'] = 'Desila se greška pri snimanju.';
 $messages['errormoving'] = 'Nije moguće premjestiti poruke.';
 $messages['errorcopying'] = 'Nije moguće kopirati poruke.';
 $messages['errordeleting'] = 'Nije moguće obrisati poruke.';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Netačna email adresa: $email';
 $messages['toomanyrecipients'] = 'Previše primaoca. Smanjite broj primaoca na $max.';
 $messages['maxgroupmembersreached'] = 'Broj članova grupe prelazi maksimum od $max.';
-$messages['internalerror'] = 'Dogodila se interna greška. Molimo vas da pokušate ponovo.';
 $messages['contactdelerror'] = 'Kontakti ne mogu biti obrisani.';
 $messages['contactdeleted'] = 'Kontakti su uspješno obrisani.';
 $messages['contactrestoreerror'] = 'Nije moguće vratiti obrisane kontakte.';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 34dfb4a..065431f 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Benvingut a $product';
 $labels['username']  = 'Nom d\'usuari';
 $labels['password']  = 'Contrasenya';
@@ -31,7 +29,7 @@
 $labels['sent']   = 'Enviats';
 $labels['trash']  = 'Paperera';
 $labels['junk']   = 'Correu brossa';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = 'Mostra els noms reals a les carpetes especials';
 $labels['subject'] = 'Assumpte';
 $labels['from']    = 'Remitent';
 $labels['sender']  = 'Remitent';
@@ -168,7 +166,7 @@
 $labels['folderactions'] = 'Accions de carpeta';
 $labels['compact'] = 'Compacta';
 $labels['empty'] = 'Buida';
-$labels['importmessages'] = 'Import messages';
+$labels['importmessages'] = 'Importa missatges';
 $labels['quota'] = 'Ús del disc';
 $labels['unknown']  = 'desconegut';
 $labels['unlimited']  = 'il·limitat';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'Cerca modificadors';
 $labels['msgtext']  = 'Missatge sencer';
 $labels['body']  = 'Cos';
-$labels['type'] = 'Type';
+$labels['type'] = 'tipus:';
+$labels['namex'] = 'Nom';
 $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
 $labels['changeformattext'] = 'Mostra en format de text net';
@@ -310,14 +309,13 @@
 $labels['lastpage']       = 'Mostra la darrera pàgina';
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Grups';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Llista els membres del grup';
 $labels['personaladrbook'] = 'Llibreta d\'adreces';
 $labels['searchsave'] = 'Desa la cerca';
 $labels['searchdelete'] = 'Suprimeix la cerca';
 $labels['import'] = 'Importa';
 $labels['importcontacts'] = 'Importa contactes';
 $labels['importfromfile'] = 'Importa des d\'un fitxer:';
-$labels['importtarget'] = 'Afegeix contactes nous a la llibreta d\'adreces:';
 $labels['importreplace'] = 'Reemplaça la llibreta d\'adreçes sencera';
 $labels['importdesc'] = 'Podeu carregar contactes des d\'una llibreta de direccions.<br/>Actualment donem suport a la importació d\'adreces des de fitxers de tipus <a href="http://ca.wikipedia.org/wiki/VCard">vCard</a> o CSV (valors separats per comes).';
 $labels['done'] = 'Fet';
@@ -352,7 +350,7 @@
 $labels['htmlonreply'] = 'només en resposta a missatges en HTML';
 $labels['htmlonreplyandforward'] = 'en reenviament o resposta a missatge HTML';
 $labels['htmlsignature'] = 'Signatura en HTML';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'Mostra l\'adreça electrònica amb el nom';
 $labels['previewpane'] = 'Mostra el panell de previsualització';
 $labels['skin'] = 'Aparença d\'interfície';
 $labels['logoutclear'] = 'Buida la paperera al tancar la sessió';
@@ -422,7 +420,7 @@
 $labels['spellcheckignorecaps'] = 'Ignora paraules amb lletres capitalitzades';
 $labels['addtodict'] = 'Afegeix al diccionari';
 $labels['mailtoprotohandler'] = 'Registra controlador de protocol pels enllaços mailto:';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'Gestiona les finestres emergents com si fossin finestres normals';
 $labels['forwardmode'] = 'Reenviament de missatges';
 $labels['inline'] = 'en línia';
 $labels['asattachment'] = 'com adjunt';
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index 3085fd4..06a72cb 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Hi ha hagut un error!';
 $messages['loginfailed']  = 'L\'accés ha fallat.';
 $messages['cookiesdisabled'] = 'El vostre navegador no accepta cookies.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Introduïu termes de cerca per trobar contactes';
 $messages['sendingfailed'] = 'Error enviant el missatge.';
 $messages['senttooquickly'] = 'Si us plau, espereu $sec segon(s) abans d\'enviar aquest missatge.';
-$messages['errorsavingsent'] = 'Hi ha hagut un error mentre es desava el missatge enviat.';
-$messages['errorsaving'] = 'Hi ha hagut un error mentre s\'estava desant.';
 $messages['errormoving'] = 'No s\'ha pogut moure el(s) missatge(s).';
 $messages['errorcopying'] = 'No s\'ha pogut copiar el(s) missatge(s).';
 $messages['errordeleting'] = 'No s\'ha pogut suprimir el(s) missatge(s).';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Adreça de correu no vàlida: $email';
 $messages['toomanyrecipients'] = 'Massa destinataris. Reduïu el nombre de destinataris a $max.';
 $messages['maxgroupmembersreached'] = 'El nombre de membres del grup excedeix el màxim de $max.';
-$messages['internalerror'] = 'Hi ha hagut un error intern. Si us plau torneu-ho a provar.';
 $messages['contactdelerror'] = 'No s\'han pogut suprimir el(s) contacte(s).';
 $messages['contactdeleted'] = 'Contacte(s) suprimit(s) correctament.';
 $messages['contactrestoreerror'] = 'No s\'ha pogut restaurar el(s) contacte(s) suprimit(s).';
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index c690316..d887d8d 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Vítejte v $product';
 $labels['username']  = 'Uživatel';
 $labels['password']  = 'Heslo';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'Parametry hledání';
 $labels['msgtext']  = 'Celá zpráva';
 $labels['body']  = 'Tělo';
-$labels['type'] = 'Type';
+$labels['type'] = 'Typ';
+$labels['namex'] = 'Jméno';
 $labels['openinextwin'] = 'Otevřít v novém okně';
 $labels['emlsave'] = 'Stáhnout (.eml)';
 $labels['changeformattext'] = 'Zobrazit v textovém formátu';
@@ -317,8 +316,11 @@
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Importovat kontakty';
 $labels['importfromfile'] = 'Importovat ze souboru';
-$labels['importtarget'] = 'Přidat nové kontakty do seznamu kontaktů:';
+$labels['importtarget'] = 'Přidat kontakty k';
 $labels['importreplace'] = 'Nahradit celý seznam kontaktů';
+$labels['importgroups'] = 'Importovat přiřazení do skupin';
+$labels['importgroupsall'] = 'Vše (vytvořit skupiny v případě potřeby)';
+$labels['importgroupsexisting'] = 'Pouze pro existující skupiny';
 $labels['importdesc'] = 'Můžete nahrát kontakty z existujícího adresáře kontaktů.<br/>Momentálně podporujeme kontakty ve formátu <a href="http://cs.wikipedia.org/wiki/VCard">vCard</a> nebo CSV (comma-separated).';
 $labels['done'] = 'Hotovo';
 $labels['settingsfor'] = 'Nastavení pro';
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index c4a928f..0bd6b0e 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Došlo k chybě!';
 $messages['loginfailed']  = 'Přihlášení selhalo';
 $messages['cookiesdisabled'] = 'Váš prohlížeč nepodporuje cookies, které jsou pro přihlášení nezbytné';
@@ -100,13 +99,16 @@
 $messages['messageopenerror'] = 'Nemohu načíst zprávu ze serveru';
 $messages['fileuploaderror'] = 'Nahrávání souboru selhalo';
 $messages['filesizeerror'] = 'Soubor přesáhl maximální velikost $size';
-$messages['copysuccess'] = 'Úspěšně zkopírováno $nr adres';
-$messages['copyerror'] = 'Nemohu zkopírovat žádnou adresu';
+$messages['copysuccess'] = 'Úspěšně zkopírováno $nr kontaktů.';
+$messages['movesuccess'] = 'Úspěšně přesunuto $nr kontaktů.';
+$messages['copyerror'] = 'Kontakty nelze kopírovat.';
+$messages['moveerror'] = 'Kontakty nelze přesunout.';
 $messages['sourceisreadonly'] = 'Tento zdroj adres je pouze pro čtení';
 $messages['errorsavingcontact'] = 'Nemohu uložit adresu kontaktu';
 $messages['movingmessage'] = 'Přesouvám zprávu...';
 $messages['copyingmessage'] = 'Kopíruji zprávu...';
 $messages['copyingcontact'] = 'Kopíruji kontakty...';
+$messages['movingcontact'] = 'Přesouvání kontaktů()...';
 $messages['deletingmessage'] = 'Odstraňuji zprávu...';
 $messages['markingmessage'] = 'Označuji zprávu...';
 $messages['addingmember'] = 'Přidávám kontakty do skupiny...';
@@ -140,7 +142,7 @@
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
 $messages['toomanyrecipients'] = 'Příliš mnoho příjemců. Změňte počet příjemců na $max.';
 $messages['maxgroupmembersreached'] = 'Počet členských skupin dosáhl maximum z $max';
-$messages['internalerror'] = 'Došlo k interní chybě. Zkuste to znovu';
+$messages['internalerror'] = 'Došlo k interní chybě. Zkuste to prosím znovu.';
 $messages['contactdelerror'] = 'Kontakty nelze odstranit';
 $messages['contactdeleted'] = 'Kontakty byly odstraněny';
 $messages['contactrestoreerror'] = 'Nelze obnovit smazané kontakty';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index 5249af4..37ee5bb 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Croeso i $product';
 $labels['username']  = 'Enw defnyddiwr';
 $labels['password']  = 'Cyfrinair';
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 130ec2a..5dd8230 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Fe gafwyd gwall!';
 $messages['loginfailed']  = 'Methwyd a\'ch mewngofnodi';
 $messages['cookiesdisabled'] = 'Nid yw eich porwr yn derbyn cwcis';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Rhowch dermau chwilio i ganfod cysylltiadau';
 $messages['sendingfailed'] = 'Methwyd danfon y neges';
 $messages['senttooquickly'] = 'Arhoswch $sec eiliad cyn danfon y neges';
-$messages['errorsavingsent'] = 'Fe gafwyd gwall wrth cadw\'r neges ddanfonwyd';
-$messages['errorsaving'] = 'Fe gafwyd gwall wrth gadw';
 $messages['errormoving'] = 'Methwyd symud y neges';
 $messages['errorcopying'] = 'Methwyd copïo\'r neges(euon)';
 $messages['errordeleting'] = 'Methwyd dileu y neges';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Cyfeiriad e-bost anghywir: $email';
 $messages['toomanyrecipients'] = 'Gormod o dderbynnwyr. Lleihewch y nifer i $max';
 $messages['maxgroupmembersreached'] = 'Mae nifer o aelodau\'r grŵp yn fwy na\'r uchafswm o $max';
-$messages['internalerror'] = 'Fe gafwyd gwall mewnol. Rhowch gynnig arni eto.';
 $messages['contactdelerror'] = 'Methwyd dileu cyswllt';
 $messages['contactdeleted'] = 'Cyswllt wedi ei ddileu yn llwyddiannus';
 $messages['contactrestoreerror'] = 'Methwyd adfer y cyswllt/cysylltiadau a ddilëwyd';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 2bf9fa0..52de86d 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Velkommen til $product';
 $labels['username']  = 'Brugernavn';
 $labels['password']  = 'Adgangskode';
@@ -31,7 +29,7 @@
 $labels['sent']   = 'Sendt post';
 $labels['trash']  = 'Papirkurv';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = 'Vis rigtige navne for specielle mapper';
 $labels['subject'] = 'Emne';
 $labels['from']    = 'Afsender';
 $labels['sender']  = 'Afsender';
@@ -168,7 +166,7 @@
 $labels['folderactions'] = 'Mappehandlinger...';
 $labels['compact'] = 'Ryd op';
 $labels['empty'] = 'Tøm';
-$labels['importmessages'] = 'Import messages';
+$labels['importmessages'] = 'Importer beskeder';
 $labels['quota'] = 'Diskforbrug';
 $labels['unknown']  = 'ukendt';
 $labels['unlimited']  = 'ubegrænset';
@@ -178,6 +176,7 @@
 $labels['msgtext']  = 'Hele beskeden';
 $labels['body']  = 'Body';
 $labels['type'] = 'Type';
+$labels['namex'] = 'Navn';
 $labels['openinextwin'] = 'Åbn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
 $labels['changeformattext'] = 'Vis i ren tekst format';
@@ -310,14 +309,13 @@
 $labels['lastpage']       = 'Vis sidste side';
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Vis gruppemedlemmer';
 $labels['personaladrbook'] = 'Personlige adresser';
 $labels['searchsave'] = 'Gem søgning';
 $labels['searchdelete'] = 'Slet søgning';
 $labels['import'] = 'Importér';
 $labels['importcontacts'] = 'Importér kontakter';
 $labels['importfromfile'] = 'Importér fra fil:';
-$labels['importtarget'] = 'Tilføj nye kontakter til adressebogen:';
 $labels['importreplace'] = 'Overskriv hele adressebogen';
 $labels['importdesc'] = 'Du kan uploade kontakter fra en eksisterende adressebog. <br/>I øjeblikket supportere vi import af adresser fra <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> og CSV (komma-separeret) data format.';
 $labels['done'] = 'Færdig';
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index 79d9c4f..c12236e 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Der opstod en fejl!';
 $messages['loginfailed']  = 'Det lykkedes ikke at logge på.';
 $messages['cookiesdisabled'] = 'Din browser accepterer ikke cookies.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Indtast søgeord for at finde kontakter.';
 $messages['sendingfailed'] = 'Beskeden kunne ikke sendes.';
 $messages['senttooquickly'] = 'Vent venligst $sec sekunder før du sender denne besked.';
-$messages['errorsavingsent'] = 'Der opstod en fejl da den sendte besked blev gemt.';
-$messages['errorsaving'] = 'Der opstod en fejl under gemning.';
 $messages['errormoving'] = 'Beskeden kunne ikke flyttes.';
 $messages['errorcopying'] = 'Beskeden kunne ikke kopieres.';
 $messages['errordeleting'] = 'Beskeden kunne ikke slettes.';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Ugyldig e-mailadresse: $email';
 $messages['toomanyrecipients'] = 'For mange modtagere. Reducer antallet af modtagere til $max.';
 $messages['maxgroupmembersreached'] = 'Antallet af gruppemedlemmer overstiger maksimum på $max.';
-$messages['internalerror'] = 'Der opstod en intern fejl - prøv venligst igen.';
 $messages['contactdelerror'] = 'Kunne ikke slette kontakt(er).';
 $messages['contactdeleted'] = 'Kontakt(er) slettet.';
 $messages['contactrestoreerror'] = 'Kunne ikke gendanne slettede kontakt(er).';
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index c07443d..e5fe1ec 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Willkommen bei $product';
 $labels['username']  = 'Benutzername';
 $labels['password']  = 'Passwort';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index a46b6b0..4e5ccaa 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Fehlermeldung';
 $messages['loginfailed']  = 'Login fehlgeschlagen';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden';
 $messages['sendingfailed'] = 'Versand der Nachricht fehlgeschlagen';
 $messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht';
-$messages['errorsavingsent'] = 'Beim Speichern der gesendeten Nachricht ist ein Fehler aufgetreten.';
-$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten';
 $messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.';
 $messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.';
 $messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
 $messages['toomanyrecipients'] = 'Zuviele Empfänger angegeben. Reduzieren Sie die Empfängeradressen auf $max.';
 $messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max.';
-$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen Sie den Vorgang erneut.';
 $messages['contactdelerror'] = 'Fehler beim Löschen.';
 $messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
 $messages['contactrestoreerror'] = 'Die gelöschten Kontakte konnten nicht wiederhergestellt werden.';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 4da6115..e3f4652 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Willkommen bei $product';
 $labels['username']  = 'Benutzername';
 $labels['password']  = 'Passwort';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'Suchkriterien ändern';
 $labels['msgtext']  = 'Nachricht';
 $labels['body']  = 'Inhalt';
-$labels['type'] = 'Type';
+$labels['type'] = 'Typ';
+$labels['namex'] = 'Name';
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Lokal speichern (.eml)';
 $labels['changeformattext'] = 'Als reiner Text anzeigen';
@@ -310,15 +309,16 @@
 $labels['lastpage']       = 'Letzte Seite';
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppen';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Gruppenmitglieder auflisten';
 $labels['personaladrbook'] = 'Persönliches Adressbuch';
 $labels['searchsave'] = 'Suchergebnisse speichern';
 $labels['searchdelete'] = 'Suchergebnisse löschen';
 $labels['import'] = 'Importieren';
 $labels['importcontacts'] = 'Kontakte importieren';
 $labels['importfromfile'] = 'Import aus Datei:';
-$labels['importtarget'] = 'Einen neuen Kontakt hinzufügen:';
+$labels['importtarget'] = 'Kontakte hinzufügen zu';
 $labels['importreplace'] = 'Bestehendes Adressbuch komplett ersetzen';
+$labels['importgroupsexisting'] = 'Nur für existierende Gruppen';
 $labels['importdesc'] = 'Sie können Kontakte von einem vorhandenen Adressbuch hochladen.<br/>Zur Zeit wird der Import von Adressen im <a href="http://de.wikipedia.org/wiki/VCard">vCard</a> oder <a href="http://de.wikipedia.org/wiki/CSV_(Dateiformat)">CSV</a>Format unterstützt.';
 $labels['done'] = 'Fertig';
 $labels['settingsfor'] = 'Einstellungen für';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 815fac4..fbc2152 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Ein Fehler ist aufgetreten!';
 $messages['loginfailed']  = 'Die Anmeldung ist fehlgeschlagen.';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden.';
 $messages['sendingfailed'] = 'Versenden der Nachricht fehlgeschlagen.';
 $messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht.';
-$messages['errorsavingsent'] = 'Ein Fehler ist beim Speichern der gesendeten Nachricht aufgetreten.';
-$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten.';
 $messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.';
 $messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.';
 $messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email';
 $messages['toomanyrecipients'] = 'Zuviele Empfänger. Reduzieren Sie die Anzahl Empfängeradressen auf $max.';
 $messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max.';
-$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen es erneut.';
 $messages['contactdelerror'] = 'Fehler beim Löschen.';
 $messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.';
 $messages['contactrestoreerror'] = 'Konnte die gelöschten Kontakte nicht wiederherstellen.';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index d17041c..2e3ab40 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Καλώς ήρθατε στο $product';
 $labels['username']  = 'Όνομα Χρήστη';
 $labels['password']  = 'Κωδικός Πρόσβασης';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'Aλλαγή αναζήτησης';
 $labels['msgtext']  = 'Σε όλο το μήνυμα';
 $labels['body']  = 'Σώμα';
-$labels['type'] = 'Type';
+$labels['type'] = 'Τυπος';
+$labels['namex'] = 'όνομα';
 $labels['openinextwin'] = 'Άνοιγμα σε νέο παράθυρο';
 $labels['emlsave'] = 'Λήψη αρχείου (.eml)';
 $labels['changeformattext'] = 'Εμφάνιση σε μορφή απλού κειμένου';
@@ -310,14 +309,13 @@
 $labels['lastpage']       = 'Εμφάνιση της τελευταίας σελίδας';
 $labels['group'] = 'Ομάδα';
 $labels['groups'] = 'Ομάδες';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Μέλη της ομάδας λίστας';
 $labels['personaladrbook'] = 'Προσωπικές Διυθύνσεις';
 $labels['searchsave'] = 'Αποθήκευση αναζήτησης';
 $labels['searchdelete'] = 'Διαγραφή αποθηκευμένης αναζήτησης';
 $labels['import'] = 'Εισαγωγή';
 $labels['importcontacts'] = 'Εισαγωγή επαφών';
 $labels['importfromfile'] = 'Εισαγωγή από το αρχείο:';
-$labels['importtarget'] = 'Προσθήκη νέων επαφών στο βιβλίο διευθύνσεων:';
 $labels['importreplace'] = 'Αντικατάσταση όλου του βιβλίου διευθύνσεων';
 $labels['importdesc'] = 'Μπορείτε να ανεβάσετε επαφές από ένα υπάρχον βιβλίο διευθύνσεων.<br/>Υποστηρίζεται η εισαγωγή διευθύνσεων από αρχεία τύπου <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ή CSV (διαχωρισμένα με κόμμα).';
 $labels['done'] = 'Ολοκληρώθηκε';
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index eba82b5..be6639d 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Έχει προκύψει κάποιο σφάλμα!';
 $messages['loginfailed']  = 'Είσοδος απέτυχε';
 $messages['cookiesdisabled'] = 'Ο περιηγητής σας (browser) δεν αποδέχεται cookies';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Εισάγετε κάποιους όρους προς αναζήτηση';
 $messages['sendingfailed'] = 'Αποστολή μηνύματος απέτυχε';
 $messages['senttooquickly'] = 'Παρακαλώ περιμένετε $sec δευτερόλεπτα, πριν στείλετε το μήνυμα';
-$messages['errorsavingsent'] = 'Παρουσιάστηκε σφάλμα, κατά την αποθήκευση του απεσταλμένου μηνύματος';
-$messages['errorsaving'] = 'Παρουσιάστηκε σφάλμα κατά την αποθήκευση';
 $messages['errormoving'] = 'Το μήνυμα δε μπορούσε να μετακινηθεί';
 $messages['errorcopying'] = 'Δεν είναι δυνατή η αντιγραφή του μηνύματος/των';
 $messages['errordeleting'] = 'Το μήνυμα δε μπορούσε να διαγραφεί';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Λανθασμένη διεύθνση email: $email';
 $messages['toomanyrecipients'] = 'Μεγάλο πλήθος αποδεκτών. Μειώστε τον αριθμό των αποδεκτών σε $max.';
 $messages['maxgroupmembersreached'] = 'Ο αριθμός των μελών της ομάδας υπερβαίνει τον μέγιστο των $max μελών.';
-$messages['internalerror'] = 'Προέκυψε ένα εσωτερικό σφάλμα. Παρακαλώ δοκιμάστε πάλι.';
 $messages['contactdelerror'] = 'Δεν είναι δυνατή η διαγραφή της επαφής/ων';
 $messages['contactdeleted'] = 'Η επαφή/ές διαγράφηκαν με επιτυχία.';
 $messages['contactrestoreerror'] = 'Οι διαγραφημενη επαφη(ες) δεν μπορουν να επαναφερθουν.';
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index f86f3c3..c7778e9 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Welcome to $product';
 $labels['username']  = 'Username';
 $labels['password']  = 'Password';
@@ -31,10 +29,8 @@
 $labels['sent']   = 'Sent';
 $labels['trash']  = 'Deleted Items';
 $labels['junk']   = 'Junk';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Subject';
 $labels['from']    = 'From';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'To';
 $labels['cc']      = 'Copy';
 $labels['bcc']     = 'Bcc';
@@ -55,7 +51,6 @@
 $labels['move']     = 'Move';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Download';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'File name';
@@ -139,7 +134,6 @@
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -168,7 +162,6 @@
 $labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Compact';
 $labels['empty'] = 'Empty';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Disk usage';
 $labels['unknown']  = 'unknown';
 $labels['unlimited']  = 'unlimited';
@@ -176,12 +169,8 @@
 $labels['resetsearch']  = 'Reset search';
 $labels['searchmod']  = 'Search modifiers';
 $labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Edit as new';
 $labels['send']           = 'Send';
 $labels['sendmessage']    = 'Send now';
@@ -297,8 +286,6 @@
 $labels['contactsfromto'] = 'Contacts $from to $to of $count';
 $labels['print']          = 'Print';
 $labels['export']         = 'Export';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Export contacts in vCard format';
 $labels['newcontactgroup'] = 'Create new contact group';
 $labels['grouprename']    = 'Rename group';
@@ -310,14 +297,12 @@
 $labels['lastpage']       = 'Show last set';
 $labels['group'] = 'Group';
 $labels['groups'] = 'Groups';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Personal Addresses';
 $labels['searchsave'] = 'Save search';
 $labels['searchdelete'] = 'Delete search';
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Import contacts';
 $labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Replace the entire address book';
 $labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Done';
@@ -334,8 +319,6 @@
 $labels['preferhtml'] = 'Display HTML';
 $labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Message';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Date format';
 $labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Pretty dates';
@@ -352,7 +335,6 @@
 $labels['htmlonreply'] = 'on reply to HTML message only';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML signature';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -422,7 +404,6 @@
 $labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalised';
 $labels['addtodict'] = 'Add to dictionary';
 $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Messages forwarding';
 $labels['inline'] = 'inline';
 $labels['asattachment'] = 'as attachment';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index 5be8ac3..5b6a8f7 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -15,8 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred.';
+$messages['errortitle']  = 'An error occured.';
 $messages['loginfailed']  = 'Login failed.';
 $messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
 $messages['sessionerror'] = 'Your session is invalid or has expired.';
@@ -27,8 +26,6 @@
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
@@ -55,8 +52,6 @@
 $messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Failed to send message.';
 $messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occurred while saving sent message.';
-$messages['errorsaving'] = 'An error occurred while saving.';
 $messages['errormoving'] = 'Could not move the message(s).';
 $messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Could not delete the message(s).';
@@ -100,16 +95,11 @@
 $messages['messageopenerror'] = 'Could not load message from server.';
 $messages['fileuploaderror'] = 'File upload failed.';
 $messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'This address book is read-only.';
 $messages['errorsavingcontact'] = 'Could not save the contact address.';
 $messages['movingmessage'] = 'Moving message(s)...';
 $messages['copyingmessage'] = 'Copying message(s)...';
 $messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Deleting message(s)...';
 $messages['markingmessage'] = 'Marking message(s)...';
 $messages['addingmember'] = 'Adding contact(s) to the group...';
@@ -128,8 +118,6 @@
 $messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
 $messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Operation not permitted!';
 $messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
 $messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
@@ -143,7 +131,6 @@
 $messages['emailformaterror'] = 'Incorrect e-mail address: $email';
 $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
 $messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occurred. Please try again.';
 $messages['contactdelerror'] = 'Could not delete contact(s).';
 $messages['contactdeleted'] = 'Contact(s) deleted successfully.';
 $messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 2741eb2..0a55d36 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Bonvenon al $product';
 $labels['username']  = 'Uzantnomo';
 $labels['password']  = 'Pasvorto';
@@ -31,10 +29,9 @@
 $labels['sent']   = 'Senditujo';
 $labels['trash']  = 'Rubujo';
 $labels['junk']   = 'Spamujo';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Temo';
 $labels['from']    = 'Sendanto';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Sendinto';
 $labels['to']      = 'Ricevanto';
 $labels['cc']      = 'Kopio';
 $labels['bcc']     = 'Blindkopio';
@@ -55,9 +52,8 @@
 $labels['move']     = 'Movi';
 $labels['moveto']   = 'transloku al...';
 $labels['download'] = 'elŝutu';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
+$labels['showattachment'] = 'Montri';
+$labels['showanyway'] = 'Tamen montri ĝin';
 $labels['filename'] = 'Dosiernomo';
 $labels['filesize'] = 'Dosiergrando';
 $labels['addtoaddressbook'] = 'Aldonu al adresaro';
@@ -139,9 +135,8 @@
 $labels['unread'] = 'Nelegitan';
 $labels['flagged'] = 'Markita';
 $labels['unanswered'] = 'Nerespondita';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Forigita';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = 'Ne forigita';
 $labels['invert'] = 'Inversigu';
 $labels['filter'] = 'Filtru';
 $labels['list'] = 'Listo';
@@ -164,11 +159,10 @@
 $labels['listcolumns'] = 'List-rubrikoj';
 $labels['listsorting'] = 'Ordig-rubriko';
 $labels['listorder'] = 'Ordig-ordo';
-$labels['listmode'] = 'List view mode';
+$labels['listmode'] = 'Lista vido';
 $labels['folderactions'] = 'Dosierujo-agoj';
 $labels['compact'] = 'Kompakta';
 $labels['empty'] = 'Malplena';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Diskuzo';
 $labels['unknown']  = 'nekonata';
 $labels['unlimited']  = 'senlima';
@@ -176,14 +170,10 @@
 $labels['resetsearch']  = 'Vakigu serĉon';
 $labels['searchmod']  = 'Serĉ-opcioj';
 $labels['msgtext']  = 'Tuta mesaĝo';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Malfermu en nova fenestro';
 $labels['emlsave'] = 'Elŝutu (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Redaktu kiel nova';
-$labels['send']           = 'Send';
+$labels['send']           = 'Sendi';
 $labels['sendmessage']    = 'Sendu mesaĝon';
 $labels['savemessage']    = 'Savu ĉi tiun malneton';
 $labels['addattachment']  = 'Alfiksu dosieron';
@@ -213,9 +203,9 @@
 $labels['showimages'] = 'Montru bildojn';
 $labels['alwaysshow'] = 'Ĉiam montru bildojn de $sender';
 $labels['isdraft']    = 'Ĉi-mesaĝo estas malneto';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['andnmore']   = '$nr pli';
+$labels['togglemoreheaders'] = 'Montri pli multajn mesaĝtitolojn';
+$labels['togglefullheaders'] = 'Maligi ĉu mesaĝaj titoloj nudu';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plata teksto';
 $labels['savesentmessagein'] = 'Konservu senditan mesaĝon en';
@@ -239,7 +229,7 @@
 $labels['jobtitle']     = 'Postena titolo';
 $labels['department']   = 'Departemento';
 $labels['gender']       = 'Sekso';
-$labels['maidenname']   = 'Maiden Name';
+$labels['maidenname']   = 'Fraŭla nomo';
 $labels['email']        = 'Retpoŝto';
 $labels['phone']        = 'Telefono';
 $labels['address']      = 'Adreso';
@@ -272,7 +262,6 @@
 $labels['typeworkfax']  = 'Laboreja faksilo';
 $labels['typecar']  = 'Aŭtomobilo';
 $labels['typepager']  = 'Televokilo';
-$labels['typevideo']  = 'Video';
 $labels['typeassistant']  = 'Asistanto';
 $labels['typehomepage']  = 'Hejmpaĝo';
 $labels['typeblog'] = 'Blogo';
@@ -297,32 +286,13 @@
 $labels['contactsfromto'] = 'Kontaktoj ekde $from ĝis $to de $count';
 $labels['print']          = 'Presi';
 $labels['export']         = 'Elporti';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'Montru auntaŭan';
 $labels['firstpage']      = 'Montru unuan';
 $labels['nextpage']       = 'Montru sekvan';
 $labels['lastpage']       = 'Montru lastan';
-$labels['group'] = 'Group';
 $labels['groups'] = 'Grupoj';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Persona Adresoj';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
 $labels['settingsfor'] = 'Preferoj de';
-$labels['about'] = 'About';
 $labels['preferences'] = 'Preferoj';
 $labels['userpreferences'] = 'Uzant-preferoj';
 $labels['editpreferences'] = 'Redaktu uzant-preferojn';
@@ -332,27 +302,16 @@
 $labels['newitem'] = 'Nova ero';
 $labels['edititem'] = 'Redaktu eron';
 $labels['preferhtml'] = 'Montru HTML';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Mesaĝo';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Agrablaj Datoj';
 $labels['setdefault']  = 'Agordu kiel norma';
-$labels['autodetect']  = 'Auto';
 $labels['language']  = 'Lingvo';
 $labels['timezone']  = 'Tempzono';
 $labels['pagesize']  = 'Mesaĝoj po paĝo';
 $labels['signature'] = 'Subskribo';
 $labels['dstactive']  = 'Taglumsavado';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Uzado de HTML-redaktilo';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML subskribo';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Montru antaŭrigardejon';
 $labels['skin'] = 'Interfaco-etoso';
 $labels['logoutclear'] = 'Malplenigu rubujon je eliro';
@@ -363,69 +322,14 @@
 $labels['mdnrequests'] = 'Sendanto-sciigoj';
 $labels['askuser'] = 'demandu';
 $labels['autosend'] = 'sendu aŭtomate';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'malatentu';
 $labels['readwhendeleted'] = 'Marku mesaĝon kiel legita kiam forigata';
 $labels['flagfordeletion'] = 'Marku mesaĝon kiel forigita anstataŭ forigi';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
 $labels['showinlineimages'] = 'Montru alfiksitajn bildojn sub la mesaĝo';
 $labels['autosavedraft']  = 'Aŭtomate savu malneton';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'neniam';
-$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Mesaĝoj vidigante';
 $labels['messagescomposition'] = 'Mesaĝo-verkado';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Dosierujo';
 $labels['folders']  = 'Dosierujoj';
 $labels['foldername']  = 'Dosierujo-nomo';
@@ -434,48 +338,7 @@
 $labels['create']  = 'Krei';
 $labels['createfolder']  = 'Kreu novan dosierujon';
 $labels['managefolders']  = 'Administru dosierujon';
-$labels['specialfolders'] = 'Special Folders';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'Ordigu per';
 $labels['sortasc']  = 'Ordigu kreskante';
 $labels['sortdesc'] = 'Ordigu malkreskante';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index 75e34ef..17e3f17 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Eraro okazis!';
 $messages['loginfailed']  = 'Malsukcesis ensaluti';
 $messages['cookiesdisabled'] = 'Via foliumilo ne akceptas kuketojn';
@@ -24,20 +23,13 @@
 $messages['servererror'] = 'Servil-eraro!';
 $messages['servererrormsg'] = 'Servil-eraro: $msg';
 $messages['dberror'] = 'Datumbaz-eraro!';
-$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Ne povis fari agon. Dosierujo estas nurlega';
 $messages['errornoperm'] = 'Ne povis fari agon. Ne havas permeson.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Nevalida peto';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Neniu mesaĝo en ĉi tiu dosierujo';
 $messages['loggedout'] = 'Vi sukcese finis la seancon. Ĝis!';
 $messages['mailboxempty'] = 'Dosierujo estas malplena';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Ŝarganta...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Ŝarganta datumojn...';
 $messages['checkingmail'] = 'Kontrolanta, ĉu  novaj mesaĝoj...';
 $messages['sendingmessage'] = 'Sedanta mesaĝon...';
@@ -47,128 +39,43 @@
 $messages['successfullysaved'] = 'Sukcese savis';
 $messages['addedsuccessfully'] = 'Sukcese aldonis kontakton al adresaro';
 $messages['contactexists'] = 'Kontakto kun ĉi tiu adreso jam ekzistas';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Por protekti vian privatecon, foraj bildoj estas blokitaj en ĉi tiu mesaĝo.';
 $messages['encryptedmessage'] = 'Ĉi tiu mesaĝo estas ĉifrata kaj ne estas montrebla. Pardonu!';
 $messages['nocontactsfound'] = 'Trovis neniun kontakton';
 $messages['contactnotfound'] = 'La petita kontakto ne trovis';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Ne sukcesis sendi mesaĝon';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'Okazis eraro dum savo de mesaĝo';
 $messages['errormoving'] = 'Ne povis transloki mesaĝon';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Ne povis forigi mesaĝon';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'Ĉu vi vere volas forigi la elektata(j)n kontakto(j)n?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Ĉu vi vere volas forigi la elektata(j)n mesaĝo(j)n?';
 $messages['deletefolderconfirm']  = 'Ĉu vi vere volas forigi la elektatan dosierujon?';
 $messages['purgefolderconfirm']  = 'Ĉu vi vere volas forigi ĉiun mesaĝon el ĉi tiu dosierujo?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'La formularo ne estis kompletigita';
 $messages['noemailwarning'] = 'Bonvolu enmeti validan retpoŝt-adreson';
 $messages['nonamewarning']  = 'Bonvulu enmeti nomon';
 $messages['nopagesizewarning'] = 'Bonvolu enmeti paĝ-grando';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Bonvolu enmeti minumume unu ricevonto';
 $messages['nosubjectwarning']  = 'La temkampo estas malplena. Ĉu vi volas skribi temon nun?';
 $messages['nobodywarning'] = 'Ĉu sendi ĉi tiun mesaĝon sen teksto?';
 $messages['notsentwarning'] = 'Mesaĝo ne estas sendita. Ĉu vi volas forigi vian mesaĝon?';
 $messages['noldapserver'] = 'Bonvolu elekti ldap-servilon por serĉado';
 $messages['nosearchname'] = 'Bonvolu enmeti kontakt-nomon aŭ retpoŝt-adreson.';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'trovis $nr mesaĝojn';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Serĉo donis nenion';
 $messages['searching'] = 'Serĉanta...';
 $messages['checking'] = 'Kontrolanta...';
 $messages['nospellerrors'] = 'Neniujn literumada eraro trovita';
 $messages['folderdeleted'] = 'Forigis dosierujon sukcese';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Sukcese forigis';
 $messages['converting'] = 'Foriganta formatan de mesaĝo...';
 $messages['messageopenerror'] = 'Ne povis ŝargi mesaĝon de servilo';
 $messages['fileuploaderror'] = 'Malsukcesis alŝuti dosieron';
 $messages['filesizeerror'] = 'La alŝutita dosiero superas la maksimuman grandon de $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Ĉi tiu adres-fonto estas nurlegebla';
 $messages['errorsavingcontact'] = 'Ne povis savi la kontakt-adreson';
 $messages['movingmessage'] = 'Translokanta mesaĝon...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Sukcese sendis konfirmon';
 $messages['errorsendingreceipt'] = 'Ne povis sendi konfirmon';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Vi ne povas forigi ĉi tiun identon, ĉar ĝi estas la lasta';
 $messages['forbiddencharacter'] = 'Dosierujo-nomo enhavas malpermesitan karaktron';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index 65c3e46..eb4630e 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Bienvenido a $product';
 $labels['username']  = 'Nombre de usuario';
 $labels['password']  = 'Contraseña';
@@ -31,7 +29,6 @@
 $labels['sent']   = 'Enviados';
 $labels['trash']  = 'Papelera';
 $labels['junk']   = 'Basura';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Asunto';
 $labels['from']    = 'Remitente';
 $labels['sender']  = 'Remitente';
@@ -39,12 +36,10 @@
 $labels['cc']      = 'Copia';
 $labels['bcc']     = 'Cco';
 $labels['replyto'] = 'Responder a';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Fecha';
 $labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
-$labels['readstatus'] = 'Read status';
 $labels['listoptions'] = 'Listar opciones...';
 $labels['mailboxlist'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
@@ -55,7 +50,6 @@
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrar esto siempre';
 $labels['filename'] = 'Nombre del archivo';
@@ -139,7 +133,6 @@
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Marcado';
 $labels['unanswered'] = 'Sin respuesta';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eliminado';
 $labels['undeleted'] = 'No eliminado';
 $labels['invert'] = 'Invertir';
@@ -164,11 +157,9 @@
 $labels['listcolumns'] = 'Listar columnas';
 $labels['listsorting'] = 'Ordenar por';
 $labels['listorder'] = 'Ordenado por';
-$labels['listmode'] = 'List view mode';
 $labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Uso de disco';
 $labels['unknown']  = 'desconocido';
 $labels['unlimited']  = 'sin límite';
@@ -176,12 +167,8 @@
 $labels['resetsearch']  = 'Reajustar la búsqueda';
 $labels['searchmod']  = 'Opciones de búsqueda';
 $labels['msgtext']  = 'Mensaje completo';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Abrir en ventana nueva';
 $labels['emlsave'] = 'Guardar (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Editar como nuevo';
 $labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar ahora el mensaje';
@@ -215,7 +202,6 @@
 $labels['isdraft']    = 'Este es un borrador.';
 $labels['andnmore']   = '$nr más...';
 $labels['togglemoreheaders'] = 'Mostrarme más encabezados de mensaje';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto';
 $labels['savesentmessagein'] = 'Guardar mensaje enviado en';
@@ -224,7 +210,6 @@
 $labels['addcc'] = 'Añadir Cc';
 $labels['addbcc'] = 'Añadir Cco';
 $labels['addreplyto'] = 'Añadir Respuesta a';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando usted lo lea. ¿Quiere enviar esta notificación?';
 $labels['receiptread'] = 'Notificación de lectura';
 $labels['yourmessage'] = 'Esta es una notificación de lectura de su mensaje';
@@ -297,8 +282,6 @@
 $labels['contactsfromto'] = 'Contactos $from a $to de $count';
 $labels['print']          = 'Imprimir';
 $labels['export']         = 'Exportar';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Exportar contactos en format vCard';
 $labels['newcontactgroup'] = 'Crear Nuevo Grupo de Contacto';
 $labels['grouprename']    = 'Renombrar grupo';
@@ -310,14 +293,12 @@
 $labels['lastpage']       = 'Mostrar último grupo';
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Direcciones personales';
 $labels['searchsave'] = 'Guardar búsqueda';
 $labels['searchdelete'] = 'Eliminar búsqueda';
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde el archivo:';
-$labels['importtarget'] = 'Agregar nuevos contactos a la libreta de direcciones:';
 $labels['importreplace'] = 'Reemplazar completamente la lista de contactos';
 $labels['importdesc'] = 'Puedes subir contactos desde una libreta de direcciones existente.<br/>Actualmente soportamos la importación de direcciones utilizando el formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (Valores Separados por Coma).';
 $labels['done'] = 'Hecho';
@@ -334,8 +315,6 @@
 $labels['preferhtml'] = 'Prefiero HTML';
 $labels['defaultcharset'] = 'Juego de Caracteres por Defecto';
 $labels['htmlmessage'] = 'Mensaje HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Formato de fecha';
 $labels['timeformat'] = 'Formato de tiempo';
 $labels['prettydate'] = 'Fecha detallada';
@@ -352,7 +331,6 @@
 $labels['htmlonreply'] = 'al responder un mensaje HTML';
 $labels['htmlonreplyandforward'] = 'al reenviar o responder un mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
 $labels['logoutclear'] = 'Vaciar papelera al cerrar sesión';
@@ -363,21 +341,17 @@
 $labels['mdnrequests'] = 'Notificaciones de envío';
 $labels['askuser'] = 'preguntar al usuario';
 $labels['autosend'] = 'enviar automáticamente';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ignorar';
 $labels['readwhendeleted'] = 'Marcar el mensage como leído al borrarlo';
 $labels['flagfordeletion'] = 'Marcar el mensage para borrarse en vez de borrarlo';
 $labels['skipdeleted'] = 'No mostrar mensajes eliminados';
 $labels['deletealways'] = 'Cuando no se pueda mover un mensaje a la papelera, eliminarlo';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Mostrar imágenes remotas';
 $labels['fromknownsenders'] = 'de remitentes conocidos';
 $labels['always'] = 'siempre';
 $labels['showinlineimages'] = 'Mostrar imágenes adjuntas debajo del mensaje';
 $labels['autosavedraft']  = 'Guardar borrador automáticamente';
 $labels['everynminutes']  = 'cada $n minuto(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'nunca';
 $labels['immediately']  = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
@@ -391,15 +365,12 @@
 $labels['focusonnewmessage'] = 'Traer al frente la ventana del navegador cuando haya nuevos mensajes';
 $labels['checkallfolders'] = 'Verificar todas las carpetas por nuevos mensajes';
 $labels['displaynext'] = 'Luedo de eliminar/mover, mostrar el próximo mensaje';
-$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Opciones Principales';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Selección';
 $labels['maintenance'] = 'Mantenimiento';
 $labels['newmessage'] = 'Nuevo Mensaje';
 $labels['signatureoptions'] = 'Opciones de Firma';
 $labels['whenreplying'] = 'Al Responder';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'iniciar el nuevo mensaje sobre el original';
 $labels['replybottomposting'] = 'iniciar el nuevo mensaje debajo del original';
 $labels['replyremovesignature'] = 'Al responder, eliminar la firma del mensaje original';
@@ -409,23 +380,6 @@
 $labels['insertsignature'] = 'Insertar firma';
 $labels['previewpanemarkread']  = 'Marcar mensajes previsualizados como leidos';
 $labels['afternseconds']  = 'despues de $n segundos';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Carpeta';
 $labels['folders']  = 'Carpetas';
 $labels['foldername']  = 'Nombre de carpeta';
@@ -435,27 +389,9 @@
 $labels['createfolder']  = 'Crear nueva carpeta';
 $labels['managefolders']  = 'Administrar carpetas';
 $labels['specialfolders'] = 'Carpetas Especiales';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'Ordenar por';
 $labels['sortasc']  = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 7e5dba9..1c442c1 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Ha ocurrido un error!';
 $messages['loginfailed']  = 'Contraseña o nombre de usuario incorrecto';
 $messages['cookiesdisabled'] = 'Su navegador no acepta cookies';
@@ -27,8 +26,6 @@
 $messages['requesttimedout'] = 'Tiempo de espera agotado';
 $messages['errorreadonly'] = 'No se pudo realizar la operación. La carpeta es de sólo lectura.';
 $messages['errornoperm'] = 'No se pudo realizar la operación. Permiso denegado.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Peteción invalida! No se guardó nada.';
 $messages['invalidhost'] = 'Nombre de servidor inválido.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
@@ -55,8 +52,6 @@
 $messages['contactsearchonly'] = 'Ingresá algún término de búsqueda para encontrar contactos';
 $messages['sendingfailed'] = 'Error al enviar mensaje';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de enviar este mensaje';
-$messages['errorsavingsent'] = 'Ocurrió un error al guardar el mensaje enviado';
-$messages['errorsaving'] = 'Ocurrió un error al guardar';
 $messages['errormoving'] = 'No se pudo mover el mensaje';
 $messages['errorcopying'] = 'No se pudo copiar el mensaje';
 $messages['errordeleting'] = 'No se ha podido eliminar el mensaje';
@@ -100,16 +95,11 @@
 $messages['messageopenerror'] = 'No puedo descargar el mensaje del servidor';
 $messages['fileuploaderror'] = 'Error al subir archivos';
 $messages['filesizeerror'] = 'El archivo excede el tamaño maximo ($size)';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Esta dirección es de sólo-lectura';
 $messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto';
 $messages['movingmessage'] = 'Moviendo mensaje...';
 $messages['copyingmessage'] = 'Copiando mensaje...';
 $messages['copyingcontact'] = 'Copiando contacto(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Eliminando contacto(s)...';
 $messages['markingmessage'] = 'Marcando mensaje(s)...';
 $messages['addingmember'] = 'Agregando contacto(s) al grupo...';
@@ -128,8 +118,6 @@
 $messages['importformaterror'] = 'Importación fallida! El archivo subido no es un archivo de importación de datos válido.';
 $messages['importconfirm'] = '<b>Se importaron $inserted contactos correctamente. $skipped ya existentes fueron ignorados</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Se ignoraron $skipped entradas ya existentes</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Operación no permitida!';
 $messages['nofromaddress'] = 'El contacto seleccionado no tiene dirección de e-mail';
 $messages['editorwarning'] = 'Si cambia a texto plano se perderán todas las opciones de formato. ¿Desea continuar?';
@@ -143,7 +131,6 @@
 $messages['emailformaterror'] = 'La dirección $email no es válida';
 $messages['toomanyrecipients'] = 'Demasiados destinatarios. Reduzca la cantidad a un máximo de $max.';
 $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max';
-$messages['internalerror'] = 'Ocurrió un error interno. Por favor, intentá de nuevo.';
 $messages['contactdelerror'] = 'No se pudo eliminar el/los contactos(s).';
 $messages['contactdeleted'] = 'Contacto(s) eliminado/s exitosamente.';
 $messages['contactrestoreerror'] = 'No se pudo recuperar el/los contacto/s eliminado(s).';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index c2dd4dc..66fcafd 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Bienvenido a $product';
 $labels['username']  = 'Nombre de usuario';
 $labels['password']  = 'Contraseña';
@@ -178,6 +176,7 @@
 $labels['msgtext']  = 'Mensaje completo';
 $labels['body']  = 'Cuerpo';
 $labels['type'] = 'Tipo';
+$labels['namex'] = 'Nombre';
 $labels['openinextwin'] = 'Abrir en nueva ventana';
 $labels['emlsave'] = 'Descargar (.eml)';
 $labels['changeformattext'] = 'Mostrar en formato de texto sencillo';
@@ -317,8 +316,11 @@
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde archivo:';
-$labels['importtarget'] = 'Añadir un nuevo contacto a la los contactos:';
+$labels['importtarget'] = 'Agregar contactos a';
 $labels['importreplace'] = 'Reemplazar toda la lista de contactos';
+$labels['importgroups'] = 'Importar asignaciones de grupo';
+$labels['importgroupsall'] = 'Todos (crear grupos si es necesario)';
+$labels['importgroupsexisting'] = 'Sólo para los grupos existentes';
 $labels['importdesc'] = 'Puede subir contactos desde una libreta de direcciones existente.<br/>Actualmente permitimos la importación desde los formatos de datos <a href="http://es.wikipedia.org/wiki/VCard">vCard</a> o CSV (separados por comas).';
 $labels['done'] = 'Hecho';
 $labels['settingsfor'] = 'Configuración para';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 672db9f..3a8b5ab 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = '¡Ha ocurrido un error!';
 $messages['loginfailed']  = 'Contraseña o nombre de usuario incorrecto.';
 $messages['cookiesdisabled'] = 'Su navegador no acepta cookies.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Ingrese algún criterio para buscar contactos';
 $messages['sendingfailed'] = 'Error al enviar mensaje.';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de mandar este mensaje.';
-$messages['errorsavingsent'] = 'Ha ocurrido un error al guardar el mensaje enviado.';
-$messages['errorsaving'] = 'Ocurrió un error mientras se guardaba.';
 $messages['errormoving'] = 'No se ha podido mover el/los mensaje(s).';
 $messages['errorcopying'] = 'No se ha podido copiar el/los mensaje(s).';
 $messages['errordeleting'] = 'No se ha podido eliminar el/los mensaje(s).';
@@ -100,13 +97,16 @@
 $messages['messageopenerror'] = 'No puedo descargar el mensaje del servidor.';
 $messages['fileuploaderror'] = 'Error al subir archivos.';
 $messages['filesizeerror'] = 'El archivo excede el tamaño máximo ($size).';
-$messages['copysuccess'] = '$nr direcciones copiadas correctamente.';
-$messages['copyerror'] = 'No se pudo copiar ninguna dirección.';
+$messages['copysuccess'] = '$nr contactos copiados correctamente.';
+$messages['movesuccess'] = '$nr contactos movidos correctamente.';
+$messages['copyerror'] = 'No se ha podido copiar ningún contacto.';
+$messages['moveerror'] = 'No se ha podido mover ningún contacto.';
 $messages['sourceisreadonly'] = 'Esta dirección es de sólo lectura.';
 $messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto.';
 $messages['movingmessage'] = 'Moviendo mensaje(s)...';
 $messages['copyingmessage'] = 'Copiando mensaje(s)...';
 $messages['copyingcontact'] = 'Copiando contacto(s)…';
+$messages['movingcontact'] = 'Moviendo contacto(s)...';
 $messages['deletingmessage'] = 'Eliminando mensaje(s)...';
 $messages['markingmessage'] = 'Marcando mensaje(s)...';
 $messages['addingmember'] = 'Añadiendo contacto(s) al grupo…';
@@ -140,7 +140,6 @@
 $messages['emailformaterror'] = 'Dirección e-mail incorrecta: $email';
 $messages['toomanyrecipients'] = 'Hay demasiados destinatarios. Reduzca el número de destinatarios a $max.';
 $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max.';
-$messages['internalerror'] = 'Ocurrió un error interno. Por favor, inténtelo de nuevo.';
 $messages['contactdelerror'] = 'No se ha podido eliminar el/los contacto(s).';
 $messages['contactdeleted'] = 'Contacto(s) eliminado(s) correctamente.';
 $messages['contactrestoreerror'] = 'No se han podido restaurar los contactos borrados.';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index aab7c20..42a268d 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Tere tulemast! See on $product.';
 $labels['username']  = 'Kasutajanimi';
 $labels['password']  = 'Parool';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'Otsingu laiendid';
 $labels['msgtext']  = 'Kogu kirjast';
 $labels['body']  = 'Keha';
-$labels['type'] = 'Type';
+$labels['type'] = 'Tüüp';
+$labels['namex'] = 'Nimi';
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['emlsave'] = 'Salvesta (.eml)';
 $labels['changeformattext'] = 'Näita lihttekstina';
@@ -317,7 +316,6 @@
 $labels['import'] = 'Impordi';
 $labels['importcontacts'] = 'Impordi kontakte';
 $labels['importfromfile'] = 'Impordi failist:';
-$labels['importtarget'] = 'Lisa uued kontaktid aadressiraamatusse:';
 $labels['importreplace'] = 'Asenda kogu aadressiraamat';
 $labels['importdesc'] = 'Sa saad laadida kontakte olemasolevast aadressiraamatust.<br/>Praegu on võimalik importida <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> või CSV (komaga eraldatud) formaadis andmeid. ';
 $labels['done'] = 'Valmis';
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 6d47527..0d2c79b 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Ilmnes tõrge!';
 $messages['loginfailed']  = 'Sisselogimine ebaõnnestus';
 $messages['cookiesdisabled'] = 'Sinu veebilehitseja ei võta präänikuid vastu';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Sisesta otsingusõna kontaktide leidmiseks';
 $messages['sendingfailed'] = 'Kirja saatmine ebaõnnestus';
 $messages['senttooquickly'] = 'Palun oota enne selle kirja saatmist $sec sekundit.';
-$messages['errorsavingsent'] = 'Saadetud kirja salvestamisel ilmnes tõrge';
-$messages['errorsaving'] = 'Salvestamise ajal ilmnes viga';
 $messages['errormoving'] = 'Ei suutnud seda kirja liigutada';
 $messages['errorcopying'] = 'Kirju ei õnnestunud kopeerida';
 $messages['errordeleting'] = 'Ei suutnud seda kirja kustutada';
@@ -100,13 +97,16 @@
 $messages['messageopenerror'] = 'Kirjade serverist laadimine ebaõnnestus';
 $messages['fileuploaderror'] = 'Faili üleslaadimine ebaõnnestus';
 $messages['filesizeerror'] = 'Üleslaetava faili suurus ületab maksimaalse suuruse $size';
-$messages['copysuccess'] = '$nr aadressi edukalt kopeeritud';
-$messages['copyerror'] = 'Ühegi aadressi kopeerimine ei õnnestunud';
+$messages['copysuccess'] = '$nr kontakti edukalt kopeeritud.';
+$messages['movesuccess'] = '$nr kontakti edukalt liigutatud.';
+$messages['copyerror'] = 'Ühegi kontakti kopeerimine ei õnnestunud.';
+$messages['moveerror'] = 'Ühegi kontakti liigutamine ei õnnestunud.';
 $messages['sourceisreadonly'] = 'Aadressi asukohas puuduvad kirjutusõigused';
 $messages['errorsavingcontact'] = 'Kontakti aadressi salvestamine ebaõnnestus';
 $messages['movingmessage'] = 'Liigutan kirja...';
 $messages['copyingmessage'] = 'Kopeerin kirja...';
 $messages['copyingcontact'] = 'Kontakti(de) kopeerimine…';
+$messages['movingcontact'] = 'Kontakti(de) liigutamine…';
 $messages['deletingmessage'] = 'Kustutan kirja...';
 $messages['markingmessage'] = 'Märgin kirja...';
 $messages['addingmember'] = 'Kontakti(de) gruppi lisamine…';
@@ -140,7 +140,6 @@
 $messages['emailformaterror'] = 'Lubamatu e-posti aadress: $email';
 $messages['toomanyrecipients'] = 'Liiga palju adressaate. Vähenda kirja saajate hulka $max-ni.';
 $messages['maxgroupmembersreached'] = 'Grupi liikmete arv ületab suurima lubatud $max';
-$messages['internalerror'] = 'Ilmnes sisemine tõrge. Palun proovi uuesti.';
 $messages['contactdelerror'] = 'Kontaktide kustutamine nurjus';
 $messages['contactdeleted'] = 'Kontaktide kustutamine õnnestus';
 $messages['contactrestoreerror'] = 'Kustutatud kontakti(de) taastamine nurjus.';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 89b19cf..bbfd0c6 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Ongi etorri $product';
 $labels['username']  = 'Erabiltzailea';
 $labels['password']  = 'Pasahitza';
@@ -31,7 +29,7 @@
 $labels['sent']   = 'Bidalitakoak';
 $labels['trash']  = 'Zakarrontzia';
 $labels['junk']   = 'Zabor-posta';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = 'Erakutsi karpeta berezien benetako izenak';
 $labels['subject'] = 'Gaia';
 $labels['from']    = 'Nork';
 $labels['sender']  = 'Igorlea';
@@ -55,9 +53,9 @@
 $labels['move']     = 'Mugitu';
 $labels['moveto']   = 'mugitu hona...';
 $labels['download'] = 'deskargatu';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
+$labels['open']     = 'Ireki';
+$labels['showattachment'] = 'Erakutsi';
+$labels['showanyway'] = 'Erakutsi edonola';
 $labels['filename'] = 'Fitxategi Izena';
 $labels['filesize'] = 'Fitxategi Tamaina';
 $labels['addtoaddressbook'] = 'Helbide liburura gehitu';
@@ -110,7 +108,7 @@
 $labels['replyall']         = 'Guztiei erantzun';
 $labels['replylist']        = 'Erantzun zerrenda';
 $labels['forward']          = 'Berbidali';
-$labels['forwardinline']    = 'Forward inline';
+$labels['forwardinline']    = 'Aurrera barnean';
 $labels['forwardattachment'] = 'Erantsi gisa berbidali';
 $labels['forwardmessage']   = 'Mezua Birbidali';
 $labels['deletemessage']    = 'Mezua ezabatu';
@@ -138,72 +136,73 @@
 $labels['currpage'] = 'Uneko orrialdea';
 $labels['unread'] = 'Irakurri gabeak';
 $labels['flagged'] = 'Banderaduna';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
+$labels['unanswered'] = 'Erantzun gabea';
+$labels['withattachment'] = 'Eranskinarekin';
 $labels['deleted'] = 'Ezabatuak';
 $labels['undeleted'] = 'Ezabatu gabeak';
-$labels['invert'] = 'Invert';
-$labels['filter'] = 'Filter';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
+$labels['invert'] = 'Alderantzizkatu';
+$labels['filter'] = 'Iragazkia';
+$labels['list'] = 'Zerrenda';
+$labels['threads'] = 'Hariak';
+$labels['expand-all'] = 'Irekin denak';
+$labels['expand-unread'] = 'Ireki irakurri gabeak';
+$labels['collapse-all'] = 'Tolestu guztiak';
+$labels['threaded'] = 'Harian';
+$labels['autoexpand_threads'] = 'Irekin mezu-hariak';
+$labels['do_expand'] = 'hari guztiak';
+$labels['expand_only_unread'] = 'soilik irakurri gabeko mezuak dutenak';
 $labels['fromto'] = 'Nork/Nori';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
+$labels['flag'] = 'Bandera';
+$labels['attachment'] = 'Eranskina';
 $labels['nonesort'] = 'Bat ere ez';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
+$labels['sentdate'] = 'Bidalketa-data';
+$labels['arrival'] = 'Jasotze-data';
+$labels['asc'] = 'gora';
+$labels['desc'] = 'behera';
+$labels['listcolumns'] = 'Zerrenda-zutabeak';
+$labels['listsorting'] = 'Zutabea ordenatzen';
+$labels['listorder'] = 'Ordenatze era';
+$labels['listmode'] = 'Zerrenda ikuspegia';
+$labels['folderactions'] = 'Karpeta-ekintzak...';
 $labels['compact'] = 'Trinkotu';
 $labels['empty'] = 'Hustu';
-$labels['importmessages'] = 'Import messages';
+$labels['importmessages'] = 'Inportatu mezuak';
 $labels['quota'] = 'Disko erabilera';
 $labels['unknown']  = 'ezezaguna';
 $labels['unlimited']  = 'mugagabea';
 $labels['quicksearch']  = 'Bilaketa azkarra';
 $labels['resetsearch']  = 'Bilaketa berrabiarazi';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
+$labels['searchmod']  = 'Bilatu modifikadoreak';
+$labels['msgtext']  = 'Mezu osoa';
+$labels['body']  = 'Gorputza';
+$labels['type'] = 'Mota';
+$labels['namex'] = 'Izena';
 $labels['openinextwin'] = 'Lehio berrian ireki';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
+$labels['emlsave'] = 'Deskargatu (.eml)';
+$labels['changeformattext'] = 'Bistaratu testua formaturik gabe';
+$labels['changeformathtml'] = 'Bistaratu HTML formatuan';
+$labels['editasnew']      = 'Editatu berri bezala';
+$labels['send']           = 'Bidali';
 $labels['sendmessage']    = 'Mezua orain bidali';
 $labels['savemessage']    = 'Zirriborro hau gorde';
 $labels['addattachment']  = 'Fitxategia erantsi';
 $labels['charset']        = 'Karaktere jokoa';
 $labels['editortype']     = 'Editore mota';
-$labels['returnreceipt']  = 'Bidaltzaileari itzuli';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['returnreceipt']  = 'Bidali jasotze-agiria';
+$labels['dsn']            = 'Entrega-egoeraren jakinarazpena';
+$labels['mailreplyintro'] = '$date egunean, $sender-(e)k idatzi du:';
 $labels['originalmessage'] = 'Jatorrizko mezua';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
+$labels['editidents']    = 'Editatu identitateak';
+$labels['spellcheck']    = 'Ortografia-egiaztatu';
 $labels['checkspelling'] = 'Egiaztaketa ortografikoa';
 $labels['resumeediting'] = 'Editatzen jarraitu';
 $labels['revertto']      = 'Itzuli hona';
-$labels['attach'] = 'Attach';
+$labels['attach'] = 'Erantsi';
 $labels['attachments'] = 'Eranskinak';
 $labels['upload'] = 'Igo';
-$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['uploadprogress'] = '$percent ($current/$total)';
 $labels['close']  = 'Itxi';
-$labels['messageoptions']  = 'Message options...';
+$labels['messageoptions']  = 'Mezu-aukerak';
 $labels['low']     = 'Baxua';
 $labels['lowest']  = 'Baxuena';
 $labels['normal']  = 'Normala';
@@ -212,117 +211,116 @@
 $labels['nosubject']  = '(gairik gabea)';
 $labels['showimages'] = 'Irudiak bistarazi';
 $labels['alwaysshow'] = 'Beti ikusi $sender -en irudiak';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['isdraft']    = 'Hau zirriborro bat da';
+$labels['andnmore']   = '$nr gehiago...';
+$labels['togglemoreheaders'] = 'Erakutsi mezu mezu-goiburu gehiago';
+$labels['togglefullheaders'] = 'Aldatu mezu gordinen goiburuak';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testu laua';
 $labels['savesentmessagein'] = 'Gorde mezua hemen';
 $labels['dontsave'] = 'ez gorde';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+$labels['maxuploadsize'] = 'Baimendutako gehienezko fitxategi tamaina: $size';
 $labels['addcc'] = 'Gehitu Cc (kopia)';
 $labels['addbcc'] = 'Gehitu Bcc (kopia ezkutua)';
 $labels['addreplyto'] = 'Gehitu erantzun-honi';
-$labels['addfollowupto'] = 'Add Followup-To';
+$labels['addfollowupto'] = 'Gehitu Jarraitu honi';
 $labels['mdnrequest'] = 'Mezu honen bidaltzaileak mezua irakurtzen duzunean jakinaraztea eskatu du. Bidaltzailea ohartu nahi duzu?';
-$labels['receiptread'] = 'Itzulketa agiria (irakurria)';
-$labels['yourmessage'] = 'Hau zure mezuaren Itzulketa Agiria da';
-$labels['receiptnote'] = 'Oharra: Agiri honek hartzailearen ordenagailuan mezua ikusi dala adierazten du besterik gabe. Honek ez du esan nahi hartzaileak mezua irakurri edo/eta ulertu duenik:';
+$labels['receiptread'] = 'Bidali jasotze-agiria (irakurria)';
+$labels['yourmessage'] = 'Hau zure mezuaren jasotze-agiria da';
+$labels['receiptnote'] = 'Oharra:  jasotze-agiri honek hartzailearen ordenagailuan mezua ikusi dala adierazten du besterik gabe. Honek ez du esan nahi hartzaileak mezua irakurri edo/eta ulertu duenik:';
 $labels['name']         = 'Izena bistarazi';
 $labels['firstname']    = 'Izena';
 $labels['surname']      = 'Abizena';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
+$labels['middlename']   = 'Izenaren bigarren partea';
+$labels['nameprefix']   = 'Aurrizkia';
+$labels['namesuffix']   = 'Atzizkia';
 $labels['nickname']     = 'Ezizena';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
+$labels['jobtitle']     = 'Lanpostua ';
+$labels['department']   = 'Departamentoa';
+$labels['gender']       = 'Generoa';
+$labels['maidenname']   = 'Ezkondu aurreko izena';
 $labels['email']        = 'ePosta';
-$labels['phone']        = 'Phone';
+$labels['phone']        = 'Telefonoa';
 $labels['address']      = 'Helbidea';
 $labels['street']       = 'Kalea';
-$labels['locality']     = 'City';
+$labels['locality']     = 'Herria';
 $labels['zipcode']      = 'Posta kodea';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
+$labels['region']       = 'Estatua/Probintzia';
+$labels['country']      = 'Herrialdea';
+$labels['birthday']     = 'Urtebetetze-eguna';
+$labels['anniversary']  = 'Urteurren-eguna';
+$labels['website']      = 'Webgunea';
+$labels['instantmessenger'] = 'Txata';
+$labels['notes'] = 'Oharrak';
+$labels['male']   = 'gizon';
+$labels['female'] = 'emakume';
+$labels['manager'] = 'Kudeatzailea';
+$labels['assistant'] = 'Laguntzailea';
+$labels['spouse'] = 'Ezkontidea';
+$labels['allfields'] = 'Eremu guztiak';
+$labels['search'] = 'Bilatu';
+$labels['advsearch'] = 'Bilaketa aurreratua';
+$labels['advanced'] = 'Aurreratua';
+$labels['other'] = 'Beste';
+$labels['typehome']   = 'Etxekoa';
+$labels['typework']   = 'Lanekoa';
+$labels['typeother']  = 'Beste';
 $labels['typemobile']  = 'Mugikorra';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
-$labels['addcontact'] = 'Txartel berria gehitu';
-$labels['editcontact'] = 'Txartela editatu';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
+$labels['typemain']  = 'Nagusia';
+$labels['typehomefax']  = 'Etxeko faxa';
+$labels['typeworkfax']  = 'Laneko faxa';
+$labels['typecar']  = 'Autoa';
+$labels['typepager']  = 'Bilagailua';
+$labels['typevideo']  = 'Bideo';
+$labels['typeassistant']  = 'Laguntzailea';
+$labels['typehomepage']  = 'Etxeko orria';
+$labels['typeblog'] = 'Bloga';
+$labels['typeprofile'] = 'Profila';
+$labels['addfield'] = 'Gehitu eremua...';
+$labels['addcontact'] = 'Gehitu kontaktu berria';
+$labels['editcontact'] = 'Editatu kontaktua';
+$labels['contacts'] = 'Kontaktuak';
+$labels['contactproperties'] = 'Kontaktuen ezaugarriak';
 $labels['personalinfo'] = 'Informazio pertsonala';
 $labels['edit']   = 'Editatu';
 $labels['cancel'] = 'Utzi';
 $labels['save']   = 'Gorde';
 $labels['delete'] = 'Ezabatu';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
-$labels['newcontact']     = 'Helbide liburu txartel berria sortu';
-$labels['deletecontact']  = 'Aukeraturiko txartelak ezabatu';
-$labels['composeto']      = 'Bidali mezua honi:';
-$labels['contactsfromto'] = '$from -tik $to -ra $count txarteletatik';
+$labels['rename'] = 'Berrizendatu';
+$labels['addphoto'] = 'Gehitu';
+$labels['replacephoto'] = 'Ordeztu';
+$labels['uploadphoto'] = 'Kargatu argazkia';
+$labels['newcontact']     = 'Sortu kontaktu-txartel berria';
+$labels['deletecontact']  = 'Ezabatu hautatutako kontaktuak';
+$labels['composeto']      = 'Idatzi mezua honi:';
+$labels['contactsfromto'] = '$from -tik $to -ra $count kontaktuak';
 $labels['print']          = 'Inprimatu';
 $labels['export']         = 'Esportatu';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
-$labels['previouspage']   = 'Aurreko sorta ikusi';
-$labels['firstpage']      = 'Lehenengo sorta ikusi';
-$labels['nextpage']       = 'Hurrengo sorta ikusi';
-$labels['lastpage']       = 'Azken sorta ikusi';
-$labels['group'] = 'Group';
+$labels['exportall']      = 'Esportatu dena';
+$labels['exportsel']      = 'Esportatu hautaketa';
+$labels['exportvcards']   = 'Esportatu kontaktuak vCard formatuan';
+$labels['newcontactgroup'] = 'Sortu kontaktu-talde berria';
+$labels['grouprename']    = 'Berrizendatu taldea';
+$labels['groupdelete']    = 'Ezabatu taldea';
+$labels['groupremoveselected'] = 'Ezabatu taldetik hautatutako kontaktuak';
+$labels['previouspage']   = 'Aurreko orria ikusi';
+$labels['firstpage']      = 'Lehenengo orria ikusi';
+$labels['nextpage']       = 'Hurrengo orria ikusi';
+$labels['lastpage']       = 'Azken orria ikusi';
+$labels['group'] = 'Taldea';
 $labels['groups'] = 'Taldeak';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Zerrendatu taldeko partaideak';
 $labels['personaladrbook'] = 'Helbide pertsonalak';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
+$labels['searchsave'] = 'Gorde bilaketa';
+$labels['searchdelete'] = 'Ezabatu bilaketa';
+$labels['import'] = 'Inportatu';
+$labels['importcontacts'] = 'Inportatu kontaktoak';
+$labels['importfromfile'] = 'Inportatu fitxategi honetatik:';
+$labels['importreplace'] = 'Ordezkatu helbide-liburu osoa';
+$labels['importdesc'] = 'Gehitzen ahal duzu kontaktuak dagoen helbide-liburu batetik.<br/>Inportatzeko onartzen diren formatuak:  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> eta CSV (komaz banandutakoak).';
+$labels['done'] = 'Egina';
 $labels['settingsfor'] = 'Honen ezarpenak:';
-$labels['about'] = 'About';
+$labels['about'] = 'Honi buruz';
 $labels['preferences'] = 'Hobespenak';
 $labels['userpreferences'] = 'Erabiltzaile hobespenak';
 $labels['editpreferences'] = 'Erabiltzaile hobespenak editatu';
@@ -332,100 +330,101 @@
 $labels['newitem'] = 'Elementu berria';
 $labels['edititem'] = 'Elementua Editatu';
 $labels['preferhtml'] = 'HTML nahiago';
-$labels['defaultcharset'] = 'Default Character Set';
-$labels['htmlmessage'] = 'HTML Mezua';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
+$labels['defaultcharset'] = 'Lehenetsitako karaktere-jokoa';
+$labels['htmlmessage'] = 'HTML mezua';
+$labels['messagepart'] = 'Zatia';
+$labels['digitalsig'] = 'Sinadura digitala';
+$labels['dateformat'] = 'Data-formatua';
+$labels['timeformat'] = 'Ordu-formatua';
 $labels['prettydate'] = 'Data politak';
 $labels['setdefault']  = 'Lehenespenak ezarri';
-$labels['autodetect']  = 'Auto';
+$labels['autodetect']  = 'Automatikoa';
 $labels['language']  = 'Hizkuntza';
 $labels['timezone']  = 'Ordu zonaldea';
 $labels['pagesize']  = 'Lerro orrialdeko';
 $labels['signature'] = 'Sinadura';
 $labels['dstactive']  = 'Eguneko gordeketak';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
-$labels['htmleditor'] = 'HTML mezuak sortu';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['showinextwin'] = 'Ireki mezua leiho berrian';
+$labels['composeextwin'] = 'Idatzi leiho berrian';
+$labels['htmleditor'] = 'Idatzi HTML mezuak';
+$labels['htmlonreply'] = 'HTML mezua erantzuteko';
+$labels['htmlonreplyandforward'] = 'HTML mezua erantzuteko edo birbidaltzeko';
 $labels['htmlsignature'] = 'HTML sinadura';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'Erakutsi helbide elektronikoak bere pantaila izenarekin';
 $labels['previewpane'] = 'Aurrebista panela ikusi';
 $labels['skin'] = 'Azal-interfazea';
 $labels['logoutclear'] = 'Garbitu Zakarronzia irtetean';
 $labels['logoutcompact'] = 'Trinkotu Sarrera irtetean';
 $labels['uisettings'] = 'Erabiltzaile-interfazea';
 $labels['serversettings'] = 'Zerbitzariaren ezarpenak';
-$labels['mailboxview'] = 'Postakutxatilaren ikuspegia';
+$labels['mailboxview'] = 'Posta-kutxatila ikuspegia';
 $labels['mdnrequests'] = 'Bidaltzailearen jakinarazpena';
 $labels['askuser'] = 'galdetu erabiltzaileari';
-$labels['autosend'] = 'bidali automatikoki';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ezikusi';
+$labels['autosend'] = 'bidali jasotze-agiria';
+$labels['autosendknown'] = 'bidali jasotze-agiria nire kontaktuei, bestela galdetu niri';
+$labels['autosendknownignore'] = 'bidali jasotze-agiria nire kontaktuei, bestela ez ikusi egin';
+$labels['ignore'] = 'ez ikusi';
 $labels['readwhendeleted'] = 'Markatu mezua irakurrita bezala ezabatzerakoan';
 $labels['flagfordeletion'] = 'Markatu mezua ezabatzeko ezabatu beharrean';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
+$labels['skipdeleted'] = 'Ez erakutsi ezabatutako mezuak';
+$labels['deletealways'] = 'Zakarrontzira bidaltzeak huts egiten badu, ezabatu';
+$labels['deletejunk'] = 'Ezabatu zuzenean 
+zabor-mezuak';
+$labels['showremoteimages'] = 'Erakutsi konektatutako urrutiko irudiak';
+$labels['fromknownsenders'] = 'bidaltzaile ezagunengandik';
+$labels['always'] = 'beti';
 $labels['showinlineimages'] = 'Erakutsi erantzitako irudiak mezuaren azpian';
 $labels['autosavedraft']  = 'Zirriborroa automatikoki gorde';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['everynminutes']  = '$n minuturo';
+$labels['refreshinterval']  = 'Freskatu (bilatu mezu berriak eta abar)';
 $labels['never']  = 'inoiz ez';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Mezuak ikusi';
-$labels['messagescomposition'] = 'Mezuak sortu';
-$labels['mimeparamfolding'] = 'Attachment names';
+$labels['immediately']  = 'berehala';
+$labels['messagesdisplaying'] = 'Mezuak bistaratzen';
+$labels['messagescomposition'] = 'Mezuak idazten';
+$labels['mimeparamfolding'] = 'Eranskinen izenak';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
+$labels['2047folding'] = 'Full RFC 2047 (beste batzuk)';
+$labels['force7bit'] = 'Erabili MIME kodeketa 8 bitekok karakterentzat';
+$labels['advancedoptions'] = 'Aukera aurreratuak';
+$labels['focusonnewmessage'] = 'Fokatu leihoa mezu berrian';
+$labels['checkallfolders'] = 'Egiaztatu karpeta guztiak mezu berrien bila';
+$labels['displaynext'] = 'Mezu bat ezabatu/mugitzean erakutsi hurrengo mezua';
+$labels['defaultfont'] = 'Lehenetsitako letra-mota HTML mezuetarako';
+$labels['mainoptions'] = 'Aukera nagusiak';
+$labels['browseroptions'] = 'Nabigatze-aukerak';
+$labels['section'] = 'Atala';
+$labels['maintenance'] = 'Mantenua';
+$labels['newmessage'] = 'Mezu berria';
+$labels['signatureoptions'] = 'Sinadura-aukerak';
+$labels['whenreplying'] = 'Erantzutean';
+$labels['replyempty'] = 'ez aipatu jatorrizko mezua';
+$labels['replytopposting'] = 'hasi mezu berria aipamenaren gainean';
+$labels['replybottomposting'] = 'hasi mezu berria aipamenaren azpian';
+$labels['replyremovesignature'] = 'Erantzutean ezabatu mezuaren jatorrizko sinadura';
+$labels['autoaddsignature'] = 'Gehitu sinadura automatikoki';
+$labels['newmessageonly'] = 'bakarrik mezu berria';
+$labels['replyandforwardonly'] = 'bakarri erantzun eta birbidalketak';
+$labels['insertsignature'] = 'Txertatu sinadura';
+$labels['previewpanemarkread']  = 'Markatu ikusitako mezuak irakurrita bezala';
+$labels['afternseconds']  = '$n segundo eta gero';
+$labels['reqmdn'] = 'Eskatu beti jasotze-agiria';
+$labels['reqdsn'] = 'Eskatu beti entrega-egoeraren jakinarazpena';
+$labels['replysamefolder'] = 'Kokatu erantzunak erantzuten ari den mezuarenkarpeta berean';
+$labels['defaultabook'] = 'Lehenetsitako helbide-liburua';
+$labels['autocompletesingle'] = 'Saltatu helbide elektroniko alternatiboak  osatze automatikoan';
+$labels['listnamedisplay'] = 'Zerrendatu kontaktuak honela';
+$labels['spellcheckbeforesend'] = 'Egiaztatu ortografia mezua bidali aurretik';
+$labels['spellcheckoptions'] = 'Ortografia-egiaztatzearen aukerak';
+$labels['spellcheckignoresyms'] = 'Ez ikusi sinboloak dituzten hitzak';
+$labels['spellcheckignorenums'] = 'Ez ikusi zenbakiak dituzten hitzak';
+$labels['spellcheckignorecaps'] = 'Ez ikusi letra kapitalak dituzten hitzak';
+$labels['addtodict'] = 'Gehitu hiztegira';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto:  estekak';
+$labels['standardwindows'] = 'Tratatu laster-leihoak leiho estandar bezala';
+$labels['forwardmode'] = 'Mezuak birbidaltzen';
+$labels['inline'] = 'Konektatua';
+$labels['asattachment'] = 'eranskin moduan';
 $labels['folder']  = 'Karpeta';
 $labels['folders']  = 'Karpetak';
 $labels['foldername']  = 'Karpeta izena';
@@ -435,47 +434,47 @@
 $labels['createfolder']  = 'Karpeta berria sortu';
 $labels['managefolders']  = 'Karpeta kudeaketa';
 $labels['specialfolders'] = 'Karpeta bereziak';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
+$labels['properties'] = 'Ezaugarriak';
+$labels['folderproperties'] = 'Karpeta-ezaugarriak';
+$labels['parentfolder'] = 'Goragoko karpeta';
+$labels['location'] = 'Kokalekua';
+$labels['info'] = 'Informazioa';
+$labels['getfoldersize'] = 'Klikatu ikusteko karpetaren tamaina';
+$labels['changesubscription'] = 'Klikatu harpidetza aldatzeko';
+$labels['foldertype'] = 'Karpeta mota';
+$labels['personalfolder']  = 'Karpeta pribatua';
+$labels['otherfolder']  = 'Beste erabiltzaileen karpetak';
+$labels['sharedfolder']  = 'Karpeta publikoa';
 $labels['sortby'] = 'Honela ordenatu';
 $labels['sortasc']  = 'Goraka ordenatu';
 $labels['sortdesc'] = 'Beheraka ordenatu';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
+$labels['undo'] = 'Desegin';
+$labels['installedplugins'] = 'Instalatutako plugin-ak';
 $labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
+$labels['version'] = 'Bertsioa';
+$labels['source'] = 'Iturria';
+$labels['license'] = 'Lizentzia';
+$labels['support'] = 'Eskuratu laguntza';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 $labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
+$labels['english'] = 'Ingelesa';
+$labels['westerneuropean'] = 'Mendebaldeko Europearra';
+$labels['easterneuropean'] = 'Ekialdeko europearra';
+$labels['southeasterneuropean'] = 'Hego-ekialdeko europearra';
+$labels['baltic'] = 'Baltikoa';
+$labels['cyrillic'] = 'Zirilikoa';
+$labels['arabic'] = 'Arabiarra';
+$labels['greek'] = 'Grekoa';
+$labels['hebrew'] = 'Hebrearra';
+$labels['turkish'] = 'Turkiarra';
+$labels['nordic'] = 'Nordikoa';
 $labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
+$labels['celtic'] = 'Zeltiar';
+$labels['vietnamese'] = 'Vietnamdarra';
+$labels['japanese'] = 'Japoniarra';
+$labels['korean'] = 'Korearra';
+$labels['chinese'] = 'Txinatarra';
 ?>
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index 6aa6cbb..7d20258 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Errore bat gertatu da!';
 $messages['loginfailed']  = 'Saio hasierak huts egin du.';
 $messages['cookiesdisabled'] = 'Zure nabigatzaileak ez ditu cookie-rik onartzen';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Sartu kontaktua aurkitzeko bilaketa daturen bat.';
 $messages['sendingfailed'] = 'Huts mezua bidaltzerakoan';
 $messages['senttooquickly'] = 'Itxaron $sec segundo mezua bidali aurretik, mesedez.';
-$messages['errorsavingsent'] = 'Errorea gertatu da bidalitako mezua gordetzean';
-$messages['errorsaving'] = 'Errore bat gertatu da gordetzean';
 $messages['errormoving'] = 'Ezin da mezua mugitu';
 $messages['errorcopying'] = 'Ezin d(ir)a kopiatu mezua(k).';
 $messages['errordeleting'] = 'Ezin da mezua ezabatu';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Helbide elektronikoa ez da baliozkoa: $email';
 $messages['toomanyrecipients'] = 'Hartzaile gehiegi. Txikitu hartzaile kopura hona $max.';
 $messages['maxgroupmembersreached'] = 'Taldeko partaideen kopurua $max -ko maximoa gainditzen du:';
-$messages['internalerror'] = 'Barne akatsa. Saiatu berriz, mesedez.';
 $messages['contactdelerror'] = 'Ezin d(ir)a kontaktua(k) ezabatu.';
 $messages['contactdeleted'] = 'Kontaktua(k) ongi ezabatu dira.';
 $messages['contactrestoreerror'] = 'Ezin d(ir)a ezabatutako kontaktua(k) leheneratu.';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 40d7cf1..4abf652 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'به اين پروژه خوش امديد';
 $labels['username']  = 'نام کاربر';
 $labels['password']  = 'شفر';
@@ -31,33 +29,22 @@
 $labels['sent']   = 'ارسال شده';
 $labels['trash']  = 'اشغال دانی';
 $labels['junk']   = 'بیکاره';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'مضمون';
 $labels['from']    = 'ارسال کننده';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'ګيرينده';
 $labels['cc']      = 'تکثیر';
 $labels['bcc']     = 'تکثیر پنهان';
 $labels['replyto'] = 'جواب نامه';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'تاريخ';
 $labels['size']    = 'اندازه';
 $labels['priority'] = 'اولویت';
 $labels['organization'] = 'تنظیمات';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'پوشه ها';
 $labels['messagesfromto'] = 'از  مقدار پيغام به مقدار حساب شده';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'از شمار پيغام های حساب شده';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'تکثیر';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'انتقال بدهید به ...';
 $labels['download'] = 'داونلود کردن';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'نام فايل';
 $labels['filesize'] = 'اندازه فايل';
 $labels['addtoaddressbook'] = 'در کتاب ادرس علاوه نماييد';
@@ -100,18 +87,11 @@
 $labels['longnov']	= 'نومبر';
 $labels['longdec']	= 'دسمبر';
 $labels['today'] = 'امروز';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'بررسي کردن پيغام های جديد';
 $labels['compose']          = 'نوشتن پیام حدید';
 $labels['writenewmessage']  = 'ساختن پيغام جديد';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'جواب دادن به پيغام';
 $labels['replytoallmessage'] = 'به فرستنده و تمام گيرينده ها جواب بدهيد';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'فرستادن این پیام به دیگران / فارورد';
 $labels['deletemessage']    = 'حذف کردن پيغام';
 $labels['movemessagetotrash'] = 'پيغام را به اشيآيي حذف شده منتقل نماييد';
@@ -122,88 +102,39 @@
 $labels['lastmessage']      = 'پيغام اخير را نشان دهيد';
 $labels['backtolist']       = 'بازگشتن به لست پيغام';
 $labels['viewsource']       = 'منبع / کود را نشان دهيد';
-$labels['mark']             = 'Mark';
 $labels['markmessages']     = 'پيغام ها را نشاني کنيد';
 $labels['markread']         = 'مانند خوانده شده';
 $labels['markunread']       = 'مانند خوانده نشده';
 $labels['markflagged']      = 'مانند نشانی شده';
 $labels['markunflagged']    = 'مانند نشانی ناشده';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'انتخاب کردن';
 $labels['all'] = 'تمام';
 $labels['none'] = 'هيچ کدام';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'ناخوانده';
 $labels['flagged'] = 'نشانی شده';
 $labels['unanswered'] = 'پیامهای جواب نداده شده';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
 $labels['filter'] = 'تصفیه کردن';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'هيچ کدام';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'خلاصه';
 $labels['empty'] = 'خالي';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = '‌طريقه استعمال ديسک';
 $labels['unknown']  = 'نامعلوم';
 $labels['unlimited']  = 'نامعين/ نامحدود';
 $labels['quicksearch']  = 'جستجوی سریع';
 $labels['resetsearch']  = 'بازنشاندن جستجو';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'در پینجره ای جدید باز کنید';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'پيغام را همين حالا ارسال کنيد';
 $labels['savemessage']    = 'این پیش نویس را حفظ نمایید';
 $labels['addattachment']  = 'ضميمه نمودن يک فايل';
 $labels['charset']        = 'ست کرکتر ها';
 $labels['editortype']     = 'روش تصحیح کننده / نوشتاری';
 $labels['returnreceipt']  = 'رسید برای مراجعت نامه';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'املا را بررسي کنيد';
 $labels['resumeediting'] = 'ادامه / بازگشت به تصحیی کردن / نوشتن';
 $labels['revertto']      = 'رجوع کردن به';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'ضميمه ها';
 $labels['upload'] = 'اپلود کردن';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'بستن';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'کم';
 $labels['lowest']  = 'کمترین';
 $labels['normal']  = 'عادی';
@@ -212,10 +143,6 @@
 $labels['nosubject']  = 'مضمون ندارد';
 $labels['showimages'] = 'نمايش دادن تصاوير';
 $labels['alwaysshow'] = 'همیشه نشان بده تصاویر را از این فرسیتنده﷼';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'ایچ تی ام ایل';
 $labels['plaintoggle'] = 'متن ساده';
 $labels['savesentmessagein'] = 'پیام ارسال شده را ذخیره کن در';
@@ -224,7 +151,6 @@
 $labels['addcc'] = 'نسخیه دوم  را علاوه کنید';
 $labels['addbcc'] = 'نسخه پنهان را علاوه کنید';
 $labels['addreplyto'] = 'علاوه کردن';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'فرستانده این پیام خواهش نموده زمانیکه شما نامه را خواندید براش آگاهی داده شود آيا شما ميخواهيد که فرستنده را آګاه سازيد';
 $labels['receiptread'] = 'بازگشت رسید (خوانده شده)';
 $labels['yourmessage'] = 'برای پيغام شما اين يک رسید بازگشت است';
@@ -232,97 +158,32 @@
 $labels['name']         = 'نشان دادن نام';
 $labels['firstname']    = 'اسم/ نام';
 $labels['surname']      = 'اسم فاميلي / تخلص';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'ايميل';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'آدرس جديد را علاوه کنيد';
 $labels['editcontact'] = 'آدرس جدید را تصحیح کنید';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'تصحيح کردن';
 $labels['cancel'] = 'لغو کردن/ حذف کردن';
 $labels['save']   = 'حفظ کردن';
 $labels['delete'] = 'حذف کردن';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'کارت تماس جديد را بسازيد';
 $labels['deletecontact']  = 'آدرس های انتخاب شده را حذف کنيد';
 $labels['composeto']      = 'ايمیل را نوشته کنيد به';
 $labels['contactsfromto'] = 'از$count$to به $from آدرس ها از';
 $labels['print']          = 'چاپ کردن';
 $labels['export']         = 'صادر کردن';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'صادر نماییدVcardآدرس ها را به فرمت';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'بسته قبلي را نشان دهيد';
 $labels['firstpage']      = 'بسته اولي را نشان دهيد';
 $labels['nextpage']       = 'بسته بعدي را نشان دهيد';
 $labels['lastpage']       = 'بسته اخير را نشان دهيد';
-$labels['group'] = 'Group';
 $labels['groups'] = 'گروه ها';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'ادرس های شخصي';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
 $labels['import'] = 'وارد کردن';
 $labels['importcontacts'] = 'آدرس ها را وارد نمایید';
 $labels['importfromfile'] = 'از یک فایل وارد نمایید';
-$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'تمام کتاب آدرس ها را عوض نمایید';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'اجرا شد';
 $labels['settingsfor'] = 'تنظیمات برای';
-$labels['about'] = 'About';
 $labels['preferences'] = 'ترجيحات';
 $labels['userpreferences'] = 'ترجيحات کاربر';
 $labels['editpreferences'] = 'تصحيح کردن ترجيحات  کاربر';
@@ -332,12 +193,7 @@
 $labels['newitem'] = 'فقره جديد';
 $labels['edititem'] = 'تصحيح کردن فقره';
 $labels['preferhtml'] = 'نشان دادن ايچ ټي ام ايل';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'پيغام ايچ ټي‌ام ايل';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'تاريخ های مهم';
 $labels['setdefault']  = 'بطور همیشگی انتخاب نمایید';
 $labels['autodetect']  = 'اتومات';
@@ -346,13 +202,8 @@
 $labels['pagesize']  = 'تعداد سطر ها در صفحه';
 $labels['signature'] = 'امضا';
 $labels['dstactive']  = 'Daylight saving time';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'پيغام ايچ ټي ام ايل رانوشته کنيد';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'امضای حساب ایمیل بشکل ایچ تی ام ال';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'چوکات پیشنما را نشان دهید';
 $labels['skin'] = 'تمپلیت محیط کاربری';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -363,69 +214,26 @@
 $labels['mdnrequests'] = 'آگاهی های ارسال کننده';
 $labels['askuser'] = 'از کاربر بپرسید';
 $labels['autosend'] = 'پیام را بطور خودکار روان کنید';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'رد کردن';
 $labels['readwhendeleted'] = 'در هنگام حفظ پیام را خوانده شده نشانی کنید';
 $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'پیام های حذف شده را نمایش ندهید';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Display remote inline images';
 $labels['fromknownsenders'] = 'نامه های از آدرس های شناخته شده';
 $labels['always'] = 'همیشه';
 $labels['showinlineimages'] = 'تصاویر ضمیمه شده را در پایین پیام نشان دهید.';
 $labels['autosavedraft']  = 'بصورت خودکار پیش نويس را حفظ کنيد';
 $labels['everynminutes']  = 'دقیفه$n هر';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'هیچگاه';
-$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'نمایش دادن پیام ها';
 $labels['messagescomposition'] = 'ایجاد کردن پیام جدید';
 $labels['mimeparamfolding'] = 'نام های ضمیمه ها';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (دیگر ها)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'انتخاب های پیشرفته';
 $labels['focusonnewmessage'] = 'فوکس دادن پینجره مرورگر به پیام جدید';
 $labels['checkallfolders'] = 'تمام پوشه ها را بخاطر پیام های جدید بررسی کنید';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'پوشه';
 $labels['folders']  = 'پوشه ها';
 $labels['foldername']  = 'نام پوشه';
@@ -435,47 +243,11 @@
 $labels['createfolder']  = 'ایجاد پوشه جدید';
 $labels['managefolders']  = 'اداره کردن پوشه ها';
 $labels['specialfolders'] = 'پوشه های مخصوص';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'فهرست کردن توسط';
 $labels['sortasc']  = 'فهرست کردن از طرف بالا به پايين';
 $labels['sortdesc'] = 'فهرست کردن از طرف پايين به بالا';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
 $labels['B'] = 'بایت';
 $labels['KB'] = 'کیلو بایت';
 $labels['MB'] = 'میگا بایت';
 $labels['GB'] = 'گیگا بایت';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/fa_AF/messages.inc b/program/localization/fa_AF/messages.inc
index 42f34be..643a9f7 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -15,21 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'خطا رخ داد';
 $messages['loginfailed']  = 'خطا در ورود به سیستم';
 $messages['cookiesdisabled'] = 'جستجوگر شما  cookies را قبول نميکند';
 $messages['sessionerror'] = 'جلسه شما وجود ندارد و يا هم از زمان معين آن گذشته است';
 $messages['storageerror'] = 'وصل شدن به آیمیپ سرور موفق نشد';
-$messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'خطای سرور: $msg';
 $messages['dberror'] = 'خطای پایگاه داده';
 $messages['requesttimedout'] = 'عدم پاسخگویی در زمان مقرر';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'نام سرور نامعتبر است';
 $messages['nomessagesfound'] = 'هيچ پيغامی در اين صندوق پستي دريافت نه شد';
 $messages['loggedout'] = 'جلسه شما بصورت مکمل فسخ شده است  خدا حافظ';
@@ -47,31 +40,23 @@
 $messages['successfullysaved'] = 'حفظ پیام موفقانه صورت گرفت';
 $messages['addedsuccessfully'] = 'آدرس بصورت مکمل در کتاب ادرس علاوه شد';
 $messages['contactexists'] = 'يک آدرس همرا اين ايميل ادرس قبلاً وجود دارد';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'برای حفظ استقلال پيغام شما، تصاویر اجنبی این پیام بلاک شده اند';
 $messages['encryptedmessage'] = 'اين يک پيغام مخفي است و اشکار شده نميتواند   معذرت ميخواهيم';
 $messages['nocontactsfound'] = 'هيچ آدرسی دريافت نه شد';
 $messages['contactnotfound'] = 'آدرس خواسته شده دريافت نه شد';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'فرستادن پيغام موفق نه شد';
 $messages['senttooquickly'] = 'ثانیه منتظر باشید$secلطفا مدت  قبل از ارسال این پیام';
-$messages['errorsavingsent'] = 'در جريان حفظ کردن پیام ارسال شده يکاشتباه به وجود امد';
-$messages['errorsaving'] = 'در جريان حفظ کردن يکاشتباه به وجود امد';
 $messages['errormoving'] = 'پيغام نقل مکان شده نتوانست';
 $messages['errorcopying'] = 'امکان کپی پیام (ها) وجود ندارد';
 $messages['errordeleting'] = 'پيغام حذف شده نتوانست';
 $messages['errormarking'] = 'امکان انتخاب پیام (ها) وجود ندارد';
 $messages['deletecontactconfirm']  = 'آيا واقعاً شما ميخواهيد که آدرس های انتخاب شده را حذف کنيد؟';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'آيا واقعاً شما ميخواهيد که پيغام هاي انتخاب شده را حذف کنيد؟';
 $messages['deletefolderconfirm']  = 'آيا واقعاً شما ميخواهيد که اين پوشه را حذف کنيد؟';
 $messages['purgefolderconfirm']  = 'آيا واقعاً شما ميخواهيد  تمام پيغام های که  در اين پوشه وجود دارد حذف کنيد؟';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
 $messages['groupdeleting'] = 'در حال حذف گروه...';
 $messages['folderdeleting'] = 'در حال حذف پوشه';
 $messages['foldermoving'] = 'در حال انتقال پوشه';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'فورمه بصورت مکمل خانه پري نه شده است';
 $messages['noemailwarning'] = 'لطفاً يک ايميل ادرس موجود را داخل کنيد';
 $messages['nonamewarning']  = 'لطفاً يک نام وارد کنيد';
@@ -83,7 +68,6 @@
 $messages['notsentwarning'] = 'پيغام ارسال نه شده است   آیا میخواهید که از این نامه صرف نظر نمایید';
 $messages['noldapserver'] = 'لطفاً يک ايل دپ سرور را بخاطر جستجو انتخاب کنيد';
 $messages['nosearchname'] = 'لطفاً يک نام تماس و يا هم يک ايميل ادرس را داخل کنيد';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr پیام یافت شد';
 $messages['contactsearchsuccessful'] = '$nr حساب کاربری یافت شد';
 $messages['searchnomatch'] = 'جستجو گر موفق به دریافت هیچ گونه اثری نشد';
@@ -91,84 +75,24 @@
 $messages['checking'] = 'در حال بررسی';
 $messages['nospellerrors'] = 'هيچ اشتباه املايي را دريافت نه کرد';
 $messages['folderdeleted'] = 'پوشه موفقانه از بين رفت/ حذف گرديد';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
 $messages['folderpurged'] = 'محتوای پوشه ها با موفقیت پاک شدند';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'با موفقیت حذف شد';
 $messages['converting'] = 'در حال پاک کردن ساختار';
 $messages['messageopenerror'] = 'پيغام از سرور جريان کرده نتوانست';
 $messages['fileuploaderror'] = 'بارگزاری فايل با خطا مواجه شد.';
 $messages['filesizeerror'] = 'تثبیت شده میباشد$size حجم فایل آپلود شده بیشتر از حجم کلی';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'اجازه نمامه کود / منبع این آدرس قفط خواندنی است';
 $messages['errorsavingcontact'] = 'ادرس این پیام را حفظکرده نتوانست';
 $messages['movingmessage'] = 'ذر حال انتقال پیام...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'یک رسید برای ارسال کننده این پیام فرستاده شد.';
 $messages['errorsendingreceipt'] = 'رسيد ارسال شده نتوانست';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'شما این شناخت نامه را حذف کرده نمیتوانید. این آخرین شناخت نامه شما است.';
 $messages['forbiddencharacter'] = 'نام پوشه دارای یک کرکتر ممنوعه است.';
 $messages['selectimportfile'] = 'لطفاً یک فایل را برای آپلود کردن انتخاب نمایید.';
 $messages['addresswriterror'] = 'کتابچه آدرس انتخاب شده دارای اجازه نامه نوشتاری نیست.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'در حال وارد کردن لطفا صبر کنید.';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Successfully imported $inserted contacts, $skipped existing entries skipped</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'اجازه این عملکرد را ندارید';
 $messages['nofromaddress'] = 'بخش ایمیل آدرس در شناخت نامه انتخاب شده مفقود است.';
 $messages['editorwarning'] = 'استفاده از تصحیح کننده متن ساده تمام فرمت و ساختار داده شده را از بین خواهد برد. آیا میخواهید که ادامه بدهید.';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index ad016a7..de23577 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -15,23 +15,21 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'به $product خوش آمدید';
 $labels['username']  = 'نام کاربری';
 $labels['password']  = 'گذرواژه';
 $labels['server']    = 'سرویس‌دهنده';
 $labels['login']     = 'ورود';
 $labels['logout']   = 'برون‌رفت';
-$labels['mail']     = 'نامه';
+$labels['mail']     = 'پست';
 $labels['settings'] = 'تنظیمات';
 $labels['addressbook'] = 'دفتر نشانی';
 $labels['inbox']  = 'صندوق ورودی';
 $labels['drafts'] = 'پیش‌نویس‌ها';
 $labels['sent']   = 'فرستاده شده';
-$labels['trash']  = 'سطل آشغال';
+$labels['trash']  = 'حذف شده‌ها';
 $labels['junk']   = 'بنجل';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = 'نمایش نام واقعی برای پوشه‌های ویژه';
 $labels['subject'] = 'موضوع';
 $labels['from']    = 'از';
 $labels['sender']  = 'فرستنده';
@@ -73,7 +71,7 @@
 $labels['tuesday']   = 'سه‌شنبه';
 $labels['wednesday'] = 'چهارشنبه';
 $labels['thursday']  = 'پنج‌شنبه';
-$labels['friday']    = 'جمعه';
+$labels['friday']    = 'آدینه';
 $labels['saturday']  = 'شنبه';
 $labels['jan']	= 'ژان';
 $labels['feb']	= 'فور';
@@ -100,19 +98,19 @@
 $labels['longnov']	= 'نوامبر';
 $labels['longdec']	= 'دسامبر';
 $labels['today'] = 'امروز';
-$labels['refresh']          = 'نوسازی';
+$labels['refresh']          = 'بازخوانی';
 $labels['checkmail']        = 'بررسی پیغام‌های جدید';
-$labels['compose']          = 'نوشتن پیغام';
+$labels['compose']          = 'نوشتن';
 $labels['writenewmessage']  = 'ایجاد پیغام جدید';
 $labels['reply']            = 'پاسخ';
 $labels['replytomessage']   = 'پاسخ به فرستنده';
 $labels['replytoallmessage'] = 'پاسخ به فهرست یا به فرستنده و تمام گیرنده‌ها';
 $labels['replyall']         = 'پاسخ به همه';
 $labels['replylist']        = 'پاسخ به فهرست';
-$labels['forward']          = 'ارجاع';
-$labels['forwardinline']    = 'ارجاع خطی';
-$labels['forwardattachment'] = 'ارجاع به صورت پیوست';
-$labels['forwardmessage']   = 'ارجاع پیغام';
+$labels['forward']          = 'باز ارسال';
+$labels['forwardinline']    = 'باز ارسال خطی';
+$labels['forwardattachment'] = 'باز ارسال به صورت پیوست';
+$labels['forwardmessage']   = 'باز ارسال پیغام';
 $labels['deletemessage']    = 'حذف پیغام';
 $labels['movemessagetotrash'] = 'انتقال پیغام به زباله‌دان';
 $labels['printmessage']     = 'چاپ این پیغام';
@@ -131,7 +129,7 @@
 $labels['moreactions']      = 'کارهای دیگر...';
 $labels['more']             = 'بيشتر';
 $labels['back']             = 'بازگشت';
-$labels['options']          = 'تنظیمات';
+$labels['options']          = 'گزینه‌ها';
 $labels['select'] = 'انتخاب';
 $labels['all'] = 'همه';
 $labels['none'] = 'هیچ‌کدام';
@@ -139,7 +137,7 @@
 $labels['unread'] = 'خوانده‌نشده';
 $labels['flagged'] = 'پرچم‌دار';
 $labels['unanswered'] = 'پاسخ داده نشده';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = 'با پیوست';
 $labels['deleted'] = 'حذف شده';
 $labels['undeleted'] = 'حذف نشده';
 $labels['invert'] = 'وارونه';
@@ -168,7 +166,7 @@
 $labels['folderactions'] = 'اعمال پوشه...';
 $labels['compact'] = 'فشرده';
 $labels['empty'] = 'خالی';
-$labels['importmessages'] = 'Import messages';
+$labels['importmessages'] = 'وارد کردن پیغام‌ها';
 $labels['quota'] = 'فضای استفاده شده';
 $labels['unknown']  = 'ناشناخته';
 $labels['unlimited']  = 'نامحدود';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'اصلاحات جستجو';
 $labels['msgtext']  = 'کل پیغام';
 $labels['body']  = 'بدنه';
-$labels['type'] = 'Type';
+$labels['type'] = 'نوع';
+$labels['namex'] = 'نام';
 $labels['openinextwin'] = 'باز کردن در پنجره‌ی جدید';
 $labels['emlsave'] = 'بارگیری (.eml)';
 $labels['changeformattext'] = 'نمایش در قالب متنی';
@@ -310,15 +309,18 @@
 $labels['lastpage']       = 'نمایش صفحه آخر';
 $labels['group'] = 'گروه';
 $labels['groups'] = 'گروه‌ها';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'فهرست اعضاء گروه';
 $labels['personaladrbook'] = 'نشانی‌های شخصی';
 $labels['searchsave'] = 'ذخیره جستجو';
 $labels['searchdelete'] = 'حذف جستجو';
 $labels['import'] = 'وارد کردن';
 $labels['importcontacts'] = 'وارد کردن تماس‌ها';
 $labels['importfromfile'] = 'وارد کردن از پرونده‌ی:';
-$labels['importtarget'] = 'افزودن تماس‌های جدید به دفتر نشانی:';
+$labels['importtarget'] = 'افزودن تماس‌ها به';
 $labels['importreplace'] = 'جایگیزینی کامل دفتر نشانی';
+$labels['importgroups'] = 'وارد کردن وظایف گروه';
+$labels['importgroupsall'] = 'همه (ایجاد گروه‌ها در صورت نیاز)';
+$labels['importgroupsexisting'] = 'فقط برای گروه‌های موجود';
 $labels['importdesc'] = 'شما می‌توانید تماس‌ها را از یک دفتر نشانی موجود بارگذاری نمایید.<br/> هم اکنون ما وارد کردن آدرس‌ها را از <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> یا قالب داده CVS (جدا شده با کاما) پشتیبانی می‌کنیم.';
 $labels['done'] = 'انجام شد';
 $labels['settingsfor'] = 'تنظیمات برای';
@@ -352,7 +354,7 @@
 $labels['htmlonreply'] = 'فقط در پاسخ به پیغام HTML';
 $labels['htmlonreplyandforward'] = 'در بازگردانی یا پاسخ به پیغام‌های HTML';
 $labels['htmlsignature'] = 'HTML امضای';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'نمایش آدرس ایمیل با نام نمایشی';
 $labels['previewpane'] = 'نمایش قاب پیش‌نمایش';
 $labels['skin'] = 'پوسته ظاهری';
 $labels['logoutclear'] = 'تمیز کردن زباله دان هنگام برون‌رفت';
@@ -422,7 +424,7 @@
 $labels['spellcheckignorecaps'] = 'نادیده گرفتن کلمات با حروف بزرگ';
 $labels['addtodict'] = 'اضافه کردن به واژه‌نامه';
 $labels['mailtoprotohandler'] = 'ثبت نگه‌دارنده پروتوکل برای mailto: پیوندها';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'بکار بردن پاپ‌آپ‌ها به صورت پنجره‌ی استاندارد';
 $labels['forwardmode'] = 'بازگردانی پیغام';
 $labels['inline'] = 'خطی';
 $labels['asattachment'] = 'به عنوان پیوست';
diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc
index 1530400..43f5a6c 100644
--- a/program/localization/fa_IR/messages.inc
+++ b/program/localization/fa_IR/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'خطایی رخ داد!';
 $messages['loginfailed']  = 'ورود ناموفق بود.';
 $messages['cookiesdisabled'] = 'مرورگر شما کوکی‌ها را قبول نمی‌کند.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'برای یافتن مخاطب عبارتی را جستجو کنید';
 $messages['sendingfailed'] = 'ارسال پیغام ناموفق بود.';
 $messages['senttooquickly'] = 'لطفا قبل از ارسال این پیغام $sec ثانیه صبر کنید.';
-$messages['errorsavingsent'] = 'در لحظه ذخیره پیغام ارسال شده، مشکلی رخ داد.';
-$messages['errorsaving'] = 'هنگام ذخیره‌سازی، مشکلی رخ داد.';
 $messages['errormoving'] = 'پیغام(ها) منتقل نشدند.';
 $messages['errorcopying'] = 'پیغام(ها) کپی نشدند.';
 $messages['errordeleting'] = 'پیغام(ها) حذف نشدند.';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'پست الکترونیکی نامعتبر: $email';
 $messages['toomanyrecipients'] = 'گیرنده‌های بیش از اندازه: تعداد گیرنده ها را به $max کاهش دهید.';
 $messages['maxgroupmembersreached'] = 'تعداد اعضای گروه بیشتر از $max است.';
-$messages['internalerror'] = 'خطای داخلی رخ داد. لطفا دوباره امتحان کنید.';
 $messages['contactdelerror'] = 'حذف مخاطب(ها) انجام شد.';
 $messages['contactdeleted'] = 'مخاطب(ها) با موفقیت حذف شدند.';
 $messages['contactrestoreerror'] = 'مخاطب(های) حذف شده بازگردانی نخواهند شد.';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index a3764ed..8a90640 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Tervetuloa $product -käyttäjäksi';
 $labels['username']  = 'Käyttäjätunnus';
 $labels['password']  = 'Salasana';
@@ -31,7 +29,6 @@
 $labels['sent']   = 'Lähetetyt';
 $labels['trash']  = 'Roskakori';
 $labels['junk']   = 'Roskaposti';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Aihe';
 $labels['from']    = 'Lähettäjä';
 $labels['sender']  = 'Lähettäjä';
@@ -178,6 +175,7 @@
 $labels['msgtext']  = 'Koko viesti';
 $labels['body']  = 'Runko';
 $labels['type'] = 'Tyyppi';
+$labels['namex'] = 'Nimi';
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
 $labels['changeformattext'] = 'Näytä raakatekstimuodossa';
@@ -310,14 +308,12 @@
 $labels['lastpage']       = 'Näytä viimeinen luettelo';
 $labels['group'] = 'Ryhmä';
 $labels['groups'] = 'Ryhmät';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Henkilökohtaiset osoitteet';
 $labels['searchsave'] = 'Tallenna haku';
 $labels['searchdelete'] = 'Poista haku';
 $labels['import'] = 'Tuo';
 $labels['importcontacts'] = 'Tuo yhteystiedot';
 $labels['importfromfile'] = 'Tuo tiedostosta:';
-$labels['importtarget'] = 'Lisää uudet yhteystiedot osoitekirjaan:';
 $labels['importreplace'] = 'Korvaa koko osoitekirja';
 $labels['importdesc'] = 'Voit tuoda yhteystietoja olemassa olevasta osoitekirjasta.<br/>Tuettuja muotoja ovat <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ja CSV (pilkuin erotetut arvot).';
 $labels['done'] = 'Valmis';
@@ -334,7 +330,6 @@
 $labels['preferhtml'] = 'Käytä HTML:aa';
 $labels['defaultcharset'] = 'Oletusmerkistökoodaus';
 $labels['htmlmessage'] = 'HTML-viesti';
-$labels['messagepart'] = 'Part';
 $labels['digitalsig'] = 'Digitaalinen allekirjoitus';
 $labels['dateformat'] = 'Päiväyksen muoto';
 $labels['timeformat'] = 'Ajan muoto';
@@ -424,7 +419,6 @@
 $labels['mailtoprotohandler'] = 'Rekisteröi mailto:-linkkien protokollakäsitteljä';
 $labels['standardwindows'] = 'Käsittele popup-ikkunoita tavallisina ikkunoina';
 $labels['forwardmode'] = 'Viestin välitys';
-$labels['inline'] = 'inline';
 $labels['asattachment'] = 'liitteenä';
 $labels['folder']  = 'Kansio';
 $labels['folders']  = 'Kansiot';
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index d581f53..1b3c3ea 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Virhe havaittu.';
 $messages['loginfailed']  = 'Sisäänkirjautuminen epäonnistui';
 $messages['cookiesdisabled'] = 'Selaimesi ei hyväksy evästeitä';
@@ -27,6 +26,8 @@
 $messages['requesttimedout'] = 'Pyyntö aikakatkaistiin';
 $messages['errorreadonly'] = 'Toiminnon suoritus ei onnistu, koska hakemisto on vain lukutilassa.';
 $messages['errornoperm'] = 'Toimintoa ei voitu suorittaa. Ei oikeuksia.';
+$messages['erroroverquota'] = 'Toiminnon suoritus epäonnistui. Levytila on loppu.';
+$messages['erroroverquotadelete'] = 'Levytila on loppu. Paina SHIFT+DEL poistaaksesi viestin.';
 $messages['invalidrequest'] = 'Virheellinen pyyntö! Tietoa ei tallennettu.';
 $messages['invalidhost'] = 'Virheellinen palvelinnimi.';
 $messages['nomessagesfound'] = 'Kansiossa ei ole sähköpostiviestejä';
@@ -53,8 +54,8 @@
 $messages['contactsearchonly'] = 'Anna hakusanoja, joilla yhteystietoja haetaan';
 $messages['sendingfailed'] = 'Viestin lähetys epäonnistui';
 $messages['senttooquickly'] = 'Odota $sec sekunti(a) ennen viestin lähettämistä';
-$messages['errorsavingsent'] = 'Lähetetyn viestin tallennuksessa tapahtui virhe';
-$messages['errorsaving'] = 'Tallennuksessa tapahtui virhe';
+$messages['errorsavingsent'] = 'Virhe tallennettaessa lähetettyä viestiä.';
+$messages['errorsaving'] = 'Virhe tallennettaessa.';
 $messages['errormoving'] = 'Viestiä ei voitu siirtää';
 $messages['errorcopying'] = 'Viestiä ei voitu kopioida';
 $messages['errordeleting'] = 'Viestiä ei voitu poistaa';
@@ -87,7 +88,7 @@
 $messages['searchnomatch'] = 'Haku ei tuottanut tuloksia';
 $messages['searching'] = 'Etsitään...';
 $messages['checking'] = 'Tarkistetaan...';
-$messages['nospellerrors'] = 'Kirjoitusvirheitä ei löytynyt';
+$messages['nospellerrors'] = 'Kirjoitusvirheitä ei löytynyt.';
 $messages['folderdeleted'] = 'Kansio poistettu onnistuneesti';
 $messages['foldersubscribed'] = 'Kansio tilattu onnistuneesti.';
 $messages['folderunsubscribed'] = 'Kansion tilaus poistettu onnistuneesti.';
@@ -98,13 +99,16 @@
 $messages['messageopenerror'] = 'Virhe kopioitaessa viestiä palvelimelta';
 $messages['fileuploaderror'] = 'Tiedoston lähettäminen epäonnistui';
 $messages['filesizeerror'] = 'Lähetettävä tiedosto ylittää sallitun enimmäiskoon $size';
-$messages['copysuccess'] = 'Kopioitu $nr osoitetta onnistuneesti';
-$messages['copyerror'] = 'Yhtään osoitetta ei voitu kopioida';
+$messages['copysuccess'] = '$nr yhteystietoa kopioitiin onnistuneesti.';
+$messages['movesuccess'] = '$nr yhteystietoa siirrettiin onnistuneesti.';
+$messages['copyerror'] = 'Yhdenkään yhteystiedon kopiointi ei onnistunut.';
+$messages['moveerror'] = 'Minkään yhteystiedon siirto ei onnistunut.';
 $messages['sourceisreadonly'] = 'Tämän osoitteen lähde on kirjoitussuojattu';
 $messages['errorsavingcontact'] = 'Yhteystietoa ei voitu tallentaa';
 $messages['movingmessage'] = 'Siirretään viestiä...';
 $messages['copyingmessage'] = 'Kopioidaan viestiä...';
 $messages['copyingcontact'] = 'Kopioidaan yhteystietoja...';
+$messages['movingcontact'] = 'Siirretään yhteystieto(j)a...';
 $messages['deletingmessage'] = 'Poistetaan viestejä...';
 $messages['markingmessage'] = 'Merkitään viestejä...';
 $messages['addingmember'] = 'Lisätään yhteystietoja ryhmään...';
@@ -118,11 +122,12 @@
 $messages['addresswriterror'] = 'Valittuun osoitekirjaan ei voi kirjoittaa';
 $messages['contactaddedtogroup'] = 'Yhteystiedot lisätty ryhmään';
 $messages['contactremovedfromgroup'] = 'Yhteystiedot poistettu ryhmästä';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Tuodaan, odota...';
 $messages['importformaterror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole kelvollinen tuontitiedosto.';
 $messages['importconfirm'] = '<b>$inserted yhteystietoa tuotu onnistuneesti</b>';
 $messages['importconfirmskipped'] = '<b>Ohitettu $skipped  olemassa olevaa merkintää</b>';
+$messages['importmessagesuccess'] = '$nr viestiä tuotiin onnistuneesti';
+$messages['importmessageerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole kelvollinen viesti tai mailbox-tiedosto';
 $messages['opnotpermitted'] = 'Toiminto ei ole sallittu!';
 $messages['nofromaddress'] = 'Valittu identiteetti ei sisällä sähköpostiosoitetta';
 $messages['editorwarning'] = 'Vaihtaminen tekstieditoriin aiheuttaa viestin muotoilun katoamisen. Haluatko jatkaa?';
@@ -131,12 +136,12 @@
 $messages['smtpautherror'] = 'SMTP-virhe ($code): Tunnistus epäonnistui';
 $messages['smtpfromerror'] = 'SMTP-virhe ($code): Lähettäjän "$from" asettaminen epäonnistui ($msg)';
 $messages['smtptoerror'] = 'SMTP-virhe ($code): Vastaanottajan "$to" lisääminen epäonnistui ($msg)';
-$messages['smtprecipientserror'] = 'SMTP-virhe: Ei voida jäsentää vastaanottajien listaa';
+$messages['smtprecipientserror'] = 'SMTP-virhe: Ei voida jäsentää vastaanottajien listaa.';
 $messages['smtperror'] = 'SMTP-virhe: $msg';
 $messages['emailformaterror'] = 'Virheellinen sähköpostiosoite: $email';
 $messages['toomanyrecipients'] = 'Liikaa vastaanottajia. Vähennä vastaanottajien määrä maksimiin $max.';
 $messages['maxgroupmembersreached'] = 'Ryhmän jäsenten määrä ylittää maksimin $max';
-$messages['internalerror'] = 'Ilmeni sisäinen virhe. Yritä uudelleen.';
+$messages['internalerror'] = 'Sisäinen virhe. Yritä uudelleen.';
 $messages['contactdelerror'] = 'Yhteystietoja ei voitu poistaa.';
 $messages['contactdeleted'] = 'Yhteystiedot poistettu onnistuneesti.';
 $messages['contactrestoreerror'] = 'Poistettujen yhteystietojen palautus epäonnistui.';
@@ -162,6 +167,6 @@
 $messages['mispellingsfound'] = 'Viestissä havaittiin kielioppivirheitä.';
 $messages['parentnotwritable'] = 'Kansiota ei voitu siirtää tai luoda valittuun yläkansioon. Ei käyttöoikeutta.';
 $messages['messagetoobig'] = 'Viestiosa on liian suuri prosessoitavaksi.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['attachmentvalidationerror'] = 'Varoitus! Tämä liitetiedosto on epäilyttävä, koska se ei vastaa ilmoitettua tiedostotyyppiä. Jos et luoda lähettäjään, älä avaa liitetiedostoa välttääksesi mahdollista vahingollista aineistoa.<br/><br/><em>Odotettu: $expected; löydetty: $detected</em>';
 $messages['noscriptwarning'] = 'Varoitus: Tämä verkkopohjainen sähköpostipalvelu vaatii Javascriptin toimiakseen. Ota Javascript käyttöön selaimesi asetuksista.';
 ?>
diff --git a/program/localization/fr_FR/csv2vcard.inc b/program/localization/fr_FR/csv2vcard.inc
index 0c67871..d28df7a 100644
--- a/program/localization/fr_FR/csv2vcard.inc
+++ b/program/localization/fr_FR/csv2vcard.inc
@@ -15,7 +15,6 @@
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
-
 $map = array();
 $map['anniversary'] = "Anniversaire de mariage ou fête";
 $map['assistants_name'] = "Nom de l''assistant(e)";
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index eee9f1a..dd0acf4 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Bienvenue sur $product';
 $labels['username']  = 'Utilisateur';
 $labels['password']  = 'Mot de passe';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index 99cf02c..fcf9eaf 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -15,152 +15,156 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Une erreur est survenue !';
-$messages['loginfailed']  = 'L\'authentification a échoué';
-$messages['cookiesdisabled'] = 'Votre navigateur n\'accepte pas les cookies';
-$messages['sessionerror'] = 'Votre session est invalide ou a expiré';
-$messages['storageerror'] = 'Erreur de connexion au serveur IMAP';
+$messages['loginfailed']  = 'L\'authentification a échoué.';
+$messages['cookiesdisabled'] = 'Votre navigateur n\'accepte pas les cookies.';
+$messages['sessionerror'] = 'Votre session est invalide ou a expiré.';
+$messages['storageerror'] = 'Erreur de connexion au serveur IMAP.';
 $messages['servererror'] = 'Erreur Serveur !';
-$messages['servererrormsg'] = 'Erreur du serveur: $msg';
-$messages['dberror'] = 'Erreur avec la base de donnée!';
+$messages['servererrormsg'] = 'Erreur du serveur : $msg';
+$messages['dberror'] = 'Erreur avec la base de données !';
 $messages['requesttimedout'] = 'Délai de la requête expiré';
-$messages['errorreadonly'] = 'Impossible d\'effectuer cette opération. Le dossier est en lecture seule';
-$messages['errornoperm'] = 'Impossible d\'effectuer cette opération. Permission refusée';
+$messages['errorreadonly'] = 'Impossible d\'effectuer cette opération. Le dossier est en lecture seule.';
+$messages['errornoperm'] = 'Impossible d\'effectuer cette opération. Permission refusée.';
 $messages['erroroverquota'] = 'Impossible d\'effectuer cette opération. Plus d\'espace libre.';
 $messages['erroroverquotadelete'] = 'Plus d\'espace libre. Utilisez SHIFT+DEL pour supprimer un message.';
 $messages['invalidrequest'] = 'Requête invalide ! Aucune donnée n\'a été sauvegardée.';
 $messages['invalidhost'] = 'Nom du serveur invalide.';
 $messages['nomessagesfound'] = 'Cette boîte aux lettres ne contient aucun message.';
-$messages['loggedout'] = 'Vous venez de vous déconnecter avec succès. Au revoir !';
+$messages['loggedout'] = 'Vous vous êtes correctement déconnecté. Au revoir !';
 $messages['mailboxempty'] = 'La boîte aux lettres est vide.';
 $messages['refreshing'] = 'Rafraîchissement en cours...';
-$messages['loading'] = 'Chargement...';
-$messages['uploading'] = 'Envoi du fichier...';
-$messages['uploadingmany'] = 'Envoi des fichiers ...';
-$messages['loadingdata'] = 'Chargement des données...';
+$messages['loading'] = 'Chargement en cours...';
+$messages['uploading'] = 'Transfert du fichier en cours...';
+$messages['uploadingmany'] = 'Transfert des fichiers en cours...';
+$messages['loadingdata'] = 'Chargement des données en cours...';
 $messages['checkingmail'] = 'Vérification des nouveaux messages...';
-$messages['sendingmessage'] = 'Expédition du message...';
-$messages['messagesent'] = 'Message expédié.';
-$messages['savingmessage'] = 'Sauvegarde du message...';
-$messages['messagesaved'] = 'Message sauvegardé dans Brouillons';
-$messages['successfullysaved'] = 'Sauvegarde effectuée';
-$messages['addedsuccessfully'] = 'Contact ajouté dans le carnet d\'adresses';
-$messages['contactexists'] = 'Cette adresse courriel est utilisée par un autre contact';
+$messages['sendingmessage'] = 'Envoi du message en cours...';
+$messages['messagesent'] = 'Le message a bien été expédié.';
+$messages['savingmessage'] = 'Sauvegarde du message en cours...';
+$messages['messagesaved'] = 'Message sauvegardé dans Brouillons.';
+$messages['successfullysaved'] = 'La sauvegarde a bien été effectuée.';
+$messages['addedsuccessfully'] = 'Le contact a bien été ajouté dans le carnet d\'adresses.';
+$messages['contactexists'] = 'Cette adresse courriel est utilisée par un autre contact.';
 $messages['contactnameexists'] = 'Il existe déjà un contact nommé ainsi.';
 $messages['blockedimages'] = 'Les images distantes sont bloquées pour protéger votre vie privée.';
 $messages['encryptedmessage'] = 'Désolé, ce message est chiffré et ne peut être affiché.';
-$messages['nocontactsfound'] = 'Aucun contact n\'a pu être trouvé';
+$messages['nocontactsfound'] = 'Aucun contact n\'a pu être trouvé.';
 $messages['contactnotfound'] = 'Le contact demandé n\'a pas été trouvé.';
-$messages['contactsearchonly'] = 'Entrez un ou plusieurs mots clés pour trouver des contacts';
-$messages['sendingfailed'] = 'L\'envoi du message a échoué';
-$messages['senttooquickly'] = 'Vous devez attendre $sec s. pour envoyer le message';
-$messages['errorsavingsent'] = 'Une erreur est survenue pendant la sauvegarde du message envoyé';
-$messages['errorsaving'] = 'Une erreur a empêché la sauvegarde';
-$messages['errormoving'] = 'Impossible de déplacer le message';
-$messages['errorcopying'] = 'La copie de ce(s) message(s) a échoué.';
-$messages['errordeleting'] = 'Impossible d\'effacer le message';
-$messages['errormarking'] = 'Impossible de marquer le message';
+$messages['contactsearchonly'] = 'Entrez un ou plusieurs mots clés pour trouver des contacts.';
+$messages['sendingfailed'] = 'L\'envoi du message a échoué.';
+$messages['senttooquickly'] = 'Veuillez patienter $sec s. pour envoyer ce message.';
+$messages['errorsavingsent'] = 'Une erreur est apparue durant l\'enregistrement du message envoyé.';
+$messages['errorsaving'] = 'Une erreur est apparue durant l\'enregistrement.';
+$messages['errormoving'] = 'Impossible de déplacer le(s) message(s).';
+$messages['errorcopying'] = 'Impossible de copier le(s) message(s).';
+$messages['errordeleting'] = 'Impossible de supprimer le(s) message(s).';
+$messages['errormarking'] = 'Impossible de marquer le(s) message(s).';
 $messages['deletecontactconfirm']  = 'Êtes-vous sûr de vouloir supprimer le(s) contact(s) sélectionné(s) ?';
 $messages['deletegroupconfirm']  = 'Êtes-vous sûr de vouloir supprimer le groupe sélectionné ?';
 $messages['deletemessagesconfirm'] = 'Êtes-vous sûr de vouloir supprimer le(s) message(s) sélectionné(s) ?';
 $messages['deletefolderconfirm']  = 'Êtes-vous sûr de vouloir supprimer ce dossier ?';
 $messages['purgefolderconfirm']  = 'Êtes-vous sûr de vouloir supprimer tous les messages de ce dossier ?';
-$messages['contactdeleting'] = 'Suppression de contact(s)...';
-$messages['groupdeleting'] = 'Suppression du groupe ...';
+$messages['contactdeleting'] = 'Suppression de contact(s) en cours...';
+$messages['groupdeleting'] = 'Suppression du groupe...';
 $messages['folderdeleting'] = 'Suppression du dossier...';
 $messages['foldermoving'] = 'Déplacement du dossier...';
 $messages['foldersubscribing'] = 'Inscription du dossier...';
 $messages['folderunsubscribing'] = 'Désinscription du dossier...';
-$messages['formincomplete'] = 'Le formulaire n\'a pas été entièrement rempli';
-$messages['noemailwarning'] = 'Veuillez spécifier un courriel valide';
-$messages['nonamewarning']  = 'Veuillez fournir un nom';
-$messages['nopagesizewarning'] = 'Veuillez indiquer une taille de page';
-$messages['nosenderwarning'] = 'Veuillez renseigner l\'adresse d\'expéditeur';
-$messages['norecipientwarning'] = 'Veuillez ajouter au moins un destinataire';
+$messages['formincomplete'] = 'Le formulaire n\'a pas été entièrement rempli.';
+$messages['noemailwarning'] = 'Veuillez spécifier un courriel valide.';
+$messages['nonamewarning']  = 'Veuillez fournir un nom.';
+$messages['nopagesizewarning'] = 'Veuillez indiquer une taille de page.';
+$messages['nosenderwarning'] = 'Veuillez renseigner l\'adresse d\'expéditeur.';
+$messages['norecipientwarning'] = 'Veuillez ajouter au moins un destinataire.';
 $messages['nosubjectwarning']  = 'Le champ «Objet» est vide. Souhaitez-vous le renseigner maintenant ?';
 $messages['nobodywarning'] = 'Envoyer ce message sans texte ?';
 $messages['notsentwarning'] = 'Le message n\'a pas été envoyé. Voulez-vous abandonner ce message ?';
-$messages['noldapserver'] = 'Choisissez un serveur LDAP pour la recherche';
-$messages['nosearchname'] = 'Entrez un nom de contact ou un courriel';
-$messages['notuploadedwarning'] = 'Certaines pièces jointes sont en cours d\'expédition : attendez ou annulez l\'envoi.';
-$messages['searchsuccessful'] = '$nr messages trouvés';
+$messages['noldapserver'] = 'Choisissez un serveur LDAP pour la recherche.';
+$messages['nosearchname'] = 'Entrez un nom de contact ou un courriel.';
+$messages['notuploadedwarning'] = 'Toutes les pièces jointes n\'ont pas encore été transférées. Veuillez patienter ou annuler cette opération.';
+$messages['searchsuccessful'] = '$nr message(s) trouvé(s).';
 $messages['contactsearchsuccessful'] = '$nr contact(s) trouvé(s).';
-$messages['searchnomatch'] = 'La recherche ne donne aucun résultat';
-$messages['searching'] = 'En cours de recherche...';
-$messages['checking'] = 'Vérification...';
-$messages['nospellerrors'] = 'Aucune faute trouvée';
-$messages['folderdeleted'] = 'Dossier effacé';
-$messages['foldersubscribed'] = 'Le dossier a bien été inscrit';
-$messages['folderunsubscribed'] = 'Le dossier a bien été désinscrit';
-$messages['folderpurged'] = 'Le dossier a bien été vidé';
-$messages['folderexpunged'] = 'Le dossier a bien été compacté';
-$messages['deletedsuccessfully'] = 'Supprimé(s) avec succès';
+$messages['searchnomatch'] = 'La recherche n\'a donné aucun résultat.';
+$messages['searching'] = 'Recherche en cours...';
+$messages['checking'] = 'Vérification en cours...';
+$messages['nospellerrors'] = 'Aucune faute d\'orthographe trouvée.';
+$messages['folderdeleted'] = 'Le dossier a bien été effacé.';
+$messages['foldersubscribed'] = 'Le dossier a bien été inscrit.';
+$messages['folderunsubscribed'] = 'Le dossier a bien été désinscrit.';
+$messages['folderpurged'] = 'Le dossier a bien été vidé.';
+$messages['folderexpunged'] = 'Le dossier a bien été compacté.';
+$messages['deletedsuccessfully'] = 'Correctement supprimé(s).';
 $messages['converting'] = 'Suppression de la mise en forme...';
-$messages['messageopenerror'] = 'Impossible de charger le message depuis serveur';
+$messages['messageopenerror'] = 'Impossible de charger le message depuis serveur.';
 $messages['fileuploaderror'] = 'Transfert du fichier échoué';
-$messages['filesizeerror'] = 'Le fichier transféré dépasse la taille maximale de $size';
-$messages['copysuccess'] = 'Succès de la copie des $nr adresses';
-$messages['copyerror'] = 'Ne peut pas copier les adresses';
-$messages['sourceisreadonly'] = 'Cette source d\'adresse est en lecture seule';
-$messages['errorsavingcontact'] = 'Ne peut pas enregistrer l\'adresse du contact';
-$messages['movingmessage'] = 'Déplacement du message...';
-$messages['copyingmessage'] = 'Copie du message ...';
-$messages['copyingcontact'] = 'Copie des contacts ...';
-$messages['deletingmessage'] = 'Suppression des messages...';
-$messages['markingmessage'] = 'Marquage des messages...';
-$messages['addingmember'] = 'Ajout des contacts dans le groupe ...';
-$messages['removingmember'] = 'Suppression des contacts du groupe ...';
-$messages['receiptsent'] = 'L\'accusé de réception a bien été envoyé';
-$messages['errorsendingreceipt'] = 'L\'accusé de réception n\'a pas pu être envoyé';
-$messages['deleteidentityconfirm'] = 'Voulez vous vraiment supprimer cette identités ?';
+$messages['filesizeerror'] = 'Le fichier transféré dépasse la taille maximale de $size.';
+$messages['copysuccess'] = '$nr contacts correctement copiés.';
+$messages['movesuccess'] = '$nr contacts correctement  déplacés.';
+$messages['copyerror'] = 'Aucun contact n\'a pu être copié.';
+$messages['moveerror'] = 'Aucun contact n\'a pu être déplacé.';
+$messages['sourceisreadonly'] = 'Cette source d\'adresse est en lecture seule.';
+$messages['errorsavingcontact'] = 'Impossible de sauvegarder l\'adresse du contact.';
+$messages['movingmessage'] = 'Message(s) en cours de déplacement...';
+$messages['copyingmessage'] = 'Message(s) en cours de copie...';
+$messages['copyingcontact'] = 'Contact(s) en cours de copie...';
+$messages['movingcontact'] = 'Contact(s) en cours de déplacement...';
+$messages['deletingmessage'] = 'Message(s) en cours de suppression...';
+$messages['markingmessage'] = 'Message(s) en cours de marquage...';
+$messages['addingmember'] = 'Contact(s) en cours d\'ajout dans le groupe...';
+$messages['removingmember'] = 'Contact(s) en cours de suppression du groupe...';
+$messages['receiptsent'] = 'L\'accusé de réception a bien été envoyé.';
+$messages['errorsendingreceipt'] = 'Impossible d\'envoyer l\'accusé de réception.';
+$messages['deleteidentityconfirm'] = 'Voulez vous vraiment supprimer cette identité ?';
 $messages['nodeletelastidentity'] = 'Vous ne pouvez pas effacer votre seule identité.';
-$messages['forbiddencharacter'] = 'Le nom du dossier contient un caractère interdit';
-$messages['selectimportfile'] = 'Veuillez sélectionner un fichier à envoyer';
-$messages['addresswriterror'] = 'Impossible d\'écrire dans le carnet d\'adresse sélectionné';
-$messages['contactaddedtogroup'] = 'Les contacts ont bien été ajoutés à ce groupe';
-$messages['contactremovedfromgroup'] = 'Les contacts ont bien été supprimés de ce groupe';
+$messages['forbiddencharacter'] = 'Le nom du dossier contient un caractère interdit.';
+$messages['selectimportfile'] = 'Veuillez sélectionner un fichier à transférer.';
+$messages['addresswriterror'] = 'Impossible d\'écrire dans le carnet d\'adresse sélectionné.';
+$messages['contactaddedtogroup'] = 'Les contacts ont bien été ajoutés à ce groupe.';
+$messages['contactremovedfromgroup'] = 'Les contacts ont bien été supprimés de ce groupe.';
 $messages['nogroupassignmentschanged'] = 'Appartenance aux groupes inchangée.';
-$messages['importwait'] = 'Importation, veuillez patienter...';
-$messages['importformaterror'] = 'Echec de l\'import ! Le fichier n\'est pas un fichier d\'import de données valide.';
-$messages['importconfirm'] = '<b>$inserted contacts importés avec succès, $skipped entrées existantes ignorées</b>:<p><em>$names</em></p>';
+$messages['importwait'] = 'Import en cours, veuillez patienter...';
+$messages['importformaterror'] = 'L\'import a échoué ! Le fichier transféré n\'est pas un fichier d\'import de données valide.';
+$messages['importconfirm'] = '<b>Les $inserted contacts ont bien été importés</b>';
 $messages['importconfirmskipped'] = '<b>$skipped entrée(s) déjà existante(s)</b>';
+$messages['importmessagesuccess'] = 'Importation de $nr messages avec succès';
+$messages['importmessageerror'] = 'L\'importation a échoué! Le fichier envoyé n\'est pas un message valide ou un fichier au format mailbox';
 $messages['opnotpermitted'] = 'Cette opération n\'est pas permise !';
-$messages['nofromaddress'] = 'Il manque une adresse e-mail dans l\'identité sélectionnée';
-$messages['editorwarning'] = 'Passer à l\'éditeur texte seul causera la perte du formatage du texte. Voulez-vous continuer ?';
+$messages['nofromaddress'] = 'Courriel manquant dans l\'identité sélectionnée.';
+$messages['editorwarning'] = 'Passer à l\'éditeur de texte brut causera la perte du formatage du texte. Souhaitez-vous continuer ?';
 $messages['httpreceivedencrypterror'] = 'Une erreur fatale de configuration est survenue. Veuillez contacter votre administrateur immédiatement. <b>Votre message n\'a pas pu être envoyé.</b>';
-$messages['smtpconnerror'] = 'Erreur SMTP ($code): Echec de la connexion au serveur';
-$messages['smtpautherror'] = 'Erreur SMTP ($code): Echec de l\'authentification';
-$messages['smtpfromerror'] = 'Erreur SMTP ($code): Impossible de définir l\'expéditeur "$from" ($msg)';
-$messages['smtptoerror'] = 'Erreur SMTP ($code): Impossible d\'ajouter le destinataire "$to" ($msg)';
-$messages['smtprecipientserror'] = 'Erreur SMTP: Impossible de lire la liste des destinataires';
-$messages['smtperror'] = 'Erreur SMTP: $msg';
-$messages['emailformaterror'] = 'Adresse email incorrecte: $email';
+$messages['smtpconnerror'] = 'Erreur SMTP ($code) : Échec de la connexion au serveur.';
+$messages['smtpautherror'] = 'Erreur SMTP ($code) : Échec de l\'authentification.';
+$messages['smtpfromerror'] = 'Erreur SMTP ($code) : Impossible de définir l\'expéditeur "$from" ($msg)';
+$messages['smtptoerror'] = 'Erreur SMTP ($code) : Impossible d\'ajouter le destinataire "$to" ($msg)';
+$messages['smtprecipientserror'] = 'Erreur SMTP : Impossible de lire la liste des destinataires.';
+$messages['smtperror'] = 'Erreur SMTP : $msg';
+$messages['emailformaterror'] = 'Courriel incorrect : $email';
 $messages['toomanyrecipients'] = 'Trop de destinataires. Réduisez leur nombre à $max maximum.';
 $messages['maxgroupmembersreached'] = 'Le nombre de membres du groupe dépasse le maximum de $max.';
-$messages['internalerror'] = 'Une erreur interne est survenue. Merci de réessayer';
-$messages['contactdelerror'] = 'Les contacts n\'ont pas pu être supprimés';
-$messages['contactdeleted'] = 'Les contacts ont bien été supprimés';
-$messages['contactrestoreerror'] = 'Impossible de restaurer les contacts supprimés.';
-$messages['contactrestored'] = 'Les contacts ont bien été restaurés.';
-$messages['groupdeleted'] = 'Le groupe a bien été supprimé';
-$messages['grouprenamed'] = 'Le groupe a bien été renommé';
-$messages['groupcreated'] = 'Le groupe a bien été créé';
+$messages['internalerror'] = 'Une erreur interne est apparue. Merci de ré-essayer.';
+$messages['contactdelerror'] = 'Impossible de supprimer le(s) contact(s).';
+$messages['contactdeleted'] = 'Contact(s) correctement supprimé(s).';
+$messages['contactrestoreerror'] = 'Impossible de restaurer le(s) contact(s) supprimé(s).';
+$messages['contactrestored'] = 'Contact(s) correctement restauré(s).';
+$messages['groupdeleted'] = 'Le groupe a bien été supprimé.';
+$messages['grouprenamed'] = 'Le groupe a bien été renommé.';
+$messages['groupcreated'] = 'Le groupe a bien été créé.';
 $messages['savedsearchdeleted'] = 'La recherche enregistrée a bien été supprimée.';
 $messages['savedsearchdeleteerror'] = 'Impossible de supprimer la recherche enregistrée.';
-$messages['savedsearchcreated'] = 'La recherche enregistrée a bien été crée.';
+$messages['savedsearchcreated'] = 'La recherche enregistrée a bien été créée.';
 $messages['savedsearchcreateerror'] = 'Impossible de créer la recherche enregistrée.';
-$messages['messagedeleted'] = 'Les messages ont bien été supprimés';
-$messages['messagemoved'] = 'Les messages ont bien été déplacés';
-$messages['messagecopied'] = 'Les messages ont bien été copiés';
-$messages['messagemarked'] = 'Les messages ont bien été marqués';
-$messages['autocompletechars'] = 'Entrez au moins $min caractères pour l\'auto-complétion';
-$messages['autocompletemore'] = 'Plusieurs entrées trouvées. Tapez plus de caractères.';
-$messages['namecannotbeempty'] = 'Le nom ne peut pas être vide';
-$messages['nametoolong'] = 'Le nom est trop long';
-$messages['folderupdated'] = 'Le dossier a bien été mis à jour';
-$messages['foldercreated'] = 'Le dossier a bien été créé';
-$messages['invalidimageformat'] = 'Format d\'image invalide';
+$messages['messagedeleted'] = 'Message(s) correctement supprimé(s).';
+$messages['messagemoved'] = 'Message(s) correctement déplacé(s).';
+$messages['messagecopied'] = 'Message(s) correctement copié(s).';
+$messages['messagemarked'] = 'Message(s) correctement marqué(s).';
+$messages['autocompletechars'] = 'Entrez au moins $min caractères pour l\'auto-complétion.';
+$messages['autocompletemore'] = 'Plusieurs entrées trouvées. Veuillez taper plus de caractères.';
+$messages['namecannotbeempty'] = 'Le nom ne peut pas être vide.';
+$messages['nametoolong'] = 'Le nom est trop long.';
+$messages['folderupdated'] = 'Le dossier a bien été mis à jour.';
+$messages['foldercreated'] = 'Le dossier a bien été créé.';
+$messages['invalidimageformat'] = 'Format d\'image invalide.';
 $messages['mispellingsfound'] = 'Des fautes d\'orthographe ont été détectées dans le message.';
 $messages['parentnotwritable'] = 'Impossible de créer/déplacer le dossier dans le dossier parent sélectionné. Aucun droit d\'accès.';
 $messages['messagetoobig'] = 'Le message est trop gros pour être traité.';
diff --git a/program/localization/fy_NL/labels.inc b/program/localization/fy_NL/labels.inc
index 5e9fcac..dc1e579 100644
--- a/program/localization/fy_NL/labels.inc
+++ b/program/localization/fy_NL/labels.inc
@@ -15,9 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
-$labels['welcome']   = 'Welcome to $product';
 $labels['username']  = 'Brûkersnamme';
 $labels['password']  = 'Wachtwurd';
 $labels['server']    = 'Server';
@@ -26,41 +23,24 @@
 $labels['mail']     = 'Mail';
 $labels['settings'] = 'Ynstellingen';
 $labels['addressbook'] = 'Adresboek';
-$labels['inbox']  = 'Inbox';
 $labels['drafts'] = 'Konsepten';
 $labels['sent']   = 'Stjoerd';
 $labels['trash']  = 'Jiskefet';
-$labels['junk']   = 'Junk';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Ûnderwerp';
 $labels['from']    = 'Fan';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Oan';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Antwurd oan';
 $labels['followupto'] = 'Oanslutend oan';
 $labels['date']    = 'Datum';
-$labels['size']    = 'Size';
-$labels['priority'] = 'Priority';
 $labels['organization'] = 'Organisaasje';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'Mappen';
-$labels['messagesfromto'] = 'Messages $from to $to of $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
-$labels['messagenrof'] = 'Message $nr of $count';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'Kopieare';
 $labels['move']     = 'Ferplaatse';
-$labels['moveto']   = 'Move to...';
 $labels['download'] = 'Delhelje';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'Toane';
-$labels['showanyway'] = 'Show it anyway';
-$labels['filename'] = 'File name';
 $labels['filesize'] = 'Triemgrutte';
-$labels['addtoaddressbook'] = 'Add to address book';
 $labels['sun'] = 'sne';
 $labels['mon'] = 'moa';
 $labels['tue'] = 'tii';
@@ -101,381 +81,6 @@
 $labels['longdec']	= 'desimber';
 $labels['today'] = 'Hjoed';
 $labels['refresh']          = 'Ferfarskje';
-$labels['checkmail']        = 'Check for new messages';
-$labels['compose']          = 'Compose';
-$labels['writenewmessage']  = 'Create a new message';
 $labels['reply']            = 'Beäntwurdzje';
-$labels['replytomessage']   = 'Reply to sender';
-$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
-$labels['forwardmessage']   = 'Forward the message';
-$labels['deletemessage']    = 'Delete message';
-$labels['movemessagetotrash'] = 'Move message to trash';
-$labels['printmessage']     = 'Print this message';
-$labels['previousmessage']  = 'Show previous message';
-$labels['firstmessage']     = 'Show first message';
-$labels['nextmessage']      = 'Show next message';
-$labels['lastmessage']      = 'Show last message';
-$labels['backtolist']       = 'Back to message list';
-$labels['viewsource']       = 'Show source';
-$labels['mark']             = 'Mark';
-$labels['markmessages']     = 'Mark messages';
-$labels['markread']         = 'As read';
-$labels['markunread']       = 'As unread';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
-$labels['select'] = 'Select';
-$labels['all'] = 'All';
-$labels['none'] = 'None';
-$labels['currpage'] = 'Current page';
-$labels['unread'] = 'Unread';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
-$labels['filter'] = 'Filter';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
-$labels['nonesort'] = 'None';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
-$labels['compact'] = 'Compact';
-$labels['empty'] = 'Empty';
-$labels['importmessages'] = 'Import messages';
-$labels['quota'] = 'Disk usage';
-$labels['unknown']  = 'unknown';
-$labels['unlimited']  = 'unlimited';
-$labels['quicksearch']  = 'Quick search';
-$labels['resetsearch']  = 'Reset search';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
-$labels['sendmessage']    = 'Send message';
-$labels['savemessage']    = 'Save as draft';
-$labels['addattachment']  = 'Attach a file';
-$labels['charset']        = 'Charset';
-$labels['editortype']     = 'Editor type';
-$labels['returnreceipt']  = 'Return receipt';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
-$labels['checkspelling'] = 'Check spelling';
-$labels['resumeediting'] = 'Resume editing';
-$labels['revertto']      = 'Revert to';
-$labels['attach'] = 'Attach';
-$labels['attachments'] = 'Attachments';
-$labels['upload'] = 'Upload';
-$labels['uploadprogress'] = '$percent ($current from $total)';
-$labels['close']  = 'Close';
-$labels['messageoptions']  = 'Message options...';
-$labels['low']     = 'Low';
-$labels['lowest']  = 'Lowest';
-$labels['normal']  = 'Normal';
-$labels['high']    = 'High';
-$labels['highest'] = 'Highest';
-$labels['nosubject']  = '(no subject)';
-$labels['showimages'] = 'Display images';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
-$labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'Plain text';
-$labels['savesentmessagein'] = 'Save sent message in';
-$labels['dontsave'] = 'don\'t save';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
-$labels['addcc'] = 'Add Cc';
-$labels['addbcc'] = 'Add Bcc';
-$labels['addreplyto'] = 'Add Reply-To';
-$labels['addfollowupto'] = 'Add Followup-To';
-$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
-$labels['receiptread'] = 'Return Receipt (read)';
-$labels['yourmessage'] = 'This is a Return Receipt for your message';
-$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
-$labels['name']         = 'Display Name';
-$labels['firstname']    = 'First Name';
-$labels['surname']      = 'Last Name';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
-$labels['email']        = 'Email';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
-$labels['addcontact'] = 'Add new contact';
-$labels['editcontact'] = 'Edit contact';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
-$labels['edit']   = 'Edit';
-$labels['cancel'] = 'Cancel';
-$labels['save']   = 'Save';
-$labels['delete'] = 'Delete';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
-$labels['newcontact']     = 'Create new contact card';
-$labels['deletecontact']  = 'Delete selected contacts';
-$labels['composeto']      = 'Compose mail to';
-$labels['contactsfromto'] = 'Contacts $from to $to of $count';
-$labels['print']          = 'Print';
-$labels['export']         = 'Export';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
-$labels['previouspage']   = 'Show previous page';
-$labels['firstpage']      = 'Show first page';
-$labels['nextpage']       = 'Show next page';
-$labels['lastpage']       = 'Show last page';
-$labels['group'] = 'Group';
-$labels['groups'] = 'Groups';
-$labels['listgroup'] = 'List group members';
-$labels['personaladrbook'] = 'Personal Addresses';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
-$labels['settingsfor'] = 'Settings for';
-$labels['about'] = 'About';
-$labels['preferences'] = 'Preferences';
-$labels['userpreferences'] = 'User preferences';
-$labels['editpreferences'] = 'Edit user preferences';
-$labels['identities'] = 'Identities';
-$labels['manageidentities'] = 'Manage identities for this account';
-$labels['newidentity'] = 'New identity';
-$labels['newitem'] = 'New item';
-$labels['edititem'] = 'Edit item';
-$labels['preferhtml'] = 'Display HTML';
-$labels['defaultcharset'] = 'Default Character Set';
-$labels['htmlmessage'] = 'HTML Message';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
-$labels['prettydate'] = 'Pretty dates';
-$labels['setdefault']  = 'Set default';
-$labels['autodetect']  = 'Auto';
-$labels['language']  = 'Language';
-$labels['timezone']  = 'Time zone';
-$labels['pagesize']  = 'Rows per page';
-$labels['signature'] = 'Signature';
-$labels['dstactive']  = 'Daylight saving time';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
-$labels['htmleditor'] = 'Compose HTML messages';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
-$labels['htmlsignature'] = 'HTML signature';
-$labels['showemail'] = 'Show email address with display name';
-$labels['previewpane'] = 'Show preview pane';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
-$labels['uisettings'] = 'User Interface';
-$labels['serversettings'] = 'Server Settings';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
-$labels['askuser'] = 'ask me';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
-$labels['showinlineimages'] = 'Display attached images below the message';
-$labels['autosavedraft']  = 'Automatically save draft';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
-$labels['never']  = 'never';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-$labels['folder']  = 'Folder';
 $labels['folders']  = 'Mappen';
-$labels['foldername']  = 'Folder name';
-$labels['subscribed']  = 'Subscribed';
-$labels['messagecount'] = 'Messages';
-$labels['create']  = 'Create';
-$labels['createfolder']  = 'Create new folder';
-$labels['managefolders']  = 'Manage folders';
-$labels['specialfolders'] = 'Special Folders';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
-$labels['sortby'] = 'Sort by';
-$labels['sortasc']  = 'Sort ascending';
-$labels['sortdesc'] = 'Sort descending';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/fy_NL/messages.inc b/program/localization/fy_NL/messages.inc
index 6a67189..da4e396 100644
--- a/program/localization/fy_NL/messages.inc
+++ b/program/localization/fy_NL/messages.inc
@@ -15,157 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
-$messages['loginfailed']  = 'Login failed.';
-$messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
-$messages['sessionerror'] = 'Your session is invalid or expired.';
-$messages['storageerror'] = 'Connection to storage server failed.';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
-$messages['nomessagesfound'] = 'No messages found in this mailbox.';
-$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
-$messages['mailboxempty'] = 'Mailbox is empty.';
-$messages['refreshing'] = 'Refreshing...';
-$messages['loading'] = 'Loading...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
-$messages['loadingdata'] = 'Loading data...';
-$messages['checkingmail'] = 'Checking for new messages...';
-$messages['sendingmessage'] = 'Sending message...';
-$messages['messagesent'] = 'Message sent successfully.';
-$messages['savingmessage'] = 'Saving message...';
-$messages['messagesaved'] = 'Message saved to Drafts.';
-$messages['successfullysaved'] = 'Successfully saved.';
-$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
-$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
-$messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
-$messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
-$messages['nocontactsfound'] = 'No contacts found.';
-$messages['contactnotfound'] = 'The requested contact was not found.';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
-$messages['sendingfailed'] = 'Failed to send message.';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'An error occured while saving.';
-$messages['errormoving'] = 'Could not move the message(s).';
-$messages['errorcopying'] = 'Could not copy the message(s).';
-$messages['errordeleting'] = 'Could not delete the message(s).';
-$messages['errormarking'] = 'Could not mark the message(s).';
-$messages['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
-$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
-$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
-$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
-$messages['formincomplete'] = 'The form was not completely filled out.';
-$messages['noemailwarning'] = 'Please enter a valid email address.';
-$messages['nonamewarning']  = 'Please enter a name.';
-$messages['nopagesizewarning'] = 'Please enter a page size.';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
-$messages['norecipientwarning'] = 'Please enter at least one recipient.';
-$messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
-$messages['nobodywarning'] = 'Send this message without text?';
-$messages['notsentwarning'] = 'Message has not been sent. Do you want to discard your message?';
-$messages['noldapserver'] = 'Please select an ldap server to search.';
-$messages['nosearchname'] = 'Please enter a contact name or email address.';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
-$messages['searchsuccessful'] = '$nr messages found.';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
-$messages['searchnomatch'] = 'Search returned no matches.';
-$messages['searching'] = 'Searching...';
-$messages['checking'] = 'Checking...';
-$messages['nospellerrors'] = 'No spelling errors found.';
-$messages['folderdeleted'] = 'Folder successfully deleted.';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
-$messages['deletedsuccessfully'] = 'Successfully deleted.';
-$messages['converting'] = 'Removing formatting...';
-$messages['messageopenerror'] = 'Could not load message from server.';
-$messages['fileuploaderror'] = 'File upload failed.';
-$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
-$messages['copysuccess'] = 'Successfully copied $nr addresses.';
-$messages['copyerror'] = 'Could not copy any addresses.';
-$messages['sourceisreadonly'] = 'This address source is read only.';
-$messages['errorsavingcontact'] = 'Could not save the contact address.';
-$messages['movingmessage'] = 'Moving message(s)...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
-$messages['errorsendingreceipt'] = 'Could not send the receipt.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
-$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 6d55afc..dc33d00 100644
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Fáilte go $product';
 $labels['username']  = 'Úsáideoir';
 $labels['password']  = 'Pasfhocal';
@@ -31,33 +29,23 @@
 $labels['sent']   = 'Amach';
 $labels['trash']  = 'Bosca bruscair';
 $labels['junk']   = 'Dramhaíl';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Ábhair';
 $labels['from']    = 'Seolaí';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Faighteoir';
 $labels['cc']      = 'Cóipeáil';
 $labels['bcc']     = 'Cóip cheilte';
 $labels['replyto'] = 'Freagair go';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Dáta';
 $labels['size']    = 'Méid';
 $labels['priority'] = 'Tosaíocht';
 $labels['organization'] = 'Eagraíocht';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'Fillteán';
 $labels['messagesfromto'] = 'Teachtaireachta as $from go $to as $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Teachtaireacht $nr as $count';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'Cóipeáil';
 $labels['move']     = 'Bog';
 $labels['moveto']   = 'bog go...';
 $labels['download'] = 'síos-luchtú';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'Comhad';
 $labels['filesize'] = 'Toirt';
 $labels['addtoaddressbook'] = 'Sábháil i mo leabhair seoltaí';
@@ -83,8 +71,6 @@
 $labels['jun']	= 'Mei';
 $labels['jul'] 	= 'Iúi';
 $labels['aug']	= 'Lún';
-$labels['sep']	= 'Sep';
-$labels['oct']	= 'Oct';
 $labels['nov']	= 'Sam';
 $labels['dec']	= 'Nol';
 $labels['longjan']	= 'Eanáir';
@@ -100,21 +86,14 @@
 $labels['longnov']	= 'Samhain';
 $labels['longdec']	= 'Nollag';
 $labels['today'] = 'Inniu';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'Seiceáil chun teachtaireacht nua';
 $labels['compose']          = 'Scríobh teachtaireacht';
 $labels['writenewmessage']  = 'Scríobh teachtaireacht nua';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'Scríobh freagra chun an seolaí';
 $labels['replytoallmessage'] = 'Scríobh freagra chun an seolaí agus na faighteoir';
 $labels['replyall']         = 'Freagra gach';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'Seol ar aghaidh an teachtaireacht';
 $labels['deletemessage']    = 'Chuir an teachtaireacht i mo bosca bruscair';
-$labels['movemessagetotrash'] = 'Move message to trash';
 $labels['printmessage']     = 'Priontáil an teachtaireacht seo';
 $labels['previousmessage']  = 'Taispeáin an teachtaireacht roimhe seo';
 $labels['firstmessage']     = 'Taispeáin an cead teachtaireacht';
@@ -122,88 +101,30 @@
 $labels['lastmessage']      = 'Taispeáin an teachtaireacht deireanach';
 $labels['backtolist']       = 'Téigh ar ais go dtí an liosta teachtaireachta';
 $labels['viewsource']       = 'Éiriú bunchód';
-$labels['mark']             = 'Mark';
-$labels['markmessages']     = 'Mark messages';
-$labels['markread']         = 'As read';
-$labels['markunread']       = 'As unread';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'Togh';
 $labels['all'] = 'An uile';
 $labels['none'] = 'Aon cheann';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Na rudaí nach bhuil corraithe';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
-$labels['filter'] = 'Filter';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'Aon cheann';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Comhbhrúigh';
 $labels['empty'] = 'Folmhaigh';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Toilleadh diosca atá athláimhe';
 $labels['unknown']  = 'gan aithne';
 $labels['unlimited']  = 'gan teorainn';
 $labels['quicksearch']  = 'Mearcuardaigh';
 $labels['resetsearch']  = 'Athshocraigh an cuardach';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Seol mo teachtaireacht láithreach bonn';
 $labels['savemessage']    = 'Sábháil an dréachta seo';
 $labels['addattachment']  = 'Suimigh Iatán';
 $labels['charset']        = 'Foireann carachtar';
 $labels['editortype']     = 'Sort eagarthóir';
 $labels['returnreceipt']  = 'Admháil léite';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Fiosrú ar mo litriú';
 $labels['resumeediting'] = 'Athdhúisigh eagarthóireacht';
 $labels['revertto']      = 'Filleadh ar';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Iatání';
 $labels['upload'] = 'Aistriú suas';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'Dún';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'Íseal';
 $labels['lowest']  = 'Is Ísle';
 $labels['normal']  = 'Gnách';
@@ -211,118 +132,31 @@
 $labels['highest'] = 'Is Airde';
 $labels['nosubject']  = '(Níl aon Ábhair)';
 $labels['showimages'] = 'Taispeáin na híomhánna';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Téacs amháin';
-$labels['savesentmessagein'] = 'Save sent message in';
-$labels['dontsave'] = 'don\'t save';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
-$labels['addcc'] = 'Add Cc';
-$labels['addbcc'] = 'Add Bcc';
-$labels['addreplyto'] = 'Add Reply-To';
-$labels['addfollowupto'] = 'Add Followup-To';
-$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
-$labels['receiptread'] = 'Return Receipt (read)';
-$labels['yourmessage'] = 'This is a Return Receipt for your message';
-$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
 $labels['name']         = 'Leasainm';
 $labels['firstname']    = 'Ainm baiste';
 $labels['surname']      = 'Sloinne';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'Ríomhphost';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Sábháil duine nua';
 $labels['editcontact'] = 'Chuir chara in eagar';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'Athraigh';
 $labels['cancel'] = 'Cealaigh';
 $labels['save']   = 'Sábháil';
 $labels['delete'] = 'Scrios';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'Scríobh carta teagmháil nua';
 $labels['deletecontact']  = 'Scrios na daoine seo';
 $labels['composeto']      = 'Scríobh teachtaireacht go';
 $labels['contactsfromto'] = 'Daoine as $from to $to as $count';
 $labels['print']          = 'Priontáil';
 $labels['export']         = 'Easportáil';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'Taispeáin an foireann roimhe seo';
 $labels['firstpage']      = 'Taispeáin an céad foireann';
 $labels['nextpage']       = 'Taispeáin an foireann ina dhiaidh sin';
 $labels['lastpage']       = 'Taispeáin an foireann deireanach';
-$labels['group'] = 'Group';
 $labels['groups'] = 'Grúpaí';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Seoltaí Pearsanta';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
 $labels['settingsfor'] = 'Socruithe chun';
-$labels['about'] = 'About';
 $labels['preferences'] = 'Tosaíocht';
 $labels['userpreferences'] = 'Tosaíocht Pearsanta';
 $labels['editpreferences'] = 'Athraigh tosaíocht pearsanta';
@@ -332,150 +166,27 @@
 $labels['newitem'] = 'Mír nua';
 $labels['edititem'] = 'Athraigh mhír';
 $labels['preferhtml'] = 'Taispeáin an HTML';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Teachtaireacht HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Dátaí Dheas';
 $labels['setdefault']  = 'Socraigh an réamhshocraithe';
-$labels['autodetect']  = 'Auto';
 $labels['language']  = 'Teanga';
 $labels['timezone']  = 'Crios ama';
 $labels['pagesize']  = 'Rónna in aghaidh gach leathanach';
 $labels['signature'] = 'Mana clabhsúir';
 $labels['dstactive']  = 'Laethúil um shamhradh';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Scríobh teachtaireachta HTML';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Mana clabhsúir HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Taispeáin an pána réamhamharc';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
-$labels['uisettings'] = 'User Interface';
-$labels['serversettings'] = 'Server Settings';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
-$labels['askuser'] = 'ask me';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
-$labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'Sábháil dréachta go huathoibríoch';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'riamh';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Fillteán';
 $labels['folders']  = 'Fillteán';
 $labels['foldername']  = 'Ainm fillteán';
 $labels['subscribed']  = 'Síntiú';
-$labels['messagecount'] = 'Messages';
 $labels['create']  = 'Cruthaigh';
 $labels['createfolder']  = 'Cruthaigh fillteán nua';
 $labels['managefolders']  = 'Stiúir na fillteán';
-$labels['specialfolders'] = 'Special Folders';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'Sórtáil trí';
 $labels['sortasc']  = 'Sórtáil in ord méadaitheach';
 $labels['sortdesc'] = 'Sórtáil in ord neartaitheach';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/ga_IE/messages.inc b/program/localization/ga_IE/messages.inc
index 67819ec..b52fbe6 100644
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -15,29 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'Theip an iarraidh chun logáil tú isteach';
 $messages['cookiesdisabled'] = 'Níor glac do sracléitheoir an fianán seisiúin';
 $messages['sessionerror'] = 'Tá an seisiúin neamhbhailí nó as feidhm';
 $messages['storageerror'] = 'Theip an iarraidh chun nasc go dtí an freastalaí Prótacal Rochtana Teachtaireachtaí Idirlín (IMAP)';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Ní bhfuair mé aon teachtaireacht i bosca postas seo';
 $messages['loggedout'] = 'D\'éirigh tú logáil amach. Slán Leat!';
 $messages['mailboxempty'] = 'Tá an bosca postas folamh';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Fan nóiméad, ag lódáil...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Ag lódáil sonraí...';
 $messages['checkingmail'] = 'Ag seiceáil chun teachtaireacht nua...';
 $messages['sendingmessage'] = 'Ag seol mo teachtaireacht láithreach bonn...';
@@ -47,128 +32,38 @@
 $messages['successfullysaved'] = 'D\'éirigh mé agus sábháil mé';
 $messages['addedsuccessfully'] = 'D\'éirigh mé agus shábháil mé duine nua go dtí an Leabhair Seoltaí';
 $messages['contactexists'] = 'Tá duine i do Leabhair Seoltaí agus tá an seoladh ríomhphost seo aige';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Chun do príobháide a cosain, choiscinn na híomhánna san teachtaireacht seo';
 $messages['encryptedmessage'] = 'Tá an teachtaireacht seo i criptiúchán, Níl an cumas agam chun é a tionscail';
 $messages['nocontactsfound'] = 'Ní raibh aon buine san Leabhair Seoltaí seo';
 $messages['contactnotfound'] = 'Ní bhfuair mé an duine seo';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Theip an iarraidh chun an teachtaireacht a seol';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'Theip mé agus ní shábháil';
 $messages['errormoving'] = 'Theip mé agus ní bog an teachtaireacht';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Theip mé agus níor scrios me an teachtaireacht';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'Ar mhaith leat scrios na daoine seo?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Ar mhaith leat scrios na teachtaireacht seo?';
 $messages['deletefolderconfirm']  = 'Ar mhaith leat scrios an fillteán seo?';
 $messages['purgefolderconfirm']  = 'Ar mhaith leat scrios gach teachtaireacht san fillteán seo?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Níor chríochnaigh tú an foirm';
 $messages['noemailwarning'] = 'Abair liom seoladh ríomhphost nach bfhuil neamhbhaillí';
 $messages['nonamewarning']  = 'Abair liom do ainm';
 $messages['nopagesizewarning'] = 'Abair liom saghas leathanaigh';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Abair liom faighteoir amhain ar a laghad';
 $messages['nosubjectwarning']  = 'Níl aon ábhair ar an teachtaireacht, ba mhaith tú déarfaidh mé ábair?';
 $messages['nobodywarning'] = 'Níl aon teacs san teachtaireacht, ba mhaith tú déarfaidh mé teachtaireacht ar bith?';
 $messages['notsentwarning'] = 'Theip an iarraidh chun an teachtaireacht a seo. ba mhaith tú scrios do teachtaireacht?';
 $messages['noldapserver'] = 'Abair liom eolaire LDAP chun é a cuardaigh';
 $messages['nosearchname'] = 'Abair liom ainm duine nó seoladh ríomhphost';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'Fuair mé $n teachtaireacht';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Ní bhfuair mé aon rud as an ceist seo';
 $messages['searching'] = 'Ag tástáil...';
 $messages['checking'] = 'Bím ag dhéanamh na mhaoirseachtí...';
 $messages['nospellerrors'] = 'Ní bhfuair mé aon earráidí i teachtaireacht seo';
 $messages['folderdeleted'] = 'D\'éirigh mé, Scrios mé an fillteán';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'D\'éirigh mé, Scrios mé';
 $messages['converting'] = 'Scrios mé formáidithe as an teachtaireacht seo';
 $messages['messageopenerror'] = 'Theip orm chun an teachtaireacht seo a tarrtháil as an freastalaí';
 $messages['fileuploaderror'] = 'Theip an suas-luchtú';
 $messages['filesizeerror'] = 'Beigh an comhad ró-mhor. Is ea $size uas-saghas chun admháil léite';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Tá an foinse seolaigh seo inléite amháin';
 $messages['errorsavingcontact'] = 'Theip mé, Níl an cumas agam an seolagh seo a sábháil';
-$messages['movingmessage'] = 'Moving message(s)...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
-$messages['errorsendingreceipt'] = 'Could not send the receipt.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
-$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 4711d97..780d47d 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Benvido a $product';
 $labels['username']  = 'Nome de usuario';
 $labels['password']  = 'Contrasinal';
@@ -177,7 +175,6 @@
 $labels['searchmod']  = 'Modificadores de busca';
 $labels['msgtext']  = 'Mensaxe enteira';
 $labels['body']  = 'Corpo';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Abrir nunha nova fiestra';
 $labels['emlsave'] = 'Gardar (.eml)';
 $labels['changeformattext'] = 'Amosar en texto plano';
@@ -310,14 +307,12 @@
 $labels['lastpage']       = 'Amosar o último grupo';
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Enderezos persoais';
 $labels['searchsave'] = 'Gardar procura';
 $labels['searchdelete'] = 'Eliminar procura';
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde ficheiro:';
-$labels['importtarget'] = 'Engadir contactos ao caderno de enderezos:';
 $labels['importreplace'] = 'Substituír completamente o caderno de enderezos';
 $labels['importdesc'] = 'Pode cargar contactos desde un caderno de enderezos preexistente.<br/>Pódense importar enderezos en formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (valores separados por comas)';
 $labels['done'] = 'Rematado';
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 8f004ed..599f2ce 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Ocurreu un erro!';
 $messages['loginfailed']  = 'O contrasinal ou o nome de usuario son incorrectos.';
 $messages['cookiesdisabled'] = 'O seu navegador non acepta galletas.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Introduza algún termo para atopar contactos';
 $messages['sendingfailed'] = 'Fallou o envío da mensaxe.';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundos antes de enviar esta mensaxe.';
-$messages['errorsavingsent'] = 'Ocurriu un erro mentres se gardaba a mensaxe enviada.';
-$messages['errorsaving'] = 'Ocurriu un erro mentres se gardaba.';
 $messages['errormoving'] = 'Non foi posible mover a(s) mensaxe(s).';
 $messages['errorcopying'] = 'Non foi posible copiar a(s) mensaxe(s).';
 $messages['errordeleting'] = 'Non foi posible eliminar a(s) mensaxe(s).';
@@ -100,8 +97,6 @@
 $messages['messageopenerror'] = 'Non foi posible cargar a mensaxe desde o servidor.';
 $messages['fileuploaderror'] = 'Fallou a carga do ficheiro.';
 $messages['filesizeerror'] = 'O ficheiro cargado é máis grande que o tamaño máximo de $size.';
-$messages['copysuccess'] = 'Copiáronse correctamente $nr enderezos.';
-$messages['copyerror'] = 'Non foi posible copiar ningún enderezo.';
 $messages['sourceisreadonly'] = 'A orixe é de só lectura.';
 $messages['errorsavingcontact'] = 'Non foi posible gardar o contacto.';
 $messages['movingmessage'] = 'Movendo a(s) mensaxe(s)...';
@@ -140,7 +135,6 @@
 $messages['emailformaterror'] = 'O enderezo de correo electrónico é incorrecto: $email.';
 $messages['toomanyrecipients'] = 'Especificou destinatarios de máis. Por favor, redúzaos a un máximo de $max.';
 $messages['maxgroupmembersreached'] = 'O número de membros do grupo excede o máximo de $max.';
-$messages['internalerror'] = 'Ocurriu un erro interno. Por favor, probe outra vez.';
 $messages['contactdelerror'] = 'Non foi posible eliminar o(s) contacto(s).';
 $messages['contactdeleted'] = 'Borráronse correctamente o(s) contacto(s).';
 $messages['contactrestoreerror'] = 'Non foi posible restaurar o(s) contacto(s) borrado(s).';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 9ee2dba..ad9a91a 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'ברוך בואך אל $product';
 $labels['username']  = 'שם משתמש';
 $labels['password']  = 'סיסמה';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'מאפייני חיפוש';
 $labels['msgtext']  = 'כל ההודעה';
 $labels['body']  = 'גוף ההודעה';
-$labels['type'] = 'Type';
+$labels['type'] = 'סוג';
+$labels['namex'] = 'שם';
 $labels['openinextwin'] = 'פתיחה בחלון חדש';
 $labels['emlsave'] = 'הורדת הודעה בפורמט  EML';
 $labels['changeformattext'] = 'הצגה בפורמט לא מעוצב';
@@ -310,14 +309,13 @@
 $labels['lastpage']       = 'הצגת הקבוצה האחרונה';
 $labels['group'] = 'קבוצה';
 $labels['groups'] = 'קבוצות';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'רשימה של חברי קבוצה';
 $labels['personaladrbook'] = 'כתובות פרטיות';
 $labels['searchsave'] = 'שמירת החיפוש';
 $labels['searchdelete'] = 'מחיקת החיפוש';
 $labels['import'] = 'ייבוא';
 $labels['importcontacts'] = 'ייבוא אנשי קשר';
 $labels['importfromfile'] = 'ייבוא מקובץ';
-$labels['importtarget'] = 'הוספת אנשי קשר לספר הכתובות';
 $labels['importreplace'] = 'החלפת כל פנקס הכתובות';
 $labels['importdesc'] = 'ניתן לטעון אנשי קשר מקובץ חיצוני. אנו תומכים בקבצים הערוכים בצורה של 
  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>  או 
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 276a9f3..b7e7d1a 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'קרתה שגיאה !';
 $messages['loginfailed']  = 'הכניסה נכשלה';
 $messages['cookiesdisabled'] = 'הדפדפן אינו מקבל עוגיות';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'יש להקיש מפתחות חיפוש כדי למצוא אנשי קשר';
 $messages['sendingfailed'] = 'שליחת ההודעה נכשלה';
 $messages['senttooquickly'] = 'נא להמתין $sec שניות לפני מסירת הודעה זו';
-$messages['errorsavingsent'] = 'נגרמה שגיאה במהלך שמירת ההודעה בתיק הודעות יוצאות';
-$messages['errorsaving'] = 'נגרמה שגיאה במהלך השמירה';
 $messages['errormoving'] = 'לא ניתן לתייק את ההודעה';
 $messages['errorcopying'] = 'העתקת ההודעות נכשלה';
 $messages['errordeleting'] = 'לא ניתן למחוק את ההודעה';
@@ -100,13 +97,16 @@
 $messages['messageopenerror'] = 'לא ניתן לטעון ההודעה מהשרת';
 $messages['fileuploaderror'] = 'העלאת הקובץ נכשלה';
 $messages['filesizeerror'] = 'הקובץ לטעינה גדול מהגודל המקסימלי שהוא $size';
-$messages['copysuccess'] = '$nr כתובות הועתקו בהצלחה';
-$messages['copyerror'] = 'לא ניתן להעתיק אף כתובת';
+$messages['copysuccess'] = '$nr אנשי קשר הועתקו בהצלחה';
+$messages['movesuccess'] = '$nr אנשי קשר הועברו בהצלחה';
+$messages['copyerror'] = 'לא ניתן היה להעתיק אנשי קשר כלשהם';
+$messages['moveerror'] = 'לא ניתן היה להעביר אנשי קשר כלשהם';
 $messages['sourceisreadonly'] = 'המקור לכתובת הוא לקריאה בלבד';
 $messages['errorsavingcontact'] = 'לא ניתן לשמור את כתובת איש הקשר';
 $messages['movingmessage'] = 'תיוק ההודעה...';
 $messages['copyingmessage'] = 'הודעת מועתקת...';
 $messages['copyingcontact'] = 'העתקת אנשי קשר...';
+$messages['movingcontact'] = 'אנשי קשר עוברים...';
 $messages['deletingmessage'] = 'המחיקה בתהליך...';
 $messages['markingmessage'] = 'סימון ההודעה בתהליך...';
 $messages['addingmember'] = 'הוספת אנשי קשר לקבוצה...';
@@ -140,7 +140,6 @@
 $messages['emailformaterror'] = '$email  כתובת דוא"ל שגויה';
 $messages['toomanyrecipients'] = 'יותר מדי נמענים. יש להקטין מספרם ל - $max';
 $messages['maxgroupmembersreached'] = 'מספרם של חברי הקבוצה אינו יכול לעבור $max';
-$messages['internalerror'] = 'שגיאת מערכת. נא לנסות שנית';
 $messages['contactdelerror'] = 'לא ניתן למחוק איש קשר';
 $messages['contactdeleted'] = 'איש הקשר נמחק';
 $messages['contactrestoreerror'] = 'לא ניתן לשחזר איש קשר שנמחק';
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index ccad601..a8b684c 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '$product में स्वागत है';
 $labels['username']  = 'यूसरनाम';
 $labels['password']  = 'पासवर्ड';
@@ -31,10 +29,8 @@
 $labels['sent']   = 'भेजा गया';
 $labels['trash']  = 'रद्दी';
 $labels['junk']   = 'स्पैम';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'विशय';
 $labels['from']    = 'भेजने वाला';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'पाने वाला';
 $labels['cc']      = 'कार्बन';
 $labels['bcc']     = 'अंधा कार्बन';
@@ -44,20 +40,13 @@
 $labels['size']    = 'माप';
 $labels['priority'] = 'मेल की महत्वपूर्णता';
 $labels['organization'] = 'संस्था';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'फ़ोल्डर';
 $labels['messagesfromto'] = '$from से ले कर $to, $count मेल में से';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr नम्बर मेल, $count में से';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'कार्बन';
 $labels['move']     = 'स्थानांतरित करें';
 $labels['moveto']   = 'खीस्काऐं...';
 $labels['download'] = 'डाऊनलोड';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'फ़ाईल नाम';
 $labels['filesize'] = 'फ़ाईल माप';
 $labels['addtoaddressbook'] = 'पता खाते में जोडें';
@@ -82,11 +71,6 @@
 $labels['may']	= 'मई';
 $labels['jun']	= 'जून';
 $labels['jul'] 	= 'जुलाई';
-$labels['aug']	= 'Aug';
-$labels['sep']	= 'Sep';
-$labels['oct']	= 'Oct';
-$labels['nov']	= 'Nov';
-$labels['dec']	= 'Dec';
 $labels['longjan']	= 'जनवरी';
 $labels['longfeb']	= 'फ़रवरी';
 $labels['longmar']	= 'मार्च';
@@ -107,14 +91,9 @@
 $labels['reply']            = 'जवाब';
 $labels['replytomessage']   = 'मेल का जवाब दें';
 $labels['replytoallmessage'] = 'सभी को जवाब लिखें';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
 $labels['forward']          = 'अग्रेषित करें';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'आगे भेजें';
 $labels['deletemessage']    = 'रद्द करें';
-$labels['movemessagetotrash'] = 'Move message to trash';
 $labels['printmessage']     = 'मेल छापें';
 $labels['previousmessage']  = 'पीछे के मेल दिखाऐं';
 $labels['firstmessage']     = 'पहला मेल दिखाऐं';
@@ -123,87 +102,30 @@
 $labels['backtolist']       = 'मेल सूची देखें';
 $labels['viewsource']       = 'सोर्स दिखाऐं';
 $labels['mark']             = 'चिह्नित';
-$labels['markmessages']     = 'Mark messages';
-$labels['markread']         = 'As read';
-$labels['markunread']       = 'As unread';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'चुनें';
 $labels['all'] = 'सभी';
 $labels['none'] = 'कोई नहीं';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'अनदेखी';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
-$labels['filter'] = 'Filter';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'कोई नहीं';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'छोटा करें';
 $labels['empty'] = 'मेल रद्दी में डालें';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'डिस्क उपयोग';
 $labels['unknown']  = 'अज्ञात';
 $labels['unlimited']  = 'असीम';
 $labels['quicksearch']  = 'तेज़ खोज';
 $labels['resetsearch']  = 'खोज खाली करें';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'मेल भेजें';
 $labels['savemessage']    = 'ड्राफ़ट सहेजें';
 $labels['addattachment']  = 'फ़ाईल जोडें';
 $labels['charset']        = 'कैरेक्टर सैट';
 $labels['editortype']     = 'सम्पादक प्राकार';
 $labels['returnreceipt']  = 'मेल रसीद';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'स्पैलिंग जाँचें';
 $labels['resumeediting'] = 'सम्पादन फिर शुरू करें';
 $labels['revertto']      = 'पहले की स्थिती पर जाऐं';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'जुडे फाईल';
 $labels['upload'] = 'अपलोड';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'बंद';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'कम';
 $labels['lowest']  = 'सबसे कम';
 $labels['normal']  = 'साधारण';
@@ -211,118 +133,29 @@
 $labels['highest'] = 'उच्चतम';
 $labels['nosubject']  = '(कोई विशय नहीं)';
 $labels['showimages'] = 'चित्र दिखाऐं';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'ऐच-टी-ऐम-एल (HTML)';
 $labels['plaintoggle'] = 'सादा पाठ';
-$labels['savesentmessagein'] = 'Save sent message in';
-$labels['dontsave'] = 'don\'t save';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
-$labels['addcc'] = 'Add Cc';
-$labels['addbcc'] = 'Add Bcc';
-$labels['addreplyto'] = 'Add Reply-To';
-$labels['addfollowupto'] = 'Add Followup-To';
-$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
-$labels['receiptread'] = 'Return Receipt (read)';
-$labels['yourmessage'] = 'This is a Return Receipt for your message';
-$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
 $labels['name']         = 'दिखने वाला नाम';
 $labels['firstname']    = 'पहला नाम';
 $labels['surname']      = 'उपनाम';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'मेल';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'नया पता जोडें';
 $labels['editcontact'] = 'पता सम्पाद';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'सम्पाद';
 $labels['cancel'] = 'रद्द';
 $labels['save']   = 'सहेज';
 $labels['delete'] = 'मिटा';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'नया पता कार्ड बनाऐं';
 $labels['deletecontact']  = 'चुने पते मिटाऐं';
 $labels['composeto']      = 'को मेल भेजें';
 $labels['contactsfromto'] = '$from से ले कर $to, $count पते में से';
 $labels['print']          = 'छापें';
 $labels['export']         = 'ऐक्स्पोर्ट';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'इससे पहले के बन्डल को दिखाऐं';
 $labels['firstpage']      = 'पहला बन्डल दिखाऐं';
 $labels['nextpage']       = 'अगला बन्डल दिखाऐं';
 $labels['lastpage']       = 'आखिरी बन्डल दिखाऐं';
-$labels['group'] = 'Group';
-$labels['groups'] = 'Groups';
-$labels['listgroup'] = 'List group members';
-$labels['personaladrbook'] = 'Personal Addresses';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
 $labels['settingsfor'] = 'इनके विन्यास:';
-$labels['about'] = 'About';
 $labels['preferences'] = 'पसंद';
 $labels['userpreferences'] = 'यूसर पसंद';
 $labels['editpreferences'] = 'यूसर पसंद सम्पादें';
@@ -332,150 +165,27 @@
 $labels['newitem'] = 'नया चीज़';
 $labels['edititem'] = 'चीज़ सम्पादें';
 $labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) दिखाऐं';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूप मेल करें';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'सुनदर तारीखें';
 $labels['setdefault']  = 'तयशुदा चुनें';
-$labels['autodetect']  = 'Auto';
 $labels['language']  = 'भाषा';
 $labels['timezone']  = 'समय क्षेत्र';
 $labels['pagesize']  = 'हर पन्ने पर इतने';
 $labels['signature'] = 'दस्तखत';
 $labels['dstactive']  = 'रौशनी बचाव';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'मेल ऐच-टी-ऐम-एल (HTML) मे लिखें';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ऐच-टी-ऐम-एल (HTML) दस्तखत';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'झलक पट्टी दिखाऐं';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
-$labels['uisettings'] = 'User Interface';
-$labels['serversettings'] = 'Server Settings';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
-$labels['askuser'] = 'ask me';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
-$labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'ड्राफ़ट अपने आप सहेजते जाऐं';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'कभी नहाीं';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'फ़ोल्डर';
 $labels['folders']  = 'फ़ोल्डर';
 $labels['foldername']  = 'फ़ोल्डर नाम';
 $labels['subscribed']  = 'सबस्क्राईब किया गया';
-$labels['messagecount'] = 'Messages';
 $labels['create']  = 'बनाऐं';
 $labels['createfolder']  = 'फ़ोलडर बनाऐं';
 $labels['managefolders']  = 'फ़ोलडर को व्यवस्थित करें';
-$labels['specialfolders'] = 'Special Folders';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'ऐसे तय करें';
 $labels['sortasc']  = 'पहले से आखीरी तय करें';
 $labels['sortdesc'] = 'आखीरी से पहले तय करें';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/hi_IN/messages.inc b/program/localization/hi_IN/messages.inc
index 8f66b13..9cf0269 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -15,29 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'लॉगिन नहीं हो पाया';
 $messages['cookiesdisabled'] = 'आपका ब्राऊसर कुकी स्वीकार नहीं कर रहा है';
 $messages['sessionerror'] = 'सत्र समाप्त या अवैद्य';
 $messages['storageerror'] = 'आईमैप (IMAP) सर्वर से सम्पर्क नहीं हो पाया';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'इस मेलबॉक्स में कोई मेल नहीं है';
 $messages['loggedout'] = 'सत्र समाप्त. टा टा!';
 $messages['mailboxempty'] = 'मेलबॉक्स खाली है';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'लोड हो रहा है';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'डाटा लोड हो रहा है...';
 $messages['checkingmail'] = 'क्या नया मेल है?...';
 $messages['sendingmessage'] = 'मेल भेजा जा रहा है...';
@@ -47,128 +32,35 @@
 $messages['successfullysaved'] = 'सहेजा गया है';
 $messages['addedsuccessfully'] = 'पता खाते में पता जोडा गया है';
 $messages['contactexists'] = 'इस ई-मेल पता से एक पता पेहले से है';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'आप के प्राईवेसी के लिये और स्पैम से बचने के लिये इस मेल में सदूर चित्र नहीं दिखाये गये हैं।';
 $messages['encryptedmessage'] = 'माफ़ कीजिये, यह मेल कूट रूप में है, इस कारण दिखाया नहीं जा सकता।';
 $messages['nocontactsfound'] = 'कोई पता नहीं मिला';
-$messages['contactnotfound'] = 'The requested contact was not found.';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'मेल नहीं भिज पाया';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'सहेजते-सहेजते गडबड हो गया';
 $messages['errormoving'] = 'मेल खिस्का नहीं';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'मेल मिटा नहीं';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'चुने गये पते को सचमुच मिटाना है ?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'चुने गये मेल को सचमुच मिटाना है ?';
 $messages['deletefolderconfirm']  = 'फ़ोल्डर को सचमुच मिटाऐं ?';
 $messages['purgefolderconfirm']  = 'फ़ोल्डर में पडे सारे मेल को सचमुच मिटाना है?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'फ़ॉर्म पूरी तरह से भरा नहीं';
 $messages['noemailwarning'] = 'वैद्य मेल पता भरें';
 $messages['nonamewarning']  = 'नाम भरें';
 $messages['nopagesizewarning'] = 'पन्ना माप भरें';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'कम-से-कम एक पाने वाले का पता भरें';
 $messages['nosubjectwarning']  = 'मेल का कोई विशय नहीं बताया गया है। क्या आप विशय डालना चाहते हैं ?';
 $messages['nobodywarning'] = 'बिना कुछ लिखे मेल भेजें?';
 $messages['notsentwarning'] = 'मेल भिजा नहीं. मेल रद्द करें ?';
 $messages['noldapserver'] = 'खोज के लिये एक ऐलडैप सर्वर चुनें';
 $messages['nosearchname'] = 'पता या पते का नाम भरें';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr मेल मिले';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'खोज असफ़ल';
 $messages['searching'] = 'खोजा रहे हैं...';
 $messages['checking'] = 'चाँचा चा रहा है...';
 $messages['nospellerrors'] = 'कोई स्पैलिंग गलती नहीं मिली';
 $messages['folderdeleted'] = 'फ़ोल्डर मिट गया';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'मिट गया';
 $messages['converting'] = 'मेल से फ़ॉर्मैटिंग निकाला जा रहा है...';
 $messages['messageopenerror'] = 'सर्वर से मेल लोड नहीं हो पाया';
 $messages['fileuploaderror'] = 'फ़ाईल अपलोड नहीं हो पाया';
 $messages['filesizeerror'] = 'अपलोड के लिये फ़ाईल हद $size से बड़ा है';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
-$messages['sourceisreadonly'] = 'This address source is read only.';
-$messages['errorsavingcontact'] = 'Could not save the contact address.';
-$messages['movingmessage'] = 'Moving message(s)...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
-$messages['errorsendingreceipt'] = 'Could not send the receipt.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
-$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index d4e2b1a..70d1c13 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Dobrodošli na $product';
 $labels['username']  = 'Korisničko ime';
 $labels['password']  = 'Lozinka';
@@ -31,10 +29,8 @@
 $labels['sent']   = 'Poslano';
 $labels['trash']  = 'Smeće';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Naslov';
 $labels['from']    = 'Od';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Za';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -45,7 +41,6 @@
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Pročitano';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'Mape';
 $labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
 $labels['threadsfromto'] = 'Teme od $from do $to od ukupno $count';
@@ -55,9 +50,6 @@
 $labels['move']     = 'Premjesti';
 $labels['moveto']   = 'Premjesti u...';
 $labels['download'] = 'Preuzmi (download)';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Veličina datoteke';
 $labels['addtoaddressbook'] = 'Dodaj u imenik';
@@ -139,9 +131,7 @@
 $labels['unread'] = 'Nepročitane';
 $labels['flagged'] = 'Označene';
 $labels['unanswered'] = 'Neodgovrene';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Obrisano';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Obrni';
 $labels['filter'] = 'Filtriraj';
 $labels['list'] = 'Lista';
@@ -168,7 +158,6 @@
 $labels['folderactions'] = 'Akcije mapa';
 $labels['compact'] = 'Kompresiranje';
 $labels['empty'] = 'Isprazni';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Kvota';
 $labels['unknown']  = 'nepoznato';
 $labels['unlimited']  = 'beskonačna';
@@ -176,14 +165,9 @@
 $labels['resetsearch']  = 'Prikaži sve poruke';
 $labels['searchmod']  = 'Postavke pretrage';
 $labels['msgtext']  = 'Cijela poruka';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Uredi kao novo';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Pošalji poruku';
 $labels['savemessage']    = 'Spremi u \'Predlošci\'';
 $labels['addattachment']  = 'Priloži datoteku';
@@ -213,9 +197,6 @@
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Uvijek prikaži slike od $sender';
 $labels['isdraft']    = 'Ova poruka je skica (draft)';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Samo tekst';
 $labels['savesentmessagein'] = 'Spremi poslane poruke u';
@@ -290,36 +271,29 @@
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Smijeniti';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'Dodaj novi kontakt';
 $labels['deletecontact']  = 'Obriši odabrane kontakte';
 $labels['composeto']      = 'Napiši mail...';
 $labels['contactsfromto'] = 'Kontakti od $from do $to od ukupno $count';
 $labels['print']          = 'Print';
 $labels['export']         = 'Export';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Izvezi kontakte u vCard formatu';
 $labels['newcontactgroup'] = 'Napravi novu kontaktnu grupu';
 $labels['grouprename']    = 'Promijeni ime grupe';
 $labels['groupdelete']    = 'Izbriši grupu';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'Prethodna strana';
 $labels['firstpage']      = 'Prva strana';
 $labels['nextpage']       = 'Slijedeća strana';
 $labels['lastpage']       = 'Zadnja strana';
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupe';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Privatna adresa';
 $labels['searchsave'] = 'Pohrani pretragu';
 $labels['searchdelete'] = 'Obriši pretragu';
 $labels['import'] = 'Uvoz';
 $labels['importcontacts'] = 'Uvoz kontakta';
 $labels['importfromfile'] = 'Uvezi iz datoteke:';
-$labels['importtarget'] = 'Dodaj nove kontakte u imenik:';
 $labels['importreplace'] = 'Prepiši cijeli adresar';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Završeno';
 $labels['settingsfor'] = 'Postavke za';
 $labels['about'] = 'O programu';
@@ -334,8 +308,6 @@
 $labels['preferhtml'] = 'HTML format u prednosti';
 $labels['defaultcharset'] = 'Zadani skup znakova';
 $labels['htmlmessage'] = 'HTML format poruke';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Format datuma';
 $labels['timeformat'] = 'Format vremena';
 $labels['prettydate'] = 'Formatiran datum';
@@ -346,13 +318,9 @@
 $labels['pagesize']  = 'Redova po stranici';
 $labels['signature'] = 'Potpis';
 $labels['dstactive']  = 'Automatska promjena vremena';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Sastavi HTML poruke';
 $labels['htmlonreply'] = 'odgovor samo na HTML poruke';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML potpis';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Prikaži područje pregleda';
 $labels['skin'] = 'Tema izgleda';
 $labels['logoutclear'] = 'Očisti smeće pri izlazu';
@@ -370,14 +338,12 @@
 $labels['flagfordeletion'] = 'Označi poruku za brisanje umjesto brisanja';
 $labels['skipdeleted'] = 'Ne prikazivaj pobrisane poruke';
 $labels['deletealways'] = 'Ukoliko premještanje poruka u mapu otpad ne uspije, izbrši poruku';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Prikaži slike s interneta';
 $labels['fromknownsenders'] = 'od poznatih pošiljatelja';
 $labels['always'] = 'uvijek';
 $labels['showinlineimages'] = 'Prikaži slike ispod poruke';
 $labels['autosavedraft']  = 'Automatski spremi draft';
 $labels['everynminutes']  = 'svakih $n minuta';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'nikada';
 $labels['immediately']  = 'odmah';
 $labels['messagesdisplaying'] = 'Prikazujem poruke';
@@ -393,13 +359,11 @@
 $labels['displaynext'] = 'Nakon brisanja/micanja poruke, prikaži slijedeću';
 $labels['defaultfont'] = 'Predodređeni font HTML poruke';
 $labels['mainoptions'] = 'Glavne postavke';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Sekcija';
 $labels['maintenance'] = 'Održavanje';
 $labels['newmessage'] = 'Nova poruka';
 $labels['signatureoptions'] = 'Postavke potpisa';
 $labels['whenreplying'] = 'Prilikom odgovora';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'započni novu poruku iznad originala';
 $labels['replybottomposting'] = 'započni novu poruku ispod originala';
 $labels['replyremovesignature'] = 'Kod odgovaranja, makni originalni potpis iz poruke';
@@ -412,20 +376,13 @@
 $labels['reqmdn'] = 'Uvijek zatraži potvrdu o primitku poruke';
 $labels['reqdsn'] = 'Uvijek zatraži potvrdu o slanju poruke';
 $labels['replysamefolder'] = 'Spremi odgovore u mapu gdje se nalazi poruka';
-$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Preskoči alternativne email adrese u autocomplete prijedlozima';
-$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = 'Provjeri pravopis prije slanja poruke';
 $labels['spellcheckoptions'] = 'Postavke provjere pravopisa';
 $labels['spellcheckignoresyms'] = 'Ignoriraj riječi koje sadrže simbole';
 $labels['spellcheckignorenums'] = 'Ignoriraj riječi koje sadrže brojeve';
 $labels['spellcheckignorecaps'] = 'Ignoriraj riječi sa sa svim velikim slovima';
 $labels['addtodict'] = 'Dodaj u rječnik';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Mapa';
 $labels['folders']  = 'Mape';
 $labels['foldername']  = 'Ime mape';
@@ -450,7 +407,6 @@
 $labels['sortasc']  = 'Sortiraj rastućim nizom';
 $labels['sortdesc'] = 'Sortiraj opadajućim nizom';
 $labels['undo'] = 'Poništi';
-$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Inačica';
 $labels['source'] = 'Izvor';
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index 2aadb32..2e51848 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'Prijava neuspješna';
 $messages['cookiesdisabled'] = 'Vaš Web preglednik ne podržava kolačiće (cookies)';
 $messages['sessionerror'] = 'Morate se ponovno ulogirati';
@@ -24,17 +22,12 @@
 $messages['servererror'] = 'Greška poslužitelja';
 $messages['servererrormsg'] = 'Greška na serveru: $msg';
 $messages['dberror'] = 'Greška baze podataka!';
-$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Nemoguća izvedba operacije. Mapa je samo za čitanje.';
 $messages['errornoperm'] = 'Nemoguća izvedba operacije. Dozvola odbijena.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Nepravilan zahtijev! Podaci nisu spremljeni.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nema poruka u sandučiću';
 $messages['loggedout'] = 'Uspješno ste se odjavili. Zbogom!';
 $messages['mailboxempty'] = 'Sandučuć je prazan';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Učitavanje...';
 $messages['uploading'] = 'Prenosim datoteku...';
 $messages['uploadingmany'] = 'Prenosim datoteke...';
@@ -55,8 +48,6 @@
 $messages['contactsearchonly'] = 'Upišite nekoliko pojmova za pretragu imenika';
 $messages['sendingfailed'] = 'Greška pri slanju poruke';
 $messages['senttooquickly'] = 'Molimo sačekajte $sec sek. prije slanja ove poruke';
-$messages['errorsavingsent'] = 'Greška pri spremanju poslane poruke';
-$messages['errorsaving'] = 'Greška pri spremanju';
 $messages['errormoving'] = 'Greška pri premještanju poruke';
 $messages['errorcopying'] = 'Greška pri kopiranju poruke';
 $messages['errordeleting'] = 'Greška pri brisanju poruke';
@@ -100,16 +91,11 @@
 $messages['messageopenerror'] = 'Učitavanje poruke nije uspjelo';
 $messages['fileuploaderror'] = 'Prijenos datoteke nije uspio';
 $messages['filesizeerror'] = 'Datoteka je prevelika. Maksimalna veličina je $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Ovaj resurs adresa je samo za čitanje';
 $messages['errorsavingcontact'] = 'Nije uspjelo spremanje adrese kontakta';
 $messages['movingmessage'] = 'Premještanje poruke...';
 $messages['copyingmessage'] = 'Kopiranje poruke...';
 $messages['copyingcontact'] = 'Kopiram kontakt(e)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Brisanje poruke...';
 $messages['markingmessage'] = 'Označavanje poruke...';
 $messages['addingmember'] = 'Dodajem kontakt(e) u grupu...';
@@ -123,13 +109,9 @@
 $messages['addresswriterror'] = 'U odabrani adresar nije moguće zapisivat...';
 $messages['contactaddedtogroup'] = 'Kontakti uspješno dodani ovoj grupi';
 $messages['contactremovedfromgroup'] = 'Kontakti uspješno izbrisani iz ove grupe';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Uvozim, molimo sačekajte...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Uspješno je uvezeno $inserted kontakt(a), preskočeno $skipped već postojećih</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Preskočeno $skipped postojećih unosa</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Operacija nije dozvoljena!';
 $messages['nofromaddress'] = 'Nije upisana e-mail adresa u odabrani identitet';
 $messages['editorwarning'] = 'Prebacivanje u čisti tekstualni uređivač će prouzrokovati gubljenje formatiranje teksta. Želite li nastaviti?';
@@ -143,7 +125,6 @@
 $messages['emailformaterror'] = 'Nepravilna e-mail adresa: $email';
 $messages['toomanyrecipients'] = 'Previše primatelja. Smanjite broj primatelja na $max.';
 $messages['maxgroupmembersreached'] = 'Broj članova grupe prelazi preko maximuma od $max';
-$messages['internalerror'] = 'Dogodila se interna greška. Molimo Vas pokušajte ponovo.';
 $messages['contactdelerror'] = 'Kontakti ne mogu biti obrisani.';
 $messages['contactdeleted'] = 'Kontakti uspješno obrisani.';
 $messages['contactrestoreerror'] = 'Ne mogu vratiti obrisan(e) kontakt(e).';
@@ -169,6 +150,4 @@
 $messages['mispellingsfound'] = 'Greške pravopisa su pronađene u poruci.';
 $messages['parentnotwritable'] = 'Nije moguće stvoriti/pomaknuti mapu u odabranu mapu. Nemate prava pristupa.';
 $messages['messagetoobig'] = 'Dio poruke je prevelik za procesiranje.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index 0bfbefd..648ac75 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Üdvözli a $product';
 $labels['username']  = 'Felhasználónév';
 $labels['password']  = 'Jelszó';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index a3b5c13..3ca87a5 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Hiba történt!';
 $messages['loginfailed']  = 'Sikertelen bejelentkezés.';
 $messages['cookiesdisabled'] = 'A böngésző nem támogatja a sütik használatát';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Adjon meg keresőkifejezéseket a kapcsolatok közti kereséshez';
 $messages['sendingfailed'] = 'Az üzenet elküldése nem sikerült';
 $messages['senttooquickly'] = 'Kérem várjon még $sec másodpercet az üzenet elküldése előtt';
-$messages['errorsavingsent'] = 'Hiba történt az elküldött üzenet mentése közben';
-$messages['errorsaving'] = 'A mentés során hiba lépett fel';
 $messages['errormoving'] = 'Az üzenet(ek)et nem sikerült áthelyezni';
 $messages['errorcopying'] = 'Az üzenet(ek)et nem sikerült másolni';
 $messages['errordeleting'] = 'Az üzenet(ek)et nem sikerült törölni';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Helytelen formátumú e-mail cím: $email';
 $messages['toomanyrecipients'] = 'Túl sok a címzett. Csökkentse a címzettek számát maximum $max címre!';
 $messages['maxgroupmembersreached'] = 'A csoport létszáma meghaladja a maximum $max főt';
-$messages['internalerror'] = 'Belső hiba történt, kérjük próbálja újra!';
 $messages['contactdelerror'] = 'Hiba a kapcsolat(ok) törlésekor';
 $messages['contactdeleted'] = 'Kapcsolat(ok) sikeresen törölve';
 $messages['contactrestoreerror'] = 'Nem sikerült a törölt kapcsolat(ok) helyreállítása';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index d390971..fec95f3 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Բարի գալուստ $product';
 $labels['username']  = 'Օգտվող';
 $labels['password']  = 'Գաղտնաբառ';
@@ -31,10 +29,8 @@
 $labels['sent']   = 'Ուղարկված';
 $labels['trash']  = 'Աղբարկղ';
 $labels['junk']   = 'Թափոն';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Վերնագիր';
 $labels['from']    = 'Ուղարկող';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Ստացող';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -55,9 +51,6 @@
 $labels['move']     = 'Տեղափոխել';
 $labels['moveto']   = 'Տեղափոխել...';
 $labels['download'] = 'Քաշել';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'Ֆայլի անուն';
 $labels['filesize'] = 'Ֆայլի չափ';
 $labels['addtoaddressbook'] = 'Հիշել հասցեն';
@@ -139,9 +132,7 @@
 $labels['unread'] = 'Չկարդացածը';
 $labels['flagged'] = 'Նշված';
 $labels['unanswered'] = 'Անպատասխան';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Ջնջված';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Փոխատեղել';
 $labels['filter'] = 'Զտիչ';
 $labels['list'] = 'Ցուցակ';
@@ -168,7 +159,6 @@
 $labels['folderactions'] = 'Պանակի գործողություններ…';
 $labels['compact'] = 'Սեղմել';
 $labels['empty'] = 'Դատարկել';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Դիսկային տարածք';
 $labels['unknown']  = 'անհայտ';
 $labels['unlimited']  = 'անսահմանափակ';
@@ -176,14 +166,9 @@
 $labels['resetsearch']  = 'Վերսկսել որոնումը';
 $labels['searchmod']  = 'Որոնման փոփոխիչներ';
 $labels['msgtext']  = 'Ողջ հաղորդագրությունը';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Բացել նոր պատուհանում';
 $labels['emlsave'] = 'Ներբեռնել (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Խմբագրել որպես նոր';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Ուղարկել';
 $labels['savemessage']    = 'Հիշել որպես սևագիր';
 $labels['addattachment']  = 'Կցել ֆայլ';
@@ -213,9 +198,6 @@
 $labels['showimages'] = 'Ցուցադրել նկարները';
 $labels['alwaysshow'] = 'Միշտ ցուցադրել պատկերները $sender–ից';
 $labels['isdraft']    = 'Սա հաղորդագրության սևագիր է';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Պարզ տեքստ';
 $labels['savesentmessagein'] = 'Գրանցել ուղարկված նամակը';
@@ -297,8 +279,6 @@
 $labels['contactsfromto'] = 'Հասցեներ $from–ից $to–ը եղած $count–ից';
 $labels['print']          = 'Տպել';
 $labels['export']         = 'Արտահանել';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Արտահանել հասցեները vCard չափաձևով';
 $labels['newcontactgroup'] = 'Ստեղծել կապորդների նոր խումբ';
 $labels['grouprename']    = 'Վերանվանել խումբը';
@@ -310,16 +290,13 @@
 $labels['lastpage']       = 'Ցուցադրել վերջին էջը';
 $labels['group'] = 'Խումբ';
 $labels['groups'] = 'Խմբեր';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Անձնական հասցեներ';
 $labels['searchsave'] = 'Պահպանել որոնումը';
 $labels['searchdelete'] = 'Ջնջել որոնումը';
 $labels['import'] = 'Ներկրել';
 $labels['importcontacts'] = 'Ներկրել հասցեներ';
 $labels['importfromfile'] = 'Ներկրել ֆայլից';
-$labels['importtarget'] = 'Ավելացնել նոր կապորդներ հասցեագրքում';
 $labels['importreplace'] = 'Փոխել ողջ հասցեագիրքը';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Ավարտված է';
 $labels['settingsfor'] = 'Նախասիրություններ';
 $labels['about'] = 'Նկարագիր';
@@ -334,8 +311,6 @@
 $labels['preferhtml'] = 'Գերադասել HTML';
 $labels['defaultcharset'] = 'Լռելյալ տառաշար';
 $labels['htmlmessage'] = 'HTML նամակ';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Ամսաթվի ձևաչափ';
 $labels['timeformat'] = 'Ժամանակի ձևաչափ';
 $labels['prettydate'] = 'Պարզ ամսաթվեր';
@@ -346,13 +321,9 @@
 $labels['pagesize']  = 'Տողեր առ էջ';
 $labels['signature'] = 'Ստորագրություն';
 $labels['dstactive']  = 'Ամառային ժամանակ';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Ստեղծել HTML նամակներ';
 $labels['htmlonreply'] = 'միայն HTML հաղորդագրությանը պատասխանելիս';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML ստորագրություն';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Ցուցադրել պատուհանը';
 $labels['skin'] = 'Տեսքի տարբերակ';
 $labels['logoutclear'] = 'Դուրս գալուց դատարկել աղբարկղը';
@@ -377,7 +348,6 @@
 $labels['showinlineimages'] = 'Ցուցադրել կցված պատկերները հաղորդագրության տակ';
 $labels['autosavedraft']  = 'Սևագրի ավտոմատ գրանցում';
 $labels['everynminutes']  = 'ամեն $n րոպեն';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'երբեք';
 $labels['immediately']  = 'անմիջապես';
 $labels['messagesdisplaying'] = 'նամակները ցուցադրելիս';
@@ -399,7 +369,6 @@
 $labels['newmessage'] = 'Նոր հաղորդագրություն';
 $labels['signatureoptions'] = 'Ստորագրության ընտրանքներ';
 $labels['whenreplying'] = 'Պատասխանելիս';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'սկսել նոր հաղորդագրությունը վերևից';
 $labels['replybottomposting'] = 'սկսել նոր հաղորդագրությունը ներքևից';
 $labels['replyremovesignature'] = 'Պատասխանելիս հեռացնել հաղորդագրությունից նախորդ ստորագրությունը';
@@ -412,7 +381,6 @@
 $labels['reqmdn'] = 'Միշտ պատվիրել ստացական';
 $labels['reqdsn'] = 'Միշտ պատվիրել առաքման կարգավիճակի ծանուցում';
 $labels['replysamefolder'] = 'Հաղորդագրության պատասխանները պահել նույն պանակում';
-$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Ավտոլրացման ժամանակ բացառել այլընտրանքային էլփոստի հասցեները';
 $labels['listnamedisplay'] = 'Ցուցադրել կապորդները որպես';
 $labels['spellcheckbeforesend'] = 'Ստուգել տառասխալները հաղորդագրությունը ուղարկելուց առաջ';
@@ -422,10 +390,6 @@
 $labels['spellcheckignorecaps'] = 'Անտեսել լրիվ մեծատառ բառերը';
 $labels['addtodict'] = 'Ավելացնել բառարանում';
 $labels['mailtoprotohandler'] = 'mailto: հղումների սպասարկող';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Դարակ';
 $labels['folders']  = 'Դարակներ';
 $labels['foldername']  = 'Դարակի անուն';
@@ -450,7 +414,6 @@
 $labels['sortasc']  = 'ըստ աճման';
 $labels['sortdesc'] = 'ըստ նվազման';
 $labels['undo'] = 'Ետարկել';
-$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Խրիչ';
 $labels['version'] = 'Տարբերակ';
 $labels['source'] = 'Աղբյուր';
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index fd52ab6..c5d167a 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Սխա՛լ';
 $messages['loginfailed']  = 'Մուտքը ձախողվեց';
 $messages['cookiesdisabled'] = 'Сookies–ների ապահովվումը բացակայում է';
@@ -27,14 +26,10 @@
 $messages['requesttimedout'] = 'Հարցման թույլատրելի ժամանակը սպառվեց';
 $messages['errorreadonly'] = 'Գործողությունը անհնար է։ Պանակը միայն ընթերցման համար է։';
 $messages['errornoperm'] = 'Գործողության կատարման իրավունքը մերժված է։';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Սխալ հարցում, ապարդյուն։';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Այս փոստարկղում նամակներ չկան';
 $messages['loggedout'] = 'Դուք բարեհաջող ավարտեցիք աշխատանքը։ Ցտեսություն…';
 $messages['mailboxempty'] = 'Փոստարկղը դատարկ է';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Բեռնում...';
 $messages['uploading'] = 'Ֆայլի վերբեռնում…';
 $messages['uploadingmany'] = 'Վերբեռնվում են ֆայլերը…';
@@ -55,8 +50,6 @@
 $messages['contactsearchonly'] = 'Ներմուծեք տվյալներ անձանց որոնման համար';
 $messages['sendingfailed'] = 'Նամակի ուղարկումը ձախողվեց';
 $messages['senttooquickly'] = 'Խնդրում ենք սպասել $sec վարկյան մինչ այս նամակն ուղարկելը';
-$messages['errorsavingsent'] = 'Ուղարկված նամակի արխիվացումը խափանվեց';
-$messages['errorsaving'] = 'Գրանցման սխալ';
 $messages['errormoving'] = 'Նամակի տեղափոխման ձախողում';
 $messages['errorcopying'] = 'Հաղորդագրության պատճենումը ձախողվեց։';
 $messages['errordeleting'] = 'Նամակի ջնջման ձախողում';
@@ -100,16 +93,11 @@
 $messages['messageopenerror'] = 'Նամակի բեռնվումը սերվերից ձախողվեց';
 $messages['fileuploaderror'] = 'Ֆայլի կցումն ձախողվեց';
 $messages['filesizeerror'] = 'Ֆայլի չափը գերազանցում է մաքսիմալը՝ $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Այս հասցեն պաշտպանված է';
 $messages['errorsavingcontact'] = 'Հասցեի գրանցումն ձախողվեց';
 $messages['movingmessage'] = 'Նամակը տեղափոխվում է…';
 $messages['copyingmessage'] = 'Հաղորդագրությունների պատճենում…';
 $messages['copyingcontact'] = 'Անձանց պատճենում…';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Հաղորդագրությունների ջնջում…';
 $messages['markingmessage'] = 'Հաղորդագրությունների նշում…';
 $messages['addingmember'] = 'Անձանց ավելացում խմբին…';
@@ -123,13 +111,9 @@
 $messages['addresswriterror'] = 'Ընտրված հասցեագիրքը ենթակա չէ փոփոխման';
 $messages['contactaddedtogroup'] = 'Անձինք բարեհաջող ավելացվեցին խմբին։';
 $messages['contactremovedfromgroup'] = 'Անձինք բարեհաջող հանվեցին խմբից։';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Ներկրումն ընթացքի մեջ է...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '$inserted նոր ներկրված հասցեներ, $skipped արդեն առկա հասցեներ՝ <p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Բաց թողնվեց $skipped առկա գրառում</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Գործողությունը անթույլատրելի է։';
 $messages['nofromaddress'] = 'Նշված անձը հասցե չունի։';
 $messages['editorwarning'] = 'Դեպի պարզ տեքստի խմբագրիչ անցման դեպքում կկորի տեքստի ձևավորումը։ Շարունակե՞լ։';
@@ -143,7 +127,6 @@
 $messages['emailformaterror'] = 'Սխալ էլփոստի հասցե` $email';
 $messages['toomanyrecipients'] = 'Ստացողների քանակը չափազանց մեծ է։ Նվազեցրեք մինչև $max-ը։';
 $messages['maxgroupmembersreached'] = 'Խմբի անդամների քանաքը գերազանցում է թույլատրելի $max-ը։';
-$messages['internalerror'] = 'Ներքին սխալ, կրկին փորձեք։';
 $messages['contactdelerror'] = 'Անձանց ջնջումը ձախողվեց։';
 $messages['contactdeleted'] = 'Անձանց ջնջումը հաջողվեց։';
 $messages['contactrestoreerror'] = 'Ջնջված անձանց վերականգնումը ձախողվեց։';
@@ -169,6 +152,4 @@
 $messages['mispellingsfound'] = 'Հաղորդագրության մեջ կան տառասխալներ։';
 $messages['parentnotwritable'] = 'Նշված պանակի մեջ պանակի ստեղծումը կամ տեղափոխումը անհնար է անբավարար իրավունքների պատճառով։';
 $messages['messagetoobig'] = 'Հաղորդագրության մասը չափազանց մեծ է սպասարկման համար։';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/ia/labels.inc b/program/localization/ia/labels.inc
index 15c8e70..0ff1e93 100644
--- a/program/localization/ia/labels.inc
+++ b/program/localization/ia/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Benvenite a $product';
 $labels['username']  = 'Nomine de usator';
 $labels['password']  = 'Contrasigno';
@@ -27,11 +25,7 @@
 $labels['settings'] = 'Configurationes';
 $labels['addressbook'] = 'Adressario';
 $labels['inbox']  = 'Cassa de entrata';
-$labels['drafts'] = 'Drafts';
 $labels['sent']   = 'Inviate';
-$labels['trash']  = 'Trash';
-$labels['junk']   = 'Junk';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Subjecto';
 $labels['from']    = 'Ex';
 $labels['sender']  = 'Expeditor';
@@ -39,25 +33,18 @@
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Responder a';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Data';
 $labels['size']    = 'Dimension';
 $labels['priority'] = 'Prioritate';
 $labels['organization'] = 'Organisation';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'Dossieres';
-$labels['messagesfromto'] = 'Messages $from to $to of $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr de $count';
 $labels['fromtoshort'] = '$from – $to de $count';
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a';
 $labels['download'] = 'Discargar';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'Monstrar';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'Nomine de file';
 $labels['filesize'] = 'Dimension del file';
 $labels['addtoaddressbook'] = 'Adder al adressario';
@@ -105,103 +92,50 @@
 $labels['compose']          = 'Componer';
 $labels['writenewmessage']  = 'Crear un nove message';
 $labels['reply']            = 'Responder';
-$labels['replytomessage']   = 'Reply to sender';
-$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
 $labels['replyall']         = 'Responder a totes';
 $labels['replylist']        = 'Responder a lista';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
-$labels['forwardmessage']   = 'Forward the message';
 $labels['deletemessage']    = 'Deler messsage';
-$labels['movemessagetotrash'] = 'Move message to trash';
 $labels['printmessage']     = 'Imprimer iste message';
-$labels['previousmessage']  = 'Show previous message';
-$labels['firstmessage']     = 'Show first message';
-$labels['nextmessage']      = 'Show next message';
-$labels['lastmessage']      = 'Show last message';
-$labels['backtolist']       = 'Back to message list';
 $labels['viewsource']       = 'Monstrar fonte';
 $labels['mark']             = 'Marcar';
 $labels['markmessages']     = 'Marcar messages';
-$labels['markread']         = 'As read';
-$labels['markunread']       = 'As unread';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
-$labels['moreactions']      = 'More actions...';
 $labels['more']             = 'Plus';
 $labels['back']             = 'Retornar';
 $labels['options']          = 'Optiones';
 $labels['select'] = 'Seliger';
 $labels['all'] = 'Totes';
 $labels['none'] = 'Necun';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Non legite';
 $labels['flagged'] = 'Marcate';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Delete';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtro';
 $labels['list'] = 'Lista';
 $labels['threads'] = 'Topicos';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
 $labels['flag'] = 'Marcar';
 $labels['attachment'] = 'Attachamento';
 $labels['nonesort'] = 'Necun';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
 $labels['folderactions'] = 'Actiones de dossier...';
 $labels['compact'] = 'Compacte';
 $labels['empty'] = 'Vacue';
-$labels['importmessages'] = 'Import messages';
-$labels['quota'] = 'Disk usage';
 $labels['unknown']  = 'incognite';
-$labels['unlimited']  = 'unlimited';
 $labels['quicksearch']  = 'Cerca rapide';
 $labels['resetsearch']  = 'Reinitialisar cerca';
-$labels['searchmod']  = 'Search modifiers';
 $labels['msgtext']  = 'Message complete';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Aperir in nove fenestra';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Modificar como nove';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Inviar message';
 $labels['savemessage']    = 'Salveguardar como version provisori';
 $labels['addattachment']  = 'Attachar un file';
 $labels['charset']        = 'Insimul de Characteres';
 $labels['editortype']     = 'Typo de editor';
-$labels['returnreceipt']  = 'Return receipt';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'Message original';
 $labels['editidents']    = 'Modificar identitates';
 $labels['spellcheck']    = 'Orthographia';
 $labels['checkspelling'] = 'Verificar orthographia';
-$labels['resumeediting'] = 'Resume editing';
-$labels['revertto']      = 'Revert to';
 $labels['attach'] = 'Attachar';
 $labels['attachments'] = 'Attachamentos';
 $labels['upload'] = 'Incargar';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'Clauder';
 $labels['messageoptions']  = 'Optiones de message...';
 $labels['low']     = 'Basse';
@@ -211,35 +145,19 @@
 $labels['highest'] = 'Maximal';
 $labels['nosubject']  = '(sin subjecto)';
 $labels['showimages'] = 'Monstrar imagines';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
-$labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto plan';
 $labels['savesentmessagein'] = 'Salveguardar message inviate in';
 $labels['dontsave'] = 'non salveguardar';
 $labels['maxuploadsize'] = 'Le dimension maximal de iste file es $size';
 $labels['addcc'] = 'Adder Cc';
 $labels['addbcc'] = 'Adder Bcc';
-$labels['addreplyto'] = 'Add Reply-To';
-$labels['addfollowupto'] = 'Add Followup-To';
-$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
-$labels['receiptread'] = 'Return Receipt (read)';
-$labels['yourmessage'] = 'This is a Return Receipt for your message';
-$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
 $labels['name']         = 'Monstrar nomine';
 $labels['firstname']    = 'Nomine';
 $labels['surname']      = 'Nomine de familia';
-$labels['middlename']   = 'Middle Name';
 $labels['nameprefix']   = 'Prefixo';
-$labels['namesuffix']   = 'Suffix';
 $labels['nickname']     = 'Pseudonymo';
-$labels['jobtitle']     = 'Job Title';
 $labels['department']   = 'Departimento';
 $labels['gender']       = 'Sexo:';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'E-posta';
 $labels['phone']        = 'Telephono';
 $labels['address']      = 'Adresse';
@@ -270,7 +188,6 @@
 $labels['typemain']  = 'Principal';
 $labels['typehomefax']  = 'Fax de domo';
 $labels['typeworkfax']  = 'Fax de labor';
-$labels['typecar']  = 'Car';
 $labels['typepager']  = 'Pager';
 $labels['typevideo']  = 'Video';
 $labels['typeassistant']  = 'Assistente';
@@ -290,36 +207,21 @@
 $labels['rename'] = 'Renominar';
 $labels['addphoto'] = 'Adder';
 $labels['replacephoto'] = 'Reimplaciar';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'Crear un nove carta de contacto';
 $labels['deletecontact']  = 'Deler contactos seligite';
-$labels['composeto']      = 'Compose mail to';
-$labels['contactsfromto'] = 'Contacts $from to $to of $count';
 $labels['print']          = 'Imprimer';
 $labels['export']         = 'Exportar';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
 $labels['newcontactgroup'] = 'Crear un nove gruppo de contacto';
 $labels['grouprename']    = 'Renominar gruppo';
 $labels['groupdelete']    = 'Deler gruppo';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
-$labels['previouspage']   = 'Show previous page';
-$labels['firstpage']      = 'Show first page';
-$labels['nextpage']       = 'Show next page';
-$labels['lastpage']       = 'Show last page';
 $labels['group'] = 'Gruppo';
 $labels['groups'] = 'Gruppos';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Adresses personal';
 $labels['searchsave'] = 'Salveguardar cerca';
 $labels['searchdelete'] = 'Deler cerca';
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar ex file:';
-$labels['importtarget'] = 'Adder nove contactos al adressario';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Facite';
 $labels['settingsfor'] = 'Configurationes pro';
 $labels['about'] = 'A proposito';
@@ -327,105 +229,38 @@
 $labels['userpreferences'] = 'Preferentias de usator';
 $labels['editpreferences'] = 'Modificar preferentias de usator';
 $labels['identities'] = 'Identitates';
-$labels['manageidentities'] = 'Manage identities for this account';
 $labels['newidentity'] = 'Nove identitate';
 $labels['newitem'] = 'Nove elemento';
 $labels['edititem'] = 'Modificar elemento';
 $labels['preferhtml'] = 'Monstrar HTML';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Message HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Formato de data';
 $labels['timeformat'] = 'Formato de tempore';
-$labels['prettydate'] = 'Pretty dates';
 $labels['setdefault']  = 'Fixar predeterminate';
 $labels['autodetect']  = 'Auto';
 $labels['language']  = 'Lingua';
 $labels['timezone']  = 'Fuso horari';
-$labels['pagesize']  = 'Rows per page';
 $labels['signature'] = 'Signatura';
-$labels['dstactive']  = 'Daylight saving time';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
-$labels['htmleditor'] = 'Compose HTML messages';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Signatura HTML';
-$labels['showemail'] = 'Show email address with display name';
-$labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Apparentia de interfacie';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
 $labels['uisettings'] = 'Interfacie de usator';
 $labels['serversettings'] = 'Configurationes de servitor';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
-$labels['askuser'] = 'ask me';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ignorar';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'sempre';
-$labels['showinlineimages'] = 'Display attached images below the message';
-$labels['autosavedraft']  = 'Automatically save draft';
 $labels['everynminutes']  = 'cata $n minuta(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'nunquam';
-$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Inviar me_ssages';
-$labels['messagescomposition'] = 'Composing Messages';
 $labels['mimeparamfolding'] = 'Nomines de attachamento';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Optiones avantiate';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Optiones principal';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Section';
 $labels['maintenance'] = 'Mantenimento';
 $labels['newmessage'] = 'Nove message';
 $labels['signatureoptions'] = 'Optiones de signatura';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
 $labels['autoaddsignature'] = 'Automaticamente inserta signatura';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
 $labels['insertsignature'] = 'Insertar signatura';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
 $labels['spellcheckoptions'] = 'Optiones de verification orthographic';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'Adder al dictionario';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Dossier';
 $labels['folders']  = 'Dossieres';
 $labels['foldername']  = 'Nomine de dossier';
@@ -434,47 +269,19 @@
 $labels['create']  = 'Crear';
 $labels['createfolder']  = 'Crear un nove dossier';
 $labels['managefolders']  = 'Gerer le dossieres';
-$labels['specialfolders'] = 'Special Folders';
 $labels['properties'] = 'Proprietates';
 $labels['folderproperties'] = 'Proprietates de dossier';
-$labels['parentfolder'] = 'Parent folder';
 $labels['location'] = 'Location';
 $labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'Typo de dossier';
 $labels['personalfolder']  = 'Dossier private';
-$labels['otherfolder']  = 'Other User\'s Folder';
 $labels['sharedfolder']  = 'Dossier public';
 $labels['sortby'] = 'Ordinar per';
-$labels['sortasc']  = 'Sort ascending';
-$labels['sortdesc'] = 'Sort descending';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
 $labels['source'] = 'Fonte';
 $labels['license'] = 'Licentia';
 $labels['support'] = 'Obtener supporte';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Anglese';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
 $labels['japanese'] = 'Japonese';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinese';
diff --git a/program/localization/ia/messages.inc b/program/localization/ia/messages.inc
index b42b3bd..50ef681 100644
--- a/program/localization/ia/messages.inc
+++ b/program/localization/ia/messages.inc
@@ -15,160 +15,27 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'Initio de session fallite';
-$messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
-$messages['sessionerror'] = 'Your session is invalid or expired.';
-$messages['storageerror'] = 'Connection to storage server failed.';
 $messages['servererror'] = 'Error de servitor!';
-$messages['servererrormsg'] = 'Server Error: $msg';
 $messages['dberror'] = 'Error de base de datos!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
-$messages['nomessagesfound'] = 'No messages found in this mailbox.';
-$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
-$messages['mailboxempty'] = 'Mailbox is empty.';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Cargante ...';
-$messages['uploading'] = 'Uploading file...';
 $messages['uploadingmany'] = 'Incargante files...';
 $messages['loadingdata'] = 'Cargante datos...';
-$messages['checkingmail'] = 'Checking for new messages...';
 $messages['sendingmessage'] = 'Inviante message...';
-$messages['messagesent'] = 'Message sent successfully.';
-$messages['savingmessage'] = 'Saving message...';
-$messages['messagesaved'] = 'Message saved to Drafts.';
 $messages['successfullysaved'] = 'Salveguardate con successo.';
-$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
-$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
-$messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
-$messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
 $messages['nocontactsfound'] = 'Nulle contactos trovate.';
-$messages['contactnotfound'] = 'The requested contact was not found.';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Falleva in inviar le message.';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'An error occured while saving.';
 $messages['errormoving'] = 'Non pote mover le message(s)';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Il non pote deler le message(s).';
-$messages['errormarking'] = 'Could not mark the message(s).';
-$messages['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
-$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
-$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
-$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
-$messages['formincomplete'] = 'The form was not completely filled out.';
-$messages['noemailwarning'] = 'Please enter a valid email address.';
 $messages['nonamewarning']  = 'Per favor inserta nomine.';
-$messages['nopagesizewarning'] = 'Please enter a page size.';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
-$messages['norecipientwarning'] = 'Please enter at least one recipient.';
-$messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
-$messages['nobodywarning'] = 'Send this message without text?';
-$messages['notsentwarning'] = 'Message has not been sent. Do you want to discard your message?';
-$messages['noldapserver'] = 'Please select an ldap server to search.';
-$messages['nosearchname'] = 'Please enter a contact name or email address.';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr messages trovate.';
 $messages['contactsearchsuccessful'] = '$nr contactos trovate.';
-$messages['searchnomatch'] = 'Search returned no matches.';
 $messages['searching'] = 'Cercante...';
 $messages['checking'] = 'A verificar...';
-$messages['nospellerrors'] = 'No spelling errors found.';
-$messages['folderdeleted'] = 'Folder successfully deleted.';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Delete con successo.';
-$messages['converting'] = 'Removing formatting...';
-$messages['messageopenerror'] = 'Could not load message from server.';
 $messages['fileuploaderror'] = 'Incargamento de file falleva.';
-$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
-$messages['sourceisreadonly'] = 'This address source is read only.';
-$messages['errorsavingcontact'] = 'Could not save the contact address.';
-$messages['movingmessage'] = 'Moving message(s)...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
-$messages['errorsendingreceipt'] = 'Could not send the receipt.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
-$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
 $messages['selectimportfile'] = 'Per favor tu selige le file a incargar.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Adresse de e-mail invalide: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'Le nomine non pote esser vacue.';
 $messages['nametoolong'] = 'Le nomine es troppo longe.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 2915d80..581428a 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Selamat datang di $product';
 $labels['username']  = 'Username';
 $labels['password']  = 'Password';
@@ -31,7 +29,7 @@
 $labels['sent']   = 'Terkirim';
 $labels['trash']  = 'Surat Terhapus';
 $labels['junk']   = 'Sampah';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = 'Tampilkan nama asli untuk folder spesial';
 $labels['subject'] = 'Judul';
 $labels['from']    = 'Pengirim';
 $labels['sender']  = 'Pengirim';
@@ -168,7 +166,7 @@
 $labels['folderactions'] = 'Tindakan pada folder...';
 $labels['compact'] = 'Rampingkan';
 $labels['empty'] = 'Kosong';
-$labels['importmessages'] = 'Import messages';
+$labels['importmessages'] = 'Impor pesan';
 $labels['quota'] = 'Penggunaan ruang';
 $labels['unknown']  = 'Tidak dikenal';
 $labels['unlimited']  = 'Tidak terbatas';
@@ -311,14 +309,13 @@
 $labels['lastpage']       = 'Perlihatkan himpunan terakhir';
 $labels['group'] = 'Kelompok';
 $labels['groups'] = 'Kelompok';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Daftar anggota grup';
 $labels['personaladrbook'] = 'Alamat pribadi';
 $labels['searchsave'] = 'Simpan pencarian';
 $labels['searchdelete'] = 'Hapus pencarian';
 $labels['import'] = 'Impor';
 $labels['importcontacts'] = 'Impor kontak';
 $labels['importfromfile'] = 'Impor dari berkas:';
-$labels['importtarget'] = 'Tambahkan kontak baru ke buku alamat:';
 $labels['importreplace'] = 'Ganti seluruh buku alamat';
 $labels['importdesc'] = 'Anda dapat mengunggah kontak dari buku alamat yang telah ada.<br/>Saat ini kami mendukung import alamat dari format data <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> atau CSV (comma-separated).';
 $labels['done'] = 'Selesai';
@@ -353,7 +350,7 @@
 $labels['htmlonreply'] = 'balasan untuk pesan HTML saja';
 $labels['htmlonreplyandforward'] = 'ketika meneruskan atau membalas pesan HTML';
 $labels['htmlsignature'] = 'Tandatangan HTML';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'Tampilkan alamat email dengan nama';
 $labels['previewpane'] = 'Unjuk pratinjau';
 $labels['skin'] = 'Tampilan antarmuka';
 $labels['logoutclear'] = 'Bersihkan Tong Sampah saat keluar';
@@ -423,7 +420,7 @@
 $labels['spellcheckignorecaps'] = 'Abaikan kata-kata dengan huruf besar semua';
 $labels['addtodict'] = 'Tambahkan ke kamus';
 $labels['mailtoprotohandler'] = 'Daftarkan pengampu protokol untuk link mailto:';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'Kelola popup sebagai standar window';
 $labels['forwardmode'] = 'Meneruskan pesan';
 $labels['inline'] = 'dalam surat';
 $labels['asattachment'] = 'sebagai sisipan';
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index 7b32cfe..020b03f 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Terjadi error!';
 $messages['loginfailed']  = 'Login gagal.';
 $messages['cookiesdisabled'] = 'Browser Anda tidak menerima cookies.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Masukkan jenis pencarian untuk mencari kontak';
 $messages['sendingfailed'] = 'Gagal mengirim pesan.';
 $messages['senttooquickly'] = 'Mohon tunggu $sec detik sebelum mengirim pesan ini.';
-$messages['errorsavingsent'] = 'Error ketika menyimpan pesan terkirim.';
-$messages['errorsaving'] = 'Error ketika menyimpan.';
 $messages['errormoving'] = 'Pesan tidak bisa dipindahkan';
 $messages['errorcopying'] = 'Pesan tidak dapat disalin';
 $messages['errordeleting'] = 'Pesan tidak bisa dihapus';
@@ -100,16 +97,16 @@
 $messages['messageopenerror'] = 'Tidak dapat mengambil pesan dari server';
 $messages['fileuploaderror'] = 'Gagal mengunggah berkas';
 $messages['filesizeerror'] = 'Berkas terunggah mencapai ukuran maksimal dari $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
+$messages['copysuccess'] = 'Berhasil menyalin kontak $nr';
+$messages['movesuccess'] = 'Berhasil memindahkan kontak $nr';
+$messages['copyerror'] = 'Tidak dapat menyalin kontak';
+$messages['moveerror'] = 'Tidak dapat memindahkan kontak';
 $messages['sourceisreadonly'] = 'Sumber dari alamat ini hanya dapat dibaca';
 $messages['errorsavingcontact'] = 'Tidak bisa menyimpan alamat kontak';
 $messages['movingmessage'] = 'Memindahkan pesan...';
 $messages['copyingmessage'] = 'Menyalin pesan...';
 $messages['copyingcontact'] = 'Menyalin kontak...';
-$messages['movingcontact'] = 'Moving contact(s)...';
+$messages['movingcontact'] = 'Memindahkan kontak(s)...';
 $messages['deletingmessage'] = 'Menghapus pesan...';
 $messages['markingmessage'] = 'Menandai Pesan...';
 $messages['addingmember'] = 'Menambahkan kontak ke grup...';
@@ -128,8 +125,8 @@
 $messages['importformaterror'] = 'Proses import gagal. File yang di upload bukan file import yang valid.';
 $messages['importconfirm'] = '<b>Berhasil mengimpor $inserted kontak</b>';
 $messages['importconfirmskipped'] = '<b>$skipped entri yang sudah ada dilewatkan</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
+$messages['importmessagesuccess'] = 'Berhasil mengimport $nr pesan';
+$messages['importmessageerror'] = 'Gagal mengimport! File yang di upload buka pesan yang valid atau file mailbox';
 $messages['opnotpermitted'] = 'Operasi tidak diperbolehkan!';
 $messages['nofromaddress'] = 'kekurangan alamat e-mail pada identitas terpilih';
 $messages['editorwarning'] = 'Beralih pada editor teks murni akan mengakibatkan semua pemformatan teks hilang. Lanjutkan?';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Alamat e-mail salah: $email';
 $messages['toomanyrecipients'] = 'Terlalu banyak penerima. Batas maksimal penerima adalah $max';
 $messages['maxgroupmembersreached'] = 'Jumlah grup melebihi jumlah maksimum $max';
-$messages['internalerror'] = 'Terjadi kesalahan internal. Silahkan diulang kembali';
 $messages['contactdelerror'] = 'Kontak tidak bisa dihapus';
 $messages['contactdeleted'] = 'Kontak berhasil dihapus';
 $messages['contactrestoreerror'] = 'Tidak bisa mengembalikan kontak yang terhapus.';
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index c1d9591..8b90730 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Velkomin í $product';
 $labels['username']  = 'Netfang';
 $labels['password']  = 'Lykilorð';
@@ -31,10 +29,8 @@
 $labels['sent']   = 'Sent';
 $labels['trash']  = 'Rusl';
 $labels['junk']   = 'Ruslpóstur';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Titill';
 $labels['from']    = 'Frá';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Til';
 $labels['cc']      = 'Afrit';
 $labels['bcc']     = 'Blint afrit';
@@ -45,7 +41,6 @@
 $labels['priority'] = 'Forgangur';
 $labels['organization'] = 'Stofnun';
 $labels['readstatus'] = 'Lesmerking';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'Möppur';
 $labels['messagesfromto'] = 'Skeyti $from til $to af $count';
 $labels['threadsfromto'] = 'Þræðir $from til $to af $count';
@@ -55,9 +50,6 @@
 $labels['move']     = 'Færa';
 $labels['moveto']   = 'Færa í...';
 $labels['download'] = 'Hlaða niður';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'Skráarheiti';
 $labels['filesize'] = 'Skráarstærð';
 $labels['addtoaddressbook'] = 'Bæta í nafnaskrá';
@@ -139,9 +131,7 @@
 $labels['unread'] = 'Ólesið';
 $labels['flagged'] = 'Flaggað';
 $labels['unanswered'] = 'Ósvarað';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eytt';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Umhverfa';
 $labels['filter'] = 'Sía';
 $labels['list'] = 'Listi';
@@ -168,7 +158,6 @@
 $labels['folderactions'] = 'Möppuaðgerðir...';
 $labels['compact'] = 'Pakka';
 $labels['empty'] = 'Tæma';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Gagnamagn';
 $labels['unknown']  = 'óþekkt';
 $labels['unlimited']  = 'ótakmarkað';
@@ -176,14 +165,9 @@
 $labels['resetsearch']  = 'Tæma leit';
 $labels['searchmod']  = 'Leitarskilyrði';
 $labels['msgtext']  = 'Allt skeytið';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Opna í nýjum glugga';
 $labels['emlsave'] = 'Niðurhlaða (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Breyta sem nýju';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Senda skeytið núna';
 $labels['savemessage']    = 'Vista drög';
 $labels['addattachment']  = 'Hengja við';
@@ -213,9 +197,6 @@
 $labels['showimages'] = 'Sýna myndir';
 $labels['alwaysshow'] = 'Sýna alltaf myndir frá $sender';
 $labels['isdraft']    = 'Þetta eru drög að skeyti';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Venjulegur texti';
 $labels['savesentmessagein'] = 'Vista send skeyti í';
@@ -290,36 +271,29 @@
 $labels['rename'] = 'Endurnefna';
 $labels['addphoto'] = 'Bæta við';
 $labels['replacephoto'] = 'Skipta út';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'Búa til nýtt nafnspjald';
 $labels['deletecontact']  = 'Eyða völdum tengiliðum';
 $labels['composeto']      = 'Skrifa skeyti til';
 $labels['contactsfromto'] = 'Netföng $from til $to af $count';
 $labels['print']          = 'Prenta';
 $labels['export']         = 'Flytja út';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Flytja út nafnspjöld á vCard formi';
 $labels['newcontactgroup'] = 'Nýr tengiliðahópur';
 $labels['grouprename']    = 'Breyta nafni hóps';
 $labels['groupdelete']    = 'Fjarlægja hóp';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'Sýna fyrri síðu';
 $labels['firstpage']      = 'Sýna fyrstu síðu';
 $labels['nextpage']       = 'Sýna næstu síðu';
 $labels['lastpage']       = 'Sýna síðustu síðu';
 $labels['group'] = 'Hópur';
 $labels['groups'] = 'Hópar';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Persónuleg heimilisföng';
 $labels['searchsave'] = 'Vista leit';
 $labels['searchdelete'] = 'Eyða leit';
 $labels['import'] = 'Flytja inn';
 $labels['importcontacts'] = 'Flytja inn nafnspjöld';
 $labels['importfromfile'] = 'Flytja inn af skrá';
-$labels['importtarget'] = 'Bæta nýjum tengiliðum við:';
 $labels['importreplace'] = 'Skipta út allri netfangaskránni';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Búið';
 $labels['settingsfor'] = 'Stillingar fyrir';
 $labels['about'] = 'Um forritið';
@@ -334,8 +308,6 @@
 $labels['preferhtml'] = 'Vil HTML';
 $labels['defaultcharset'] = 'Venjulegt stafasett';
 $labels['htmlmessage'] = 'HTML skeyti';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Snið dagsetningar';
 $labels['timeformat'] = 'Tímasnið';
 $labels['prettydate'] = 'Fallegar dagsetningar';
@@ -346,13 +318,9 @@
 $labels['pagesize']  = 'Línur á síðu';
 $labels['signature'] = 'Undirskrift';
 $labels['dstactive']  = 'Sumar-/vetratími';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Skrifa HTML-skeyti';
 $labels['htmlonreply'] = 'sem svar við HTML-skeytum aðeins';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML-undirskrift';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Sýna forskoðunarglugga';
 $labels['skin'] = 'Sniðmát á viðmóti';
 $labels['logoutclear'] = 'Tæma rusl við útskráningu';
@@ -370,14 +338,12 @@
 $labels['flagfordeletion'] = 'Merkja skeyti til eyðingar í stað þess að eyða';
 $labels['skipdeleted'] = 'Ekki sýna eydd skeyti';
 $labels['deletealways'] = 'Ef ekki er hægt að setja skeytið í ruslafötuna, henda þeim';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Sýna myndir annarsstaðar frá';
 $labels['fromknownsenders'] = 'frá þekktum sendendum';
 $labels['always'] = 'alltaf';
 $labels['showinlineimages'] = 'Sýna viðhangandi myndir fyrir neðan skeytið';
 $labels['autosavedraft']  = 'Vista sjálfkrafa sem drög';
 $labels['everynminutes']  = '$n mínútu fresti';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'aldrei';
 $labels['immediately']  = 'samstundis';
 $labels['messagesdisplaying'] = 'Sýni skeyti';
@@ -393,13 +359,11 @@
 $labels['displaynext'] = 'Að eyðingu/færslu lokinni sýna næsta skeyti';
 $labels['defaultfont'] = 'Sjálfgefið letur HTML-skeyta';
 $labels['mainoptions'] = 'Aðalstillingar';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Hluti';
 $labels['maintenance'] = 'Viðhald';
 $labels['newmessage'] = 'Nýtt skeyti';
 $labels['signatureoptions'] = 'Valkostir undirskriftar';
 $labels['whenreplying'] = 'Þegar svarað';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'hefja nýtt skeyti fyrir ofan eldra';
 $labels['replybottomposting'] = 'hefja nýtt skeyti undir eldra';
 $labels['replyremovesignature'] = 'Þegar svarað fjarlægja upphaflega undirskrift úr skeyti';
@@ -412,7 +376,6 @@
 $labels['reqmdn'] = 'Biðja ávallt um kvittun';
 $labels['reqdsn'] = 'Biðja ávallt um sendingarstöðu';
 $labels['replysamefolder'] = 'Setja svarskeyti í möppu sem upphaflegt skeyti er í';
-$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Sleppa aukanetföngum í sjálfklárun';
 $labels['listnamedisplay'] = 'Lista tengiliði sem';
 $labels['spellcheckbeforesend'] = 'Athuga stafsetningu áður en skeyti er sent';
@@ -421,11 +384,6 @@
 $labels['spellcheckignorenums'] = 'Hunsa orð með tölum';
 $labels['spellcheckignorecaps'] = 'Hunsa orð sem eru í hástöfum';
 $labels['addtodict'] = 'Bæta við orðalista';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Mappa';
 $labels['folders']  = 'Möppur';
 $labels['foldername']  = 'Nafn möppu';
@@ -450,7 +408,6 @@
 $labels['sortasc']  = 'Raða vaxandi';
 $labels['sortdesc'] = 'Raða minnkandi';
 $labels['undo'] = 'Taka til baka';
-$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Viðbætur';
 $labels['version'] = 'Útgáfa';
 $labels['source'] = 'Uppruni';
diff --git a/program/localization/is_IS/messages.inc b/program/localization/is_IS/messages.inc
index d6eb165..06b7073 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -15,160 +15,44 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'Innskráning mistókst';
 $messages['cookiesdisabled'] = 'Vafrinn þinn vill ekki taka við kökum (cookies)';
 $messages['sessionerror'] = 'Innskráningin þín ógild eða útrunnin';
 $messages['storageerror'] = 'Tengin við IMAP-miðlara mistókst';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Engin skeyti eru í þessu pósthólfi';
 $messages['loggedout'] = 'Þú hefur útskráðst. Bless!';
 $messages['mailboxempty'] = 'Pósthólfið er tómt';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Hleð...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Hleð gögn...';
 $messages['checkingmail'] = 'Gái að nýjum skeytum...';
-$messages['sendingmessage'] = 'Sending message...';
 $messages['messagesent'] = 'Skeyti var sent';
 $messages['savingmessage'] = 'Vista skeyti...';
 $messages['messagesaved'] = 'Skeytið vistað í Drög';
 $messages['successfullysaved'] = 'Vistun heppnaðist!';
 $messages['addedsuccessfully'] = 'Netfangi var bætt í netfangaskrá';
 $messages['contactexists'] = 'Þetta netfang er þegar skráð í netfangaskrána';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Til verndar hafa allar myndir í þessu skeyti verið blokkaðar.';
 $messages['encryptedmessage'] = 'Þetta er dulkóðað skeyti og því miður er ekki hægt að birta það';
 $messages['nocontactsfound'] = 'Engin netföng';
-$messages['contactnotfound'] = 'The requested contact was not found.';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Sending misheppnaðist';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'Villa kom upp þegar var verið að vista';
 $messages['errormoving'] = 'Gat ekki fært skeytið';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Gat ekki eytt skeytinu';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'Ertu viss um að þú viljir eyða völdum netföngum?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
-$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
 $messages['deletefolderconfirm']  = 'Ertu viss um að vilja eyða þessari möppu?';
-$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Formið var ekki fyllt út að fullu';
 $messages['noemailwarning'] = 'Sláðu inn gildt netfang';
 $messages['nonamewarning']  = 'Sláðu inn nafn';
 $messages['nopagesizewarning'] = 'Sláðu inn síðustærð';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Í það minnsta einn viðtakandi verður að vera';
 $messages['nosubjectwarning']  = 'Efnislínan er tóm. Viltu slá eitthvað inn í hana?';
 $messages['nobodywarning'] = 'Viltu senda tómt skeyti?';
 $messages['notsentwarning'] = 'Skeytið hefur ekki verið send. Viltu henda skeytinu?';
 $messages['noldapserver'] = 'Please select an ldap server to search';
 $messages['nosearchname'] = 'Sláðu inn nafn eða netfang';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr skeyti fundust';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Leit skilaði engu';
 $messages['searching'] = 'Leita...';
 $messages['checking'] = 'Gái...';
 $messages['nospellerrors'] = 'Engar innsláttarvillur fundust';
 $messages['folderdeleted'] = 'Möppu var eytt';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
-$messages['deletedsuccessfully'] = 'Successfully deleted.';
-$messages['converting'] = 'Removing formatting...';
-$messages['messageopenerror'] = 'Could not load message from server.';
-$messages['fileuploaderror'] = 'File upload failed.';
-$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
-$messages['sourceisreadonly'] = 'This address source is read only.';
-$messages['errorsavingcontact'] = 'Could not save the contact address.';
-$messages['movingmessage'] = 'Moving message(s)...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
-$messages['errorsendingreceipt'] = 'Could not send the receipt.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
-$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 5cd18c2..ac8e2a6 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Benvenuto in $product';
 $labels['username']  = 'Utente';
 $labels['password']  = 'Password';
@@ -31,7 +29,7 @@
 $labels['sent']   = 'Inviata';
 $labels['trash']  = 'Cestino';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = 'Mostra nomi reali per le cartelle speciali';
 $labels['subject'] = 'Oggetto';
 $labels['from']    = 'Mittente';
 $labels['sender']  = 'Mittente';
@@ -168,7 +166,7 @@
 $labels['folderactions'] = 'Operazioni cartella';
 $labels['compact'] = 'Compatta';
 $labels['empty'] = 'Svuota';
-$labels['importmessages'] = 'Import messages';
+$labels['importmessages'] = 'Importa messaggi';
 $labels['quota'] = 'Spazio utilizzato';
 $labels['unknown']  = 'sconosciuto';
 $labels['unlimited']  = 'illimitato';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'Ambito di ricerca';
 $labels['msgtext']  = 'Intero messaggio';
 $labels['body']  = 'Body';
-$labels['type'] = 'Type';
+$labels['type'] = 'Tipo';
+$labels['namex'] = 'Nome';
 $labels['openinextwin'] = 'Apri in una nuova finestra';
 $labels['emlsave'] = 'Scarica (.eml)';
 $labels['changeformattext'] = 'Visualizza nel formato testo semplice';
@@ -310,15 +309,18 @@
 $labels['lastpage']       = 'Ultima pagina';
 $labels['group'] = 'Gruppo';
 $labels['groups'] = 'Gruppi';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Elenca membri dei gruppi';
 $labels['personaladrbook'] = 'Rubrica Personale';
 $labels['searchsave'] = 'Salva ricerca';
 $labels['searchdelete'] = 'Elimina ricerca';
 $labels['import'] = 'Importa';
 $labels['importcontacts'] = 'Importa contatti';
 $labels['importfromfile'] = 'Importa da file:';
-$labels['importtarget'] = 'Aggiungi nuovi contattu alla rubrica:';
+$labels['importtarget'] = 'Aggiungi contatti a';
 $labels['importreplace'] = 'Sostituisci l\'intera rubrica';
+$labels['importgroups'] = 'Importa le assegnazioni di gruppo';
+$labels['importgroupsall'] = 'Tutti (crea i gruppi se necessario)';
+$labels['importgroupsexisting'] = 'Solo per i gruppi esistenti';
 $labels['importdesc'] = 'Puoi caricare i contatti da una rubrica esistente.<br/>Attualmente si possono importare contatti in formato  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (comma-separated).';
 $labels['done'] = 'Fatto';
 $labels['settingsfor'] = 'Impostazioni per';
@@ -369,7 +371,7 @@
 $labels['readwhendeleted'] = 'Marca il messaggio come letto prima di eliminarlo';
 $labels['flagfordeletion'] = 'Marca il messaggio come eliminato invece di eliminarlo';
 $labels['skipdeleted'] = 'Non mostrare i messaggi marcati come eliminati';
-$labels['deletealways'] = 'Quando non è possinile spostare i messaggi nel Cestino eliminali';
+$labels['deletealways'] = 'Quando non è possibile spostare i messaggi nel Cestino, eliminali';
 $labels['deletejunk'] = 'Elimina direttamente i messaggi in Spam';
 $labels['showremoteimages'] = 'Mostra immagini remote contenute nel messaggio';
 $labels['fromknownsenders'] = 'da mittenti conosciuti';
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index f9e85f4..c5a8104 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Si è verificato un errore!';
 $messages['loginfailed']  = 'Impossibile accedere. Utente o password non corretti';
 $messages['cookiesdisabled'] = 'Il tuo browser non accetta i cookies';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Inserisci dei termini per cercare i contatti';
 $messages['sendingfailed'] = 'Impossibile inviare il messaggio';
 $messages['senttooquickly'] = 'Per favore, attendi $sec secondi prima di inviare questo messaggio';
-$messages['errorsavingsent'] = 'C\'è stato un errore nel salvare il messaggio inviato';
-$messages['errorsaving'] = 'Impossibile salvare';
 $messages['errormoving'] = 'Impossibile spostare il messaggio';
 $messages['errorcopying'] = 'Impossibile copiare il messaggio';
 $messages['errordeleting'] = 'Impossibile eliminare il messaggio';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Indirizzo e-mail non corretto: $email';
 $messages['toomanyrecipients'] = 'Numero eccessivo di destinatari, ridurlo a $max';
 $messages['maxgroupmembersreached'] = 'Il numero dei membri del gruppo eccede il massimo di $max';
-$messages['internalerror'] = 'Si è verificato un errore interno. Si prega di riprovare di nuovo.';
 $messages['contactdelerror'] = 'Impossibile eliminare il/i contatto/i';
 $messages['contactdeleted'] = 'Contatto/i correttamente eliminato/i';
 $messages['contactrestoreerror'] = 'Impossibile ripristinare il/i contatto/i cancellato/i';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 07bb86f..aadc8fc 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '$productにようこそ';
 $labels['username']  = 'ユーザー名';
 $labels['password']  = 'パスワード';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = '検索の条件';
 $labels['msgtext']  = 'メッセージ全体';
 $labels['body']  = '本文';
-$labels['type'] = 'Type';
+$labels['type'] = '種類';
+$labels['namex'] = '名前';
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'ダウンロード(.eml形式)';
 $labels['changeformattext'] = 'テキスト形式で表示';
@@ -317,8 +316,11 @@
 $labels['import'] = 'インポート';
 $labels['importcontacts'] = '連絡先をインポート';
 $labels['importfromfile'] = 'ファイルからインポート';
-$labels['importtarget'] = 'アドレス帳に新しい連絡先の追加:';
+$labels['importtarget'] = '次に連絡先を追加';
 $labels['importreplace'] = 'アドレス帳全体と置き換え';
+$labels['importgroups'] = 'グループの割り当てをインポート';
+$labels['importgroupsall'] = 'すべて (必要ならグループを作成)';
+$labels['importgroupsexisting'] = '存在するグループだけ';
 $labels['importdesc'] = '連絡先を既存のアドレス帳からアップロードできます。<br />現在、<a href="http://ja.wikipedia.org/wiki/VCard">vCard</a>またはCSV(コンマ区切り)のデータ形式からアドレスのインポートをサポートしています。';
 $labels['done'] = '完了';
 $labels['settingsfor'] = '次の設定:';
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 19f3168..fb03bc0 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'エラーが発生しました!';
 $messages['loginfailed']  = 'ログインできませんでした。';
 $messages['cookiesdisabled'] = 'ブラウザーがCookieを受け付けません。';
@@ -55,7 +54,7 @@
 $messages['contactsearchonly'] = '連絡先を探すための検索語を入力してください';
 $messages['sendingfailed'] = 'メッセージを送信できませんでした。';
 $messages['senttooquickly'] = 'このメッセージを送信するまで、$sec秒お待ちください。';
-$messages['errorsavingsent'] = '送信メッセージの保存中にエラーが発生しました。';
+$messages['errorsavingsent'] = '送信したメッセージの保存中にエラーが発生しました。';
 $messages['errorsaving'] = '保存中にエラーが発生しました。';
 $messages['errormoving'] = 'メッセージを移動できません。';
 $messages['errorcopying'] = 'メッセージをコピーできません。';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index fae6f65..7a14b62 100644
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'მოგესალმებათ $product';
 $labels['username']  = 'მომხმარებელი';
 $labels['password']  = 'პაროლი';
@@ -31,33 +29,22 @@
 $labels['sent']   = 'გაგზავნილი';
 $labels['trash']  = 'წაშლილი';
 $labels['junk']   = 'სპამი';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'სათაური';
 $labels['from']    = 'გამგზავნი';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'ვის';
 $labels['cc']      = 'ასლი';
 $labels['bcc']     = 'ფარული';
 $labels['replyto'] = 'პასუხი';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'თარიღი';
 $labels['size']    = 'ზომა';
 $labels['priority'] = 'პრიორიტეტი';
 $labels['organization'] = 'ორგანიზაცია';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'საქაღალდეები';
-$labels['messagesfromto'] = 'Messages $from to $to of $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'შეტყობინება $nr დან $count';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'ასლი';
 $labels['move']     = 'გადატანა';
 $labels['moveto']   = 'გადატანა...';
 $labels['download'] = 'გადმოწერა';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'ფაილის სახელი';
 $labels['filesize'] = 'ფაილის ზომა';
 $labels['addtoaddressbook'] = 'მისამართებში დამატება';
@@ -100,18 +87,11 @@
 $labels['longnov']	= 'ნოემბერი';
 $labels['longdec']	= 'დეკემბერი';
 $labels['today'] = 'დღეს';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'შემოწმება ახალ შეტყობინებაზე';
 $labels['compose']          = 'შეტყობინების დაწერა';
 $labels['writenewmessage']  = 'ახალი შეტყობინება';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'პასუხი';
 $labels['replytoallmessage'] = 'პასუხი ყველას';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'გადაგზავნა';
 $labels['deletemessage']    = 'წაშლა';
 $labels['movemessagetotrash'] = 'შეტყობინების წაშლილებში გადატანა';
@@ -122,16 +102,12 @@
 $labels['lastmessage']      = 'ბოლო შეტყობინების ნახვა';
 $labels['backtolist']       = 'უკან ჩამონათვალში';
 $labels['viewsource']       = 'შიგთავსი';
-$labels['mark']             = 'Mark';
 $labels['markmessages']     = 'მონიშნეთ შეტყობინებები';
 $labels['markread']         = 'როგორც წაკითხული';
 $labels['markunread']       = 'როგორც წაუკითხავი';
 $labels['markflagged']      = 'როგორც მონიშნული';
 $labels['markunflagged']    = 'როგორც მოუნიშნავი';
 $labels['moreactions']      = 'მეტი მოქმედება...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'მონიშვნა';
 $labels['all'] = 'ყველა';
 $labels['none'] = 'არცერთი';
@@ -139,36 +115,23 @@
 $labels['unread'] = 'წაუკითხავი';
 $labels['flagged'] = 'მონიშნული';
 $labels['unanswered'] = 'უპასუხო';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'წაშლილი';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'შებრუნებული';
 $labels['filter'] = 'ფილტრი';
 $labels['list'] = 'სია';
-$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'ყველას გაშლა';
 $labels['expand-unread'] = 'წაუკითხავის გაშლა';
 $labels['collapse-all'] = 'ყველას დაკეცვა';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'ვისგან/ვის';
 $labels['flag'] = 'დროშა';
 $labels['attachment'] = 'მიმაგრებული ფაილი';
 $labels['nonesort'] = 'არცერთი';
 $labels['sentdate'] = 'გაგზავნის თარიღი';
-$labels['arrival'] = 'Arrival date';
 $labels['asc'] = 'ზრდადობით';
 $labels['desc'] = 'კლებადობით';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
 $labels['listorder'] = 'დალაგება';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'შეკუმშვა';
 $labels['empty'] = 'გაცარიელება';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'შეზღუდვა';
 $labels['unknown']  = 'უცნობი';
 $labels['unlimited']  = 'შეუზღუდავი';
@@ -176,34 +139,21 @@
 $labels['resetsearch']  = 'ძიების გასუფთავება';
 $labels['searchmod']  = 'ძებნის ვარიანტები';
 $labels['msgtext']  = 'ყველა შეტყობინება';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'გახსნა ახალ ფანჯარაში';
 $labels['emlsave'] = 'გადმოწერა (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'რედაქტირება როგორც ახლის';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'შეტყობინების გაგზავნა';
 $labels['savemessage']    = 'დროებით შენახვა';
 $labels['addattachment']  = 'ფაილის ატვირთვა';
 $labels['charset']        = 'კოდირება';
 $labels['editortype']     = 'რედაქტორი';
 $labels['returnreceipt']  = 'პასუხის მოთხოვნა';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ორთოგრაფიული შემოწმება';
 $labels['resumeediting'] = 'რედაქტირების გაგრძელება';
 $labels['revertto']      = 'გაუქმება';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'გზავნილები';
 $labels['upload'] = 'ატვირთვა';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'დახურვა';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'დაბალი';
 $labels['lowest']  = 'უდაბლესი';
 $labels['normal']  = 'საშუალო';
@@ -212,10 +162,6 @@
 $labels['nosubject']  = '(უსათაურო)';
 $labels['showimages'] = 'გამოსახულების ჩვენება';
 $labels['alwaysshow'] = 'ყოველთვის გამოაჩინე სურათები $sender –გან';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'ტექსტური';
 $labels['savesentmessagein'] = 'შეინახე შეტყობინება';
@@ -224,7 +170,6 @@
 $labels['addcc'] = 'დაამატე კოპიო';
 $labels['addbcc'] = 'დაამატე ფარული კოპიო';
 $labels['addreplyto'] = 'დაამატე გამომგზავნი';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'გამომგზავნს სურს შეიტყოს წერილის მიღება. გსურთ შეატყობინოთ გამომგზავნს?';
 $labels['receiptread'] = 'გზავნილის დაბრუნება';
 $labels['yourmessage'] = 'ეს არის მიღების დასტური თქვენს შეტყობინებაზე';
@@ -232,14 +177,8 @@
 $labels['name']         = 'სრული სახელი';
 $labels['firstname']    = 'სახელი';
 $labels['surname']      = 'გვარი';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
 $labels['department']   = 'დეპარტამენტი';
 $labels['gender']       = 'სქესი';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'ელ–ფოსტა';
 $labels['phone']        = 'ტელეფონი';
 $labels['address']      = 'მისამართი';
@@ -249,19 +188,13 @@
 $labels['region']       = 'შტატი/პროვინცია';
 $labels['country']      = 'ქვეყანა';
 $labels['birthday']     = 'დაბადების დღე';
-$labels['anniversary']  = 'Anniversary';
 $labels['website']      = 'ვებგვერდი';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
 $labels['male']   = 'მამრობითი';
 $labels['female'] = 'მდედრობით';
 $labels['manager'] = 'მენეჯერი';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
 $labels['allfields'] = 'ყველა ველი';
 $labels['search'] = 'ძებნა';
 $labels['advsearch'] = 'გაფართოებული ძებნა';
-$labels['advanced'] = 'Advanced';
 $labels['other'] = 'სხვა';
 $labels['typehome']   = 'სახლი';
 $labels['typework']   = 'სამსახური';
@@ -273,15 +206,12 @@
 $labels['typecar']  = 'მანქანა';
 $labels['typepager']  = 'პეიჯერი';
 $labels['typevideo']  = 'ვიდეო';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
 $labels['typeblog'] = 'ბლოგი';
 $labels['typeprofile'] = 'პროფილი';
 $labels['addfield'] = 'ველის დამატება...';
 $labels['addcontact'] = 'კონტაქტებში დამატება';
 $labels['editcontact'] = 'კონტაქტის რედაქტირება';
 $labels['contacts'] = 'კონტაქტები';
-$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'პირადი ინფორმაცია';
 $labels['edit']   = 'რედაქტირება';
 $labels['cancel'] = 'გაუქმება';
@@ -290,39 +220,31 @@
 $labels['rename'] = 'გადარქმევა';
 $labels['addphoto'] = 'დამატება';
 $labels['replacephoto'] = 'გამოცვლა';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'კონტაქტის შექმნა';
 $labels['deletecontact']  = 'მონიშნელი კონტაქტის წაშლა';
 $labels['composeto']      = 'ფოსტის გაგზავნა შერჩეულ ადრესატებთან';
 $labels['contactsfromto'] = 'კონტაქტები $from დან $to ში $count';
 $labels['print']          = 'დაბეჭვდა';
 $labels['export']         = 'ექსპორტი';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'კონტაქტების ექსპორტი vCard ფორმატში';
 $labels['newcontactgroup'] = 'ახალი საკონტაქტო ჯგუფის შექმნა';
 $labels['grouprename']    = 'ჯგუფის სახელის შეცვლა';
 $labels['groupdelete']    = 'ჯგუფის წაშლა';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'წინას ჩვენება';
 $labels['firstpage']      = 'პირველის ჩვენება';
 $labels['nextpage']       = 'შემდეგის ჩვენება';
 $labels['lastpage']       = 'ბოლოს ჩვენება';
 $labels['group'] = 'ჯგუფი';
 $labels['groups'] = 'ჯგუფები';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'პერსონალური მისამართები';
 $labels['searchsave'] = 'ძებნის შენახვა';
 $labels['searchdelete'] = 'ძებნის წაშლა';
 $labels['import'] = 'შემოტანა';
 $labels['importcontacts'] = 'კონტაქტების შემოტანა';
 $labels['importfromfile'] = 'შემოტანა ფაილიდან:';
-$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'ჩაანაცვლეთ არსებული მისამართები';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'დასრულებულია';
 $labels['settingsfor'] = 'პარამეტრები';
-$labels['about'] = 'About';
 $labels['preferences'] = 'პარამეტრები';
 $labels['userpreferences'] = 'მომხმარებლის პარამეტრები';
 $labels['editpreferences'] = 'მომხმარებლის პარამეტრების რედაქტირება';
@@ -334,8 +256,6 @@
 $labels['preferhtml'] = 'როგორც HTML';
 $labels['defaultcharset'] = 'ნაგულისხმები სიმბოლოთა ნაკრები';
 $labels['htmlmessage'] = 'HTML შეტყობინება';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'თარიღის ფორმატი';
 $labels['timeformat'] = 'დროის ფორმატი';
 $labels['prettydate'] = 'კარგი თარიღები';
@@ -346,13 +266,8 @@
 $labels['pagesize']  = 'სტრიქონი გვერდზე';
 $labels['signature'] = 'ხელმოწერა';
 $labels['dstactive']  = 'დროის გადაყვანა';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'შეტყობინების შექმნა HTML –ში';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML ხელმოწერა';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ჩვენება';
 $labels['skin'] = 'ინტერფეისი';
 $labels['logoutclear'] = 'წაშლილების გასუფთავება გამოსვლისას';
@@ -363,21 +278,16 @@
 $labels['mdnrequests'] = 'მგზავნელის შეტყობინებები';
 $labels['askuser'] = 'ჰკითხე მომხმარებელს';
 $labels['autosend'] = 'გაგზავნე ავტომატურად';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'იგნორირება';
 $labels['readwhendeleted'] = 'მონიშნე გზავნილი წაკითხულად წაშლის დროს';
 $labels['flagfordeletion'] = 'აღნიშნეთ გზავნილები როგორც წასაშლელი წაშლის ნაცვლად';
 $labels['skipdeleted'] = 'არ გამოაჩინო წაშლილი გზავნილები';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'გამოაჩინე მოშორებული სურათები';
 $labels['fromknownsenders'] = 'ნაცნობი მგზავნელებისგან';
 $labels['always'] = 'ყოველთვის';
 $labels['showinlineimages'] = 'ატვირთული სურათები გამოაჩინე გზავნილის ქვემოთ';
 $labels['autosavedraft']  = 'ავტომატური შენახვა';
 $labels['everynminutes']  = 'ყოველ $n წუთში';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'არასდროს';
 $labels['immediately']  = 'დაუყონებლივ';
 $labels['messagesdisplaying'] = 'გამოაჩინე შეტყობინებები';
@@ -391,15 +301,12 @@
 $labels['focusonnewmessage'] = 'ფოკუსირება ახალ შეტყობინებებზე';
 $labels['checkallfolders'] = 'შეამოწმე ყველა საქაღალდე ახალ შეტყობინებაზე';
 $labels['displaynext'] = 'შეტყობინების წაშლის ან გადატანის შემდეგ გამოჩნდეს შემდეგი შეტყობინება';
-$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'ძირითადი პარამეტრები';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'განყოფილება';
 $labels['maintenance'] = 'მომსახურება';
 $labels['newmessage'] = 'ახალი შეტყობინება';
 $labels['signatureoptions'] = 'ხელმოწერის ოფციები';
 $labels['whenreplying'] = 'პასუხის შემთხვევაში';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'დაიწყოს ახალი შეტყობინება ორიგინალის ზემოთ';
 $labels['replybottomposting'] = 'დაიწყოს ახალი შეტყობინება ორიგინალის ქვემოთ';
 $labels['replyremovesignature'] = 'წაიშალოს ხელმოწერა პასუხის შემთხვევაში';
@@ -407,25 +314,8 @@
 $labels['newmessageonly'] = 'მხოლოდ ახალი შეტყობინება';
 $labels['replyandforwardonly'] = 'მხოლოდ გადაგზავნის და პასუხის შემთხვევაში';
 $labels['insertsignature'] = 'ხელმოცერის ჩასმა';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = '$n წამის შემდეგ';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'ლექსიკონში დამატება';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'საქაღალდე';
 $labels['folders']  = 'საქაღალდეები';
 $labels['foldername']  = 'საქაღალდის დასახელება';
@@ -435,27 +325,15 @@
 $labels['createfolder']  = 'საქაღალდის შექმნა';
 $labels['managefolders']  = 'საქაღალდეების მართვა';
 $labels['specialfolders'] = 'სპეციალური საქაღალდე';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
 $labels['location'] = 'მდებარეობა';
 $labels['info'] = 'ინფორმაცია';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'დასტის ტიპი';
 $labels['personalfolder']  = 'კერძო დასტა';
-$labels['otherfolder']  = 'Other User\'s Folder';
 $labels['sharedfolder']  = 'საჯარო დასტა';
 $labels['sortby'] = 'დალაგება';
 $labels['sortasc']  = 'დალაგება ზრდადობით';
 $labels['sortdesc'] = 'დალაგება კლებადობით';
 $labels['undo'] = 'დაბრუნება';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
 $labels['B'] = 'ბტ';
 $labels['KB'] = 'კბტ';
 $labels['MB'] = 'მბტ';
@@ -464,14 +342,12 @@
 $labels['english'] = 'ინსგლისური';
 $labels['westerneuropean'] = 'დასავლურევროპული';
 $labels['easterneuropean'] = 'აღმოსავლეთევროპული';
-$labels['southeasterneuropean'] = 'South-Eastern European';
 $labels['baltic'] = 'ბალტიური';
 $labels['cyrillic'] = 'კირილიცა';
 $labels['arabic'] = 'არაბული';
 $labels['greek'] = 'ბერძნული';
 $labels['hebrew'] = 'ებრაული';
 $labels['turkish'] = 'თურქული';
-$labels['nordic'] = 'Nordic';
 $labels['thai'] = 'ტაი';
 $labels['celtic'] = 'კელტური';
 $labels['vietnamese'] = 'ვიეტნამური';
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 9779939..2c544e1 100644
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'შესვლა შეუძლებელია';
 $messages['cookiesdisabled'] = 'თქვენი ბროუზერი კუკიებს არ პასუხობს';
 $messages['sessionerror'] = 'თქვენი სესია არის მცდარი ან ვადაგასული';
@@ -24,17 +22,11 @@
 $messages['servererror'] = 'შეცდომა სერვერზე!';
 $messages['servererrormsg'] = 'სერვერის შეცდომა: $msg';
 $messages['dberror'] = 'მონაცემთა ბაზის შეცდომა!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'მოქმედების შესრულება შეუძლებალია. წვდომა აკრძალულია.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'არასწორი მოთხოვნა! მონაცემების შენახვა არ მოხერხდა.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'არ არის ახალი შეტყობინება';
 $messages['loggedout'] = 'წარმატებით დაიხურა თქვენი სესია';
 $messages['mailboxempty'] = 'საფოსტო ყუთი ცარიელია';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'იტვირთება...';
 $messages['uploading'] = 'ფაილი იტვირთება...';
 $messages['uploadingmany'] = 'ფაილების ატვირთვა...';
@@ -47,31 +39,22 @@
 $messages['successfullysaved'] = 'წარმატებით შეინახა';
 $messages['addedsuccessfully'] = 'კონტაქტი წარმატებით დაემატა მისამართებში';
 $messages['contactexists'] = 'კონტაქტი ამ მისამართზე უკვე არსებობს';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'უსაფრთხოების მიზნით სურათების ჩვენება შეზღუდულია';
 $messages['encryptedmessage'] = 'შეტყობინება დაშიფრულია და სამწუხაროდ ჩვენება შეუძლებელია';
 $messages['nocontactsfound'] = 'კონტაქტი ვერ მოიძებნა';
 $messages['contactnotfound'] = 'მოთხოვნილი კონტაქტი ვერ მოიძებნა';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'შეტყობინება ვერ გაიგზავნა';
 $messages['senttooquickly'] = 'გთხოვთ მოიცადოთ $sec წამი. სანამ იგზავნება შეტყობინება';
-$messages['errorsavingsent'] = 'შეცდომა სანამ ინახება გაგზავნილი შეტყობინება';
-$messages['errorsaving'] = 'შენახვის დროს მოხდა შეცდომა';
 $messages['errormoving'] = 'შეტყობინების გადატანა შეუძლებელია';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'შეტყობინების წაშლა შეუძლებელია';
 $messages['errormarking'] = 'შეტყობინების მონიშვნა შეუძლებელია';
 $messages['deletecontactconfirm']  = 'ნამდვილად გსურთ მონიშნული კონტაქტების წაშლა?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'ნამდვილად გსურთ მონიშნული შეტყობინებების წაშლა?';
 $messages['deletefolderconfirm']  = 'ნამდვილად გსურთ ამ საქაღალდის წაშლა?';
 $messages['purgefolderconfirm']  = 'ნამდვილად გსურთ ყველა შეტყობინების წაშლა აღნიშნულ საქაღალდეში?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
 $messages['groupdeleting'] = 'ჯგუფის წაშლა...';
 $messages['folderdeleting'] = 'საქაღალდის წაშლა...';
 $messages['foldermoving'] = 'საქაღალდის გადატანა...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'ყველა ველი არ არის შევსებული';
 $messages['noemailwarning'] = 'მიუთითეთ სწორი ელ–ფოსტის მისამართი';
 $messages['nonamewarning']  = 'მიუთითეთ სახელი';
@@ -91,45 +74,22 @@
 $messages['checking'] = 'შემოწმება...';
 $messages['nospellerrors'] = 'ორთოგრაფიული შეცდომა არ არის';
 $messages['folderdeleted'] = 'საქაღალდე წარმატებით წაიშალა';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'წარმატებით წაიშალა';
 $messages['converting'] = 'შეტყობინების ფორმატირების გაუქმება...';
 $messages['messageopenerror'] = 'შეტყობინება ვერ ჩაიტვირთა სერვერიდან';
 $messages['fileuploaderror'] = 'ფაილი ვერ აიტვირთა';
 $messages['filesizeerror'] = 'ატვირთული ფაილის ზომა მეტია დასაშვებ ფაილის მაქსიმალურ ზომაზე ($size)';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'აღნიშნული მისამართის მხოლოდ წაკითხვაა შესაძლებელი';
 $messages['errorsavingcontact'] = 'საკონტაქტო მისამართის შენახვა შეუძლებელია';
 $messages['movingmessage'] = 'შეტყობინების გადატანა...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'წარმატებით გაიგზავნა';
 $messages['errorsendingreceipt'] = 'არ გაიგზავნა';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'წაშლა შეუძლებელია, ის თქვენთვის ერთადერთია';
 $messages['forbiddencharacter'] = 'საქაღალდის სახელი შეიცავს აკრძალულ სიმბოლოებს';
 $messages['selectimportfile'] = 'გთხოვთ მონიშნოთ ფაილი ასატვირთად';
 $messages['addresswriterror'] = 'მონიშნულ მისამართებში ჩაწერა შეუძლებელია';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'გთხოვთ მოიცადოთ, მიმდინარეობს შემოტანა';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>წარმატებით დასრულდა $inserted კონტაქტების შემოტანა, $skipped არსებულის გამოტოვება</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'ოპერაცია შეზღუდულია';
 $messages['nofromaddress'] = 'ელ–ფოსტის მისამართი გამოტოვებულია';
 $messages['editorwarning'] = 'რედაქტორის გადართვა ტექსტურ რეჟიმში გამოიწვევს არსებული ტექსტის ფორმატის დაკარგვას. გსურთ გაგრძელება?';
@@ -141,34 +101,16 @@
 $messages['smtprecipientserror'] = 'SMTP Error: მიმღებთა ჩამონათვალის დამუშავება ვერ მოხერხდა';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'ელ-ფოსტის მისამართი არასწორია $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
 $messages['contactdeleted'] = 'კონტაქტ(ებ)ი წარმატებით წაიშალა.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
 $messages['contactrestored'] = 'კონრაქტ(ებ)ი წარმატებით აღდგა,';
 $messages['groupdeleted'] = 'ჯგუფი წარმატებით წაიშალა.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
 $messages['groupcreated'] = 'ჯგუფი წარმატებით შეიქმნა.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
 $messages['messagedeleted'] = 'შეტყობინებები წარმატებით წაიშალა.';
 $messages['messagemoved'] = 'შეტყობინებები გადატანილია წარმატებით.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
 $messages['messagemarked'] = 'შეტყობინებები წარმატებით მოინიშნა.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'სახელი არ შეიძლება იყოს ცარიელი.';
 $messages['nametoolong'] = 'სახელი ძალიან მოკლეა.';
 $messages['folderupdated'] = 'დასტა წარმატებით განახლდა.';
 $messages['foldercreated'] = 'დასტა წარმატებით შეიქმნა.';
 $messages['invalidimageformat'] = 'გამოსახულების ფორმატი არასწორია.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index 4c83ab8..9a27999 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '$product សូមស្វាគមន៍';
 $labels['username']  = 'ឈ្មោះអ្នកប្រើ';
 $labels['password']  = 'ពាក្យសំងាត់';
@@ -31,10 +29,8 @@
 $labels['sent']   = 'សំបុត្រដែលបានបញ្ជូន';
 $labels['trash']  = 'ធុងសំរាម';
 $labels['junk']   = 'សំបុត្រមិនល្អ';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'ចំណងជើង';
 $labels['from']    = 'អ្នកផ្ញើ';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'អ្នកទទួល';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -45,19 +41,14 @@
 $labels['priority'] = 'អទិភាព';
 $labels['organization'] = 'អង្គភាព';
 $labels['readstatus'] = 'ស្ថានភាពនៃការអាន';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'ថតទាំងអស់';
 $labels['messagesfromto'] = 'សំបុត្រពី $from ទៅដល់ $toក្នុងចំណោម $count សំបុត្រ';
 $labels['threadsfromto'] = 'បន្តុំសំបុត្រពី $from ទៅដល់ $toក្នុងចំណោម $count សំបុត្រ';
 $labels['messagenrof'] = 'សំបុត្រ $nr នៃ $count';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'ចំលង';
 $labels['move']     = 'ផ្ទេរ';
 $labels['moveto']   = 'ផ្ទេរទៅ';
 $labels['download'] = 'ទាញយក';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'ឈ្មោះឯកសារ';
 $labels['filesize'] = 'ទំហំឯកសារ';
 $labels['addtoaddressbook'] = 'រក្សាទុកក្នុងសៀវភៅអាសយដ្ឋាន';
@@ -100,18 +91,13 @@
 $labels['longnov']	= 'វិច្ឆិកា';
 $labels['longdec']	= 'ធ្នូ';
 $labels['today'] = 'ថ្ងៃនេះ';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'ពិនិត្យសំបុត្រថ្មី';
 $labels['compose']          = 'សរសេរសំបុត្រថ្មី';
 $labels['writenewmessage']  = 'សរសេរសំបុត្រថ្មី';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'ឆ្លើយតបទៅអ្នកផ្ញើ';
 $labels['replytoallmessage'] = 'ឆ្លើយតបទៅ អ្នកទទួលទាំងអស់និង ក្រុម ឬ អ្នកផ្ញើ';
 $labels['replyall']         = 'ឆ្លើយតបទៅទាំងអស់គ្នា';
 $labels['replylist']        = 'ឆ្លើយតបទៅក្រុម';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'ផ្ញើសំបុត្របន្តរ';
 $labels['deletemessage']    = 'លុបសំបុត្រចោល';
 $labels['movemessagetotrash'] = 'ផ្ទេរសំបុត្រទៅក្នុងធុងសំរាម';
@@ -122,16 +108,11 @@
 $labels['lastmessage']      = 'បង្ហាញសំបុត្រចុងក្រោយ';
 $labels['backtolist']       = 'ត្រលប់ទៅកាន់ក្រុមសំបុត្រ';
 $labels['viewsource']       = 'បង្ហាញ Source របស់សំបុត្រ';
-$labels['mark']             = 'Mark';
 $labels['markmessages']     = 'កំណត់សំគាល់សំបុត្រ';
 $labels['markread']         = 'កំណត់ថាបានអានរួច';
 $labels['markunread']       = 'កំណត់ថាមិនទាន់បានអាន';
 $labels['markflagged']      = 'កំណត់សំគាល់ដោយផ្កាយ';
 $labels['markunflagged']    = 'លុបកំណត់សំគាល់ដោយផ្កាយ';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'ជ្រើសរើស';
 $labels['all'] = 'ទាំងអស់';
 $labels['none'] = 'មិនតំរៀប';
@@ -139,9 +120,7 @@
 $labels['unread'] = 'មិនទាន់អាន';
 $labels['flagged'] = 'មានកំណត់សំគាល់ដោយផ្កាយ';
 $labels['unanswered'] = 'មិនទាន់ឆ្លើយតប';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'បានលុបរួច';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'បញ្ច្រស់';
 $labels['filter'] = 'លក្ខខ័ណ្ឌ';
 $labels['list'] = 'តារាង';
@@ -168,7 +147,6 @@
 $labels['folderactions'] = 'មុខងារថត';
 $labels['compact'] = 'បង្រួម';
 $labels['empty'] = 'ទទេរ';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'ទំហំសំបុត្រទាំងអស់ដែលមាន';
 $labels['unknown']  = 'មិនស្គាល់';
 $labels['unlimited']  = 'គ្មានកំនត់';
@@ -176,14 +154,9 @@
 $labels['resetsearch']  = 'កំណត់លក្ខខ័ណ្ឌស្វែងរកជាថ្មី';
 $labels['searchmod']  = 'កែសំរួលលក្ខខ័ណ្ឌស្វែងរក';
 $labels['msgtext']  = 'សំបុត្រទាំងមូល';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'បើកក្នុងវីនដូវថ្មី';
 $labels['emlsave'] = 'រក្សាទុកទិន្នន័យជាឯកសារប្រភេទ(.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'ផ្ញើសំបុត្រនេះ';
 $labels['savemessage']    = 'រក្សាទុកសំបុត្រពង្រៀង';
 $labels['addattachment']  = 'ឯកសារភ្ជាប់';
@@ -191,17 +164,12 @@
 $labels['editortype']     = 'ប្រភេទ Editor';
 $labels['returnreceipt']  = 'អត្ថបទបញ្ជាក់ពីការត្រឡប់';
 $labels['dsn']            = 'ប្រាប់អំពីស្ថានភាពផ្ញើ';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
 $labels['editidents']    = 'ផ្លាស់ប្តូរអត្តសញ្ញាណ';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ពិនិត្យអក្ខរាវិរុទ្ធ';
 $labels['resumeediting'] = 'បន្តរការកែតំរូវ';
 $labels['revertto']      = 'ត្រលប់ទៅ';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'ឯកសារភ្ជាប់';
 $labels['upload'] = 'ភ្ជាប់ឯកសារ';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'បិទ';
 $labels['messageoptions']  = 'កំណត់ជំរើសរបស់សំបុត្រ';
 $labels['low']     = 'ទាប';
@@ -212,10 +180,6 @@
 $labels['nosubject']  = '(គ្មានចំណងជើង)';
 $labels['showimages'] = 'បង្ហាញរូបភាព';
 $labels['alwaysshow'] = 'បង្ហាញជានិច្ចរាល់រូបភាពបញ្ជូនពី$sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'អត្ថបទ HTML';
 $labels['plaintoggle'] = 'អត្ថបទធម្មតា';
 $labels['savesentmessagein'] = 'រក្សាសំបុត្រដែលបានផ្ញើក្នុង';
@@ -225,10 +189,8 @@
 $labels['addbcc'] = 'បន្ថែម Bcc';
 $labels['addreplyto'] = 'បន្ថែម Reply-To';
 $labels['addfollowupto'] = 'បន្ថែម Followup-To';
-$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
 $labels['receiptread'] = 'អត្ថបទផ្ញើត្រលប់ (បានអាន)';
 $labels['yourmessage'] = 'នេះគឺជាអត្ថបទផ្ញើត្រលប់សំរាប់សំបុត្ររបស់លោកអ្នក។';
-$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
 $labels['name']         = 'ឈ្មោះសំរាប់បង្ហាញ';
 $labels['firstname']    = 'នាមត្រកូល';
 $labels['surname']      = 'នាមខ្លួន';
@@ -258,10 +220,6 @@
 $labels['manager'] = 'នាយក';
 $labels['assistant'] = 'ជំនួយការ';
 $labels['spouse'] = 'គ្រួសារ';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
 $labels['other'] = 'ផ្សេងពីនេះ';
 $labels['typehome']   = 'គេហដ្ឋាន';
 $labels['typework']   = 'កន្លែងធ្វើការ';
@@ -274,9 +232,6 @@
 $labels['typepager']  = 'ឧបករណ៍ផ្តល់សារ';
 $labels['typevideo']  = 'វីដេអូរ';
 $labels['typeassistant']  = 'ជំនួយការ';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
 $labels['addfield'] = 'បន្ថែម';
 $labels['addcontact'] = 'បន្ថែមអាសយដ្ឋានទាក់ទង';
 $labels['editcontact'] = 'កែប្រែអាសយដ្ឋានទាក់ទង';
@@ -290,39 +245,27 @@
 $labels['rename'] = 'ប្តូរឈ្មោះ';
 $labels['addphoto'] = 'បន្ថែមរូបថត';
 $labels['replacephoto'] = 'លុបរូបថត';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'បង្កើតអាសយដ្ឋានទាក់ទងថ្មី';
 $labels['deletecontact']  = 'លុបអាសយដ្ឋានទាក់ទងដែលបានជ្រើសរើស';
 $labels['composeto']      = 'ផ្ញើសំបុត្រទៅ';
 $labels['contactsfromto'] = 'អាសយដ្ឋានទាក់ទង $from ដល់ $to នៃ$count';
 $labels['print']          = 'បោះពុម្ភ';
 $labels['export']         = 'ទាញនិងរក្សាទុក';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'ទាញនិងរក្សាទុកអាសយដ្ឋានជាប្រភេទvCard';
 $labels['newcontactgroup'] = 'បង្កើតក្រុមអាសយដ្ឋានថ្មី';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'ទំព័រមុន';
 $labels['firstpage']      = 'ទំព័រដំបូង';
 $labels['nextpage']       = 'ទំព័របន្ទាប់';
 $labels['lastpage']       = 'ទំព័រចុងក្រោយ';
 $labels['group'] = 'ក្រុម';
 $labels['groups'] = 'ក្រុម';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'អាសយដ្ឋានផ្ទាល់ខ្លួន';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
 $labels['import'] = 'បញ្ចូល';
 $labels['importcontacts'] = 'បញ្ចូលអាសយដ្ឋាន';
 $labels['importfromfile'] = 'បញ្ចូលពី ឯកសារ';
-$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'ផ្លាស់ប្តូរអាសយដ្ឋានទាំងអស់';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'ចប់រួចរាល់';
 $labels['settingsfor'] = 'កំណត់សំរាប់';
-$labels['about'] = 'About';
 $labels['preferences'] = 'កំណត់តាមការចូលចិត្ត';
 $labels['userpreferences'] = 'កំណត់តាមការចូលចិត្តរបស់អ្នកប្រើ';
 $labels['editpreferences'] = 'ផ្លាស់ប្តូរការចូលចិត្តរបស់អ្នកប្រើ';
@@ -334,10 +277,6 @@
 $labels['preferhtml'] = 'បង្ហាញជា HTML';
 $labels['defaultcharset'] = 'លេខកូតអក្សរមានស្រាប់';
 $labels['htmlmessage'] = 'សំបុត្រប្រភេទ HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'កាលបរិច្ឆេតងាយស្រួលមើល';
 $labels['setdefault']  = 'កំណត់ទុក';
 $labels['autodetect']  = 'ស្វ័យប្រវត្តិ';
@@ -346,13 +285,9 @@
 $labels['pagesize']  = 'ចំនួនសំបុត្រក្នុងមួយទំព័រ';
 $labels['signature'] = 'ហត្ថលេខា';
 $labels['dstactive']  = 'ម៉ោងវស្សានរដូវ';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'សរសេរសំបុត្រតាមបែប HTML';
 $labels['htmlonreply'] = 'ឆ្លើយតបសំបុត្រតាមបែប HTML';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ហត្ថលេខាតាមបែប HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'បង្ហាញប្រអប់សំរាប់មើលសំបុត្រ';
 $labels['skin'] = 'ការរចនាទំព័រ';
 $labels['logoutclear'] = 'សំអាតធុងសំរាមពេលពិនិត្យចេញ';
@@ -370,14 +305,12 @@
 $labels['flagfordeletion'] = 'កំណត់សញ្ញាផ្កាយអោយសំបុត្រថាបានលុបដោយមិនចាំបាច់លុបជាក់ស្តែង';
 $labels['skipdeleted'] = 'មិនបង្ហាញសំបុត្រដែលបានលុប';
 $labels['deletealways'] = 'លុបសំបុត្រចោលប្រសិនជាមិនអាចផ្ទេសំបុត្រនោះទៅធុងសំរាមបាន';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'បង្ហាញរូបភាពដែលគេផ្ញើមក';
 $labels['fromknownsenders'] = 'ពីអ្នកផ្ញើដែលស្គាល់';
 $labels['always'] = 'គ្រប់ពេល';
 $labels['showinlineimages'] = 'បង្ហាញរូបភាពនៅក្រោមអត្ថបទសំបុត្រ';
 $labels['autosavedraft']  = 'រក្សាទុកសំបុត្រពង្រៀងដោយស្វ័យប្រវត្តិ';
 $labels['everynminutes']  = 'រៀងរាល់ $n នាទី';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'មិនដែល';
 $labels['immediately']  = 'ភ្លាមៗ';
 $labels['messagesdisplaying'] = 'កំពុងបង្ហាញសំបុត្រ';
@@ -391,15 +324,12 @@
 $labels['focusonnewmessage'] = 'ផ្តោតលើវីនដូវដែលកំពុងសរសេរសំបុត្រថ្មី';
 $labels['checkallfolders'] = 'ពិនិត្យសំបុត្រថ្មីនៅគ្រប់ថតទាំងអស់';
 $labels['displaynext'] = 'បន្ទាប់ពីសំបុត្រត្រូវបានលុប​ឬផ្ទេរបង្ហាញសំបុត្របន្ទាប់';
-$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'ជំរើសដែលជាគោល';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'ផ្នែក';
 $labels['maintenance'] = 'ការថែរក្សា';
 $labels['newmessage'] = 'សំបុត្រថ្មី';
 $labels['signatureoptions'] = 'កំណត់ហត្ថលេខា';
 $labels['whenreplying'] = 'នៅពេលកំពុងឆ្លើយតប';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'ចាប់ផ្តើម​សរសេរ​ពី​លើ​សំបុត្រ​ដើម';
 $labels['replybottomposting'] = 'ចាប់ផ្តើមសរសេរពីក្រោមសំបុត្រដើម';
 $labels['replyremovesignature'] = 'នៅ​ពេល​ឆ្លើយ​តប​លុប​ហត្ថលេខា​ចេញ​ពីសំបុត្រ';
@@ -412,20 +342,6 @@
 $labels['reqmdn'] = 'ក្រោយពី $n វិនាទី';
 $labels['reqdsn'] = 'ក្រោយពី $n វិនាទី';
 $labels['replysamefolder'] = 'ក្រោយពី $n វិនាទី';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'ថត';
 $labels['folders']  = 'ថតទាំងអស់';
 $labels['foldername']  = 'ឈ្មោះថត';
@@ -442,20 +358,9 @@
 $labels['info'] = 'ព័ត៌មាន';
 $labels['getfoldersize'] = 'ទំហំថត';
 $labels['changesubscription'] = 'ផ្លាស់ប្តូរការជាវ';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'តំរៀបតាម';
 $labels['sortasc']  = 'តំរៀបតាមលំដាប់ចុះ';
 $labels['sortdesc'] = 'តំរៀបតាមលំដាប់ឡើង';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/km_KH/messages.inc b/program/localization/km_KH/messages.inc
index d1db6cc..a2c4bab 100644
--- a/program/localization/km_KH/messages.inc
+++ b/program/localization/km_KH/messages.inc
@@ -15,29 +15,20 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'ការពិនិត្យចូលមិនបានសំរេចព្រោះមានបញ្ហាកើតឡើង';
 $messages['cookiesdisabled'] = 'កម្មវិធីមើលគេហទំព័រនេះមិនទទួលយកCookies';
 $messages['sessionerror'] = 'Session មិនត្រឹមត្រូវ ឬហួសកំណត់';
 $messages['storageerror'] = 'មិនអាចភ្ជាប់ទៅកាន់ម៉ាស៊ីនIMAP';
 $messages['servererror'] = 'មានបញ្ហានៅម៉ាស៊ីនមេ';
 $messages['servererrormsg'] = 'បញ្ហា: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'មិនអាចប្រតិបត្តិបានពីព្រោះថតនេះត្រូវបានគេកំណត់សំរាប់តែមើល';
 $messages['errornoperm'] = 'មិនអាចប្រតិបត្តិបានពីព្រោះមិនមានសិទ្ទគ្រប់គ្រាន់';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'មិនអាចរក្សាទុកទិន្នន័យបានពីព្រោះមានបញ្ហានៅពេលបញ្ជូនទិន្នន័យ';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ពុំមានសំបុត្រក្នុងប្រអប់សំបុត្រនេះទេ';
 $messages['loggedout'] = 'អ្នកបានពិនិត្យចេញដោយជោគជ័យ។';
 $messages['mailboxempty'] = 'ប្រអប់សំបុត្រទទេ';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'កំពុងដំណើរការ...';
 $messages['uploading'] = 'កំពុងបញ្ជូនឯកសារ...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'កំពុងបើកឯកសារ...';
 $messages['checkingmail'] = 'កំពុងស្វែងរកមើលសំបុត្រថ្មី៝...';
 $messages['sendingmessage'] = 'កំពុងផ្ញើសំបុត្រ...';
@@ -47,27 +38,20 @@
 $messages['successfullysaved'] = 'រក្សាទុកដោយជោគជ័យ';
 $messages['addedsuccessfully'] = 'អាសយដ្ឋានត្រូវបានរក្សាទុកដោយជោគជ័យ';
 $messages['contactexists'] = 'ព័ត៌មានទាក់ទងដែលមានអ៊ីមែលនេះមានក្នុងសៀវភៅអាសយដ្ឋានរួចហើយ';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'រូបភាពដែលមានក្នុងសំបុត្រនេះត្រូវបានបិទដើម្បីរក្សាសុវត្ថភាព';
 $messages['encryptedmessage'] = 'លោកអ្នកមិនអាចមើលសំបុត្រនេះបានទេពីព្រោះសំបុត្រនេះជាសំបុត្រសំងាត់';
 $messages['nocontactsfound'] = 'ពុំមានអាសយដ្ឋានទាក់ទងទេ';
 $messages['contactnotfound'] = 'អាសយដ្ឋានទាក់ទងដែលលោកអ្នកចង់រកពុំមានឡើយ';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'មិនអាចផ្ញើសំបុត្របាន';
 $messages['senttooquickly'] = 'សូមរងចាំ $sec វិនាទីមុននឹងផ្ញើសំបុត្រនេះ';
-$messages['errorsavingsent'] = 'មានបញ្ហាកើតឡើងនៅពេលកំពុងរក្សាទុកសំបុត្រដែលបានផ្ញើរួច';
-$messages['errorsaving'] = 'មានបញ្ហាកើតឡើងនៅពេលកំពុងរក្សាសំបុត្រទុក';
 $messages['errormoving'] = 'មិនអាចផ្ទេរសំបុត្របាន';
 $messages['errorcopying'] = 'មិនអាចចំលងសំបុត្របាន';
 $messages['errordeleting'] = 'មិនអាចលុបសំបុត្រចោលបាន';
 $messages['errormarking'] = 'មិនអាចកំណត់ចំណាំលើសំបុត្របាន';
 $messages['deletecontactconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបព័ត៌មានទំនាក់ទំនងនេះមែនទេ?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'តើលោកអ្នកពិតជាចង់លុបសំបុត្រនេះមែនទេ?';
 $messages['deletefolderconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបថតនេះមែនទេ?';
 $messages['purgefolderconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបសំបុត្រទាំងអស់នៅក្នុងថតនេះមែនទេ?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'កំពុងលុបថតសំរាប់ទុកឯកសារ...';
 $messages['foldermoving'] = 'កំពុងផ្ទេរថតសំរាប់ទុកឯកសារ...';
 $messages['foldersubscribing'] = 'កំពុងកំណត់ប្រើថតសំរាប់ទុកឯកសារ...';
@@ -83,9 +67,7 @@
 $messages['notsentwarning'] = 'សំបុត្រនេះមិនទាន់បានផ្ញើទេ។ តើលោកអ្នកចង់លុបចោលទេ?';
 $messages['noldapserver'] = 'សូមកំណត់ម៉ាស៊ីន LDAPដើម្បីស្វែងរក';
 $messages['nosearchname'] = 'សូមបំពេញឈ្មោះទំនាក់ទំនង ឬអាសយដ្ឋានអ៊ីមែល';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'រកឃើញសំបុត្រចំនួន $nr';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'រកមិនឃើញអ្វីទាំងអស់';
 $messages['searching'] = 'កំពុងស្វែងរក...';
 $messages['checking'] = 'កំពុងពិនិត្យរក...';
@@ -100,40 +82,24 @@
 $messages['messageopenerror'] = 'មិនអាចទាញយកសំបុត្រពីម៉ាស៊ីនមេបានទេ';
 $messages['fileuploaderror'] = 'មិនអាចបញ្ជូលភ្ជាប់ឯកសារ';
 $messages['filesizeerror'] = 'ទំហំឯកសារត្រូវបញ្ជូនលើសចំណុះទំហំធំបំផុតគឺ $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'លោកអ្នកមានសិទ្ធត្រឹមតែមើលប្រភពនៃអាសយដ្ឋាននេះ';
 $messages['errorsavingcontact'] = 'មិនអាចរក្សាអាសយដ្ឋានបានទេ';
 $messages['movingmessage'] = 'កំពុកផ្តេរសំបុត្រ...';
 $messages['copyingmessage'] = 'កំពុងចំលងសំបុត្រ...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'កំពុងលុបសំបុត្រ...';
 $messages['markingmessage'] = 'កំពុងកំណត់សំគាល់សំបុត្រ...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'បានបញ្ជូនអត្ថបទបញ្ជាក់ថាបានអានបានសំរេច';
 $messages['errorsendingreceipt'] = 'មិនអាចបញ្ជូនអត្ថបទបញ្ជាក់ថាបានអាន ទេ';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'លោកអ្នកមិនអាចលុបអត្តសញ្ញាណនេះទេព្រោះវានៅសល់ចុងក្រោយគេ';
 $messages['forbiddencharacter'] = 'ឈ្មោះថតនេះមានអក្សរដែលត្រូវហាមឃាត់';
 $messages['selectimportfile'] = 'សូមជ្រើសរើសឯកសារដើម្បីបញ្ជូនភ្ជាប់';
 $messages['addresswriterror'] = 'សៀវភៅអាសយដ្ឋាននោះមិនអាចសរសេរចូលបានទេ';
 $messages['contactaddedtogroup'] = 'បានដាក់ពត៌មានទំនាក់ទំនងចូលក្នុងក្រុមនេះដោយជោគជ័យ';
 $messages['contactremovedfromgroup'] = 'បានលុបពត៌មានទំនាក់ទំនងចេញពីក្រុមនេះដោយជោគជ័យ';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'សូមមេត្តារង់ចាំកំពុងទាញទិន្នន័យចូល ...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>ព័ត៌មានទំនាក់ទំនង $insertedបានបញ្ចូលដោយជោគជ័យ,ហើយបានរំលងចោលពត៌មានដែលមានស្រាប់$skipped </b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'ប្រតិ្តបត្តិការត្រូវបានគេហាមឃាត់!';
 $messages['nofromaddress'] = 'ខ្វះអាសយដ្ឋានអ៊ីមែលក្នុងអត្តសញ្ណាណមួយនេះ';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code):មិនអាចភ្ជាប់ទៅម៉ាស៊ីនមេ';
 $messages['smtpautherror'] = 'SMTP Error ($code):ព័ត៌មានគនីយមិនត្រឹមត្រូវ';
 $messages['smtpfromerror'] = 'SMTP Error ($code):មិនអាចកំនត់អ្នកផ្ញើ "$from" ($msg)';
@@ -143,32 +109,19 @@
 $messages['emailformaterror'] = 'អាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវទេ:$email';
 $messages['toomanyrecipients'] = 'ចំនួនអ្នកទទួលច្រើនលើសកំនត់!សូមមេត្តាលុបចោលរហូតដល់ $max។';
 $messages['maxgroupmembersreached'] = 'ចំនួនក្រុមលើសកំនត់ហើយចំនួនច្រើនបំផុតគឺ $max';
-$messages['internalerror'] = 'មានបញ្ហាខាងម៉ាស៊ីនមេ ។សូមព្យាយាមម្តងទៀត!';
 $messages['contactdelerror'] = 'មិនអាចលុបអាសយដ្ឋានទំនាក់ទំនង';
 $messages['contactdeleted'] = 'អាសយដ្ឋានទំនាក់ទំនងត្រូវបានលុបដោយជោគជ័យ';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
 $messages['groupdeleted'] = 'លុបក្រុមបានដោយជោគជ័យ';
 $messages['grouprenamed'] = 'ប្តូរឈ្មោះក្រុមបានដោយជោគជ័យ';
 $messages['groupcreated'] = 'បង្កើតក្រុមបានដោយជោគជ័យ';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
 $messages['messagedeleted'] = 'លុបសំបុត្របានដោយជោគជ័យ';
 $messages['messagemoved'] = 'ផ្ទេរសំបុត្របានដោយជោគជ័យ';
 $messages['messagecopied'] = 'ចំលងសំបុត្របានដោយជោគជ័យ';
 $messages['messagemarked'] = 'កំណត់សំគាល់សំបុត្របានដោយជោគជ័យ';
 $messages['autocompletechars'] = 'សូមសរសេរអក្សរយ៉ាងតិច $minដើម្បីបង្ហាយដោយស្វ័យប្រវត្តិ';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'សូមសរសេរឈ្មោះ';
 $messages['nametoolong'] = 'ឈ្មោះវែងពេក';
 $messages['folderupdated'] = 'ផ្លាស់ប្តូរថតបានដោយជោគជ័យ';
 $messages['foldercreated'] = 'បង្កើតថតបានដោយជោគជ័យ';
 $messages['invalidimageformat'] = 'ប្រភេទរូបភាពមិនត្រឹមត្រូវ';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index f4c1815..bccd421 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '$product에 오신 것을 환영합니다';
 $labels['username']  = '사용자명';
 $labels['password']  = '암호';
@@ -31,7 +29,7 @@
 $labels['sent']   = '보낸 편지함';
 $labels['trash']  = '휴지통';
 $labels['junk']   = '스팸 편지함';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = '특별 폴더에서 실제 이름 보이기';
 $labels['subject'] = '제목';
 $labels['from']    = '보내는 사람';
 $labels['sender']  = '발신인';
@@ -139,7 +137,7 @@
 $labels['unread'] = '읽지 않음';
 $labels['flagged'] = '깃발로 표시됨';
 $labels['unanswered'] = '답장하지 않음';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = '첨부파일 포함';
 $labels['deleted'] = '삭제됨';
 $labels['undeleted'] = '삭제되지 않음';
 $labels['invert'] = '반전';
@@ -168,7 +166,7 @@
 $labels['folderactions'] = '폴더 명령';
 $labels['compact'] = '간단하게';
 $labels['empty'] = '비어 있음';
-$labels['importmessages'] = 'Import messages';
+$labels['importmessages'] = '메시지 가져오기';
 $labels['quota'] = '디스크 사용량';
 $labels['unknown']  = '알 수 없음';
 $labels['unlimited']  = '제한 없음';
@@ -177,11 +175,12 @@
 $labels['searchmod']  = '수정자 검색';
 $labels['msgtext']  = '전체 메시지';
 $labels['body']  = '본문';
-$labels['type'] = 'Type';
+$labels['type'] = '유형';
+$labels['namex'] = '이름';
 $labels['openinextwin'] = '새 창에서 열기';
 $labels['emlsave'] = '다운로드(.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
+$labels['changeformattext'] = '메시지를 평문 형식으로 표시';
+$labels['changeformathtml'] = 'HTML 형식으로 표시';
 $labels['editasnew']      = '새 메시지로 편집';
 $labels['send']           = '보내기';
 $labels['sendmessage']    = '메일 보내기';
@@ -310,15 +309,18 @@
 $labels['lastpage']       = '마지막 페이지 보기';
 $labels['group'] = '그룹';
 $labels['groups'] = '그룹';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = '그룹 구성원 목록 보기';
 $labels['personaladrbook'] = '개인 주소';
 $labels['searchsave'] = '검색 저장';
 $labels['searchdelete'] = '검색 삭제';
 $labels['import'] = '가져오기';
 $labels['importcontacts'] = '연락처 가져오기';
 $labels['importfromfile'] = '파일에서 가져오기:';
-$labels['importtarget'] = '새 연락처를 주소록에 추가:';
+$labels['importtarget'] = '연락처 추가 위치';
 $labels['importreplace'] = '전체 주소록을 바꾸기';
+$labels['importgroups'] = '그룹 할당 가져오기';
+$labels['importgroupsall'] = '전체 (필요에 따라 그룹 생성)';
+$labels['importgroupsexisting'] = '기존 그룹에만 해당';
 $labels['importdesc'] = '기존 주소록에서 연락처를 가져올 수 있습니다.<br/> 현재 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 데이터 형식에서 주소 가져오기를 지원합니다.\'';
 $labels['done'] = '완료';
 $labels['settingsfor'] = '설정';
@@ -352,7 +354,7 @@
 $labels['htmlonreply'] = 'HTML 메시지 회신 시';
 $labels['htmlonreplyandforward'] = '전달 또는 HTML 메시지 회신 시';
 $labels['htmlsignature'] = 'HTML 서명';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = '이메일 주소를 표시 이름과 함께 보기';
 $labels['previewpane'] = '미리보기 창 보기';
 $labels['skin'] = '인터페이스 스킨';
 $labels['logoutclear'] = '로그아웃할 때 휴지통 비우기';
@@ -422,7 +424,7 @@
 $labels['spellcheckignorecaps'] = '모두 대문자로 표기된 단어 무시';
 $labels['addtodict'] = '사전에 추가';
 $labels['mailtoprotohandler'] = 'mailto: 링크의 프로토콜 처리자 등록';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = '팝업을 일반 창같이 취급';
 $labels['forwardmode'] = '메시지 전달';
 $labels['inline'] = '본문 내용으로';
 $labels['asattachment'] = '첨부파일로';
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index a1103c7..f6f274c 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = '오류 발생!';
 $messages['loginfailed']  = '로그인이 실패하였습니다.';
 $messages['cookiesdisabled'] = '브라우저가 쿠키를 지원하지 않습니다.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = '연락처를 찾기 위해 일부 검색용어를 입력하세요.';
 $messages['sendingfailed'] = '메시지 보내기를 실패하였음.';
 $messages['senttooquickly'] = '이 메시지를 보내기 전에 $sec초 동안 기다리세요.';
-$messages['errorsavingsent'] = '보낸 메시지를 저장하는 동안 오류가 발생했습니다.';
-$messages['errorsaving'] = '저장 중 오류가 발생했습니다.';
 $messages['errormoving'] = '메시지를 이동할 수 없었음.';
 $messages['errorcopying'] = '메시지를 복사할 수 없었음.';
 $messages['errordeleting'] = '메시지를 삭제할 수 없었음.';
@@ -100,16 +97,16 @@
 $messages['messageopenerror'] = '서버에서 메시지를 불러올 수 없음.';
 $messages['fileuploaderror'] = '파일 업로드를 실패함.';
 $messages['filesizeerror'] = '업로드된 파일이 최대 크기인 $size를 초과하였습니다.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
+$messages['copysuccess'] = '$nr개의 연락처를 성공적으로 복사함';
+$messages['movesuccess'] = '$nr개의 연락처를 성공적으로 이동함';
+$messages['copyerror'] = '전체 연락처를 복사할 수 없없음';
+$messages['moveerror'] = '전체 연락처를 이동할 수 없없음';
 $messages['sourceisreadonly'] = '이 주소의 소스는 읽기 전용입니다.';
 $messages['errorsavingcontact'] = '연락처의 주소를 저장할 수 없음.';
 $messages['movingmessage'] = '메시지를 이동하는 중...';
 $messages['copyingmessage'] = '메시지 복사하는 중...';
 $messages['copyingcontact'] = '연락처 복사하는 중...';
-$messages['movingcontact'] = 'Moving contact(s)...';
+$messages['movingcontact'] = '연락처 이동 중...';
 $messages['deletingmessage'] = '메시지 삭제하는 중...';
 $messages['markingmessage'] = '메시지에 표시하는 중...';
 $messages['addingmember'] = '그룹에 연락처를 추가하는 중...';
@@ -128,8 +125,8 @@
 $messages['importformaterror'] = '가져오기를 실패함! 업로드된 파일은 유효하지 않은 가져오기 데이터 파일입니다.';
 $messages['importconfirm'] = '<b>$inserted 연락처를 성공적으로 가져옴<b>';
 $messages['importconfirmskipped'] = '<b>기존 기재사항인 $skipped을(를) 건너뜀</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
+$messages['importmessagesuccess'] = '$nr개의 메시지를 성공적으로 가져옴';
+$messages['importmessageerror'] = '가져오기 실패! 업로드된 파일은 유효하지 않은 메시지 또는 메일함 파일임';
 $messages['opnotpermitted'] = '작업이 허가되지 않음!';
 $messages['nofromaddress'] = '선택된 신원에 이메일 주소 가 누락됨.';
 $messages['editorwarning'] = '일반 텍스트 편집기로 바꾸면 모든 텍스트 서식이 사라집니다. 계속하시겠습니까?';
@@ -144,7 +141,6 @@
 $messages['emailformaterror'] = '유효하지 않은 이메일 주소: $email';
 $messages['toomanyrecipients'] = '수신인이 너무 많음. 수신인 수를 $max명으로 줄이세요.';
 $messages['maxgroupmembersreached'] = '그룹 구성원의 수가 최대 인원인 $max명을 초과합니다.';
-$messages['internalerror'] = '내부 오류가 발생함. 재시도 해주시기 바랍니다.';
 $messages['contactdelerror'] = '연락처를 삭제할 수 없음.';
 $messages['contactdeleted'] = '연락처가 성공적으로 삭제됨.';
 $messages['contactrestoreerror'] = '삭제된 연락처를 복구할 수 없음.';
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 27d5413..c88b52d 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Bixêr hatî $product \'ê';
 $labels['username']  = 'Bikarhêner';
 $labels['password']  = 'Nasnav';
@@ -31,33 +29,22 @@
 $labels['sent']   = 'Şandî';
 $labels['trash']  = 'Çop';
 $labels['junk']   = 'Biikêrnehatî';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Mijar';
 $labels['from']    = 'Şandyar';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Standyar';
 $labels['cc']      = 'Kopiya Karbon';
 $labels['bcc']     = 'Kopiya karbon a Veşartî';
 $labels['replyto'] = 'Navnîşanên Standyar';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Dîrok';
 $labels['size']    = 'Mezinahî';
 $labels['priority'] = 'Girîngî';
 $labels['organization'] = 'Sazî';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'Peldank';
 $labels['messagesfromto'] = 'Peyam $count ên di navbera $from - $to';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr a peyama $count';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'Kopiya Karbon';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'bibe...';
 $labels['download'] = 'daxe';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'Navê pelê';
 $labels['filesize'] = 'Mezinahiya pelê';
 $labels['addtoaddressbook'] = 'Têxe lênûska navnîşanan';
@@ -75,43 +62,12 @@
 $labels['thursday']  = 'Pêncşem';
 $labels['friday']    = 'În';
 $labels['saturday']  = 'Şemî';
-$labels['jan']	= 'Jan';
-$labels['feb']	= 'Feb';
-$labels['mar']	= 'Mar';
-$labels['apr']	= 'Apr';
-$labels['may']	= 'May';
-$labels['jun']	= 'Jun';
-$labels['jul'] 	= 'Jul';
-$labels['aug']	= 'Aug';
-$labels['sep']	= 'Sep';
-$labels['oct']	= 'Oct';
-$labels['nov']	= 'Nov';
-$labels['dec']	= 'Dec';
-$labels['longjan']	= 'January';
-$labels['longfeb']	= 'February';
-$labels['longmar']	= 'March';
-$labels['longapr']	= 'April';
-$labels['longmay']	= 'May';
-$labels['longjun']	= 'June';
-$labels['longjul']	= 'July';
-$labels['longaug']	= 'August';
-$labels['longsep']	= 'September';
-$labels['longoct']	= 'October';
-$labels['longnov']	= 'November';
-$labels['longdec']	= 'December';
 $labels['today'] = 'Îro';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'Li peyamên nû venihêre';
 $labels['compose']          = 'Peyamekê biafirîne';
 $labels['writenewmessage']  = 'Peyameke nû biafirîne';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'Bersivê bide peyamê';
 $labels['replytoallmessage'] = 'Bersivê ji bo hemû kesên ku ev peyan standine bişîne';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'Bersivê bide peyamê';
 $labels['deletemessage']    = 'Peyamê jê bibe';
 $labels['movemessagetotrash'] = 'Peyamê dake çopê';
@@ -122,88 +78,33 @@
 $labels['lastmessage']      = 'Peyama dawî nîşan bide';
 $labels['backtolist']       = 'Vegere lîsteya peyaman';
 $labels['viewsource']       = 'Çavkaniyê nîşan bide';
-$labels['mark']             = 'Mark';
 $labels['markmessages']     = 'Peyamê nîşan bike';
 $labels['markread']         = 'Wekî xwendî';
 $labels['markunread']       = 'Wekî nexwendî';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'Hilbijêre';
 $labels['all'] = 'Hemû';
 $labels['none'] = 'Ne yek jî';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Nexwendî';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
-$labels['filter'] = 'Filter';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'Ne yek jî';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Vala Bike';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Bikaranîna dîskê';
 $labels['unknown']  = 'nayê zanîn';
 $labels['unlimited']  = 'bêsînor';
 $labels['quicksearch']  = 'Lêgerîna bilez';
 $labels['resetsearch']  = 'Lêgerînê reset bike';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Peyamê niha bişîne';
 $labels['savemessage']    = 'Hilîne';
 $labels['addattachment']  = 'Pelekê lê zêde bike';
 $labels['charset']        = 'Curetîp';
 $labels['editortype']     = 'Cureyê serastkat';
 $labels['returnreceipt']  = 'Rapora Vegerînê';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Kontrola rastnivîsê';
 $labels['resumeediting'] = 'Serastkirinê bidomîne';
 $labels['revertto']      = 'Şûnde bîne';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Pêvek';
 $labels['upload'] = 'Bar bike';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'Bigire';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'Nizm';
 $labels['lowest']  = 'Nizmtirîn';
 $labels['normal']  = 'Asayî';
@@ -211,20 +112,11 @@
 $labels['highest'] = 'Bilintirîn';
 $labels['nosubject']  = '(bê mijar)';
 $labels['showimages'] = 'Xuyakirina wêneyan';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Deqa tazî';
-$labels['savesentmessagein'] = 'Save sent message in';
-$labels['dontsave'] = 'don\'t save';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
 $labels['addcc'] = 'Cc Têxê';
 $labels['addbcc'] = 'Bcc Têxê';
 $labels['addreplyto'] = 'Bibersivîne têxê';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'Şandyara/ê vê peyamê xwest dema ku te peyam vekir, jê re hişyarî here. Dixwazî jê re hişyarî here?';
 $labels['receiptread'] = 'Rapora Vegerînê (xwendî)';
 $labels['yourmessage'] = 'Ev rapora vegerîna peyama te ye';
@@ -232,97 +124,26 @@
 $labels['name']         = 'Navê xuya dibe';
 $labels['firstname']    = 'Nav';
 $labels['surname']      = 'Paşnav';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'E-Peyam';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Têkiliyeke nû têxê';
 $labels['editcontact'] = 'Têkiliyê serast bike';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'Serast bike';
 $labels['cancel'] = 'Betal';
 $labels['save']   = 'Tomar bike';
 $labels['delete'] = 'Jê Bibe';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'kardeke nû a têkiliyê biafirîne';
 $labels['deletecontact']  = 'Têkiliyên hilbijartî jê bibe';
 $labels['composeto']      = 'Ji têkiliya hilbijartî re peyam bişîne';
 $labels['contactsfromto'] = 'Têkiliyên $count ên di navbera $from - $to de';
 $labels['print']          = 'çap bike';
 $labels['export']         = 'Derxe';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'Seta berê nîşan bide';
 $labels['firstpage']      = 'Seta yekemîn nîşan bide';
 $labels['nextpage']       = 'Seta di rêzê de nîşan bide';
 $labels['lastpage']       = 'Seta dawî nîşan bide';
-$labels['group'] = 'Group';
 $labels['groups'] = 'Kom';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Navnîşanên Takekesî';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
 $labels['settingsfor'] = 'Mîheng ji bo';
-$labels['about'] = 'About';
 $labels['preferences'] = 'Vebijêrk';
 $labels['userpreferences'] = 'Vebijêrkên bikarhêner';
 $labels['editpreferences'] = 'Vebijêrkên bikarhêner serast bike';
@@ -332,100 +153,19 @@
 $labels['newitem'] = 'Parçeya nû';
 $labels['edititem'] = 'Parçeyê serast bike';
 $labels['preferhtml'] = 'Wekî HTML nîşan bide';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Peyama HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Kurtenivîsa Dîrokê';
 $labels['setdefault']  = 'Wekî standard tomar bike';
-$labels['autodetect']  = 'Auto';
 $labels['language']  = 'Ziman';
 $labels['timezone']  = 'Herêma demê';
 $labels['pagesize']  = 'Hejmara peyamên her rûpelekê';
 $labels['signature'] = 'Şanenav';
 $labels['dstactive']  = 'Demjimêra havînî';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Peyameke HTML biafirîne';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Şanenava HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Panela berê nîşan bide';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
-$labels['uisettings'] = 'User Interface';
-$labels['serversettings'] = 'Server Settings';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
-$labels['askuser'] = 'ask me';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
-$labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'Xweber hilîne';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'qet';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Peldank';
 $labels['folders']  = 'Peldank';
 $labels['foldername']  = 'Navê peldankê';
@@ -434,48 +174,7 @@
 $labels['create']  = 'Biafirîne';
 $labels['createfolder']  = 'Peldankeke nû biafirîne';
 $labels['managefolders']  = 'Rêveberiya peldankan';
-$labels['specialfolders'] = 'Special Folders';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'Şêweyê rêzkirinê';
 $labels['sortasc']  = 'Wekî zêde dibe';
 $labels['sortdesc'] = 'Wekî kêm dibe';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index eec0b25..6000aac 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -15,29 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'Têketin têk çû';
 $messages['cookiesdisabled'] = 'Geroka te destûrê nade çerezan';
 $messages['sessionerror'] = 'Danişîna te çewt e an jî bi dawî bûye';
 $messages['storageerror'] = 'Girêdana pêşkêşkara IMAP têk çû';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Di vê peyamdankê de tu peyam nehat dîtin';
 $messages['loggedout'] = 'Te danişînî bi dawî anî. Oxir be!';
 $messages['mailboxempty'] = 'Peyamdank vala ye';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Tê barkirin...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Dane tên barkirin...';
 $messages['checkingmail'] = 'Li peyamên nû vedinihêre...';
 $messages['sendingmessage'] = 'Peyamê dişîne...';
@@ -47,128 +32,42 @@
 $messages['successfullysaved'] = 'Hat hilanîn';
 $messages['addedsuccessfully'] = 'Têkilî li navnîşanan hat zêdekirin';
 $messages['contactexists'] = 'Têkiliyeke bi vê navnîşanê jixwe heye';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Ji bo ewlekariya te wêneyên cuda yên vê peyamê hatin astenkirin.';
 $messages['encryptedmessage'] = 'Ev peyamenek şîfrekirî ye, bibore, nayê vekirin!';
 $messages['nocontactsfound'] = 'Tu têkiliyek nehat dîtin';
 $messages['contactnotfound'] = 'Têkiliya dihat xwestin nehat dîtin';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Peyam nehat şandin';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'Di tomarkirinê de çewtiyek derket';
 $messages['errormoving'] = 'Ciyê peyamê nehat guherandin';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Peyam nehat jêbirin';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'Ji dil dixwazî têkiliya/ên nîşankirî jê bibî?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Ji dil dixwazî peya/ên nîşankirî jê bibî?';
 $messages['deletefolderconfirm']  = 'Ji dil dixwazî vê peldankê jê bibî?';
 $messages['purgefolderconfirm']  = 'Ji dil dixwazî hemû peyamên di vê peldankê de jê bibî?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Form bi temamî nehat tijekirin';
 $messages['noemailwarning'] = 'Tika ye, navnîşaneke rast têkevê';
 $messages['nonamewarning']  = 'Tika ye, navekî têkevê';
 $messages['nopagesizewarning'] = 'Tika ye, mezinahiyeke pelê têkevê';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Tika ye, herî kêm standyarekê têkevê';
 $messages['nosubjectwarning']  = 'Qada "Mijar"ê vala ye. Dixwazî niha tiştekî lê binivîsî?';
 $messages['nobodywarning'] = 'Peyamê bê nivîs bişeyînî?';
 $messages['notsentwarning'] = 'Peyam nehat şandin. Dixwazî peyamê pişTgo bikî?';
 $messages['noldapserver'] = 'Tika ye, ji bo lêgerînê pêşkêşkareke Idap têkevê';
 $messages['nosearchname'] = 'Tika ye, nav an jî navnîşaneke têkiliyê têkevê';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr peyam hat(in) dîtin';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Di lêgerînê de tu tişt nehat dîtin';
 $messages['searching'] = 'Digere...';
 $messages['checking'] = 'Vedinihêre...';
 $messages['nospellerrors'] = 'Tu şaşiyeke rastnivîsê nehat dîtin';
 $messages['folderdeleted'] = 'Peldank hat jêbirin';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Hat jêbirin';
 $messages['converting'] = 'Formatkirin ji peyamê tê birin...';
 $messages['messageopenerror'] = 'Peyam ji pêşkêşkar nehat barkirin';
 $messages['fileuploaderror'] = 'Barkirina pelê têk çû';
 $messages['filesizeerror'] = 'Pel pir mezin e. Herî zêde divê $size be';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Çavkaniya vê navnîşanê tenê-xwendin e';
 $messages['errorsavingcontact'] = 'Navnîşana têkiliyê nehat barkirin';
 $messages['movingmessage'] = 'Ciyê peyamê tê guhertin...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Rapora şandina serkeftî';
 $messages['errorsendingreceipt'] = 'Rapor nehat şandin';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Nikarî vê nasnameyê jê bibî. Ew ya dawî ye.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/lb_LU/labels.inc b/program/localization/lb_LU/labels.inc
index 7b7c2b6..d32a263 100644
--- a/program/localization/lb_LU/labels.inc
+++ b/program/localization/lb_LU/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Wëllkomm bei $product';
 $labels['username']  = 'Benotzernumm';
 $labels['password']  = 'Passwuert';
@@ -318,7 +316,6 @@
 $labels['import'] = 'Importéieren';
 $labels['importcontacts'] = 'Kontakter importéieren';
 $labels['importfromfile'] = 'Aus Fichier importéieren:';
-$labels['importtarget'] = 'Nei Kontakter an d\'Adressbuch setzen:';
 $labels['importreplace'] = 'Dat ganzt Adressbuch ersetzen';
 $labels['importdesc'] = 'Du kanns Kontakter aus engem existéierenden Adressbuch eroplueden.<br/>Mir ënnerstëtze momentan en Adress-Import vum <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>- oder CSV (mat Komma getrennt)-Date-Format.';
 $labels['done'] = 'Erleedegt';
diff --git a/program/localization/lb_LU/messages.inc b/program/localization/lb_LU/messages.inc
index 6176d9a..8ef0b2f 100644
--- a/program/localization/lb_LU/messages.inc
+++ b/program/localization/lb_LU/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Ee Feeler ass opgetrueden!';
 $messages['loginfailed']  = 'Login feelgeschloen.';
 $messages['cookiesdisabled'] = 'Däi Browser acceptéiert keng Cookien.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Gëff e puer Sichbegrëffer a fir Kontakter ze fannen';
 $messages['sendingfailed'] = 'De Message konnt net verschéckt ginn.';
 $messages['senttooquickly'] = 'Waart wann ech gelift $sec Sekonn(en) bevir s du de Message verschécks. ';
-$messages['errorsavingsent'] = 'Beim Späichere vum verschéckte Message ass e Feeler opgetrueden';
-$messages['errorsaving'] = 'Beim Späicheren ass e Feeler opgetrueden.';
 $messages['errormoving'] = 'D\'Messagë konnten net verréckelt ginn.';
 $messages['errorcopying'] = 'D\'Messagë konnten net kopéiert ginn.';
 $messages['errordeleting'] = 'D\'Messagë konnten net geläscht ginn.';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Ongëlteg E-Mail-Adress: $email';
 $messages['toomanyrecipients'] = 'Zevill Empfänger. Reduzéier d\'Zuel vun den Empfänger op $max.';
 $messages['maxgroupmembersreached'] = 'D\'Unzuel vu Gruppememberen iwwersteigt de Maximum vun $max.';
-$messages['internalerror'] = 'En interne Feeler ass opgetrueden. Probéier w.e.gl nach eng Kéier.';
 $messages['contactdelerror'] = 'Kontakter konnten net geläscht ginn.';
 $messages['contactdeleted'] = 'Kontakter erfollegräich geläscht.';
 $messages['contactrestoreerror'] = 'Déi geläschte Kontakter konnten net recuperéiert ginn.';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index a77ac90..129b0de 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Sveiki! Čia $product';
 $labels['username']  = 'Naudotojo vardas';
 $labels['password']  = 'Slaptažodis';
@@ -31,7 +29,7 @@
 $labels['sent']   = 'Išsiųsti laiškai';
 $labels['trash']  = 'Šiukšlinė';
 $labels['junk']   = 'Brukalas';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = 'Rodyti tikrus specialiųjų aplankų vardus';
 $labels['subject'] = 'Tema';
 $labels['from']    = 'Siuntėjas';
 $labels['sender']  = 'Siuntėjas';
@@ -102,7 +100,7 @@
 $labels['today'] = 'Šiandien';
 $labels['refresh']          = 'Atnaujinti';
 $labels['checkmail']        = 'Tikrinti, ar yra naujų laiškų';
-$labels['compose']          = 'Rašyti naują laišką';
+$labels['compose']          = 'Rašyti';
 $labels['writenewmessage']  = 'Rašyti naują laišką';
 $labels['reply']            = 'Atsakyti';
 $labels['replytomessage']   = 'Atsakyti siuntėjui';
@@ -129,7 +127,7 @@
 $labels['markflagged']      = 'Pažymėti gairele';
 $labels['markunflagged']    = 'Pašalinti gairelę';
 $labels['moreactions']      = 'Kiti veiksmai…';
-$labels['more']             = 'Daugiau';
+$labels['more']             = 'Kita';
 $labels['back']             = 'Grįžti';
 $labels['options']          = 'Nuostatos';
 $labels['select'] = 'Pažymėti';
@@ -168,7 +166,7 @@
 $labels['folderactions'] = 'Veiksmai su aplankais…';
 $labels['compact'] = 'Suglaudinti';
 $labels['empty'] = 'Ištuštinti';
-$labels['importmessages'] = 'Import messages';
+$labels['importmessages'] = 'Importuoti laiškus';
 $labels['quota'] = 'Disko naudojimas';
 $labels['unknown']  = 'nežinomas';
 $labels['unlimited']  = 'neribotas';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'Paieškos modifikatoriai';
 $labels['msgtext']  = 'Visas laiškas';
 $labels['body']  = 'Laiško tekstas';
-$labels['type'] = 'Type';
+$labels['type'] = 'Tipas';
+$labels['namex'] = 'Vardas';
 $labels['openinextwin'] = 'Atverti naujame lange';
 $labels['emlsave'] = 'Parsisiųsti (.eml)';
 $labels['changeformattext'] = 'Rodyti grynojo teksto formatu';
@@ -310,14 +309,13 @@
 $labels['lastpage']       = 'Rodyti paskutinį puslapį';
 $labels['group'] = 'Grupė';
 $labels['groups'] = 'Grupės';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Išvardinti grupės narius';
 $labels['personaladrbook'] = 'Asmeniniai adresai';
 $labels['searchsave'] = 'Įrašyti kaip radinių aplanką';
 $labels['searchdelete'] = 'Pašalinti radinių aplanką';
 $labels['import'] = 'Importuoti';
 $labels['importcontacts'] = 'Importuoti adresatus';
 $labels['importfromfile'] = 'Importuoti iš failo:';
-$labels['importtarget'] = 'Pridėti naujus adresatus į adresų knygą:';
 $labels['importreplace'] = 'Perrašyti visą adresų knygą';
 $labels['importdesc'] = 'Galite įkelti kontaktus iš jau turimos adresų knygos. <br/>Šiuo metu galima importuoti kontaktus iš <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> arba CSV (comma-separated) duomenų formatų.';
 $labels['done'] = 'Baigta';
@@ -352,7 +350,7 @@
 $labels['htmlonreply'] = 'tik atsakymus į HTML formato laiškus';
 $labels['htmlonreplyandforward'] = 'atsakant į HTML laišką arba jį persiunčiant';
 $labels['htmlsignature'] = 'HTML parašas';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'Rodyti el. pašto adresą ir asmenvardį';
 $labels['previewpane'] = 'Rodyti laiško peržiūros polangį';
 $labels['skin'] = 'Grafinis apvalkalas';
 $labels['logoutclear'] = 'Išvalyti Šiukšlinę atsijungiant';
@@ -422,7 +420,7 @@
 $labels['spellcheckignorecaps'] = 'Nepaisyti žodžių vien iš didžiųjų raidžių';
 $labels['addtodict'] = 'Įtraukti į žodyną';
 $labels['mailtoprotohandler'] = 'Užregistruoti svetainę kaip dirbančią su „mailto:“ saitais';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'Iškylančiuosius langus traktuoti kaip įprastus';
 $labels['forwardmode'] = 'Laiškų persiuntimo būdas';
 $labels['inline'] = 'kaip citatą';
 $labels['asattachment'] = 'kaip priedas';
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index 8ffacb3..f3feedd 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Įvyko klaida!';
 $messages['loginfailed']  = 'Prisijungti nepavyko.';
 $messages['cookiesdisabled'] = 'Jūsų naršyklė nepriima slapukų.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Įveskite reikšminius žodžius adresatų paieškai';
 $messages['sendingfailed'] = 'Laiško išsiųsti nepavyko.';
 $messages['senttooquickly'] = 'Turite luktelėti $sec sek., kad galėtumėte išsiųsti laišką.';
-$messages['errorsavingsent'] = 'Įrašant išsiųstą laišką įvyko klaida.';
-$messages['errorsaving'] = 'Įrašant įvyko klaida.';
 $messages['errormoving'] = 'Laiško(-ų) perkelti nepavyko.';
 $messages['errorcopying'] = 'Laiško(-ų) nukopijuoti nepavyko.';
 $messages['errordeleting'] = 'Laiško(-ų) pašalinti nepavyko.';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Netinkamas el. pašto adresas: $email';
 $messages['toomanyrecipients'] = 'Per daug gavėjų. Sumažinkite jų bent iki $max.';
 $messages['maxgroupmembersreached'] = 'Grupės narių skaičius viršijo maksimalų leistiną ($max).';
-$messages['internalerror'] = 'Įvyko klaida. Prašom bandyti iš naujo.';
 $messages['contactdelerror'] = 'Nepavyko pašalinti adresato(-ų).';
 $messages['contactdeleted'] = 'Adresatas(-ai) sėkmingai pašalintas(-i).';
 $messages['contactrestoreerror'] = 'Nepavyko atkurti pašalinto(-ų) adresato(-ų).';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index b9c3b0c..95afc4c 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Esiet laipni lūgti $product';
 $labels['username']  = 'Lietotājvārds';
 $labels['password']  = 'Parole';
@@ -178,6 +176,7 @@
 $labels['msgtext']  = 'Visā vēstulē';
 $labels['body']  = 'Pamatteksts';
 $labels['type'] = 'Tips';
+$labels['namex'] = 'Vārds';
 $labels['openinextwin'] = 'Atvērt jaunā logā';
 $labels['emlsave'] = 'lejupielādēt (.eml)';
 $labels['changeformattext'] = 'Rādīt kā neformatētu tekstu';
@@ -317,8 +316,10 @@
 $labels['import'] = 'Importēt';
 $labels['importcontacts'] = 'Importēt kontaktus';
 $labels['importfromfile'] = 'Importēt no faila:';
-$labels['importtarget'] = 'Pievienot jaunus kontaktus adrešu grāmatai:';
+$labels['importtarget'] = 'Kontaktus pievienot';
 $labels['importreplace'] = 'Aizvietot visu adrešu grāmatu';
+$labels['importgroupsall'] = 'Visus (ja nepieciešams, izveidojiet grupas)';
+$labels['importgroupsexisting'] = 'Tikai esošām grupām';
 $labels['importdesc'] = 'Jūs varat ieimportēt kontaktus no jau esošas adrešu grāmatas.<br/>Uz doto brīdi tiek atbalstīti <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> vai CSV (ar komatu atdalītie) datu formāti.';
 $labels['done'] = 'Pabeigts';
 $labels['settingsfor'] = 'Iestatījumi';
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index 87d5717..f27b01b 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Radās kļūda!';
 $messages['loginfailed']  = 'Pieslēgties neizdevās';
 $messages['cookiesdisabled'] = 'Jūsu pārlūkprogramma neatbalsta sīkdatnes (cookies)';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Lai atrastu kontaktus, ievadiet meklēšanas kritērijus';
 $messages['sendingfailed'] = 'Vēstule netika nosūtīta';
 $messages['senttooquickly'] = 'Lūdzu uzgaidiet $sec sekundi(-es) pirms sūtiet šo vēstuli';
-$messages['errorsavingsent'] = 'Saglabājot vēstuli notika kļūda - vēstule netika saglabāta';
-$messages['errorsaving'] = 'Saglabājot notika kļūda';
 $messages['errormoving'] = 'Vēstule(s) netika pārvietota(s)';
 $messages['errorcopying'] = 'Vēstules pārkopēt neizdevās';
 $messages['errordeleting'] = 'Vēstules izdzēst neizdevās';
@@ -100,13 +97,16 @@
 $messages['messageopenerror'] = 'Nevarēja ielādēt vēstuli no servera';
 $messages['fileuploaderror'] = 'Faila augšupielāde neveiksmīga';
 $messages['filesizeerror'] = 'Augšupielādētais fails pārsniedz pieļaujamo $size izmēru.';
-$messages['copysuccess'] = 'Veiksmīgi nokopētas $nr adreses.';
-$messages['copyerror'] = 'Nevarēja nokopēt nevienu adresi.';
+$messages['copysuccess'] = '$nr kontakti tika veiksmīgi pārkopēti.';
+$messages['movesuccess'] = '$nr kontakti tika veiksmīgi pārvietoti.';
+$messages['copyerror'] = 'Kontaktus pārkopēt neizdevās.';
+$messages['moveerror'] = 'Kontaktus pārvietot neizdevās.';
 $messages['sourceisreadonly'] = 'Adreses avots ir lasīšanas režīmā tikai';
 $messages['errorsavingcontact'] = 'Kontakta adresi nevarēja saglabāt.';
 $messages['movingmessage'] = 'Pārvieto vēstules...';
 $messages['copyingmessage'] = 'Kopē vēstules...';
 $messages['copyingcontact'] = 'Kopē kontaktus...';
+$messages['movingcontact'] = 'Pārvieto kontaktu(s)...';
 $messages['deletingmessage'] = 'Dzēš vēstules...';
 $messages['markingmessage'] = 'Atzīmē vēstules...';
 $messages['addingmember'] = 'Kontaktus pievieno grupai...';
@@ -140,7 +140,6 @@
 $messages['emailformaterror'] = 'Nepareiza e-pasta adrese: $email';
 $messages['toomanyrecipients'] = 'Pārāk daudz saņēmēju. Samaziniet skaitu līdz $max.';
 $messages['maxgroupmembersreached'] = 'Grupas dalībnieku skaits pārsniedz limitu $max.';
-$messages['internalerror'] = 'Notika servera iekšējā kļūda. Lūdzu mēģiniet vēlreiz.';
 $messages['contactdelerror'] = 'Kontaktus izdzēst neizdevās.';
 $messages['contactdeleted'] = 'Kontakti izdzēsti veiksmīgi.';
 $messages['contactrestoreerror'] = 'Izdzēstos kontaktus atjaunot neizdevās.';
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index dcbf341..2c6c422 100644
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Добредојдовте во $product';
 $labels['username']  = 'Корисничко име';
 $labels['password']  = 'Лозинка';
@@ -31,33 +29,22 @@
 $labels['sent']   = 'Пратени';
 $labels['trash']  = 'Корпа';
 $labels['junk']   = 'Ѓубре';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Наслов';
 $labels['from']    = 'Праќач';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Примач';
 $labels['cc']      = 'Копирај';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Препрати на';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Датум';
 $labels['size']    = 'Големина';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организација';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'Папки';
 $labels['messagesfromto'] = 'Писма од $from до $to од $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Писмо $nr од $count';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'Копирај';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'Премести во...';
 $labels['download'] = 'Преземи';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'Име на податотеката';
 $labels['filesize'] = 'Големина на податотеката';
 $labels['addtoaddressbook'] = 'Додај во именик';
@@ -100,18 +87,11 @@
 $labels['longnov']	= 'Ноември';
 $labels['longdec']	= 'Декември';
 $labels['today'] = 'Денес';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'Провери пошта';
 $labels['compose']          = 'Пиши ново писмо';
 $labels['writenewmessage']  = 'Ново писмо';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'Одговори на испраќачот';
 $labels['replytoallmessage'] = 'Одговори на испраќачот и сите примачи';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'Препрати писмо';
 $labels['deletemessage']    = 'Избриши писмо';
 $labels['movemessagetotrash'] = 'Премести ги писмата во Корпа';
@@ -122,53 +102,23 @@
 $labels['lastmessage']      = 'Прикажи го последното писмо';
 $labels['backtolist']       = 'Назад кон листа на писма';
 $labels['viewsource']       = 'Покажи го изворот на писмото';
-$labels['mark']             = 'Mark';
 $labels['markmessages']     = 'Обележи ги писмата';
 $labels['markread']         = 'Како прочитани';
 $labels['markunread']       = 'Како непрочитани';
 $labels['markflagged']      = 'Како обележано';
 $labels['markunflagged']    = 'Како необележано';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'Одбери';
 $labels['all'] = 'Сите';
 $labels['none'] = 'Ниедно';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Непрочитани';
 $labels['flagged'] = 'Обележано';
 $labels['unanswered'] = 'Неодговорено';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Избришано';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Обратно';
 $labels['filter'] = 'Филтер';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'Ниедно';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Компактно';
 $labels['empty'] = 'Испразни';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Искористен простор';
 $labels['unknown']  = 'непознато';
 $labels['unlimited']  = 'неограничено';
@@ -176,34 +126,21 @@
 $labels['resetsearch']  = 'Ново пребарување';
 $labels['searchmod']  = 'Модификатори на пребарувањето';
 $labels['msgtext']  = 'Цело писмо';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Отвори во нов прозорец';
 $labels['emlsave'] = 'Преземи (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Уреди како ново';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Испрати сега';
 $labels['savemessage']    = 'Зачувај го писмото во Непратени';
 $labels['addattachment']  = 'Приложи податотека';
 $labels['charset']        = 'Збир од знаци';
 $labels['editortype']     = 'Тип на уредник';
 $labels['returnreceipt']  = 'Врати';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Провери правопис';
 $labels['resumeediting'] = 'Продолжи со уредување';
 $labels['revertto']      = 'Врати на';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Приложено';
 $labels['upload'] = 'Подигни';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'Затвори';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'Низок';
 $labels['lowest']  = 'Најнизок';
 $labels['normal']  = 'Нормален';
@@ -212,10 +149,6 @@
 $labels['nosubject']  = '(без наслов)';
 $labels['showimages'] = 'Прикажи слики';
 $labels['alwaysshow'] = 'Секогаш прикажувај ги сликите од $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Обичен текст';
 $labels['savesentmessagein'] = 'Сними го пратеното писмо во';
@@ -224,7 +157,6 @@
 $labels['addcc'] = 'Додај Cc';
 $labels['addbcc'] = 'Додај Bcc';
 $labels['addreplyto'] = 'Додај Одговори-на';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'Праќачот на оваа порака сака да биде известен кога ќе го прочитате писмото. Дали сакате да го известите?';
 $labels['receiptread'] = 'Извести (прочитано)';
 $labels['yourmessage'] = 'Ова е известување за вашата порака';
@@ -232,97 +164,32 @@
 $labels['name']         = 'Име за приказ';
 $labels['firstname']    = 'Име';
 $labels['surname']      = 'Презиме';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'Е-пошта';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Додај нов контакт';
 $labels['editcontact'] = 'Уреди контакт';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'Уреди';
 $labels['cancel'] = 'Откажи';
 $labels['save']   = 'Зачувај';
 $labels['delete'] = 'Избриши';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'Додај ново име';
 $labels['deletecontact']  = 'Избриши ги следните имиња';
 $labels['composeto']      = 'Напиши порака за';
 $labels['contactsfromto'] = 'Имиња од $from до $to од $count';
 $labels['print']          = 'Испечати';
 $labels['export']         = 'Извези како';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Извези ги контактите во vCard формат';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'Прикажи претходна страна';
 $labels['firstpage']      = 'Прикажи ја првата страна';
 $labels['nextpage']       = 'Прикажи ја следната страна';
 $labels['lastpage']       = 'Прикажи ја последната страна';
-$labels['group'] = 'Group';
 $labels['groups'] = 'Групи';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Лични адреси';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
 $labels['import'] = 'Увези';
 $labels['importcontacts'] = 'Увези контакти';
 $labels['importfromfile'] = 'Увези од податотека:';
-$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Замени го целиот именик';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Завршено';
 $labels['settingsfor'] = 'Нагодувања за';
-$labels['about'] = 'About';
 $labels['preferences'] = 'Нагодувања';
 $labels['userpreferences'] = 'Кориснички нагодувања';
 $labels['editpreferences'] = 'Промени кориснички нагодувања';
@@ -332,12 +199,7 @@
 $labels['newitem'] = 'Нов објект';
 $labels['edititem'] = 'Промени објект';
 $labels['preferhtml'] = 'Прикажи во HTML';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML писмо';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Убави датуми';
 $labels['setdefault']  = 'Постави за основно';
 $labels['autodetect']  = 'Автоматски';
@@ -346,13 +208,8 @@
 $labels['pagesize']  = 'Редови по страна';
 $labels['signature'] = 'Потпис';
 $labels['dstactive']  = 'Промени на времето';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Пиши HTML порака';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML потпис';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Прикажи прозорец за преглед';
 $labels['skin'] = 'Модел на изгледот';
 $labels['logoutclear'] = 'Исчисти ја Кантата при излез';
@@ -363,43 +220,33 @@
 $labels['mdnrequests'] = 'Известувања за праќачот';
 $labels['askuser'] = 'прашај го корисникот';
 $labels['autosend'] = 'испрати автоматски';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'игнорирај';
 $labels['readwhendeleted'] = 'Обележи го писмото како прочитано при бришење';
 $labels['flagfordeletion'] = 'Обележи го писмото за бришење наместо да го избришеш';
 $labels['skipdeleted'] = 'Не ги прикажувај избришаните писма';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Прикажи вметнати слики';
 $labels['fromknownsenders'] = 'од познати праќачи';
 $labels['always'] = 'секогаш';
 $labels['showinlineimages'] = 'Прикажи приложени слики под писмото';
 $labels['autosavedraft']  = 'Авоматски зачувувај во Непратени';
 $labels['everynminutes']  = 'секои $n минути';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'никогаш';
-$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Прикажување на писма';
 $labels['messagescomposition'] = 'Пишување на писма';
 $labels['mimeparamfolding'] = 'Име на прикачените податотеки';
 $labels['2231folding'] = 'Полн RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Полн RFC 2047 (друго)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Напредни можности';
 $labels['focusonnewmessage'] = 'Фокусирај го прозорецот на прелистувачот на новото писмо';
 $labels['checkallfolders'] = 'Провери ги сите папки за нови писма';
 $labels['displaynext'] = 'По бришење/преместување на писмото прикажи го следното писмо';
-$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Главни можности';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Заглавие';
 $labels['maintenance'] = 'Одржување';
 $labels['newmessage'] = 'Ново писмо';
 $labels['signatureoptions'] = 'Можности за потписот';
 $labels['whenreplying'] = 'При одговарање';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'новото писмо започни го над оригиналот';
 $labels['replybottomposting'] = 'новото писмо започни го под оригиналот';
 $labels['replyremovesignature'] = 'При одговарање отстрани го изворниот потпис од писмото';
@@ -407,25 +254,6 @@
 $labels['newmessageonly'] = 'само нови писма';
 $labels['replyandforwardonly'] = 'само одгорови и препраќања';
 $labels['insertsignature'] = 'Вметни потпис';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Папка';
 $labels['folders']  = 'Папки';
 $labels['foldername']  = 'Име на папката';
@@ -435,47 +263,11 @@
 $labels['createfolder']  = 'Создај нова папка';
 $labels['managefolders']  = 'Организирање на папки';
 $labels['specialfolders'] = 'Специјални папки';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'Сортирај по';
 $labels['sortasc']  = 'Сортирај нагорно';
 $labels['sortdesc'] = 'Сортирај надолно';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
 $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index 0ddfbe7..d123bad 100644
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -15,29 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'Најавата не успеа';
 $messages['cookiesdisabled'] = 'Вашиот прелистувач не прифаќа колачиња';
 $messages['sessionerror'] = 'Сесијата е неважечка или е истечена';
 $messages['storageerror'] = 'Поврзувањето со IMAP не успеа';
 $messages['servererror'] = 'Грешка во серверот!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Неважечко барање! Податоците не се зачувани.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Немате писма во ова сандаче';
 $messages['loggedout'] = 'Успешно се одјавивте. Ви благодариме и довидување!';
 $messages['mailboxempty'] = 'Поштенското сандаче е празно.';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Вчитувам...';
 $messages['uploading'] = 'Ја подигам податотеката...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Ги вчитувам податоците...';
 $messages['checkingmail'] = 'Проверувам нова пошта...';
 $messages['sendingmessage'] = 'Ја испраќам пораката...';
@@ -47,31 +35,21 @@
 $messages['successfullysaved'] = 'Успешно зачувано';
 $messages['addedsuccessfully'] = 'Името е успешно додадено во Именикот';
 $messages['contactexists'] = 'Веќе постои име со зададената Е-поштенска адреса';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'За да се заштити вашата приватност, сликите во оваа порака не се прикажани.';
 $messages['encryptedmessage'] = 'Оваа порака е кодирана и не може да се прикаже. Жалиме!';
 $messages['nocontactsfound'] = 'Нема пронајдено имиња.';
 $messages['contactnotfound'] = 'Бараното име не е пронајдено';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Не упеав да го испратам писмото';
 $messages['senttooquickly'] = 'Почекајте $sec секунда/и пред да го испратите писмото';
-$messages['errorsavingsent'] = 'Грешка при зачувувањето на пратеното писмо';
-$messages['errorsaving'] = 'Грешка при зачувувањето';
 $messages['errormoving'] = 'Не можев да го преместам писмото';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Не можев да го избришам писмото';
 $messages['errormarking'] = 'Не можев да го обележам писмото';
 $messages['deletecontactconfirm']  = 'Дали сте сигурни дека сакате да го избришете одбраното(те) име(ња)?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Дали сте сигурни дека сакате да го(и) избришете обележаниот(те) писмо(а)?';
 $messages['deletefolderconfirm']  = 'Дали сте сигурни дека сакате да ја избришете оваа папка?';
 $messages['purgefolderconfirm']  = 'Дали сте сигурни дека сакате да ги избршете сите писма во оваа папка?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'Ја бришам папката...';
 $messages['foldermoving'] = 'Ја преместувам папката...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Имате изоставено непополнети информации';
 $messages['noemailwarning'] = 'Внесете валидна е-поштенска адреса';
 $messages['nonamewarning']  = 'Внесете име';
@@ -85,51 +63,27 @@
 $messages['nosearchname'] = 'Внесете име или е-поштенска адреса';
 $messages['notuploadedwarning'] = 'Сè уште нема подигнати прилози. Почекајте или откажете го подигањето';
 $messages['searchsuccessful'] = 'Пронајадени се $nr пораки';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Пребарувањето не даде резлутати';
 $messages['searching'] = 'Пребарувам....';
 $messages['checking'] = 'Проверувам...';
 $messages['nospellerrors'] = 'Нема грешки во спелувањето';
 $messages['folderdeleted'] = 'Папката е успешно избришана';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Успешно избришано';
 $messages['converting'] = 'Форматирањето на писмото е отстрането...';
 $messages['messageopenerror'] = 'Не можев да го вчитам писното од серверот';
 $messages['fileuploaderror'] = 'Прикачувањето е неуспешно';
 $messages['filesizeerror'] = 'Подигнатата податотека го надминува ограничувањето од $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Изворот на оваа адреса неможе да се промени';
 $messages['errorsavingcontact'] = 'Името неможе да се сними';
 $messages['movingmessage'] = 'Пораката се преместува...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Известувањето е успешно пратено';
 $messages['errorsendingreceipt'] = 'Известувањето не е пратено';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Овој идентитет неможе да се избрише, тој е последниот.';
 $messages['forbiddencharacter'] = 'Името на папката содржи несоодветен формат';
 $messages['selectimportfile'] = 'Изберете ја податотеката која сакате да ја прикачите';
 $messages['addresswriterror'] = 'Одбраниот именик не може да се менува';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Убезувам,, почекајте...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Успешно се увезени $inserted имиња, $skipped веќе постојат и се прескокнати</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Операцијата не е дозволена';
 $messages['nofromaddress'] = 'Не е внесена е-пошта во одберениот идентитет';
 $messages['editorwarning'] = 'Префрлањето на уредникот на обичен текст ќе резултира со губење на целото форматирање на текстот. Дали сакате да продолжите?';
@@ -141,34 +95,4 @@
 $messages['smtprecipientserror'] = 'SMTP грешка: Не успеав да ја испарсирам листата на примачи';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Неправилна поштенска адреса: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index ad5cfee..395893a 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '$product ലേയ്ക്ക് സ്വാഗതം';
 $labels['username']  = 'ഉപയോക്തൃനാമം';
 $labels['password']  = 'രഹസ്യവാക്ക്';
@@ -31,33 +29,17 @@
 $labels['sent']   = 'അയച്ചവ';
 $labels['trash']  = 'ചവറ്റുകുട്ട';
 $labels['junk']   = 'ആവശ്യമില്ലാത്തവ';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'വിഷയം';
 $labels['from']    = 'പ്രേഷിതന്‍';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'സ്വീകര്‍ത്താവ്';
-$labels['cc']      = 'Cc';
-$labels['bcc']     = 'Bcc';
-$labels['replyto'] = 'Reply-To';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'തീയതി';
 $labels['size']    = 'വലിപ്പം';
 $labels['priority'] = 'മുന്‍ഗണന';
-$labels['organization'] = 'Organization';
 $labels['readstatus'] = 'അവസ്ഥ വായിക്കുക';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'ഫോള്‍ഡറുകള്‍';
-$labels['messagesfromto'] = 'Messages $from to $to of $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
-$labels['messagenrof'] = 'Message $nr of $count';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'പകര്‍ത്തുക';
 $labels['move']     = 'നീക്കുക';
-$labels['moveto']   = 'Move to...';
 $labels['download'] = 'ഡൗണ്‍ലോഡ്';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'ഫയല്‍ നാമം';
 $labels['filesize'] = 'ഫയലിന്റെ വലിപ്പം';
 $labels['addtoaddressbook'] = 'മേല്‍വിലാസങ്ങളില്‍ ചേര്‍ക്കുക.';
@@ -103,15 +85,8 @@
 $labels['refresh']          = 'പുതുക്കുക';
 $labels['checkmail']        = 'പുതിയ സന്ദേശത്തിനായി തിരയുക';
 $labels['compose']          = 'രചന';
-$labels['writenewmessage']  = 'Create a new message';
 $labels['reply']            = 'മറുപടി';
-$labels['replytomessage']   = 'Reply to sender';
-$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
 $labels['forward']          = 'കൈമാറുക';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'സന്ദേശം കൈമാറുക';
 $labels['deletemessage']    = 'സന്ദേശം മായ്ക്കുക';
 $labels['movemessagetotrash'] = 'സന്ദേശം ചവറ്റുകുട്ടയിലേക്ക് നീക്കുക';
@@ -120,14 +95,11 @@
 $labels['firstmessage']     = 'ആദ്യത്തെ സന്ദേശം കാണിക്കുക.';
 $labels['nextmessage']      = 'അടുത്ത സന്ദേശം കാണിക്കുക.';
 $labels['lastmessage']      = 'അവസാനത്തെ സന്ദേശം കാണിക്കുക.';
-$labels['backtolist']       = 'Back to message list';
 $labels['viewsource']       = 'ഉറവിടം കാണിക്കുക.';
 $labels['mark']             = 'അടയാളപ്പെടുത്തു';
 $labels['markmessages']     = 'സന്തേശങ്ങള്‍ അടയാളപ്പെടുത്തു';
 $labels['markread']         = 'വായിച്ചതായി';
 $labels['markunread']       = 'വായിക്കാത്തതായി';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
 $labels['moreactions']      = 'കൂടുതല്‍ ചെയ്തികള്‍...';
 $labels['more']             = 'കൂടുതല്‍';
 $labels['back']             = 'പിന്നോട്ട്';
@@ -139,69 +111,39 @@
 $labels['unread'] = 'വായിക്കാത്തത്';
 $labels['flagged'] = 'അടയാളപ്പെടുത്തിയവ';
 $labels['unanswered'] = 'മറുപടി കൊടുക്കാത്ത';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'മായ്ച്ചവ';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'തലതിരിക്കുക';
 $labels['filter'] = 'അരിപ്പ';
 $labels['list'] = 'പട്ടിക';
-$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'എല്ലാം വികസിപ്പിക്കുക';
 $labels['expand-unread'] = 'വായിക്കാത്തവ വികസിപ്പിക്കുക';
 $labels['collapse-all'] = 'എല്ലാം അടയ്ക്കുക';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'എവിടുന്ന് /എങ്ങൊട്ടു';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'ഒന്നുമില്ല';
 $labels['sentdate'] = 'അയച്ച തീയതി';
 $labels['arrival'] = 'വന്ന തീയതി';
 $labels['asc'] = 'ആരോഹണം';
 $labels['desc'] = 'അവരോഹണം';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
 $labels['listorder'] = 'തരംതിരിക്കണ്ട രീതി';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'ചുരുക്കു';
 $labels['empty'] = 'ശൂന്യം';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'ഡിസ്ക്ക് ഉപയോഗം';
 $labels['unknown']  = 'അറിയാത്ത';
 $labels['unlimited']  = 'പരിമിതികളില്ലാത്ത';
 $labels['quicksearch']  = 'പെട്ടെന്ന് തെരയു';
-$labels['resetsearch']  = 'Reset search';
-$labels['searchmod']  = 'Search modifiers';
 $labels['msgtext']  = 'മുഴുവന്‍ സന്ദേശവും';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'പുതിയ വിന്‍ഡോയില്‍ തുറക്കുക';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'പുതിയതായി തിരുത്തുക';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'സന്ദേശം അയയ്ക്കുക';
 $labels['savemessage']    = 'പൂര്‍ത്തിയാകാത്തവ ആയി സൂക്ഷിക്കുക';
 $labels['addattachment']  = 'ഒരു ഫയല്‍ മെയിലിനൊപ്പം ചേര്‍ക്കുക';
-$labels['charset']        = 'Charset';
 $labels['editortype']     = 'തിരുത്തല്‍ രീതി';
-$labels['returnreceipt']  = 'Return receipt';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'യഥാര്‍ഥ സന്ദേശം';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'അക്ഷരത്തെറ്റു് പരിശോധിക്കുക';
 $labels['resumeediting'] = 'തിരുത്തല്‍ തുടരുക';
-$labels['revertto']      = 'Revert to';
 $labels['attach'] = 'സംയോജിപ്പിക്കു';
 $labels['attachments'] = 'അറ്റാച്ച്മെന്റുകള്‍';
 $labels['upload'] = 'അപ്‌ലോഡ് ചെയ്യുക';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'അടയ്ക്കുക';
 $labels['messageoptions']  = 'സന്ദേശ ​ഐച്ഛികങ്ങള്‍...';
 $labels['low']     = 'കുറഞ്ഞ';
@@ -211,30 +153,12 @@
 $labels['highest'] = 'ഏറ്റവും കൂടിയത്';
 $labels['nosubject']  = '(വിഷയം ഇല്ല)';
 $labels['showimages'] = 'ചിത്രങ്ങള്‍ കാണിക്കുക';
-$labels['alwaysshow'] = 'Always show images from $sender';
 $labels['isdraft']    = 'ഇതൊരു കരടുരൂപമാണ്.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'Plain text';
-$labels['savesentmessagein'] = 'Save sent message in';
 $labels['dontsave'] = 'സുക്ഷിക്കരുത്';
 $labels['maxuploadsize'] = '$size ആണ് പരമാവധി  ഫയല്‍ വലിപ്പം';
-$labels['addcc'] = 'Add Cc';
-$labels['addbcc'] = 'Add Bcc';
-$labels['addreplyto'] = 'Add Reply-To';
-$labels['addfollowupto'] = 'Add Followup-To';
-$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
-$labels['receiptread'] = 'Return Receipt (read)';
-$labels['yourmessage'] = 'This is a Return Receipt for your message';
-$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
-$labels['name']         = 'Display Name';
 $labels['firstname']    = 'ആദ്യ നാമം';
 $labels['surname']      = 'അവസാന നാമം';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
 $labels['nickname']     = 'ചെല്ലപേര്';
 $labels['jobtitle']     = 'ജോലിയുടെ പേര്';
 $labels['department']   = 'വകുപ്പ്';
@@ -251,14 +175,12 @@
 $labels['birthday']     = 'പിറന്നാള്‍';
 $labels['anniversary']  = 'വാര്‍ഷികം';
 $labels['website']      = 'വെബ്സൈറ്റ്';
-$labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'കുറിപ്പുകള്‍';
 $labels['male']   = 'പുരുഷന്‍';
 $labels['female'] = 'സ്‌ത്രീ';
 $labels['manager'] = 'പരിപാലകന്‍';
 $labels['assistant'] = 'സഹായി';
 $labels['spouse'] = 'ഭാര്യ/ഭര്‍ത്താവ്';
-$labels['allfields'] = 'All fields';
 $labels['search'] = 'തെരയുക';
 $labels['advsearch'] = 'വിപുലമായ തിരച്ചില്‍';
 $labels['advanced'] = 'സങ്കീര്‍ണ്ണം';
@@ -277,11 +199,6 @@
 $labels['typehomepage']  = 'ഹോം പേജ്';
 $labels['typeblog'] = 'ബ്ലോഗ്';
 $labels['typeprofile'] = 'പ്രൊഫൈല്‍';
-$labels['addfield'] = 'Add field...';
-$labels['addcontact'] = 'Add new contact';
-$labels['editcontact'] = 'Edit contact';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'സ്വകാര്യ വിവരങ്ങള്‍';
 $labels['edit']   = 'തിരുത്തുക';
 $labels['cancel'] = 'റദ്ദാക്കുക';
@@ -290,173 +207,51 @@
 $labels['rename'] = 'പേരുമാറ്റുക';
 $labels['addphoto'] = 'ചേര്‍ക്കുക';
 $labels['replacephoto'] = 'പകരം വയ്ക്കുക';
-$labels['uploadphoto'] = 'Upload photo';
-$labels['newcontact']     = 'Create new contact card';
-$labels['deletecontact']  = 'Delete selected contacts';
-$labels['composeto']      = 'Compose mail to';
-$labels['contactsfromto'] = 'Contacts $from to $to of $count';
 $labels['print']          = 'അച്ചടി';
 $labels['export']         = 'പുറത്തെടുക്കുക';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
 $labels['grouprename']    = 'കുട്ടത്തിന്റെ പേര് മാറ്റുക';
 $labels['groupdelete']    = 'കൂട്ടം മായ്ക്കുക';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'മുമ്പുളള താള്‍ കാണിയ്ക്കുക';
-$labels['firstpage']      = 'Show first page';
-$labels['nextpage']       = 'Show next page';
-$labels['lastpage']       = 'Show last page';
 $labels['group'] = 'കൂട്ടം';
 $labels['groups'] = 'കൂട്ടങ്ങള്‍';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'സ്വകാര്യ വിലാസങ്ങള്‍';
 $labels['searchsave'] = 'തിരയല്‍ സൂക്ഷിക്കുക';
 $labels['searchdelete'] = 'തിരയല്‍ നീക്കംചെയ്യുക';
 $labels['import'] = 'പ്രോഗ്രമ്മിലേക്ക് എടുക്കുക';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'പൂര്‍ത്തീകരിച്ചു';
-$labels['settingsfor'] = 'Settings for';
 $labels['about'] = 'വിവരം';
-$labels['preferences'] = 'Preferences';
 $labels['userpreferences'] = 'ഉപയൊക്ത മുന്‍ഗണനകള്‍';
-$labels['editpreferences'] = 'Edit user preferences';
-$labels['identities'] = 'Identities';
-$labels['manageidentities'] = 'Manage identities for this account';
-$labels['newidentity'] = 'New identity';
-$labels['newitem'] = 'New item';
-$labels['edititem'] = 'Edit item';
 $labels['preferhtml'] = 'HTML കാണിക്കുക';
-$labels['defaultcharset'] = 'Default Character Set';
-$labels['htmlmessage'] = 'HTML Message';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
-$labels['prettydate'] = 'Pretty dates';
-$labels['setdefault']  = 'Set default';
-$labels['autodetect']  = 'Auto';
 $labels['language']  = 'ഭാഷ';
 $labels['timezone']  = 'സമയ മേഖല';
 $labels['pagesize']  = 'ഒരു താളിലെ വരികള്‍';
 $labels['signature'] = 'ഒപ്പ്';
-$labels['dstactive']  = 'Daylight saving time';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML സന്ദേശങ്ങള്‍ രചിക്കുക';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
-$labels['htmlsignature'] = 'HTML signature';
-$labels['showemail'] = 'Show email address with display name';
-$labels['previewpane'] = 'Show preview pane';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
-$labels['uisettings'] = 'User Interface';
 $labels['serversettings'] = 'സേവകന്റെ ക്രമീകരണങ്ങള്‍';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
 $labels['askuser'] = 'എന്നൊടു ചോദിക്കുക';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'അവഗണിക്കുക';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'എപ്പോഴും';
-$labels['showinlineimages'] = 'Display attached images below the message';
-$labels['autosavedraft']  = 'Automatically save draft';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'ഒരിക്കലുമില്ല';
 $labels['immediately']  = 'ഉടനടി';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
 $labels['2231folding'] = 'Full RFC 2231 (തണ്ടര്‍ബേട് )';
 $labels['miscfolding'] = 'Full RFC 2231 ( മൈക്രൊസൊഫ്റ്റ് ഔട്ട്ലൂക്കു് )';
 $labels['2047folding'] = 'Full RFC 2047 (മറ്റുള്ളവ)';
 $labels['force7bit'] = '8-bit അക്ഷരങ്ങള്‍ക്കു "MIME encoding" ഉപയോഗിക്കുക';
 $labels['advancedoptions'] = 'വിപുലീക്രിതമായ ക്രമീകരണങ്ങള്‍';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
 $labels['defaultfont'] = 'HTML സന്ദേശത്തിന്റെ തനതായ ലിപി';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'വിഭാഗം';
-$labels['maintenance'] = 'Maintenance';
 $labels['newmessage'] = 'പുതിയ സന്ദേശം';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'പുതിയ സന്ദേശം മാത്രം';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = '$n നിമിഷങ്ങള്‍ കഴിഞ്ഞു്';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
 $labels['spellcheckignorenums'] = 'അക്കങ്ങള്‍ ഉള്ള വാക്കുകളെ അവഗണിക്കുക';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'നിഘണ്ടുവില്‍ ചേര്‍ക്കുക';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
-$labels['folder']  = 'Folder';
 $labels['folders']  = 'ഫോള്‍ഡറുകള്‍';
-$labels['foldername']  = 'Folder name';
-$labels['subscribed']  = 'Subscribed';
-$labels['messagecount'] = 'Messages';
-$labels['create']  = 'Create';
-$labels['createfolder']  = 'Create new folder';
-$labels['managefolders']  = 'Manage folders';
-$labels['specialfolders'] = 'Special Folders';
 $labels['properties'] = 'സവിശേഷതകള്‍';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
 $labels['info'] = 'വിവരം';
 $labels['getfoldersize'] = 'അറയുടെ വലുപ്പം അരിയാന്‍ ക്ലിക്ക് ചെയ്യുക';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
 $labels['personalfolder']  = 'സ്വകാര്യ അറ';
-$labels['otherfolder']  = 'Other User\'s Folder';
 $labels['sharedfolder']  = 'പൊതു - അറ';
-$labels['sortby'] = 'Sort by';
-$labels['sortasc']  = 'Sort ascending';
-$labels['sortdesc'] = 'Sort descending';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
 $labels['support'] = 'സഹായം തേടുക';
-$labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
@@ -464,7 +259,6 @@
 $labels['english'] = 'ഇംഗ്ലീഷ്';
 $labels['westerneuropean'] = 'പടിഞ്ഞാറന്‍ യൂറോപ്യന്‍';
 $labels['easterneuropean'] = 'കിഴക്കന്‍ യൂറോപ്യന്‍';
-$labels['southeasterneuropean'] = 'South-Eastern European';
 $labels['baltic'] = 'ബാള്‍ട്ടിക്ക്';
 $labels['cyrillic'] = 'സിറില്ലിക്ക്';
 $labels['arabic'] = 'അറബിക്ക്';
diff --git a/program/localization/ml_IN/messages.inc b/program/localization/ml_IN/messages.inc
index a64c7b6..9abaeda 100644
--- a/program/localization/ml_IN/messages.inc
+++ b/program/localization/ml_IN/messages.inc
@@ -15,160 +15,13 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
-$messages['loginfailed']  = 'Login failed.';
 $messages['cookiesdisabled'] = 'തങ്കളുടെ ബ്രവു്സര്‍ കുക്കീസ് സ്വീകരിക്കുന്നതല്ല';
-$messages['sessionerror'] = 'Your session is invalid or expired.';
-$messages['storageerror'] = 'Connection to storage server failed.';
 $messages['servererror'] = 'സര്‍വര്‍ പിഴവ് !';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'പ്രവര്‍ത്തനം തടസപ്പെട്ടു . അനുമതി നിഷേധിക്കപെട്ടിരിക്കുന്നു';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'അസാധുവായ അപേക്ഷ ! ഒരു രേഖയും സൂക്ഷിച്ചിട്ടില്ല';
-$messages['invalidhost'] = 'Invalid server name.';
-$messages['nomessagesfound'] = 'No messages found in this mailbox.';
-$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
-$messages['mailboxempty'] = 'Mailbox is empty.';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'തുറക്കുന്നു...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
-$messages['loadingdata'] = 'Loading data...';
 $messages['checkingmail'] = 'പുതിയ സന്ദേസങ്ങള്‍കുവേണ്ടി തിരയുന്നു...';
 $messages['sendingmessage'] = 'സന്ദേശം അയക്കുന്നു...';
-$messages['messagesent'] = 'Message sent successfully.';
-$messages['savingmessage'] = 'Saving message...';
-$messages['messagesaved'] = 'Message saved to Drafts.';
-$messages['successfullysaved'] = 'Successfully saved.';
-$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
-$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
-$messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
-$messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
-$messages['nocontactsfound'] = 'No contacts found.';
-$messages['contactnotfound'] = 'The requested contact was not found.';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'സന്ദേശം അയക്കാന്‍ സാധിച്ചില്ല.';
 $messages['senttooquickly'] = 'സന്ദേശം അയക്കുന്നതിനു മുന്പു ദയവായ്  $sec കാത്തിരിക്കൂ';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'An error occured while saving.';
-$messages['errormoving'] = 'Could not move the message(s).';
-$messages['errorcopying'] = 'Could not copy the message(s).';
-$messages['errordeleting'] = 'Could not delete the message(s).';
-$messages['errormarking'] = 'Could not mark the message(s).';
-$messages['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
-$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
-$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
-$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
-$messages['formincomplete'] = 'The form was not completely filled out.';
-$messages['noemailwarning'] = 'Please enter a valid email address.';
-$messages['nonamewarning']  = 'Please enter a name.';
-$messages['nopagesizewarning'] = 'Please enter a page size.';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
-$messages['norecipientwarning'] = 'Please enter at least one recipient.';
-$messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
-$messages['nobodywarning'] = 'Send this message without text?';
-$messages['notsentwarning'] = 'Message has not been sent. Do you want to discard your message?';
-$messages['noldapserver'] = 'Please select an ldap server to search.';
-$messages['nosearchname'] = 'Please enter a contact name or email address.';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
-$messages['searchsuccessful'] = '$nr messages found.';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
-$messages['searchnomatch'] = 'Search returned no matches.';
-$messages['searching'] = 'Searching...';
-$messages['checking'] = 'Checking...';
-$messages['nospellerrors'] = 'No spelling errors found.';
-$messages['folderdeleted'] = 'Folder successfully deleted.';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
-$messages['deletedsuccessfully'] = 'Successfully deleted.';
-$messages['converting'] = 'Removing formatting...';
-$messages['messageopenerror'] = 'Could not load message from server.';
-$messages['fileuploaderror'] = 'File upload failed.';
-$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
-$messages['sourceisreadonly'] = 'This address source is read only.';
-$messages['errorsavingcontact'] = 'Could not save the contact address.';
-$messages['movingmessage'] = 'Moving message(s)...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
-$messages['errorsendingreceipt'] = 'Could not send the receipt.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
-$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index b9b963a..9eb8787 100644
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '$product वरती स्वागत आहे';
 $labels['username']  = 'वापरकर्त्याचे नाव(तुमचे इमेल)';
 $labels['password']  = 'परवलीचा शब्द';
@@ -31,15 +29,12 @@
 $labels['sent']   = 'पाठवलेले';
 $labels['trash']  = 'कचरा पेटी';
 $labels['junk']   = 'नको असलेले कचरा संदेश';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'विषय';
 $labels['from']    = 'प्रेषक';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'प्रती';
 $labels['cc']      = 'प्रत';
 $labels['bcc']     = 'गुप्त प्रत';
 $labels['replyto'] = 'यास उत्तर द्या';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'दिनांक';
 $labels['size']    = 'आकार';
 $labels['priority'] = 'प्राधान्य';
@@ -50,14 +45,10 @@
 $labels['messagesfromto'] = 'संदेश $from कडून $to साठी $count वा';
 $labels['threadsfromto'] = 'धागे $from कडून $to साठी $count वा';
 $labels['messagenrof'] = 'Message $nr of $count';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'नक्‍कल';
 $labels['move']     = 'हलवा';
 $labels['moveto']   = 'या फोल्डरमधे ठेवा';
 $labels['download'] = 'उतरवून घ्या';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'फाईलचे नाव';
 $labels['filesize'] = 'फाईलचा आकार';
 $labels['addtoaddressbook'] = 'पत्ता नोंदवहीत नोंदवा';
@@ -108,10 +99,6 @@
 $labels['replytomessage']   = 'पाठवणार्‍याला उत्तर द्या';
 $labels['replytoallmessage'] = 'पाठवणार्‍याला आणि प्रत केलेल्या सर्वांना संदेश पाठवा';
 $labels['replyall']         = 'सर्वांना उत्तर दया';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'हा संदेश पुढे पाठवा';
 $labels['deletemessage']    = 'संदेश काढून टाका';
 $labels['movemessagetotrash'] = 'संदेश कचरापेटीत टाका';
@@ -139,9 +126,7 @@
 $labels['unread'] = 'न वाचलेले';
 $labels['flagged'] = 'खूण लावलेले';
 $labels['unanswered'] = 'उत्तर न दिलेले';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'काढून टाकलेला(ले)';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'उलट करा';
 $labels['filter'] = 'गाळणी';
 $labels['list'] = 'यादी';
@@ -168,7 +153,6 @@
 $labels['folderactions'] = 'फोल्डर कृती..';
 $labels['compact'] = 'छोटा';
 $labels['empty'] = 'रिकामा';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'डिस्कचा वापर';
 $labels['unknown']  = 'माहित नसलेला';
 $labels['unlimited']  = 'अमर्याद';
@@ -176,14 +160,9 @@
 $labels['resetsearch']  = 'परत शोध';
 $labels['searchmod']  = 'बदलकर्त्‍यांना शोधा';
 $labels['msgtext']  = 'संपूर्ण संदेश';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'नवीन खिडकी उघडा';
 $labels['emlsave'] = 'इएमएल स्‍वरूपात उतरवून घ्या';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'नवीन आहे असा संपादित करा';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'आत्ता पाठवा';
 $labels['savemessage']    = 'हा मसूदा साठवून ठेवा';
 $labels['addattachment']  = 'फाईल सोबत जोडा';
@@ -201,7 +180,6 @@
 $labels['attach'] = 'जोडा';
 $labels['attachments'] = 'जोडलेल्या';
 $labels['upload'] = 'चढवा';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'बंद';
 $labels['messageoptions']  = 'संदेश पर्याय..';
 $labels['low']     = 'कमी';
@@ -213,9 +191,6 @@
 $labels['showimages'] = 'चित्र दाखवा';
 $labels['alwaysshow'] = '$sender कडून आलेल्या संदेशातील चित्रे नेहमी दाखवा';
 $labels['isdraft']    = 'हा मसुदा संदेश आहे';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'एच टी एम एल';
 $labels['plaintoggle'] = 'साधे लिखाण';
 $labels['savesentmessagein'] = 'पाठवलेला संदेश या फोल्डरमधे ठेवा';
@@ -224,7 +199,6 @@
 $labels['addcc'] = 'प्रत करा';
 $labels['addbcc'] = 'गुप्त प्रत करा';
 $labels['addreplyto'] = 'आणखी लोकांना संदेश पाठवा';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'हा संदेश पाठवणार्‍याने हा संदेश तुम्ही वाचल्यावर कळवावयाला सांगितले आहे. तुम्हाला असे कळवणे चालेल ना?';
 $labels['receiptread'] = 'पोच पावती (संदेश वाचला)';
 $labels['yourmessage'] = 'ही तुमच्या संदेशाची पोच पावती आहे.';
@@ -233,32 +207,24 @@
 $labels['firstname']    = 'नाव';
 $labels['surname']      = 'आडनाव';
 $labels['middlename']   = 'मधले नाव';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
 $labels['nickname']     = 'टोपणनाव';
 $labels['jobtitle']     = 'कामाचे शिर्षक';
 $labels['department']   = 'विभाग';
 $labels['gender']       = 'लिंग';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'इ-मेल्';
 $labels['phone']        = 'दूरध्वनी';
 $labels['address']      = 'पत्ता';
 $labels['street']       = 'रस्ता';
 $labels['locality']     = 'शहर';
-$labels['zipcode']      = 'ZIP Code';
 $labels['region']       = 'राज्य / संस्थान';
 $labels['country']      = 'देश';
 $labels['birthday']     = 'वाढदिवस';
-$labels['anniversary']  = 'Anniversary';
 $labels['website']      = 'संकेतस्थळ';
-$labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'टिपा';
 $labels['male']   = 'पुरूष';
 $labels['female'] = 'स्त्री';
 $labels['manager'] = 'व्यवस्थापक';
 $labels['assistant'] = 'सहाय्यक';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
 $labels['search'] = 'शोध';
 $labels['advsearch'] = 'प्रगत शोध';
 $labels['advanced'] = 'आधुनिक';
@@ -268,20 +234,12 @@
 $labels['typeother']  = 'इतर';
 $labels['typemobile']  = 'भ्रमणध्वनी';
 $labels['typemain']  = 'मुख्य';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
 $labels['typevideo']  = 'चलचित्र';
 $labels['typeassistant']  = 'सहाय्यक';
 $labels['typehomepage']  = 'मुख्य पृष्ठ';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'नवीन पत्ता नोंदवहीत ठेवा';
 $labels['editcontact'] = 'नोंदवहीतील पत्ता सुधारा';
 $labels['contacts'] = 'संपर्क';
-$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'वैयक्तिक माहिती';
 $labels['edit']   = 'संदेश तयार करा';
 $labels['cancel'] = 'रद्द करा';
@@ -290,36 +248,28 @@
 $labels['rename'] = 'दूसरे नाव द्या';
 $labels['addphoto'] = 'समावेश करा';
 $labels['replacephoto'] = 'बदला';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'नोंदवहीत नवीन संपर्क लिहिण्यासाठी';
 $labels['deletecontact']  = 'खूण केलेले सर्व संपर्काचे पत्ते काढून टाका';
 $labels['composeto']      = 'साठी नवीन संदेश तयार करा';
 $labels['contactsfromto'] = '$from पासून ते $to पर्यंत $count पैकी';
 $labels['print']          = 'छापा';
 $labels['export']         = 'निर्यात करा';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'व्ही कार्ड स्वरुपात पत्ते निर्यात करा';
 $labels['newcontactgroup'] = 'नवीन पत्‍त्‍यांचा गट बनवा';
-$labels['grouprename']    = 'Rename group';
 $labels['groupdelete']    = 'गट नष्ट करा';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'आधिचा संच दाखवा';
 $labels['firstpage']      = 'पहिला संच दाखवा';
 $labels['nextpage']       = 'नंतरचा संच दाखवा';
 $labels['lastpage']       = 'शेवटचा संच दाखवा';
 $labels['group'] = 'गट';
 $labels['groups'] = 'अनेक गट';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'वैयक्तिक पत्ते';
 $labels['searchsave'] = 'शोध जतन करा';
 $labels['searchdelete'] = 'शोध नष्ट करा';
 $labels['import'] = 'आयात करा';
 $labels['importcontacts'] = 'पत्ते आयात करा';
 $labels['importfromfile'] = 'या फाईल मधून आयात करा';
-$labels['importtarget'] = 'नवीन पत्ता नोंदवहीत नोंदवा';
 $labels['importreplace'] = 'संपूर्ण पत्ता नोंदवही बदला';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'झाले';
 $labels['settingsfor'] = 'साठी सेटिंग्ज';
 $labels['about'] = 'च्या विषयी';
@@ -334,10 +284,6 @@
 $labels['preferhtml'] = 'एच टी एम एल दाखवा';
 $labels['defaultcharset'] = 'नेहमीचा अक्षर संच';
 $labels['htmlmessage'] = 'एच टी एम एल संदेश';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'विशेष दिवस';
 $labels['setdefault']  = 'हा नेहमीसाठी वापरा';
 $labels['autodetect']  = 'स्वयंचलित';
@@ -346,13 +292,8 @@
 $labels['pagesize']  = 'प्रत्येक पानावरील ओळी';
 $labels['signature'] = 'सही';
 $labels['dstactive']  = 'दिवसाची वेळ';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'एच टी एम एल संदेश तयारा करा';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'एच टी एम एल सही';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'प्रक्रियापूर्व तावदान दाखवा';
 $labels['skin'] = 'दृष्य गोष्टी';
 $labels['logoutclear'] = 'खात्यातून बाहेर पडतांना कचरा पेटी साफ करा';
@@ -363,21 +304,17 @@
 $labels['mdnrequests'] = 'पाठवणार्‍याच्या सूचना';
 $labels['askuser'] = 'वापरकर्त्याला विचारा';
 $labels['autosend'] = 'स्वयंचलित (आपोआप पाठवणे)';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'दुर्लक्ष करा';
 $labels['readwhendeleted'] = 'काढून टाकल्यावर संदेश वाचला असे दाखवा';
 $labels['flagfordeletion'] = 'संदेश काढून टाकण्या ऎवजी संदेश काढून टाकण्यासाठी आहे अशी खूण करा';
 $labels['skipdeleted'] = 'काढून टाकलेले संदेश दाखवू नका';
 $labels['deletealways'] = 'जर संदेश कचरापेटीत गेले नाहीत तर काढून टाका';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'संदेशातील चित्रे दाखवा';
 $labels['fromknownsenders'] = 'माहितीतील पाठवणार्‍याकडून संदेश';
 $labels['always'] = 'नेहमी';
 $labels['showinlineimages'] = 'सोबत जोडलेली चित्रे संदेशाच्या खाली दाखवा';
 $labels['autosavedraft']  = 'मसूदा आपोआप जतन करा';
 $labels['everynminutes']  = 'प्रत्येक $n मिनिटांनी';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'कधीच नाही';
 $labels['immediately']  = 'ताबडतोब';
 $labels['messagesdisplaying'] = 'संदेश दाखवा';
@@ -391,15 +328,12 @@
 $labels['focusonnewmessage'] = 'ब्राऊझर खिडकी नवीन संदेशावर केंद्रित करा';
 $labels['checkallfolders'] = 'सर्व फोल्डरमधे नवीन संदेश शोधा';
 $labels['displaynext'] = 'संदेश काढल्‍यानंतर किंवा हलवल्‍यानंतर पुढचा संदेश दाखवा';
-$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'मुख्‍य पर्याय';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'भाग';
 $labels['maintenance'] = 'देखभाल';
 $labels['newmessage'] = 'नवीन संदेश';
 $labels['signatureoptions'] = 'सही पर्याय';
 $labels['whenreplying'] = 'उत्‍तर देताना';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'नवीन संदेश मुळ संदेशाच्‍या वर चालू करा';
 $labels['replybottomposting'] = 'नवीन संदेश मुळ संदेशाच्‍या खाली चालू करा';
 $labels['replyremovesignature'] = 'उत्‍तर देताना मुळ सही संदेशातून काढून टाका';
@@ -411,21 +345,6 @@
 $labels['afternseconds']  = '$n क्षणानंतर';
 $labels['reqmdn'] = 'नेहमी पोचपावतीची विनंती करा';
 $labels['reqdsn'] = 'नेहमी पोचपावती स्थिती निर्देशाची विनंती करा';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'फोल्डर';
 $labels['folders']  = 'फोल्डर्स';
 $labels['foldername']  = 'फोल्डरचे नाव';
@@ -435,27 +354,9 @@
 $labels['createfolder']  = 'नवीन फोल्डर तयार करा';
 $labels['managefolders']  = 'फोल्डर्सचे नियोजन करा';
 $labels['specialfolders'] = 'विषेश फोल्डर';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'ने वर्गवारी करा';
 $labels['sortasc']  = 'चढत्या क्रमाने';
 $labels['sortdesc'] = 'उतरत्या क्रमाने';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
 $labels['B'] = 'बाइट';
 $labels['KB'] = 'केबी';
 $labels['MB'] = 'एमबी';
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index 748898b..36eb8dc 100644
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'काहीतरी चूक झाली';
 $messages['loginfailed']  = 'प्रवेश करता आला नाही';
 $messages['cookiesdisabled'] = 'तुमचा ब्राऊझर कुकीज घेऊ शकत नाही';
@@ -24,20 +23,14 @@
 $messages['servererror'] = 'सर्व्‍हर चूक !';
 $messages['servererrormsg'] = 'सर्व्हर चूक : $msg';
 $messages['dberror'] = 'माहितीसाठा चूक !';
-$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'कृती करण्यास असमर्थ, फोल्डर फक्त बघण्यासाठी';
 $messages['errornoperm'] = 'कृती करण्यास असमर्थ, परवानगी अमान्य';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'अवैध विनंती! माहिती साठवलेली नाही.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'या खात्यामधे कोणताही संदेश आलेला नाही';
 $messages['loggedout'] = 'तुम्ही यशस्वीरित्या खाते बंद केले आहे . राम राम !';
 $messages['mailboxempty'] = 'खात्यात कोणताही संदेश नाही';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'संदेश आणत आहे';
 $messages['uploading'] = 'फाईल चढवली जात आहे...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'माहिती आणत आहे';
 $messages['checkingmail'] = 'नवीन संदेश आले आहेत का हे पहात आहे';
 $messages['sendingmessage'] = 'संदेश पाठवत आहे';
@@ -52,11 +45,8 @@
 $messages['encryptedmessage'] = 'हा गुप्त व सांकेतिक संदेश आहे. तो तुम्हाला असा दाखवता येणार नाही.';
 $messages['nocontactsfound'] = 'कोणताच पत्ता नोंदवहीत नाही.';
 $messages['contactnotfound'] = 'या नावाचा कोणताच पत्ता नोंदवहीत नाही.';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'संदेश पाठवता आला नाही.';
 $messages['senttooquickly'] = 'कृपया हा संदेश पाठवण्यापूर्वी $sec थांबा';
-$messages['errorsavingsent'] = 'पाठवलेला संदेश ठेवून देतांना काहीतरी चूक झाली.';
-$messages['errorsaving'] = 'संदेश ठेवून देतांना काहीतरी चूक झाली.';
 $messages['errormoving'] = 'संदेश तेथे ठेवता आला नाही.';
 $messages['errorcopying'] = 'संदेशांची नक्‍कल करता आली नाही';
 $messages['errordeleting'] = 'संदेश काढून टाकता आला नाही.';
@@ -66,12 +56,8 @@
 $messages['deletemessagesconfirm'] = 'खूण केलेले सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
 $messages['deletefolderconfirm']  = 'हा फोल्डर खरोखरच तुम्हाला काढून टाकायचा आहेत का?';
 $messages['purgefolderconfirm']  = 'या फोल्डरमधिल सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'फोल्डर काढून टाकत आहे';
 $messages['foldermoving'] = 'फोल्डर हलवत आहे.';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'फॉर्म पूर्णपणे भरलेला  नाही.';
 $messages['noemailwarning'] = 'योग्य, बरोबर, आणि वैध इमेल पत्ता द्या.';
 $messages['nonamewarning']  = 'नाव द्या';
@@ -85,14 +71,11 @@
 $messages['nosearchname'] = 'कृपया ज्यांना तुम्हाला संदेश पाठवावयाचा आहे त्यांचे नाव किंवा इमेल पत्ता द्या.';
 $messages['notuploadedwarning'] = 'सर्व फाईल अजून चढवल्‍या गेलेल्‍या नाहीत. कृपया वाट पहा किंवा मागे फिरा';
 $messages['searchsuccessful'] = '$nr संदेष मिळाले.';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'शोध घेतल्यानंतर एकही संदेश मिळाला नाही';
 $messages['searching'] = 'शोधत आहे......';
 $messages['checking'] = 'तपासत आहे.....';
 $messages['nospellerrors'] = 'शुध्दलेखनाची चूक सापडली नाही';
 $messages['folderdeleted'] = 'फोल्डर यशस्वी रित्या काढून टाकण्यात आला आहे.';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
 $messages['folderpurged'] = 'फोल्डर यशस्वीरीत्या रिकामा केला';
 $messages['folderexpunged'] = 'फोल्डर यशस्वीरीत्या संक्षिप्त केला';
 $messages['deletedsuccessfully'] = 'यशस्वी रित्या काढून टाकण्यात आला आहे.';
@@ -100,20 +83,10 @@
 $messages['messageopenerror'] = 'सर्व्हरवरुन संदेश आणता आला नाही.';
 $messages['fileuploaderror'] = 'फाईल चढवता आली नाही';
 $messages['filesizeerror'] = 'तुम्ही चढवलेली फाईल क्षमतेपेक्षा जास्त मोठी आहे.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'पत्ता फक्त वाचण्यासाठी आहे.';
 $messages['errorsavingcontact'] = 'पत्ता नोंदवहीत ठेवता आला नाही.';
 $messages['movingmessage'] = 'संदेश हलवत आहे..';
 $messages['copyingmessage'] = 'संदेशाची नक्‍कल करत आहे...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'पोचपावती यशस्वीरित्या पाठवण्यात आली आहे.';
 $messages['errorsendingreceipt'] = 'पोचपावती पाठवता आली नाही.';
 $messages['deleteidentityconfirm'] = 'तुम्हाला ही ओळख नक्की नष्ट करायची आहे का?';
@@ -123,13 +96,8 @@
 $messages['addresswriterror'] = 'निवडलेल्या पत्ता नोंदवहीत नोंद करता येत नाही.';
 $messages['contactaddedtogroup'] = 'पत्‍ते यशस्‍वीरित्‍या हया गटात वाढवण्‍यात आले.';
 $messages['contactremovedfromgroup'] = 'पत्‍ते यशस्‍वीरित्‍या हया गटातून काढून टाकले.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'आयात करत आहे, कृपया वाट पहा.....';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>$inserted पत्ते यशस्वीरित्या आयात केल, $skipped आधिच असलेल्या नोंदी केल्या नाहीत</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'ही क्रिया करण्यास परवानगी नाही.';
 $messages['nofromaddress'] = 'निवडलेल्या खात्यात इमेल पत्ता दिलेला नाही.';
 $messages['editorwarning'] = 'टेक्स्ट संपादन निवडल्यास संदेशाचे दृष्य स्वरुप बदलून जाईल. तुम्हाला असेच करायचे आहे ना?';
@@ -143,32 +111,4 @@
 $messages['emailformaterror'] = 'अवैध ईमेल पत्‍ता : $email';
 $messages['toomanyrecipients'] = 'खूप जास्‍त प्राप्‍तकर्ते. प्राप्‍तकर्त्‍यांची संख्‍या $max पर्यंत कमी करा';
 $messages['maxgroupmembersreached'] = 'गट सभासद संख्‍या $max पेक्षा जास्‍त झाली आहे';
-$messages['internalerror'] = 'अंतर्गत चूक झाली. कृपया परत प्रयत्‍न करा.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index b39a3bf..13d9d89 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Selamat datang ke $product';
 $labels['username']  = 'Nama Pengguna';
 $labels['password']  = 'Katalaluan';
@@ -31,10 +29,8 @@
 $labels['sent']   = 'Hantar';
 $labels['trash']  = 'Tong Sampah';
 $labels['junk']   = 'Junk';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Subjek';
 $labels['from']    = 'Daripada';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Kepada';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -55,9 +51,6 @@
 $labels['move']     = 'Alih';
 $labels['moveto']   = 'Alih ke...';
 $labels['download'] = 'Muat Turun';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'Nama Fail';
 $labels['filesize'] = 'Saiz Fail';
 $labels['addtoaddressbook'] = 'Tambah ke buku alamat';
@@ -139,9 +132,7 @@
 $labels['unread'] = 'Belum dibaca';
 $labels['flagged'] = 'Ditanda';
 $labels['unanswered'] = 'Belum dijawab';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Telah dipadam';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Songsangkan';
 $labels['filter'] = 'Tapis';
 $labels['list'] = 'Senarai';
@@ -168,7 +159,6 @@
 $labels['folderactions'] = 'Aksi folder';
 $labels['compact'] = 'Kompak';
 $labels['empty'] = 'Kosong';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Penggunaan cakera';
 $labels['unknown']  = 'tidak diketahui';
 $labels['unlimited']  = 'Tidak terhad';
@@ -176,14 +166,9 @@
 $labels['resetsearch']  = 'Set semula carian';
 $labels['searchmod']  = 'Pengubah carian';
 $labels['msgtext']  = 'Keseluruhan mesej';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Buka dalam tetingkap baru';
 $labels['emlsave'] = 'Muat-turun (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Ubah seperti baharu';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Hantar mesej';
 $labels['savemessage']    = 'Simapan sebagai draf';
 $labels['addattachment']  = 'Lampir fail';
@@ -213,9 +198,6 @@
 $labels['showimages'] = 'Papar imej';
 $labels['alwaysshow'] = 'selalu paparkan imej dari $sender';
 $labels['isdraft']    = 'Ini adalah draf mesej';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Teks kosong';
 $labels['savesentmessagein'] = 'Simpan mesej yang telah dihantar dalam';
@@ -232,97 +214,26 @@
 $labels['name']         = 'Nama paparan';
 $labels['firstname']    = 'Nama pertama';
 $labels['surname']      = 'Nama akhir';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'E-Mel';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Tambah kontek baru';
 $labels['editcontact'] = 'Ubahsuai Kontek';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'Sunting';
 $labels['cancel'] = 'Batal';
 $labels['save']   = 'Simpan';
 $labels['delete'] = 'Padam';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'Cipta kad kontek baru';
 $labels['deletecontact']  = 'Hapus kontek yang dipilih';
 $labels['composeto']      = 'Karang mel kepada';
 $labels['contactsfromto'] = 'Kontek $from ke $to dari $count';
 $labels['print']          = 'Cetak';
 $labels['export']         = 'Eksport';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'Papar set sebelumnya';
 $labels['firstpage']      = 'Papar set pertama';
 $labels['nextpage']       = 'Papar set seterusnya';
 $labels['lastpage']       = 'Papar set akhir';
-$labels['group'] = 'Group';
 $labels['groups'] = 'Kumpulan';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Alamat-alamat Peribadi';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
 $labels['settingsfor'] = 'Tetapan bagi';
-$labels['about'] = 'About';
 $labels['preferences'] = 'Keutamaan';
 $labels['userpreferences'] = 'Keutamaan pengguna';
 $labels['editpreferences'] = 'Sunting keutamaan pengguna';
@@ -332,29 +243,17 @@
 $labels['newitem'] = 'Butiran baru';
 $labels['edititem'] = 'Ubahsuai butiran';
 $labels['preferhtml'] = 'Papar HTML';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Mesej HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Tarikh-tarikh cantik';
 $labels['setdefault']  = 'Tetap asal';
-$labels['autodetect']  = 'Auto';
 $labels['language']  = 'Bahasa';
 $labels['timezone']  = 'Zon Masa';
 $labels['pagesize']  = 'Baris setiap muka';
 $labels['signature'] = 'Tandatangan';
 $labels['dstactive']  = 'Simpanan siang hari';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Karang mesej HTML';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Tandatangan HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Pamer ruang previu';
-$labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Kosongkan Tong sampah ketika keluar';
 $labels['logoutcompact'] = 'Padatkan Inbox ketika keluar';
 $labels['uisettings'] = 'Antaramuka Pengguna';
@@ -363,69 +262,11 @@
 $labels['mdnrequests'] = 'Pemberitahuan Pengirim';
 $labels['askuser'] = 'Tanya pengguna';
 $labels['autosend'] = 'Hantar automatik';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'Biarkan';
 $labels['readwhendeleted'] = 'Tanda mesej sebagai dibaca ketika hapus';
 $labels['flagfordeletion'] = 'Tanda mesej untuk pembuangan (tidak delete terus)';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
-$labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'Simpan draf dengan automatik';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'tidak pernah';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Kabinet Fail';
 $labels['folders']  = 'Folder';
 $labels['foldername']  = 'Nama Kabinet Fail';
@@ -434,48 +275,7 @@
 $labels['create']  = 'Cipta';
 $labels['createfolder']  = 'Cipta kabinet fail baru';
 $labels['managefolders']  = 'Urus kabinet fail';
-$labels['specialfolders'] = 'Special Folders';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'Susun dengan';
 $labels['sortasc']  = 'Susun menaik';
 $labels['sortdesc'] = 'Susun menurun';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index 8728512..c2140e2 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -15,29 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'Log masuk gagal';
 $messages['cookiesdisabled'] = 'Pelayar anda tidak menerima cookies';
 $messages['sessionerror'] = 'Sesi anda tidak sah atau telah tamat';
 $messages['storageerror'] = 'Sambungan ke pelayan IMAP gagal';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Tiada mesej dijumpai dalam kotak mel ini';
 $messages['loggedout'] = 'Sesi anda telah tamat. Selamat tinggal!';
 $messages['mailboxempty'] = 'Kotak mail kosong';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Memuat...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Memuat data...';
 $messages['checkingmail'] = 'Menyemak mesej baru...';
 $messages['sendingmessage'] = 'Menghantar mesej...';
@@ -47,128 +32,42 @@
 $messages['successfullysaved'] = 'Berjaya disimpan';
 $messages['addedsuccessfully'] = 'Kontek berjaya disimpan ke dalam buku alamat';
 $messages['contactexists'] = 'Kontek dengan alamat emel ini sudah wujud';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Untuk melindungi kebesasan peribadi anda, imej jauh dihalang dalam mesej ini.';
 $messages['encryptedmessage'] = 'Ini adalah mesej yang di\'encrypted\' dan tidak boleh dipamerkan. Maaf!';
 $messages['nocontactsfound'] = 'Tiada kontek dijumpai';
 $messages['contactnotfound'] = 'Kontek yang diminta tidak dijumpai';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Gagal menghantar mesej';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'Terdapat ralat ketika menyimpan';
 $messages['errormoving'] = 'Tidak boleh pindah mesej';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Tidak boleh hapus mesej';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'Adakah anda ingin hapuskan kontek yang dipilih?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Adakah anda ingin hapuskan mesej yang dipilih?';
 $messages['deletefolderconfirm']  = 'Adakah anda ingin hapuskan kabinet fail ini?';
 $messages['purgefolderconfirm']  = 'Adakah anda ingin hapuskan semua mesej dalam kabinet fail ini?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Borang tidak diisi dengan lengkap';
 $messages['noemailwarning'] = 'Sila masukkan alamat emel yang sah';
 $messages['nonamewarning']  = 'Sila masukkan nama';
 $messages['nopagesizewarning'] = 'Sila masukkan saiz halaman';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Sila masukkan sekurang-kurangnya satu penerima';
 $messages['nosubjectwarning']  = 'Ruang "Subjek" kosong. Adakah anda ingin masukkannya sekarang?';
 $messages['nobodywarning'] = 'Hantar mesej ini tanpa teks?';
 $messages['notsentwarning'] = 'Mesej tidak dihantar. Adakah anda ingin menyingkir mesej anda?';
 $messages['noldapserver'] = 'Sila pilih satu pelayan ldap untuk carian';
 $messages['nosearchname'] = 'Sila masukkan nama kontek atau alamat emel';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr mesej dijumpai';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Carian tiada padanan';
 $messages['searching'] = 'Menggelintar...';
 $messages['checking'] = 'Menyemak...';
 $messages['nospellerrors'] = 'Tiada kesalah ejaan dijumpai';
 $messages['folderdeleted'] = 'Kabinet fail berjaya dihapuskan';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Berjaya dihapuskan';
 $messages['converting'] = 'Singkir format dari mesej...';
 $messages['messageopenerror'] = 'Tidak boleh muat mesej dari server';
 $messages['fileuploaderror'] = 'Muatnaik fail gagal';
 $messages['filesizeerror'] = 'Fail yang dimuatnaik melampaui saiz maksima $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Sumber alamat ini adalah untuk bacaan sahaja';
 $messages['errorsavingcontact'] = 'Tidak boleh simmpan alamat kontek';
 $messages['movingmessage'] = 'Memindah mesej...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Berjaya menghantar resip bacaan';
 $messages['errorsendingreceipt'] = 'Tidak dapat menghantar resip';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Anda tidak boleh membuang identiti ini, ia milik anda yang terakhir.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index f9ccfab..20bbd13 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Velkommen til $product';
 $labels['username']  = 'Brukernavn';
 $labels['password']  = 'Passord';
@@ -31,7 +29,6 @@
 $labels['sent']   = 'Sendt';
 $labels['trash']  = 'Slettet';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Emne';
 $labels['from']    = 'Avsender';
 $labels['sender']  = 'Avsender';
@@ -168,7 +165,6 @@
 $labels['folderactions'] = 'Mappehandlinger...';
 $labels['compact'] = 'Rydd opp';
 $labels['empty'] = 'Tøm';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Plassforbruk';
 $labels['unknown']  = 'ukjent';
 $labels['unlimited']  = 'ubegrenset';
@@ -177,7 +173,6 @@
 $labels['searchmod']  = 'Søke felt';
 $labels['msgtext']  = 'Hele meldingen';
 $labels['body']  = 'Meldingstekst';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Åpne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
 $labels['changeformattext'] = 'Vis i ren tekst';
@@ -310,14 +305,12 @@
 $labels['lastpage']       = 'Vis siste sett';
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Egne adresser';
 $labels['searchsave'] = 'Lagre søk';
 $labels['searchdelete'] = 'Slett søk';
 $labels['import'] = 'Importer';
 $labels['importcontacts'] = 'Importer kontakter';
 $labels['importfromfile'] = 'Importer fra fil:';
-$labels['importtarget'] = 'Legg til kontakter i adresseboka:';
 $labels['importreplace'] = 'Erstatt hele adresseboken';
 $labels['importdesc'] = 'Du kan laste opp kontakter fra en eksisterende adressebok.<br/>Vi støtter adressebøker i <a href="http://no.wikipedia.org/wiki/VCard">vCard</a> eller CSV (kommaseparert) .';
 $labels['done'] = 'Fullført';
@@ -422,7 +415,6 @@
 $labels['spellcheckignorecaps'] = 'Ignorer ord med kun store bokstaver';
 $labels['addtodict'] = 'Legg til i ordbok';
 $labels['mailtoprotohandler'] = 'Registrer protokollhåndtering for mailto-lenker';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Meldinger videresendes';
 $labels['inline'] = 'i teksten';
 $labels['asattachment'] = 'som vedlegg';
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index 23ee932..1d51017 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Det oppsto en feil!';
 $messages['loginfailed']  = 'Pålogging mislyktes';
 $messages['cookiesdisabled'] = 'Nettleseren din tillater ikke informasjonskapsler (cookies)';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Skriv inn noen søkeord for å finne kontakter.';
 $messages['sendingfailed'] = 'Kunne ikke sende e-posten';
 $messages['senttooquickly'] = 'Vennligst vent $sec sekund(er) før du sender denne meldingen';
-$messages['errorsavingsent'] = 'En feil oppsto under lagring av sendt melding';
-$messages['errorsaving'] = 'Det oppstod en feil ved lagring av data';
 $messages['errormoving'] = 'Kunne ikke flytte meldingen(e)';
 $messages['errorcopying'] = 'Kunne ikke kopiere meldingen(e)';
 $messages['errordeleting'] = 'Kunne ikke slette meldingen(e)';
@@ -100,16 +97,11 @@
 $messages['messageopenerror'] = 'Kunne ikke hente meldingen fra server';
 $messages['fileuploaderror'] = 'Feil under opplastning.';
 $messages['filesizeerror'] = 'Filen overstiger maksimum tillatt filstørrelse ($size)';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Denne adressekilden er skrivebeskyttet';
 $messages['errorsavingcontact'] = 'Kunne ikke lagre kontaktadressen.';
 $messages['movingmessage'] = 'Flytter e-post ...';
 $messages['copyingmessage'] = 'Kopierer e-post...';
 $messages['copyingcontact'] = 'Kopierer kontakt(er) …';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Sletter melding(er) …';
 $messages['markingmessage'] = 'Markerer melding(er) ...';
 $messages['addingmember'] = 'Legger til kontakt(er) i gruppa ...';
@@ -143,7 +135,6 @@
 $messages['emailformaterror'] = 'Ukorrekt e-postadresse: $email';
 $messages['toomanyrecipients'] = 'For mange mottakere. Reduser antall mottakere til $max.';
 $messages['maxgroupmembersreached'] = 'Antall gruppemedlemmer overskrider maksgrensen på $max';
-$messages['internalerror'] = 'Intern feil, prøv igjen senere.';
 $messages['contactdelerror'] = 'Kunne ikke slette kontakt(er)';
 $messages['contactdeleted'] = 'Kontakt(er) slettet uten feil.';
 $messages['contactrestoreerror'] = 'Kunne ikke gjenopprette kontakt(er).';
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index 826571d..97f3020 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '$product मा स्वागत छ';
 $labels['username']  = 'प्रयोगकर्ताको नाम';
 $labels['password']  = 'प्रवेश शब्द';
@@ -31,10 +29,8 @@
 $labels['sent']   = 'पठईएका मेलहरु';
 $labels['trash']  = 'रद्दी टोकरी';
 $labels['junk']   = 'स्पाम';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'विषय';
 $labels['from']    = 'प्रेषक';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'प्रापक';
 $labels['cc']      = 'बोधार्थ';
 $labels['bcc']     = 'गुप्त बोधार्थ';
@@ -45,7 +41,6 @@
 $labels['priority'] = 'प्राथमिकता';
 $labels['organization'] = 'संस्था';
 $labels['readstatus'] = 'पढेको अवस्था';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'फोल्डरहरु';
 $labels['messagesfromto'] = 'मेलहरु $from बाट $to सम्म, $count मध्यबाट';
 $labels['threadsfromto'] = 'थ्रेडहरु $from बाट $to सम्म, $count मध्यबाट';
@@ -55,9 +50,6 @@
 $labels['move']     = 'सार्नुहोस';
 $labels['moveto']   = 'यहाँ सार्नुहोस';
 $labels['download'] = 'डाऊनलोड';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'फाईलको नाम';
 $labels['filesize'] = 'फाईलको नाप';
 $labels['addtoaddressbook'] = 'ठेगाना पुस्तिकामा भर्नुहोस';
@@ -124,86 +116,33 @@
 $labels['viewsource']       = 'श्रोत देखाउनुहोस';
 $labels['mark']             = 'चिन्ह लगाउनुहोस्';
 $labels['markmessages']     = 'सन्देशमा चिन्ह लगाउनुहोस्';
-$labels['markread']         = 'As read';
-$labels['markunread']       = 'As unread';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
-$labels['moreactions']      = 'More actions...';
 $labels['more']             = 'अझ धेरै';
 $labels['back']             = 'पछाडि';
 $labels['options']          = 'विकल्पहरू';
 $labels['select'] = 'चयन गर्नुहोस्';
 $labels['all'] = 'सबै';
 $labels['none'] = 'हैन';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'नपढिएका |';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
-$labels['filter'] = 'Filter';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'हैन';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'छोटो गर्नुहोस';
 $labels['empty'] = 'खाली गर्ने';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'डिस्कको उपभोग';
 $labels['unknown']  = 'अज्ञात';
 $labels['unlimited']  = 'अनगिन्ति';
 $labels['quicksearch']  = 'स्फुर्ति खोज';
 $labels['resetsearch']  = 'पन: खोज';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'तुरुन्तै मेल पठाउनुहोस';
 $labels['savemessage']    = 'ड्राफ्ट जोगाउनुहोस';
 $labels['addattachment']  = 'फाइल टाँस्नुहोस';
 $labels['charset']        = 'क्यारेक्टर सेट';
 $labels['editortype']     = 'सम्पादकको प्रकार';
 $labels['returnreceipt']  = 'फिर्ति रसीद';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'हिज्जे जाँच';
 $labels['resumeediting'] = 'पुन: सम्पादन गर्नुहोस';
 $labels['revertto']      = 'पहिलेको स्थितीमा जानुहोस';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'टाँसिएका फाईलहरु';
 $labels['upload'] = 'अपलोड';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'बन्द';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'कम';
 $labels['lowest']  = 'सबै भन्दा कम';
 $labels['normal']  = 'साधारण';
@@ -211,118 +150,31 @@
 $labels['highest'] = 'उच्चतम';
 $labels['nosubject']  = '(बिना विषयको)';
 $labels['showimages'] = 'चित्र देखाउनुहोस';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'ऐच-टी-ऐम-एल (HTML)';
 $labels['plaintoggle'] = 'सादा अक्षर';
-$labels['savesentmessagein'] = 'Save sent message in';
-$labels['dontsave'] = 'don\'t save';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
-$labels['addcc'] = 'Add Cc';
-$labels['addbcc'] = 'Add Bcc';
-$labels['addreplyto'] = 'Add Reply-To';
-$labels['addfollowupto'] = 'Add Followup-To';
-$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
-$labels['receiptread'] = 'Return Receipt (read)';
-$labels['yourmessage'] = 'This is a Return Receipt for your message';
-$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
 $labels['name']         = 'देखाउने नाम';
 $labels['firstname']    = 'पहिलो नाम';
 $labels['surname']      = 'थर';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'ई-मेल';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'नया सम्पर्क जोड्नुहोस';
 $labels['editcontact'] = 'सम्पर्क सच्याउनुहोस';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'सच्याउनुहोस';
 $labels['cancel'] = 'खारेज गर्नुहोस';
 $labels['save']   = 'जोगाउनुहोस';
 $labels['delete'] = 'मेटाउनुहोस';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'नया सम्पर्क कार्ड बनाउनुहोस';
 $labels['deletecontact']  = 'छानिएका सम्पर्कहरु मेटाउनुहोस';
 $labels['composeto']      = 'मेल लेखी पठाउनुहोस';
 $labels['contactsfromto'] = 'सम्पर्कहरु $from बाट $to सम्म, $count मध्यबाट';
 $labels['print']          = 'छाप्नुहोस';
 $labels['export']         = 'ऐक्स्पोर्ट गर्नुहोस';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'पहिलेको सेट देखाउनुहोस';
 $labels['firstpage']      = 'पहिलो सेट देखाउनुहोस';
 $labels['nextpage']       = 'अर्को सेट देखाउनुहोस';
 $labels['lastpage']       = 'अन्तिम सेट देखाउनुहोस';
-$labels['group'] = 'Group';
 $labels['groups'] = 'समूहहरु';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'व्यक्तिगत ठेगानाहरु';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
 $labels['settingsfor'] = 'तय';
-$labels['about'] = 'About';
 $labels['preferences'] = 'रोजाइहरु';
 $labels['userpreferences'] = 'यूसरका रोजाइहरु';
 $labels['editpreferences'] = 'यूसरका रोजाइहर सम्पादन गर्नुहोस';
@@ -332,150 +184,27 @@
 $labels['newitem'] = 'नया प्रकार';
 $labels['edititem'] = 'प्रकार सम्पादन गर्नुहोस';
 $labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) देखाउनुहोस';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूपका मेल';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'सुन्दर तारिख';
 $labels['setdefault']  = 'तय गर्नुहोस';
-$labels['autodetect']  = 'Auto';
 $labels['language']  = 'भाषा';
 $labels['timezone']  = 'समय क्षेत्र';
 $labels['pagesize']  = 'हरेक पन्नामा यति';
 $labels['signature'] = 'हस्ताक्षर';
 $labels['dstactive']  = 'प्रकाश बचाव';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'ऐच-टी-ऐम-एल (HTML) मेल लखन गर्नुहोस';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ऐच-टी-ऐम-एल (HTML) हस्ताक्षर';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'पूर्व दृष्य देखाउनुहोस';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
-$labels['uisettings'] = 'User Interface';
-$labels['serversettings'] = 'Server Settings';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
-$labels['askuser'] = 'ask me';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
-$labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'स्वत ड्राफ्ट जोगाउनुहोस';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'काहिलै नहुने';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'फोल्डर';
 $labels['folders']  = 'फोल्डरहरु';
 $labels['foldername']  = 'फोल्डरको नाम';
 $labels['subscribed']  = 'सबस्क्राईब गरियो';
-$labels['messagecount'] = 'Messages';
 $labels['create']  = 'बनाउनुहोस';
 $labels['createfolder']  = 'नया फोलडर बनाउनुहोस';
 $labels['managefolders']  = 'फोलडर व्यवस्थित गर्नुहोस';
-$labels['specialfolders'] = 'Special Folders';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'यसरी तय गर्नुहोस';
 $labels['sortasc']  = 'पहिलो देखि अन्तिम सम्म तय गर्नुहोस';
 $labels['sortdesc'] = 'अन्तिम देखि पहिलो सम्म तय गर्नुहोस';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/ne_NP/messages.inc b/program/localization/ne_NP/messages.inc
index a30cc87..7873f57 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -15,29 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'लागईन हुन पाएन';
 $messages['cookiesdisabled'] = 'तपाईको ब्राऊसरले कुकी स्वीकार गारिरहेको छैन';
 $messages['sessionerror'] = 'सत्र समाप्त वा अवैद्य';
 $messages['storageerror'] = 'सर्वर संग सम्पर्क हुन पाएन';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'यो मेलबक्स मा कुनै मेल छैन';
 $messages['loggedout'] = 'सत्र समाप्त । नमास्कार!';
 $messages['mailboxempty'] = 'मेल बक्स खाली छ';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'लोड भईरहेको छ...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'डाटा लोड भईरहेको छै...';
 $messages['checkingmail'] = 'नया मेलको खोजी भईरहेको छ...';
 $messages['sendingmessage'] = 'मेल पठाईदै रहेको छ...';
@@ -47,128 +32,38 @@
 $messages['successfullysaved'] = 'सफल्तापूर्वक जोगाईयो';
 $messages['addedsuccessfully'] = 'सम्पर्क पुस्तिकामा सफल्तापूर्वक सम्पर्क प्रविष्ट गारियो';
 $messages['contactexists'] = 'यो ई-मेल पहिलै लिईसकिएको छ';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'तपाईको प्राईवेसी को लागि तथा अन्य स्पामबाट बच्नकोलागि यो मेलमा चित्रहुरु देखाईएका छैनन्।';
 $messages['encryptedmessage'] = 'माफ गर्नुहोसे, यो मेल ईन्क्रिफ्ट गरिएको रूपमा छ, त्यसैले देखाउन सकिदैन!';
 $messages['nocontactsfound'] = 'कुनै सम्पर्क भेटिएन';
 $messages['contactnotfound'] = 'अनुरोध गारिएको सम्पर्क भेटिएन';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'मेल पठाउन सकिएन';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'जोगाउदा-जोगाउदै गडबड भायो';
 $messages['errormoving'] = 'मेल सार्न सकिएन';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'मेल मेटाउन सकिएन';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'तापाईले छान्नुभएको सम्पर्कहरु, साँचै मेट्न चहानुहुन्छ?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'तापाईले छान्नु भएको मेलहरु, साँचै मेट्न चहानुहुन्छ?';
 $messages['deletefolderconfirm']  = 'तापाईले साँचै यो फोल्डर मेट्न चहानु हुन्छ?';
 $messages['purgefolderconfirm']  = 'तापाईले साँचै यो फोल्डरमा भएका सबै मेलहरु मेट्न चहानुहुन्छ?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'फर्म पूर्ण रुपमा भरिएको छैन';
 $messages['noemailwarning'] = 'कृपया वैद्य ई-मेल भर्नुहोस';
 $messages['nonamewarning']  = 'कृपया नाम भर्नुहोस';
 $messages['nopagesizewarning'] = 'कृपया पन्नाको नाप भर्नुहोस';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'कृपया कम-से-कम एउटा प्रापकको विवरण भर्नुहोस';
 $messages['nosubjectwarning']  = 'मेलको कुनै विषय तोकिएको छैनै। केहि तोक्न चहानुहुन्छ ?';
 $messages['nobodywarning'] = 'बिना केहि लेखि पठाउने?';
 $messages['notsentwarning'] = 'मेल पठएको छैन.. मेल रद्द गर्न चहानुहुन्छ?';
 $messages['noldapserver'] = 'कृपया खोजको निम्ति एउटा ऐलडाप सर्वर छान्नहोस';
 $messages['nosearchname'] = 'कृपया सम्पर्कको नाम या ई-मेल भर्नुहोस';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr मेलहरु पाइयो';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'खोज असफल रहयो';
 $messages['searching'] = 'खोजि भईरहेको छ...';
 $messages['checking'] = 'जाँच भईरहेको छ...';
 $messages['nospellerrors'] = 'कुनै गलत हिज्जे फेला परेनन्';
 $messages['folderdeleted'] = 'फोल्डर सफल्तापूर्वक मेटियो';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'सफल्तापूर्वक मेटियो';
 $messages['converting'] = 'मेलबाट फोर्माटिङ हटाईदै छ...';
 $messages['messageopenerror'] = 'सर्वरबाट मेल लोड हुन सकेन';
 $messages['fileuploaderror'] = 'फाईल अपलोड हुन असफल';
 $messages['filesizeerror'] = 'अपलोड गरिएको फाईल हद $size भन्दा ठूलो छ';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'यो ठेगाना को श्रोत पढ्नको लागि मात्र उपलब्ध छ';
 $messages['errorsavingcontact'] = 'स्मपर्कको ठेगाना जोगाउन सकिएन';
-$messages['movingmessage'] = 'Moving message(s)...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
-$messages['errorsendingreceipt'] = 'Could not send the receipt.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
-$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index 6882db5..2e76194 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Welkom bij $product';
 $labels['username']  = 'Gebruikersnaam';
 $labels['password']  = 'Wachtwoord';
@@ -31,7 +29,6 @@
 $labels['sent']   = 'Verzonden berichten';
 $labels['trash']  = 'Prullenbak';
 $labels['junk']   = 'Spam';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Onderwerp';
 $labels['from']    = 'Van';
 $labels['sender']  = 'Afzender';
@@ -55,7 +52,6 @@
 $labels['move']     = 'Verplaats';
 $labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Downloaden';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'Weergeven';
 $labels['showanyway'] = 'Toch weergeven';
 $labels['filename'] = 'Bestandsnaam';
@@ -110,7 +106,6 @@
 $labels['replyall']         = 'Allen beantwoorden';
 $labels['replylist']        = 'Lijst beantwoorden';
 $labels['forward']          = 'Doorsturen';
-$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'Doorsturen als bijlage';
 $labels['forwardmessage']   = 'Bericht doorsturen';
 $labels['deletemessage']    = 'Dit bericht verwijderen';
@@ -139,7 +134,6 @@
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Geselecteerd';
 $labels['unanswered'] = 'Onbeantwoord';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omkeren';
@@ -168,7 +162,6 @@
 $labels['folderactions'] = 'Acties voor map...';
 $labels['compact'] = 'Comprimeren';
 $labels['empty'] = 'Legen';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Gebruikte schijfruimte';
 $labels['unknown']  = 'onbekend';
 $labels['unlimited']  = 'onbeperkt';
@@ -176,12 +169,8 @@
 $labels['resetsearch']  = 'Zoek opnieuw';
 $labels['searchmod']  = 'Zoekopties';
 $labels['msgtext']  = 'Volledig bericht';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Als nieuw bewerken';
 $labels['send']           = 'Verzenden';
 $labels['sendmessage']    = 'Bericht verzenden';
@@ -215,7 +204,6 @@
 $labels['isdraft']    = 'Dit is een concept bericht.';
 $labels['andnmore']   = '$nr meer...';
 $labels['togglemoreheaders'] = 'Toon meer berichthoofden';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Platte tekst';
 $labels['savesentmessagein'] = 'Bewaar verzonden bericht in';
@@ -232,97 +220,37 @@
 $labels['name']         = 'Naam';
 $labels['firstname']    = 'Voornaam';
 $labels['surname']      = 'Achternaam';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'E-mailadres';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Geselecteerde contactpersoon toevoegen';
 $labels['editcontact'] = 'Contactpersoon bewerken';
 $labels['contacts'] = 'Contactpersonen';
 $labels['contactproperties'] = 'Eigenschappen van contactpersoon';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'Bewerken';
 $labels['cancel'] = 'Annuleren';
 $labels['save']   = 'Opslaan';
 $labels['delete'] = 'Verwijderen';
 $labels['rename'] = 'Hernoemen';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'Contactpersoon toevoegen';
 $labels['deletecontact']  = 'Verwijder geselecteerde contactpersonen';
 $labels['composeto']      = 'Mail sturen aan';
 $labels['contactsfromto'] = 'Contactpersonen $from - $to van $count';
 $labels['print']          = 'Afdrukken';
 $labels['export']         = 'Exporteren';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Exporteer contactpersonen in vCard formaat';
 $labels['newcontactgroup'] = 'Maak een nieuwe contactgroep';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'Toon vorige';
 $labels['firstpage']      = 'Toon eerste';
 $labels['nextpage']       = 'Toon volgende';
 $labels['lastpage']       = 'Toon laatste';
 $labels['group'] = 'Groep';
 $labels['groups'] = 'Groepen';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Personlijke adressen';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
 $labels['import'] = 'Importeer';
 $labels['importcontacts'] = 'Contactpersonen importeren';
 $labels['importfromfile'] = 'Importeer van bestand:';
-$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Vervang het complete adresboek';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Klaar';
 $labels['settingsfor'] = 'Instellingen voor';
-$labels['about'] = 'About';
 $labels['preferences'] = 'Voorkeuren';
 $labels['userpreferences'] = 'Gebruikersvoorkeuren';
 $labels['editpreferences'] = 'Gebruikersvoorkeuren bewerken';
@@ -334,10 +262,6 @@
 $labels['preferhtml'] = 'Gebruik HTML-opmaak';
 $labels['defaultcharset'] = 'Standaard karakterset';
 $labels['htmlmessage'] = 'HTML-bericht';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Uitgebreide datumweergave';
 $labels['setdefault']  = 'Als standaard instellen';
 $labels['autodetect']  = 'Automatisch';
@@ -346,13 +270,9 @@
 $labels['pagesize']  = 'Berichten per pagina';
 $labels['signature'] = 'Handtekening';
 $labels['dstactive']  = 'Zomer/wintertijd';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML berichten opmaken';
 $labels['htmlonreply'] = 'enkel bij beantwoorden van een HTML bericht';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML handtekening';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Toon voorbeeldvenster';
 $labels['skin'] = 'Opmaakprofiel';
 $labels['logoutclear'] = 'Prullenbak legen bij uitloggen';
@@ -370,14 +290,12 @@
 $labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren';
 $labels['skipdeleted'] = 'Verwijderde berichten niet tonen';
 $labels['deletealways'] = 'Verwijder bericht wanneer verplaatsen naar Prullenbak mislukt';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Geef externe toegevoegde berichten weer';
 $labels['fromknownsenders'] = 'Van bekende afzenders';
 $labels['always'] = 'altijd';
 $labels['showinlineimages'] = 'Toon bijgevoegde afbeeldingen onder het bericht';
 $labels['autosavedraft']  = 'Automatisch als concept opslaan';
 $labels['everynminutes']  = 'elke $n minuten';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'nooit';
 $labels['immediately']  = 'onmiddellijk';
 $labels['messagesdisplaying'] = 'Berichten weergave';
@@ -391,15 +309,12 @@
 $labels['focusonnewmessage'] = 'Focus browserscherm bij nieuw bericht';
 $labels['checkallfolders'] = 'Controleer alle mappen op nieuwe berichten';
 $labels['displaynext'] = 'Na verplaatsen/verwijderen het volgende bericht tonen';
-$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Hoofdopties';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Sectie';
 $labels['maintenance'] = 'Onderhoud';
 $labels['newmessage'] = 'Nieuw bericht';
 $labels['signatureoptions'] = 'Opties voor handtekening';
 $labels['whenreplying'] = 'Bij beantwoorden';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'begin bericht boven het origineel';
 $labels['replybottomposting'] = 'begin bericht onder het origineel';
 $labels['replyremovesignature'] = 'Verwijder handtekening uit het origneel bij beantwoorden';
@@ -412,20 +327,6 @@
 $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
 $labels['reqdsn'] = 'Vraag altijd een Delivery Status Notification';
 $labels['replysamefolder'] = 'Plaats antwoorden in de map van het beantwoorde bericht';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Map';
 $labels['folders']  = 'Mappen';
 $labels['foldername']  = 'Naam';
@@ -442,20 +343,9 @@
 $labels['info'] = 'Informatie';
 $labels['getfoldersize'] = 'Klik voor de grootte van de map';
 $labels['changesubscription'] = 'Klik voor abonnement te wijzigen';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'Sorteren op';
 $labels['sortasc']  = 'Oplopend sorteren';
 $labels['sortdesc'] = 'Aflopend sorteren';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index a7fe310..a90e250 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Er is een fout opgetreden!';
 $messages['loginfailed']  = 'Aanmelden mislukt...';
 $messages['cookiesdisabled'] = 'Uw browser accepteert geen cookies...';
@@ -27,8 +26,6 @@
 $messages['requesttimedout'] = 'Aanvraag verlopen';
 $messages['errorreadonly'] = 'Kon opdracht niet uitvoeren. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Kon opdracht niet uitvoeren. Toegang geweigerd.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
 $messages['invalidhost'] = 'Ongeldige server.';
 $messages['nomessagesfound'] = 'Er zijn geen berichten in deze map...';
@@ -55,8 +52,6 @@
 $messages['contactsearchonly'] = 'Voer enkele zoektermen in om de contactpersonen te zoeken.';
 $messages['sendingfailed'] = 'Kon het bericht niet versturen...';
 $messages['senttooquickly'] = 'U moet $sec second(en) wachten om het bericht te versturen.';
-$messages['errorsavingsent'] = 'Er is een fout opgetreden tijdens het opslaan van het verzonden bericht.';
-$messages['errorsaving'] = 'Er is een fout opgetreden bij het opslaan van het bericht...';
 $messages['errormoving'] = 'Kon de bericht(en) niet verplaatsen...';
 $messages['errorcopying'] = 'Kon de bericht(en) niet kopiëren';
 $messages['errordeleting'] = 'Kon de bericht(en) niet verwijderen...';
@@ -100,16 +95,11 @@
 $messages['messageopenerror'] = 'Kon het bericht niet ophalen van de server.';
 $messages['fileuploaderror'] = 'Bestandsupload mislukt.';
 $messages['filesizeerror'] = 'Het bestand overschrijdt de maximum grootte van $size.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Het adres kan niet worden opgeslagen.';
 $messages['errorsavingcontact'] = 'Kon de contactpersoon niet bewaren.';
 $messages['movingmessage'] = 'Bericht wordt verplaatst...';
 $messages['copyingmessage'] = 'Bericht wordt gekopieerd...';
 $messages['copyingcontact'] = 'Kopiëren contactpersonen...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Bericht wordt verwijderd...';
 $messages['markingmessage'] = 'Bericht wordt gemarkeerd...';
 $messages['addingmember'] = 'Contactpersonen worden toegevoegd aan de groep...';
@@ -128,8 +118,6 @@
 $messages['importformaterror'] = 'Importeren mislukt! Het geüploade bestand is geen importeerbaar bestand.';
 $messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol geïmporteerd</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestaande contactpersonen overgeslagen</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Deze actie is niet toegestaan!';
 $messages['nofromaddress'] = 'De geselecteerde identiteit bevat geen emailadres.';
 $messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet u zeker dat u verder wilt gaan?';
@@ -143,7 +131,6 @@
 $messages['emailformaterror'] = 'Ongeldig e-mailadres: $email';
 $messages['toomanyrecipients'] = 'Te veel geadresseerden. Verminder de hoeveelheid geadresseerden tot $max.';
 $messages['maxgroupmembersreached'] = 'Het aantal leden van de groep groter is dan de maximale van $max.';
-$messages['internalerror'] = 'Er is een interne fout opgetreden. Probeer het nogmaals.';
 $messages['contactdelerror'] = 'Kon contactpersoon niet verwijderen.';
 $messages['contactdeleted'] = 'Contactpersoon succesvol verwijderd.';
 $messages['contactrestoreerror'] = 'Verwijderde contactpersonen konden niet hersteld worden.';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 0f36b11..f0e4a74 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Welkom bij $product';
 $labels['username']  = 'Gebruikersnaam';
 $labels['password']  = 'Wachtwoord';
@@ -178,6 +176,7 @@
 $labels['msgtext']  = 'Gehele bericht';
 $labels['body']  = 'Inhoud';
 $labels['type'] = 'Type';
+$labels['namex'] = 'Naam';
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
 $labels['changeformattext'] = 'Weergeven als platte tekst';
@@ -317,8 +316,11 @@
 $labels['import'] = 'Importeren';
 $labels['importcontacts'] = 'Contactpersonen importeren';
 $labels['importfromfile'] = 'Importeer van bestand:';
-$labels['importtarget'] = 'Voeg nieuwe contactpersonen toe aan adresboek:';
+$labels['importtarget'] = 'Contacten toevoegen aan';
 $labels['importreplace'] = 'Vervang het complete adresboek';
+$labels['importgroups'] = 'Importeer groepstoewijzingen';
+$labels['importgroupsall'] = 'Allemaal (maak groepen aan indien nodig)';
+$labels['importgroupsexisting'] = 'Alleen voor bestaande groepen';
 $labels['importdesc'] = 'U kunt contactpersonen uploaden van een bestaand adresboek<br/>Momenteel wordt het importeren van adresboeken in <a href="http://en.wikipedia.org/wiki/VCard">vCard-formaat</a> of CSV-formaat (kommagescheiden tekstbestand) ondersteund.';
 $labels['done'] = 'Klaar';
 $labels['settingsfor'] = 'Instellingen voor';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index e31dc01..22f9e0f 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Er is een fout opgetreden!';
 $messages['loginfailed']  = 'Aanmelden mislukt.';
 $messages['cookiesdisabled'] = 'Uw browser accepteert geen cookies.';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index 830ed98..eae5fc6 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Velkomen til $product';
 $labels['username']  = 'Brukarnamn';
 $labels['password']  = 'Passord';
@@ -31,7 +29,6 @@
 $labels['sent']   = 'Sendt';
 $labels['trash']  = 'Sletta';
 $labels['junk']   = 'Søppel';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Emne';
 $labels['from']    = 'Frå';
 $labels['sender']  = 'Avsendar';
@@ -55,7 +52,6 @@
 $labels['move']     = 'Flytt';
 $labels['moveto']   = 'flytt til …';
 $labels['download'] = 'Last ned';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
 $labels['filename'] = 'Filnamn';
@@ -139,7 +135,6 @@
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagga';
 $labels['unanswered'] = 'Ikkje svara';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Sletta';
 $labels['undeleted'] = 'Ikkje sletta';
 $labels['invert'] = 'Inverter';
@@ -168,7 +163,6 @@
 $labels['folderactions'] = 'Mappehandlingar';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Tom';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Plassbruk';
 $labels['unknown']  = 'ukjend';
 $labels['unlimited']  = 'ubegrensa';
@@ -177,11 +171,8 @@
 $labels['searchmod']  = 'Søkeutsagn';
 $labels['msgtext']  = 'Heile eposten';
 $labels['body']  = 'Meldingstekst';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Opna i nytt vindauga';
 $labels['emlsave'] = 'Last ned (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Rediger som ny';
 $labels['send']           = 'Send';
 $labels['sendmessage']    = 'Send meldinga no';
@@ -310,14 +301,12 @@
 $labels['lastpage']       = 'Siste side';
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppar';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Personlege adresser';
 $labels['searchsave'] = 'Lagre søk';
 $labels['searchdelete'] = 'Slett søk';
 $labels['import'] = 'Importer';
 $labels['importcontacts'] = 'Importer kontaktar';
 $labels['importfromfile'] = 'Importer frå fil:';
-$labels['importtarget'] = 'Legg til kontakter i adresseboka';
 $labels['importreplace'] = 'Byt ut heile adresseboka';
 $labels['importdesc'] = 'Du kan laste opp kontaktar frå ei eksisterande adressebok.<br/>Vi støttar adressebøker i formata <a href="http://no.wikipedia.org/wiki/VCard">vCard</a> og CSV (kommaseparert).';
 $labels['done'] = 'Ferdig';
@@ -352,7 +341,6 @@
 $labels['htmlonreply'] = 'ved svar på HTML-melding';
 $labels['htmlonreplyandforward'] = 'ved vidaresending av eller svar på HTML-melding';
 $labels['htmlsignature'] = 'HTML-signatur';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Vis førehandsvisningsboks';
 $labels['skin'] = 'Bunad';
 $labels['logoutclear'] = 'Fjern alt i «sletta element» ved utlogging';
@@ -422,7 +410,6 @@
 $labels['spellcheckignorecaps'] = 'Ignorer ord med berre store bokstavar';
 $labels['addtodict'] = 'Legg til i ordliste';
 $labels['mailtoprotohandler'] = 'Registrer protokollhandsaming for mailto-lenkjer';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Meldingar vidaresendast';
 $labels['inline'] = 'i teksten';
 $labels['asattachment'] = 'som vedlegg';
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index 409b6f4..5c8386c 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Noko gjekk feil.';
 $messages['loginfailed']  = 'Feil ved innlogging.';
 $messages['cookiesdisabled'] = 'Nettlesaren din tillet ikkje informasjonskapslar (cookies).';
@@ -27,8 +26,6 @@
 $messages['requesttimedout'] = 'Førespurnaden fekk tidsavbrot';
 $messages['errorreadonly'] = 'Klarte ikkje utføra handlinga. Mappa kan berre lesast.';
 $messages['errornoperm'] = 'Klarte ikkje utføra handlinga. Nekta tilgang.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Eg forstår ingen ting! Ingen data lagra.';
 $messages['invalidhost'] = 'Ugyldig tenarnamn.';
 $messages['nomessagesfound'] = 'Ingen meldingar i denne postkassa.';
@@ -55,8 +52,6 @@
 $messages['contactsearchonly'] = 'Skriv søkeord for å finna kontaktar';
 $messages['sendingfailed'] = 'Klarte ikkje senda meldinga.';
 $messages['senttooquickly'] = 'Du må venta $sec sekund for å senda meldinga.';
-$messages['errorsavingsent'] = 'Klarte ikkje lagra den sende meldinga.';
-$messages['errorsaving'] = 'Det skjedde ein feil ved lagring.';
 $messages['errormoving'] = 'Klarte ikkje flytte meldinga(r).';
 $messages['errorcopying'] = 'Klarte ikkje kopiera meldinga(r).';
 $messages['errordeleting'] = 'Klarte ikkje sletta meldinga(r).';
@@ -100,16 +95,11 @@
 $messages['messageopenerror'] = 'Klarte ikkje lasta meldinga frå tenaren.';
 $messages['fileuploaderror'] = 'Filopplasting feila.';
 $messages['filesizeerror'] = 'Fila du lasta opp, er større enn største tillatne filstorleik, $size.';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Denne adressekjelda er berre lesbar.';
 $messages['errorsavingcontact'] = 'Klarte ikkje lagra kontaktadressa.';
 $messages['movingmessage'] = 'Flyttar melding(ar) …';
 $messages['copyingmessage'] = 'Kopierer melding(ar) …';
 $messages['copyingcontact'] = 'Kopierer kontakt(ar) …';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Slettar melding(ar) …';
 $messages['markingmessage'] = 'Merkar melding(ar) …';
 $messages['addingmember'] = 'Legg til kontakt(ar) i gruppa …';
@@ -128,8 +118,6 @@
 $messages['importformaterror'] = 'Importering feila. Den opplasta fila er i feil format.';
 $messages['importconfirm'] = '<b>Importerte $inserted kontaktar</b>';
 $messages['importconfirmskipped'] = '<b>Hoppa over $skipped oppføringar som fanst frå før</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Ulovleg operasjon.';
 $messages['nofromaddress'] = 'Manglar e-postadresse i denne identiteten.';
 $messages['editorwarning'] = 'Å byta til rein tekst vil fjerna all tekstformateringa. Vil du halda fram?';
@@ -143,7 +131,6 @@
 $messages['emailformaterror'] = 'Ugyldig e-postadresse: $email';
 $messages['toomanyrecipients'] = 'For mange mottakarar. Senk talet til $max.';
 $messages['maxgroupmembersreached'] = 'Ei gruppe kan ikkje ha fleire enn $max medlemmer.';
-$messages['internalerror'] = 'Intern feil. Prøv igjen.';
 $messages['contactdelerror'] = 'Klarte ikkje sletta kontakt(ar).';
 $messages['contactdeleted'] = 'Kontakt(ar) sletta utan feil.';
 $messages['contactrestoreerror'] = 'Klarte ikkje gjenoppretta kontakt(ar).';
diff --git a/program/localization/pl_PL/csv2vcard.inc b/program/localization/pl_PL/csv2vcard.inc
index 52a77bf..c6c5be4 100644
--- a/program/localization/pl_PL/csv2vcard.inc
+++ b/program/localization/pl_PL/csv2vcard.inc
@@ -15,7 +15,6 @@
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
-
 $map = array();
 $map['anniversary'] = "Rocznica";
 $map['assistants_name'] = "Asystent";
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index af2c972..4c13fb7 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Witamy w $product';
 $labels['username']  = 'Nazwa';
 $labels['password']  = 'Hasło';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'Parametry wyszukiwania';
 $labels['msgtext']  = 'Cała wiadomość';
 $labels['body']  = 'Treść';
-$labels['type'] = 'Type';
+$labels['type'] = 'Typ';
+$labels['namex'] = 'Nazwa';
 $labels['openinextwin'] = 'Otwórz w nowym oknie';
 $labels['emlsave'] = 'Pobierz (.eml)';
 $labels['changeformattext'] = 'Wyświetl w formacie tekstowym';
@@ -317,8 +316,11 @@
 $labels['import'] = 'Importuj';
 $labels['importcontacts'] = 'Import kontaktów';
 $labels['importfromfile'] = 'Import z pliku:';
-$labels['importtarget'] = 'Dodaj nowe kontakty do książki adresowej:';
+$labels['importtarget'] = 'Dodaj kontakty do';
 $labels['importreplace'] = 'Zastąp całą książkę adresową';
+$labels['importgroups'] = 'Importuj powiązania z grupami';
+$labels['importgroupsall'] = 'Wszystkie (utwórz grupy jeśli potrzeba)';
+$labels['importgroupsexisting'] = 'Tylko do isniejących grup';
 $labels['importdesc'] = 'Import kontaktów z isniejącej książki adresowej.<br/>Obecnie obsługiwany jest import w formacie <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> lub CSV (pola oddzielone przecinkiem).';
 $labels['done'] = 'Wykonane';
 $labels['settingsfor'] = 'Ustawienia dla';
@@ -360,7 +362,7 @@
 $labels['uisettings'] = 'Interfejs użytkownika';
 $labels['serversettings'] = 'Ustawienia serwera';
 $labels['mailboxview'] = 'Widok skrzynki pocztowej';
-$labels['mdnrequests'] = 'Na żadanie potwierdzenia odbioru';
+$labels['mdnrequests'] = 'Na żądanie potwierdzenia odbioru';
 $labels['askuser'] = 'pytaj mnie';
 $labels['autosend'] = 'wyślij potwierdzenie';
 $labels['autosendknown'] = 'wyślij potwierdzenie tylko do moich kontaktów, pytaj o pozostałe';
@@ -387,7 +389,7 @@
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'RFC 2047 (przestarzałe)';
 $labels['force7bit'] = 'Używaj kodowania MIME dla znaków 8-bitowych';
-$labels['advancedoptions'] = 'opcje zaawansowane';
+$labels['advancedoptions'] = 'Opcje zaawansowane';
 $labels['focusonnewmessage'] = 'Informuj przeglądarkę o nowej wiadomości';
 $labels['checkallfolders'] = 'Sprawdzaj czy nadeszły nowe wiadomości we wszystkich folderach';
 $labels['displaynext'] = 'Po usunięciu/przeniesieniu wiadomości wyświetl następną';
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index d6e4ea0..0ad357b 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Wystąpił błąd!';
 $messages['loginfailed']  = 'Błąd logowania!';
 $messages['cookiesdisabled'] = 'Twoja przeglądarka nie obsługuje ciasteczek!';
@@ -100,13 +99,16 @@
 $messages['messageopenerror'] = 'Nie można załadować wiadomości z serwera.';
 $messages['fileuploaderror'] = 'Załączanie pliku nie powiodło się.';
 $messages['filesizeerror'] = 'Plik przekracza maksymalną wielkość $size.';
-$messages['copysuccess'] = 'Pomyślnie skopiowano następującą liczbę adresów: $nr.';
-$messages['copyerror'] = 'Nie można skopiować żadnego adresu.';
+$messages['copysuccess'] = 'Pomyślnie skopiowano $nr kontaktów.';
+$messages['movesuccess'] = 'Pomyślnie przeniesiono $nr kontaktów.';
+$messages['copyerror'] = 'Nie udało się skopiować żadnego kontaktu.';
+$messages['moveerror'] = 'Nie udało się przenieść żadnego kontaktu.';
 $messages['sourceisreadonly'] = 'Źródło adresu jest tylko do odczytu.';
 $messages['errorsavingcontact'] = 'Nie można było zapisać adresu kontaktu.';
 $messages['movingmessage'] = 'Przenoszenie wiadomości...';
 $messages['copyingmessage'] = 'Kopiowanie wiadomości...';
 $messages['copyingcontact'] = 'Kopiowanie kontaktów...';
+$messages['movingcontact'] = 'Przenoszenie kontaktów...';
 $messages['deletingmessage'] = 'Usuwanie wiadomości...';
 $messages['markingmessage'] = 'Oznaczanie wiadomości...';
 $messages['addingmember'] = 'Dodawanie kontaktów do grupy...';
@@ -166,6 +168,6 @@
 $messages['mispellingsfound'] = 'Wykryto błędy pisowni w tej wiadomości.';
 $messages['parentnotwritable'] = 'Nie można utworzyć/przenieść folderu w wybrane miejsce. Brak upranień.';
 $messages['messagetoobig'] = 'Ta część wiadomości jest zbyt duża aby ją przetworzyć.';
-$messages['attachmentvalidationerror'] = 'UWAGA! Ten załącznik jest podejrzany ponieważ jego typ nie jest zgodny z typem zadeklarownym w wiadomości. Jeśli nie ufasz temu nadawcy nie powinieneś otwierać go w przeglądarce, bo może zawierać złośliwe oprogramowanie.<br/><br/><em>Spodziwany: $expected; znaleziono: $detected</em>';
+$messages['attachmentvalidationerror'] = 'UWAGA! Ten załącznik jest podejrzany ponieważ jego typ nie jest zgodny z typem zadeklarownym w wiadomości. Jeśli nie ufasz temu nadawcy nie powinieneś otwierać go w przeglądarce, gdyż może zawierać złośliwe oprogramowanie.<br/><br/><em>Zadeklarowany: $expected; wykryty: $detected</em>';
 $messages['noscriptwarning'] = 'Uwaga: Usługa wymaga Javascriptu! Aby z niej skorzystać proszę włączyć obsługę języka Javascript w ustawieniach przeglądarki.';
 ?>
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index ed993cb..9b4c8d8 100644
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '$product ته ښه راغلاست';
 $labels['username']  = 'کارن نوم';
 $labels['password']  = 'پټنوم';
@@ -31,33 +29,22 @@
 $labels['sent']   = 'لېږل شوي ليکونه';
 $labels['trash']  = 'کثافت دانۍ';
 $labels['junk']   = 'جنک';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'مضمون';
 $labels['from']    = 'استوونکی';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'ترلاسه کوونکی';
 $labels['cc']      = 'لمېسل';
 $labels['bcc']     = 'پټليکی';
 $labels['replyto'] = 'ځوابول';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'نېټه';
 $labels['size']    = 'کچه';
 $labels['priority'] = 'لومړيتوب';
 $labels['organization'] = 'ټولنه';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'پوښۍ';
 $labels['messagesfromto'] = 'له ټاکلي استوزو څخه ټاکلي شمېرل شوو استوزو ته';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'له $nr ځخه استوزو $count استوزو ته';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'لمېسل';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'ته خوځوي';
 $labels['download'] = 'ښکته کول';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'فايل نوم';
 $labels['filesize'] = 'فايل کچه';
 $labels['addtoaddressbook'] = 'د پتو کتاب ته يې ورزيات کړئ';
@@ -100,18 +87,11 @@
 $labels['longnov']	= 'نومبر';
 $labels['longdec']	= 'ډسمبر';
 $labels['today'] = 'نن';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'نوي استوزي وګوره';
 $labels['compose']          = 'استوزه وليکه';
 $labels['writenewmessage']  = 'نوي استوزي جوړول';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'استوونکي ته ځواب ورکړئ';
 $labels['replytoallmessage'] = 'استوونکي او ټولو ترلاسه کوونکو ته ځواب لېږل';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'استوزه بل ته استول';
 $labels['deletemessage']    = 'استوزه ړنګول';
 $labels['movemessagetotrash'] = 'استوزه کثافت داني ته واستوه';
@@ -122,88 +102,39 @@
 $labels['lastmessage']      = 'پای /آخري استوزه وښيه';
 $labels['backtolist']       = 'بيرته د استوزو لست ته';
 $labels['viewsource']       = 'سرچينه وښيه';
-$labels['mark']             = 'Mark';
 $labels['markmessages']     = 'استوزي په نښه کړئ';
 $labels['markread']         = 'لوستل شوي په توګه';
 $labels['markunread']       = 'د نالوستل شوي په توګه';
 $labels['markflagged']      = 'د بي کاره په توګه';
 $labels['markunflagged']    = 'د کارونې په توګه';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'ټاکل';
 $labels['all'] = 'ټول';
 $labels['none'] = 'هېڅ';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'نالوستي';
 $labels['flagged'] = 'بې کاره';
 $labels['unanswered'] = 'ناځواب شوي';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
 $labels['filter'] = 'چڼول';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'هېڅ';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'کېښکلی';
 $labels['empty'] = 'تش';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'ټيکلي لارښود';
 $labels['unknown']  = 'نامعلوم';
 $labels['unlimited']  = 'بي کچه';
 $labels['quicksearch']  = 'ژر پلټنه';
 $labels['resetsearch']  = 'د پلټنې بياسمون';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'په نوي کړکۍ کې پرانيزه';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'اوس يې واستوه';
 $labels['savemessage']    = 'دا ګارليک خوندي کړه';
 $labels['addattachment']  = 'يو فايل ونښلوه';
 $labels['charset']        = 'چيرست';
 $labels['editortype']     = 'د ټايب سمونګر';
 $labels['returnreceipt']  = 'د رسليک راګرځېدل';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ليکدود کتنه';
 $labels['resumeediting'] = 'کارمخينې سمونه';
 $labels['revertto']      = 'ته بېرته اړول';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'نښلني';
 $labels['upload'] = 'پورته کول';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'بندول';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'ټيټ';
 $labels['lowest']  = 'خورا ټيټ';
 $labels['normal']  = 'نورمال';
@@ -212,10 +143,6 @@
 $labels['nosubject']  = 'هېڅ موضوع';
 $labels['showimages'] = 'انځورونه وښيه';
 $labels['alwaysshow'] = 'تل له $استوونکي څخه انځورونه وښيه';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'ايچ ټی ايمل ال';
 $labels['plaintoggle'] = 'ساده متن';
 $labels['savesentmessagein'] = 'استول شوي استوزه په خوندي کړه';
@@ -224,7 +151,6 @@
 $labels['addcc'] = 'څرګندليک';
 $labels['addbcc'] = 'پټليک';
 $labels['addreplyto'] = 'ته ورزيات کړه';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'ددې استوزي استوونکی پوښتي چېد استوزي لوستلو سره سم تاسې خبر کړي،.    غواړئ چې استوونکی خبرشي؟';
 $labels['receiptread'] = 'رسليک راګرځېدل (لوستل';
 $labels['yourmessage'] = 'دا رسليک راګرځېدل ستاسې استوزي لپاره دی';
@@ -232,97 +158,32 @@
 $labels['name']         = 'نوم ښوونه';
 $labels['firstname']    = 'نوم';
 $labels['surname']      = 'کورنی نوم';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'برېښناليک';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'نوی اړيکلوری ورزيات کړه';
 $labels['editcontact'] = 'اړيکلوري سمون';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'سمون';
 $labels['cancel'] = 'لري کول';
 $labels['save']   = 'ساتل';
 $labels['delete'] = 'ړنګول';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'نوي اړيکلوري کارټ جوړ کړه';
 $labels['deletecontact']  = 'ټاکل شوي اړيکلوري ړنګ کړه';
 $labels['composeto']      = 'ته ليک وليکه';
 $labels['contactsfromto'] = 'له دومره اړيکلورو څخه دومره شمېرل شوي Contacts $from to $to of $count';
 $labels['print']          = 'چاپ';
 $labels['export']         = 'بهرول';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'اړيکلوري د ويکارډ په بڼه واستوئ';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'پخوانی غونډ وښيه';
 $labels['firstpage']      = 'لومړی غونډ وښيه';
 $labels['nextpage']       = 'ورپسې غونډ وښيه';
 $labels['lastpage']       = 'پای غونډ وښيه';
-$labels['group'] = 'Group';
 $labels['groups'] = 'ډلې';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'ځاني پتې';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
 $labels['import'] = 'رانقلول';
 $labels['importcontacts'] = 'اړيکلوري نقل کړئ';
 $labels['importfromfile'] = 'له فايل څخه رانقل کړئ';
-$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'ټول ادرس کتاب بدل کړئ';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'ترسره شو';
 $labels['settingsfor'] = 'لپاره برابرونې';
-$labels['about'] = 'About';
 $labels['preferences'] = 'غورونې';
 $labels['userpreferences'] = 'کارن غورونې';
 $labels['editpreferences'] = 'د کارن غورونو سمون';
@@ -332,12 +193,7 @@
 $labels['newitem'] = 'نوی توک';
 $labels['edititem'] = 'توک سمون';
 $labels['preferhtml'] = 'ايچ ټي ام ايل ښوون';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ايچ ټي ام ايل استوزه';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'په زړه پورې نېټې';
 $labels['setdefault']  = 'تلوالي برابرول';
 $labels['autodetect']  = 'په خپلواکه توګه';
@@ -346,13 +202,8 @@
 $labels['pagesize']  = 'په هر مخ پرتې کښې';
 $labels['signature'] = 'لاسليک';
 $labels['dstactive']  = 'ورځنيو کارونو لنډيز ساتل';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'ايچ ټي‌ام ايل استوزي وليکه';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ايچ ټي ام ايل لاسليک';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'پخوانی چوکاټ وښييه';
 $labels['skin'] = 'انټرفيس بڼه';
 $labels['logoutclear'] = 'کثافت داني د وتنې په وخت کې پاکه کړه';
@@ -363,69 +214,26 @@
 $labels['mdnrequests'] = 'د استوونکي خبرتياوې';
 $labels['askuser'] = 'له کاروونکي څخه وپوښته';
 $labels['autosend'] = 'په خپلواکه توګه واستوه';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'لرې کړه';
 $labels['readwhendeleted'] = 'په ړنګ شوو کې استوزي د لوستل شوي  په توګه په نښه کړه';
 $labels['flagfordeletion'] = 'استوزه د ړنګ شوي پرځای بېکاره کړه';
 $labels['skipdeleted'] = 'ړنګ شوي استوزي مه ښکاره کوه';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'انځورونه له لري په ليکه کې ښکاره کړه';
 $labels['fromknownsenders'] = 'له اشنا استوونکو څخه';
 $labels['always'] = 'تل';
 $labels['showinlineimages'] = 'نښلول شوي انځورونه تر استوزې لاندې ښکاره کړه';
 $labels['autosavedraft']  = 'بارليک په خپل سري توګه  خوندي‌کړه';
 $labels['everynminutes']  = 'هر ه ګڼه په دقيقو کې';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'هېڅ';
-$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'استوزي ښيي';
 $labels['messagescomposition'] = 'استوزي ليکي';
 $labels['mimeparamfolding'] = 'د نښلول شوو نومونه';
 $labels['2231folding'] = 'بشپړ RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (نور)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'پرمختللي لارې';
 $labels['focusonnewmessage'] = 'فوکاس براوسر کړکۍ په نوي استوزي کې';
 $labels['checkallfolders'] = 'په ټولو پوښيو کې نوي استوزي وګورئ';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'پوښۍ';
 $labels['folders']  = 'پوښۍ';
 $labels['foldername']  = 'پوښۍ نوم';
@@ -435,47 +243,11 @@
 $labels['createfolder']  = 'نوې پوښۍ جوړ کړه';
 $labels['managefolders']  = 'پوښيو څارل';
 $labels['specialfolders'] = 'ځانګړي پوښۍۍ';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'اڼل';
 $labels['sortasc']  = 'له پورته نه ښکته خوا ته برابرول';
 $labels['sortdesc'] = 'له ښکته نه پورته خوا ته برابرول';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
 $labels['B'] = 'بي';
 $labels['KB'] = 'کي بي';
 $labels['MB'] = 'ام بي';
 $labels['GB'] = 'جي بي';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/ps/messages.inc b/program/localization/ps/messages.inc
index f4f966c..a900d32 100644
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -15,29 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'ننوتنه په بري سره ترسره نه شوه';
 $messages['cookiesdisabled'] = 'ستاسو لټوني ککوړي ونه منل';
 $messages['sessionerror'] = 'ستاسې ناسته ناباوري يا له مينځه تللې ده';
 $messages['storageerror'] = 'له ای ميپ سرور سره پيوستون په بري سره ترسره نه شو';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ليکبکس کې هېڅ استوزي ونه مونده';
 $messages['loggedout'] = 'تاسې له ناستې څخه په بشپړه توګه وويستل شوئ الله په امان';
 $messages['mailboxempty'] = 'ليکبکس تش دی';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'د کار په حال کې';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'اومتوک د کار په حال کې';
 $messages['checkingmail'] = 'نوي استوزي ګوري';
 $messages['sendingmessage'] = 'استوزه استوي.';
@@ -47,31 +32,20 @@
 $messages['successfullysaved'] = 'په بري‌سره خوندي شوه';
 $messages['addedsuccessfully'] = 'اړيکلوری په بري سره پتې کتاب ته ور زيات شو';
 $messages['contactexists'] = 'يو اړيکلوری له دې برېښناليک پتې سره شتون لري';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'ستاسو د پټتيآ خوندي کېدو لپاره ، له لري انځورنه په دې استوزي‌کې بند کړئ';
 $messages['encryptedmessage'] = 'دا يوه پټه استوزه ده او نه څرګندېږي. بښنه غواړو';
 $messages['nocontactsfound'] = 'هېڅ اړيکلوری يې ونه موند';
 $messages['contactnotfound'] = 'وړاندی شوی اړيکلوری ونه مونده';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'استوزي استونه په بري سره پای ته ونه رسېده';
 $messages['senttooquickly'] = 'مهرباني وکړئ $صبر وکړئ د دې استوزې له لېږلو مخکې';
-$messages['errorsavingsent'] = 'دخوندي کولو او لېږلو پر  مهال يوه تيروتنه رامنځ ته شوه';
-$messages['errorsaving'] = 'دخوندي کولو پر  مهال يوه تيروتنه رامنځ ته شوه';
 $messages['errormoving'] = 'استوزه ونه خوځول شوه';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'استوزه ړنګه نه شوه';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'په رښتيا سره غواړئ چې ټاکل شوی اړيکلوری ړنګ کړئ؟';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'په رښتيا سره غواړئ چې ټاکل شوي استوزي‌ړنګ کړئ؟';
 $messages['deletefolderconfirm']  = 'په رښتيآ سره غواړئ چې دا پوښۍ ړنګه کړئ؟';
 $messages['purgefolderconfirm']  = 'په رښتيا سره غواړئ چې ددې پوښۍ ټول استوزي‌ړنګ کړئ؟';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'پوښۍ ړنګوي';
 $messages['foldermoving'] = 'پوښۍ خوځوي';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'دا پورمه بشپړه ډکه شوې نه ده';
 $messages['noemailwarning'] = 'مهرباني وکړئ د يوه شته برېښناليک پته ورځای کړئ';
 $messages['nonamewarning']  = 'مهرباني‌وکړئ يو نوم وليکئ';
@@ -83,92 +57,29 @@
 $messages['notsentwarning'] = 'استوزه نه ده لېږل شوې. غواړئ چې استوزه مو لرې وغورځوئ';
 $messages['noldapserver'] = 'مهرباني وکړئ يو ال ډپ سرور د پلټلو لپاره وټاکئ';
 $messages['nosearchname'] = 'مهرباني وکړئ  د يو اړيکلوري‌نوم يا برېښناليک پته وليکئ';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'استوزي ومونده$';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'د پلټلو بيا راګرځېدل هېڅ سمون ونه خوړه';
 $messages['searching'] = 'پلټي';
 $messages['checking'] = 'ګوري';
 $messages['nospellerrors'] = 'هېڅ ليکدودي‌تيروتنه ونه مونده';
 $messages['folderdeleted'] = 'پوښۍ په بشپړه توګه ړنګه شوه';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'په بشپړه توګه ړنګ شول';
 $messages['converting'] = 'له استوزي څخه بڼې ړنګېږي';
 $messages['messageopenerror'] = 'له سرور څخه استوزي پرمخ نه شي تلی';
 $messages['fileuploaderror'] = 'دفايل پورته کول په بري سره سرته ونه رسيده';
 $messages['filesizeerror'] = 'د پورته شوي فايل کچه بايد لږترلږه له $څخه تيری ونه کړي';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'ددې پتې يوازې سرچينه لوستل کېږي';
 $messages['errorsavingcontact'] = 'د پتې اړيکلوری يې خوندي‌نه شو کړای';
 $messages['movingmessage'] = 'استوزه خوځوي';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'يو لوستل شوی رسليک په بشپړه توګه واستول شو';
 $messages['errorsendingreceipt'] = 'رسليک يې ونه شوای ليږلی';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'تاسې نه شئ کولی چې دا پېژندنه ړنګه کړئ، داستاسو اخرنی پيژندنه ده';
 $messages['forbiddencharacter'] = 'د پوښۍ نوم له فوربايډن تورو څخه جوړ دی';
 $messages['selectimportfile'] = 'مهرباني وکړئ‌يو فايل د پورته کولو لپاره وټاکئ';
 $messages['addresswriterror'] = 'ټاکل شوی پتې کتاب د بياليکلو نه دی';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'نقلوي...صبر وکړئ';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>په بشپړه توګه نقل شو $اړيکلوري داخل شول, $شته تيرشوي انټاير څخه تيرشول</b>:<p><em>$نومونه</em></p>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'چار اجازه نه لري';
 $messages['nofromaddress'] = 'په ټاکل شوي پيژندنه کې برېښناليک پتې له لاسه ورکړي';
 $messages['editorwarning'] = 'که د متن بڼو له منځه تللو ګواښ وي نو د متن سمون پرانيزئ. غواړئ چې دوام ورکړئ';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 9235e33..13db63e 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Bem-vindo ao $product';
 $labels['username']  = 'Usuário';
 $labels['password']  = 'Senha';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 447173a..2f57823 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Ocorreu um erro!';
 $messages['loginfailed']  = 'Falha no login';
 $messages['cookiesdisabled'] = 'Seu navegador não aceita cookies';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Informe os termos de pesquisa para localizar os contatos';
 $messages['sendingfailed'] = 'Falha no envio da mensagem.';
 $messages['senttooquickly'] = 'Aguarde $sec s para enviar a mensagem.';
-$messages['errorsavingsent'] = 'Ocorreu um erro ao salvar a mensagem enviada.';
-$messages['errorsaving'] = 'Ocorreu um erro ao salvar.';
 $messages['errormoving'] = 'Não foi possível mover a(s) mensagem(ns).';
 $messages['errorcopying'] = 'Não foi possível copiar a(s) mensagem(ns).';
 $messages['errordeleting'] = 'Não foi possível apagar a(s) mensagem(ns).';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Endereço de e-mail inválido: $email';
 $messages['toomanyrecipients'] = 'Há muitos destinatários. Reduza o número de destinatários para $max.';
 $messages['maxgroupmembersreached'] = 'O número de membros do grupo excede o máximo de $max';
-$messages['internalerror'] = 'Ocorreu um erro interno. Por favor tente novamente.';
 $messages['contactdelerror'] = 'Não foi possível excluir o(s) contato(s).';
 $messages['contactdeleted'] = 'Contato(s) excluído(s) com sucesso.';
 $messages['contactrestoreerror'] = 'Não foi possivel recuperar o(s) contato(s) excluído(s).';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 137840e..b128300 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Bem-vindo ao $product';
 $labels['username']  = 'Utilizador';
 $labels['password']  = 'Palavra-passe';
@@ -177,7 +175,8 @@
 $labels['searchmod']  = 'Pesquisar em';
 $labels['msgtext']  = 'Mensagem completa';
 $labels['body']  = 'Corpo';
-$labels['type'] = 'Type';
+$labels['type'] = 'Tipo';
+$labels['namex'] = 'Nome';
 $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
 $labels['changeformattext'] = 'Mostrar em formato de texto simples';
@@ -317,8 +316,11 @@
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importação de contactos';
 $labels['importfromfile'] = 'Importar do ficheiro:';
-$labels['importtarget'] = 'Adicionar novo contacto ao livro de endereços:';
+$labels['importtarget'] = 'Adicionar contactos a';
 $labels['importreplace'] = 'Substituir todo o livro de endereços.';
+$labels['importgroups'] = 'Importar atribuições de grupo';
+$labels['importgroupsall'] = 'Todos (criar grupos se necessário)';
+$labels['importgroupsexisting'] = 'Apenas para grupos existentes';
 $labels['importdesc'] = 'Pode enviar/carregar contactos de um livro de endereços existente.<br/>Neste momento suportamos a importação nos seguintes formatos: <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (valores separados por vírgula).';
 $labels['done'] = 'Terminado';
 $labels['settingsfor'] = 'Configurações para';
@@ -361,8 +363,8 @@
 $labels['serversettings'] = 'Definições do servidor';
 $labels['mailboxview'] = 'Visualização da Caixa de Entrada';
 $labels['mdnrequests'] = 'Enviar notificações';
-$labels['askuser'] = 'perguntar ao ultilizador';
-$labels['autosend'] = 'enviar automáticamente';
+$labels['askuser'] = 'perguntar ao utilizador';
+$labels['autosend'] = 'enviar automaticamente';
 $labels['autosendknown'] = 'enviar recibo de leitura apenas para os meus contactos';
 $labels['autosendknownignore'] = 'enviar recibo para os meus contactos, caso contrário, ignorar';
 $labels['ignore'] = 'ignorar';
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index ad924d6..06e7819 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Ocorreu um erro!';
 $messages['loginfailed']  = 'O utilizador ou palavra-passe que introduziu não correspondem.';
 $messages['cookiesdisabled'] = 'O seu navegador não suporta cookies';
@@ -55,8 +54,8 @@
 $messages['contactsearchonly'] = 'Insira os termos de pesquisa para localizar os contactos';
 $messages['sendingfailed'] = 'Falha no envio da mensagem';
 $messages['senttooquickly'] = 'Por favor espere $sec seg(s) antes de enviar esta mensagem';
-$messages['errorsavingsent'] = 'Ocorreu um erro ao guardar a mensagem enviada';
-$messages['errorsaving'] = 'Ocorreu um erro ao guardar';
+$messages['errorsavingsent'] = 'Ocorreu um erro ao gravar a mensagem enviada.';
+$messages['errorsaving'] = 'Ocorreu um erro ao gravar.';
 $messages['errormoving'] = 'Não foi possível mover a mensagem';
 $messages['errorcopying'] = 'Não foi possível copiar a mensagem';
 $messages['errordeleting'] = 'Não foi possível eliminar a mensagem';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index d863017..953cfe8 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Bine aţi venit la $product';
 $labels['username']  = 'Utilizator';
 $labels['password']  = 'Parolă';
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 16eb0cd..c3e7459 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'A avut loc o EROARE!';
 $messages['loginfailed']  = 'Autentificare eşuată';
 $messages['cookiesdisabled'] = 'Browserul dumneavoastră nu acceptă cookies';
@@ -24,13 +23,13 @@
 $messages['servererror'] = 'Eroare de server!';
 $messages['servererrormsg'] = 'Eroare Server: $msg';
 $messages['dberror'] = 'Eroare bază de date!';
-$messages['requesttimedout'] = 'Timpul alocat cereri a expirat';
-$messages['errorreadonly'] = 'Nu se poate efectua operaţia. Dosarul este doar-citire.';
-$messages['errornoperm'] = 'Nu se poate efectua operaţia. Acces interzis.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
+$messages['requesttimedout'] = 'Timpul alocat cererii a expirat';
+$messages['errorreadonly'] = 'Nu se poate efectua operaţiunea. Dosarul este disponibil doar pentru citire.';
+$messages['errornoperm'] = 'Nu se poate efectua operaţiunea. Acces interzis.';
+$messages['erroroverquota'] = 'Nu se poate efectua operația. Nu există spațiu liber.';
+$messages['erroroverquotadelete'] = 'Nu există spațiu liber. Folosiți SHIFT+DEL pentru a șterge un mesaj.';
 $messages['invalidrequest'] = 'Solicitare invalidă! Datele nu au fost salvate.';
-$messages['invalidhost'] = 'Hosname invalid';
+$messages['invalidhost'] = 'Nume server invalid.';
 $messages['nomessagesfound'] = 'Nu a fost găsit nici un mesaj în această căsuţă poştală';
 $messages['loggedout'] = 'Sesiune încheiată cu succes. La revedere!';
 $messages['mailboxempty'] = 'Căsuţa poştală este goală';
@@ -39,34 +38,32 @@
 $messages['uploading'] = 'Fişierul se încarcă...';
 $messages['uploadingmany'] = 'Încarc fişierele...';
 $messages['loadingdata'] = 'Se încarcă informaţiile...';
-$messages['checkingmail'] = 'Se caută mesaje noi...';
+$messages['checkingmail'] = 'Se verifică pentru mesaje noi...';
 $messages['sendingmessage'] = 'Trimitere mesaj...';
 $messages['messagesent'] = 'Mesajul a fost trimis cu succes!';
 $messages['savingmessage'] = 'Salvare mesaj...';
 $messages['messagesaved'] = 'Mesajul a fost salvat în Ciorne';
-$messages['successfullysaved'] = 'Salvarea s-a efectuat cu succes';
+$messages['successfullysaved'] = 'Salvat cu succes.';
 $messages['addedsuccessfully'] = 'Contactul a fost adăugat cu succes în agendă';
-$messages['contactexists'] = 'Mai există un contact cu această adresă de e-mail';
+$messages['contactexists'] = 'Un contact cu această adresă de e-mail există deja.';
 $messages['contactnameexists'] = 'Există deja un contact cu acelaşi nume.';
 $messages['blockedimages'] = 'Pentru a vă proteja intimitatea, imaginile externe au fost blocate.';
 $messages['encryptedmessage'] = 'Acesta este un mesaj criptat şi nu poate fi afişat. Ne pare rău.';
 $messages['nocontactsfound'] = 'Nu s-a găsit nici un contact';
 $messages['contactnotfound'] = 'Contactul solicitat nu a fost găsit.';
-$messages['contactsearchonly'] = 'Introdu nişte termeni decăutare pentru a găsi contactele';
+$messages['contactsearchonly'] = 'Introdu nişte termeni de căutare pentru a găsi contactele';
 $messages['sendingfailed'] = 'Nu s-a reuşit trimiterea mesajului';
 $messages['senttooquickly'] = 'Vă rugăm aşteptaţi $sec sec. înainte de a trimite acest mesaj';
-$messages['errorsavingsent'] = 'A intervenit o eroare în timp ce se efectua salvarea mesajului trimis';
-$messages['errorsaving'] = 'A intervenit o eroare în timp ce se efectua salvarea';
-$messages['errormoving'] = 'Mesajul(e) nu a(u) putut fi mutat(e)';
-$messages['errorcopying'] = 'Mesajul(e) nu a(u) putut fi copiat(e)';
-$messages['errordeleting'] = 'Mesajul(e) nu a(u) putut fi şters(e)';
-$messages['errormarking'] = 'Mesajul(e) nu a(u) putut fi marcat(e)';
-$messages['deletecontactconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi contactul(ele) selectate?';
-$messages['deletegroupconfirm']  = 'Chiar vrei să ştergi grupul selectat?';
-$messages['deletemessagesconfirm'] = 'Chiar doriţi să ştergeţi mesajele selectate ?';
+$messages['errormoving'] = 'Nu am putut muta mesajul (mesajele).';
+$messages['errorcopying'] = 'Nu am putut copia mesajul (mesajele).';
+$messages['errordeleting'] = 'Nu am putut şterge mesajul (mesajele).';
+$messages['errormarking'] = 'Nu am putut marca mesajul (mesajele)';
+$messages['deletecontactconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi contactul/ele selectat(e)?';
+$messages['deletegroupconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi grupul selectat?';
+$messages['deletemessagesconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi mesajul (mesajele) selectate ?';
 $messages['deletefolderconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi acest dosar?';
 $messages['purgefolderconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi toate mesajele din acest dosar?';
-$messages['contactdeleting'] = 'Şterg contactul(ele)...';
+$messages['contactdeleting'] = 'Şterg contactul (ele)...';
 $messages['groupdeleting'] = 'Şterg grupul...';
 $messages['folderdeleting'] = 'Se şterge dosarul...';
 $messages['foldermoving'] = 'Se mută dosarul...';
@@ -99,14 +96,17 @@
 $messages['converting'] = 'Resetez mesajul la parametrii iniţiali...';
 $messages['messageopenerror'] = 'Nu s-a putut încărca mesajul din server';
 $messages['fileuploaderror'] = 'Încărcarea pe server a eşuat';
-$messages['filesizeerror'] = 'Fişierul încărcat depăşeşte mărimea de $size';
-$messages['copysuccess'] = '$nr adrese s-au copiat cu succes';
-$messages['copyerror'] = 'Nu s-a putut copia nicio adresă';
-$messages['sourceisreadonly'] = 'Sursa acestei adrese este "read-only"(se poate doar citi)';
+$messages['filesizeerror'] = 'Fişierul încărcat depăşeşte dimensiunea de $size';
+$messages['copysuccess'] = 'Am copiat cu succes $nr contacte.';
+$messages['movesuccess'] = 'Am mutat cu succes $nr contacte.';
+$messages['copyerror'] = 'Nu am putut copia nici un contact.';
+$messages['moveerror'] = 'Nu am putut muta nici un contact.';
+$messages['sourceisreadonly'] = 'Sursa acestei adrese este "read-only" (se poate doar citi)';
 $messages['errorsavingcontact'] = 'Nu s-a putut salva adresa de contact';
 $messages['movingmessage'] = 'Mutare mesaj....';
 $messages['copyingmessage'] = 'Copiere mesaj...';
 $messages['copyingcontact'] = 'Copiez contact(ele)...';
+$messages['movingcontact'] = 'Se muta contactul (contactele) ...';
 $messages['deletingmessage'] = 'Şterg mesaj(ele)...';
 $messages['markingmessage'] = 'Marchez mesaj(ele)...';
 $messages['addingmember'] = 'Adaug contact(ele) la grup...';
@@ -117,18 +117,20 @@
 $messages['nodeletelastidentity'] = 'Nu puteţi şterge această identitate, este ultima.';
 $messages['forbiddencharacter'] = 'Numele dosarului conţine un caracter nepermis.';
 $messages['selectimportfile'] = 'Va rugăm să selectaţi fişierul pentru încărcare';
-$messages['addresswriterror'] = 'Agenda selectată nu poate fi actualizată';
+$messages['addresswriterror'] = 'Agenda selectată nu poate fi actualizată, aceasta fiind disponibila doar pentru citire.';
 $messages['contactaddedtogroup'] = 'Contactele au fost adăugate cu succes la acest grup';
 $messages['contactremovedfromgroup'] = 'Contactele au fost şterse cu succes din acest grup';
 $messages['nogroupassignmentschanged'] = 'Atribuirile la grupuri nu au fost modificate.';
 $messages['importwait'] = 'Datele sunt importate, vă rugăm să aşteptaţi...';
 $messages['importformaterror'] = 'Importul a eșuat! Fișierul încărcat nu este un fișier valid pentru import de date.';
-$messages['importconfirm'] = 'Contactele $inserted au fost importate cu succes, $skipped intrări au fost ignorate deoarece ele există deja:$names';
+$messages['importconfirm'] = '<b>$inserted contacte au fost importate cu succes, $skipped intrări au fost ignorate deoarece ele există deja: $names</b>';
 $messages['importconfirmskipped'] = '<b>Am sărit peste $skipped înregistrări</b>';
-$messages['opnotpermitted'] = 'Operaţia nu este permisă!';
+$messages['importmessagesuccess'] = 'Am importat cu succes $nr mesaje.';
+$messages['importmessageerror'] = 'Importarea a esuat. Fisierul incarca nu este un mesaj valid pentru email.';
+$messages['opnotpermitted'] = 'Operaţiunea nu este permisă!';
 $messages['nofromaddress'] = 'Nu există o adresă de e-mail în identitatea selectată';
 $messages['editorwarning'] = 'Trecerea în mod text a editorului va cauza pierderea formatării textului. Doriţi să continuaţi?';
-$messages['httpreceivedencrypterror'] = 'Vă rugăm să luaţi legătura cu administratorul serverului de mail, deoarece există o eroare în configuraţia acestuia. Mesajul d-voastră nu a fost trimis.';
+$messages['httpreceivedencrypterror'] = 'Vă rugăm să luaţi legătura cu administratorul serverului de mail, deoarece există o eroare în configuraţia acestuia. <b>Mesajul d-voastră nu a fost trimis.</b>';
 $messages['smtpconnerror'] = 'Eroare SMTP ($code): Conexiunea cu serverul a eşuat';
 $messages['smtpautherror'] = 'Eroare SMTP ($code): Autentificare eşuată';
 $messages['smtpfromerror'] = 'Eroare SMTP ($code): Nu s-a putut seta expeditorul "$from" ($msg)';
@@ -138,7 +140,6 @@
 $messages['emailformaterror'] = 'Adresă de e-mail incorectă: $email';
 $messages['toomanyrecipients'] = 'Prea mulţi destinatari. Reduceţi numărul de destinatari la $max.';
 $messages['maxgroupmembersreached'] = 'Numărul de membri ai grupului depăşeşte maximul de $max.';
-$messages['internalerror'] = 'A avut loc o eroare internă. Încearcă mai târziu.';
 $messages['contactdelerror'] = 'Nu am putut şterge contact(ele).';
 $messages['contactdeleted'] = 'Contact(ele) au fost şterse cu succes.';
 $messages['contactrestoreerror'] = 'Nu am putut restaura contact(ele) şterse.';
@@ -147,13 +148,13 @@
 $messages['grouprenamed'] = 'Grupul a fost redenumit cu succes.';
 $messages['groupcreated'] = 'Grupul a fost creat cu succes.';
 $messages['savedsearchdeleted'] = 'Căutarea salvată a fost ştearsă cu succes.';
-$messages['savedsearchdeleteerror'] = 'Nu a putut şterge căutarea salvată.';
+$messages['savedsearchdeleteerror'] = 'Nu am putut şterge căutarea salvată.';
 $messages['savedsearchcreated'] = 'Căutarea a fost salvată cu succes.';
 $messages['savedsearchcreateerror'] = 'Nu am putut salva căutarea.';
-$messages['messagedeleted'] = 'Mesaj(ele) a(u) fost şters(e) cu succes.';
-$messages['messagemoved'] = 'Mesaj(ele) a(u) fost mutat(e) cu succes.';
-$messages['messagecopied'] = 'Mesaj(ele) a(u) fost copiat(e) cu succes.';
-$messages['messagemarked'] = 'Mesaj(ele) a(u) fost marcat(e) cu succes.';
+$messages['messagedeleted'] = 'Mesajul (ele) a (u) fost şters (e) cu succes.';
+$messages['messagemoved'] = 'Mesajul (ele) a (u) fost mutat (e) cu succes.';
+$messages['messagecopied'] = 'Mesajul (ele) a (u) fost copiat (e) cu succes.';
+$messages['messagemarked'] = 'Mesajul (ele) a (u) fost marcat (e) cu succes.';
 $messages['autocompletechars'] = 'Introdu măcar $min caractere pentru autocompletare.';
 $messages['autocompletemore'] = 'Au fost găsite mai multe înregistrări. Introdu mai multe caractere.';
 $messages['namecannotbeempty'] = '"Nume" nu poate fi gol.';
@@ -165,5 +166,5 @@
 $messages['parentnotwritable'] = 'Nu pot crea/muta dosarul în dosarul părinte selectat. Fără drepturi de acces.';
 $messages['messagetoobig'] = 'Partea de mesaj este prea mare pentru a o procesa.';
 $messages['attachmentvalidationerror'] = 'ATENȚIE! Acest atașament este suspect, fiindcă tipul lui nu coincide cu tipul declarat în mesaj. Dacă nu aveți încredere în expeditor, nu vă recomandăm să deschideți fișierul, fiindcă poate avea conținut malițios. <br/><br/><em>Așteptat: $expected; găsit: $detected</em>';
-$messages['noscriptwarning'] = 'Atenție: Serviciul de webmail necesită Javascript! Pentru al utiliza vă rugăm activați Javascript în navigator.';
+$messages['noscriptwarning'] = 'Atenție: Serviciul de webmail necesită Javascript! Pentru a-l utiliza vă rugăm activați Javascript în setările browserului.';
 ?>
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 86937e5..1097936 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Добро пожаловать в $product!';
 $labels['username']  = 'Имя пользователя';
 $labels['password']  = 'Пароль';
@@ -318,8 +316,11 @@
 $labels['import'] = 'Импортировать';
 $labels['importcontacts'] = 'Импортировать контакты';
 $labels['importfromfile'] = 'Импортировать из файла:';
-$labels['importtarget'] = 'Добавить новые контакты в адресную книгу:';
+$labels['importtarget'] = 'Добавить контакты в';
 $labels['importreplace'] = 'Заменить всю адресную книгу';
+$labels['importgroups'] = 'Распределение по группам при импорте.';
+$labels['importgroupsall'] = 'Все (создать группы при необходимости)';
+$labels['importgroupsexisting'] = 'Только для существующих групп';
 $labels['importdesc'] = 'Вы можете загрузить контакты из существующей адресной книги. <br/>В настоящее время мы поддерживаем импорт адресов в формате визитной карточки <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> или CSV (данные разделённые запятой).';
 $labels['done'] = 'Завершено';
 $labels['settingsfor'] = 'Настройки для';
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index cdd7b5a..d8da5ee 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Произошла ошибка!';
 $messages['loginfailed']  = 'Неудачная попытка входа.';
 $messages['cookiesdisabled'] = 'Ваш браузер не принимает cookie.';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index ef79119..9baa370 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '$product වෙත පිළිගනිමු';
 $labels['username']  = 'පරිශීලක නාමය';
 $labels['password']  = 'මුරපදය';
@@ -31,33 +29,23 @@
 $labels['sent']   = 'යැවූ';
 $labels['trash']  = 'ඉවතලන බඳුන';
 $labels['junk']   = 'සුන්බුන්';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'මාතෘකාව';
 $labels['from']    = 'වෙතින්';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'වෙත';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'පිළිතුරු සඳහා';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'දිනය';
 $labels['size']    = 'ප්‍රමාණය';
 $labels['priority'] = 'ප්‍රමුඛත්වය';
 $labels['organization'] = 'සංවිධානය';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'බහාලුම්';
 $labels['messagesfromto'] = '$from වෙතින් $to වෙත පණිවිඩ $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'පණිවිඩ $count න් $nr';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'පිටපත් කරන්න';
 $labels['move']     = 'ගෙනයන්න';
 $labels['moveto']   = 'ගෙන යන්න...';
 $labels['download'] = 'බාගත කරන්න';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'ගොනුවේ නම';
 $labels['filesize'] = 'ගොනුවේ ප්‍රමාණය';
 $labels['addtoaddressbook'] = 'ලිපින පොතට එක් කරන්න';
@@ -100,18 +88,13 @@
 $labels['longnov']	= 'නොවැම්බර්';
 $labels['longdec']	= 'දෙසැම්බර්';
 $labels['today'] = 'අද';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'අඵත් පණිවිඩ සඳහා පිරික්සීම';
 $labels['compose']          = 'පණිවිඩයක් සෑදීම';
 $labels['writenewmessage']  = 'අඵත් පණිවිඩයක්';
 $labels['reply']            = 'පිළිතුරු දෙන්න';
 $labels['replytomessage']   = 'පණිවිඩයට පිළිතුරු';
 $labels['replytoallmessage'] = 'එවන්නාට සහ සැමට පිළිතුරු';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
 $labels['forward']          = 'ඉදිරියට';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'පණිවිඩය ඉදිරියට';
 $labels['deletemessage']    = 'පණිවිඩය මකන්න';
 $labels['movemessagetotrash'] = 'පණිවිඩය ලටපට වෙත ගෙන යන්න';
@@ -126,8 +109,6 @@
 $labels['markmessages']     = 'පණිවිඩ සලකුණු කරන්න';
 $labels['markread']         = 'කියවු ලෙස';
 $labels['markunread']       = 'නොකියවු ලෙස';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
 $labels['moreactions']      = 'තවත් ක්‍රියා...';
 $labels['more']             = 'තවත්';
 $labels['back']             = 'ආපසු';
@@ -137,73 +118,40 @@
 $labels['none'] = 'කිසිවක් නැත';
 $labels['currpage'] = 'දැනට ඇති පිටුව';
 $labels['unread'] = 'නොකියවූ';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'මකා දැමූ';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
 $labels['filter'] = 'පෙරන්න';
 $labels['list'] = 'ලැයිස්තුව';
-$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'සියල්ල දිගහරින්න';
-$labels['expand-unread'] = 'Expand Unread';
 $labels['collapse-all'] = 'සියල්ල හකුළන්න';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'වෙතින්/වෙත';
-$labels['flag'] = 'Flag';
 $labels['attachment'] = 'ඇමුණුම';
 $labels['nonesort'] = 'කිසිවක් නැත';
 $labels['sentdate'] = 'යැවූ දිනය';
 $labels['arrival'] = 'ලගාවූ දිනය';
 $labels['asc'] = 'ආරෝහණ';
 $labels['desc'] = 'අවරෝහණ';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
 $labels['folderactions'] = 'බහාලුම් ක්‍රියා...';
 $labels['compact'] = 'සංයුක්ත';
 $labels['empty'] = 'හිස්';
-$labels['importmessages'] = 'Import messages';
-$labels['quota'] = 'Disk usage';
 $labels['unknown']  = 'නොදනී';
 $labels['unlimited']  = 'අසීමිත';
 $labels['quicksearch']  = 'ඉක්මන් සෙවුම';
 $labels['resetsearch']  = 'සෙවුම යලි පිහිටවීම';
-$labels['searchmod']  = 'Search modifiers';
 $labels['msgtext']  = 'සම්පූර්ණ පණිවිඩය';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'නව කවුළුවක විවෘත කරන්න';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'පණිවිඩය යවන්න';
 $labels['savemessage']    = 'කටු සටහනක් ලෙස සුරකින්න';
 $labels['addattachment']  = 'ගොනුවක් අමුණන්න';
 $labels['charset']        = 'අකුරැ කට්ටලය';
 $labels['editortype']     = 'සම්පාදන ආකාරය';
 $labels['returnreceipt']  = 'නැවත ලබන්නා';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'අක්‍ෂර වින්‍යාසය පරික්‍ෂාකරන්න';
 $labels['resumeediting'] = 'සම්පාදන නැවත ඇරඹීම';
 $labels['revertto']      = 'ආපසු ඒම';
 $labels['attach'] = 'අමුණන්න';
 $labels['attachments'] = 'ඇමුණුම්';
 $labels['upload'] = 'ඇතුල් කරීම';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'වසන්න';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'අඩු';
 $labels['lowest']  = 'අඩුම';
 $labels['normal']  = 'සාමාන්‍ය';
@@ -211,20 +159,11 @@
 $labels['highest'] = 'ඉහළම';
 $labels['nosubject']  = '(මාතෘකාව නොමැත)';
 $labels['showimages'] = 'රූප පෙන්වන්න';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'පැහැදිලි අකුරු';
-$labels['savesentmessagein'] = 'Save sent message in';
-$labels['dontsave'] = 'don\'t save';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
 $labels['addcc'] = 'Cc එක් කරන්න';
 $labels['addbcc'] = 'Bcc එක් කරන්න';
 $labels['addreplyto'] = '\'පිළිතුරු සඳහා\' එක් කරන්න';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'මෙම පණිවුඩය එවන්නා ඔබ එය කියවු බව අසයි. එය දැන්වීමට ඔබ කැමතිද?';
 $labels['receiptread'] = 'ලැබීම් ලදුපත (කියවීම)';
 $labels['yourmessage'] = 'මෙය ඔබගේ පණිවුඩයේ ලැබීම් ලදුපතයි';
@@ -232,20 +171,14 @@
 $labels['name']         = 'ප්‍රදර්ශනය වන නම';
 $labels['firstname']    = 'මුල් නම';
 $labels['surname']      = 'අවසන් නම';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
 $labels['nickname']     = 'සුරතල් නම';
 $labels['jobtitle']     = 'රැකියා තනතුර';
 $labels['department']   = 'දෙපාර්තමේන්තුව';
 $labels['gender']       = 'ස්ත්‍රි/පුරුෂ භාවය';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'විද්‍යුත් තැපෑල';
 $labels['phone']        = 'දුරකථනය';
 $labels['address']      = 'ලිපිනය';
-$labels['street']       = 'Street';
 $labels['locality']     = 'නගරය';
-$labels['zipcode']      = 'ZIP Code';
 $labels['region']       = 'ප්‍රාන්තය/පළාත';
 $labels['country']      = 'රට';
 $labels['birthday']     = 'උපන්දිනය';
@@ -257,10 +190,7 @@
 $labels['female'] = 'ස්ත්‍රී';
 $labels['manager'] = 'කළමණාකරු';
 $labels['assistant'] = 'සහායක';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
 $labels['search'] = 'සොයන්න';
-$labels['advsearch'] = 'Advanced Search';
 $labels['advanced'] = 'සංකීර්ණ‍';
 $labels['other'] = 'වෙනත්';
 $labels['typehome']   = 'නිවස';
@@ -269,19 +199,14 @@
 $labels['typemobile']  = 'ජංගම';
 $labels['typemain']  = 'ප්‍රධාන';
 $labels['typehomefax']  = 'ගෘහස්ථ ෆැක්ස්';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
 $labels['typepager']  = 'පේජරය';
 $labels['typevideo']  = 'වීඩියෝ';
 $labels['typeassistant']  = 'සහායක';
-$labels['typehomepage']  = 'Home Page';
 $labels['typeblog'] = 'බ්ලොග්';
 $labels['typeprofile'] = 'පැතිකඩ';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'නව සබඳතාවය එක් කරන්න';
 $labels['editcontact'] = 'ලිපිනය වෙනස් කිරීම';
 $labels['contacts'] = 'සබඳතා';
-$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'පුද්ගලික තොරතුරු';
 $labels['edit']   = 'සංස්කරණය';
 $labels['cancel'] = 'අවලංගු කරන්න';
@@ -289,37 +214,20 @@
 $labels['delete'] = 'මකන්න';
 $labels['rename'] = 'නම වෙනස් කරන්න';
 $labels['addphoto'] = 'එක් කරන්න';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'අඵත් ලිපින පතක් සෑදීම';
 $labels['deletecontact']  = 'තෝරාගත් ලිපින මකාදමන්න';
 $labels['composeto']      = 'පනිවුඩයක් සෑදීම';
 $labels['contactsfromto'] = '$from ගෙන් $to ලිපින $count';
 $labels['print']          = 'මුද්‍රණය කරන්න';
 $labels['export']         = 'අපනයනය';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'පෙර පිටුව පෙන්වන්න';
 $labels['firstpage']      = 'පළමුවන පිටුව පෙන්වන්න';
 $labels['nextpage']       = 'මීළඟ පිටුව පෙන්වන්න';
 $labels['lastpage']       = 'අවසාන පිටුව පෙන්වන්න';
 $labels['group'] = 'කණ්ඩායම';
 $labels['groups'] = 'කණ්ඩායම්';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'පුද්ගලික ලිපිනය';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
 $labels['import'] = 'ආනයනය කරන්න';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'අවසානයි';
 $labels['settingsfor'] = 'සඳහා සැකසුම්';
 $labels['about'] = 'පිළිබඳ';
@@ -332,100 +240,37 @@
 $labels['newitem'] = 'අඵත් අයිතම';
 $labels['edititem'] = 'අයිතම වෙනස් කිරීම්';
 $labels['preferhtml'] = 'HTML විදහා පෙන්වීම';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML පණිවිඩය';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'සුරුබුහුටි දින';
 $labels['setdefault']  = 'පළමු තත්වයට';
 $labels['autodetect']  = 'ස්වයංක්‍රීය';
 $labels['language']  = 'භාෂාව';
 $labels['timezone']  = 'කාල කලාපය';
-$labels['pagesize']  = 'Rows per page';
 $labels['signature'] = 'අත්සන';
 $labels['dstactive']  = 'දිවා එළිය ඉතිරි කිරීම';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML පණිවිඩයක් සෑදීම';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML අත්සන';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'පූර්වදර්ශන කොටස පෙන්නන්න';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
 $labels['uisettings'] = 'පරිශීලක අතුරුමුහුණත';
-$labels['serversettings'] = 'Server Settings';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
 $labels['askuser'] = 'මගෙන් විමසන්න';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'නොසලකා හරින්න';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'සැමවිට';
-$labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'ස්වයංක්‍රීයව කටු සටහන සුරකින්න';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'කිසි විටෙකත් නැති';
 $labels['immediately']  = 'හැකි ඉක්මනින්';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (වෙනත්)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'අංශය';
 $labels['maintenance'] = 'නඩත්තු කිරීම';
 $labels['newmessage'] = 'අලුත් පණිවිඩයක්';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
 $labels['autoaddsignature'] = 'ස්වයංක්‍රීයව අත්සන ඇතුලත් කරන්න';
 $labels['newmessageonly'] = 'අලුත් පණිවිඩය පමණක්';
-$labels['replyandforwardonly'] = 'replies and forwards only';
 $labels['insertsignature'] = 'අත්සන ඇතුලත් කරන්න';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'තත්පර $nකට පසු';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
 $labels['spellcheckignoresyms'] = 'සලකුණු සහිත වචන නොසලකා හරින්න';
 $labels['spellcheckignorenums'] = 'අංක සහිත වචන නොසලකා හරින්න';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'ශබ්ද කෝෂයට එක් කරන්න';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'බහාලුම';
 $labels['folders']  = 'බහාලුම්';
 $labels['foldername']  = 'බහාලුමේ නම';
@@ -437,20 +282,14 @@
 $labels['specialfolders'] = 'විශේෂ බහාලුම්';
 $labels['properties'] = 'වත්කම්';
 $labels['folderproperties'] = 'බහාලුමේ වත්කම්';
-$labels['parentfolder'] = 'Parent folder';
 $labels['location'] = 'ස්ථානය';
 $labels['info'] = 'තොරතුරු';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'බහාලුම් වර්ගය';
 $labels['personalfolder']  = 'පුද්ගලික බහාලුම';
-$labels['otherfolder']  = 'Other User\'s Folder';
 $labels['sharedfolder']  = 'පොදු බහාලුම';
 $labels['sortby'] = 'වර්ග කරන්න';
 $labels['sortasc']  = 'ආරෝහණ වර්ග කිරීම';
 $labels['sortdesc'] = 'අවරෝහණ වර්ග කිරීම';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'ප්ලගිනය';
 $labels['version'] = 'අනුවාදය';
 $labels['source'] = 'මූලාශ්‍රය';
@@ -463,10 +302,7 @@
 $labels['unicode'] = 'යුනිකේත';
 $labels['english'] = 'ඉංග්‍රීසි';
 $labels['westerneuropean'] = 'බටහිර යුරෝපීය';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
 $labels['baltic'] = 'බෝල්ටික්';
-$labels['cyrillic'] = 'Cyrillic';
 $labels['arabic'] = 'අරාබි';
 $labels['greek'] = 'ග්‍රීක';
 $labels['hebrew'] = 'හීබෲ';
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index e2e18c3..0c6fa11 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -15,29 +15,15 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'දෝෂයක් මතුවිය!';
 $messages['loginfailed']  = 'ඇතුල්වීම අසාර්ථකයි.';
 $messages['cookiesdisabled'] = 'ඔබේ බෞසරය කුකී බාර ගන්නේ නැත';
 $messages['sessionerror'] = 'ඔබේ වාරය අවලංගු හෝ කාලය ඉකුත් වී ඇත';
-$messages['storageerror'] = 'Connection to storage server failed.';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
 $messages['dberror'] = 'දත්ත ගබඩාවේ දෝෂය!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ලියුම් පෙට්ටියේ පනිවුඩ නැත';
 $messages['loggedout'] = 'ඔබගේ වාරය සාර්ථකව අවසන් විය. අයුබොවන්!';
 $messages['mailboxempty'] = 'ලියුම් පෙට්ටිය හිස්';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'පූරනය...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'දත්ත පූරනය...';
 $messages['checkingmail'] = 'අලුත් පණිවිඩ පරීක්ෂා කරමින්...';
 $messages['sendingmessage'] = 'පණිවිඩය යවමින්...';
@@ -47,128 +33,56 @@
 $messages['successfullysaved'] = 'සුරැකීම සාර්ථකයි.';
 $messages['addedsuccessfully'] = 'ලිපිනය සාර්ථකව ලිපින පොතට එකතු කරන ලදී.';
 $messages['contactexists'] = 'ඉහත ලිපිනය සහිත විද්යුත් තැපැල් ලිපිනයක් ලිපින පොතේ ඇත.';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'ඔබගෙ පොද්ගලිකත්වය හේතුවෙන්, දුරස්ථ රූප අවහිර කර ඇත.';
 $messages['encryptedmessage'] = 'මෙම පනිවුඩය රහස් කේතනය කර ඇති බැවින් පෙන්විය නොහැක. සමාවන්න!';
 $messages['nocontactsfound'] = 'ලිපින සොයා ගත නොහැක';
 $messages['contactnotfound'] = 'ඉල්ලූ ලිපිනය සොයාගත නොහැක';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'පණිවිඩය යැවීම අසාර්ථකයි.';
 $messages['senttooquickly'] = 'කරුණාකර මෙම පණිවිඩය යැවීමට පෙර තත්පර $secක් රැදී සිටින්න.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'පණිවිඩය සුරැකීමේදී දෝෂයක් මතුවිය.';
 $messages['errormoving'] = 'පනිවුඩය ගෙන යාමට නොහැක';
 $messages['errorcopying'] = 'පණිවිඩ(ය) පිටපත් කල නොහැක.';
 $messages['errordeleting'] = 'පණිවිඩ(ය) මකා දැමීමට නොහැක.';
 $messages['errormarking'] = 'පණිවිඩ(ය) සලකුණු කල නොහැක.';
 $messages['deletecontactconfirm']  = 'තෝරා ඇති ලිපින ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'තෝරා ඇති පණිවිඩ(ය) ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
 $messages['deletefolderconfirm']  = 'ඔබට මෙම බහාලුම මකා දැමීමට සැබවින්ම වුවමනාද?';
 $messages['purgefolderconfirm']  = 'මෙම බහාලමේ ඇති සියලුම පණිවිඩ ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'බහාලුම මකාදමමින්...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'පෝරමය සම්පූර්ණයෙන් පුරවා නොමැත.';
 $messages['noemailwarning'] = 'කරුණාකර වලංගු විද්යුත් ලිපිනයක් ඇතුලත් කරන්න.';
 $messages['nonamewarning']  = 'කරුණාකර නම ඇතුලත් කරන්න.';
 $messages['nopagesizewarning'] = 'කරුණාකර පිටුවේ ප්‍රමාණය ඇතුලත් කරන්න.';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'කරුණාකර යටත් පිරිසෙයින් එක් ලබන්නෙකු හෝ ඇතුලත් කරන්න';
 $messages['nosubjectwarning']  = '"මාතෘකාව" හිස්. මාතෘකාවක් ඇතුලත් කිරීමට ඔබ කැමතිද?';
 $messages['nobodywarning'] = 'මෙම හිස් පනිවුඩය යවන්නද?';
 $messages['notsentwarning'] = 'පණිවිඩය යැවීමට නොහැකි විය. ඔබට එය බැහැර කිරීමට වුවමනාද?';
 $messages['noldapserver'] = 'සෙවුම සඳහා කරුණාකර ldap සම්බන්ධතාවයක් තෝරා ගන්න';
 $messages['nosearchname'] = 'කරුණාකර ලිපිනයෙහි නම හෝ විද්යුත් තැපැල් ලිපිනය ඇතුලත් කරන්න';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr පනිවුඩය හමු විය';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'සෙවුමට අදාල ගැලපීමක් නොමැත.';
 $messages['searching'] = 'සොයමින්...';
 $messages['checking'] = 'පරික්‍ෂාකරමින්...';
 $messages['nospellerrors'] = 'වියාකරන දොෂ නොමැත';
 $messages['folderdeleted'] = 'බහාලුම සාර්ථකව මකා දමන ලදී.';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'සාර්ථකව මකාදමන ලදී.';
 $messages['converting'] = 'පනිවුඩයෙන් ආකෘතීකරණය ඉවත් කිරීම';
 $messages['messageopenerror'] = 'පනිවුඩය පූරනය කිරීමට නොහැක';
 $messages['fileuploaderror'] = 'ගොනුව ඇතුලත් කිරීමට නොහැක';
 $messages['filesizeerror'] = 'ඇතුලත් කල ගොනුවෙ ප්රමාණය උපරිම අගය $size ඉක්මවා ඇත';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'මෙම ලිපින මූලාශ්රය කියවීම සඳහා පමනි';
 $messages['errorsavingcontact'] = 'ලිපිනය තැන්පත් කීරීමට නොහැක';
 $messages['movingmessage'] = 'පණිවිඩ(ය) ගෙනයමින්...';
 $messages['copyingmessage'] = 'පණිවිඩ(ය) පිටපත් කරමින්...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'පණිවිඩ(ය) මකා දමමින්...';
 $messages['markingmessage'] = 'පණිවිඩ(ය) සලකුණු කරමින්...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
 $messages['errorsendingreceipt'] = 'කියවීම් භාර ගැනීම යැවීමට නොහැක';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'අවසාන අනන්‍යතාවය මකා දැමිය නොහැක';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'ආනයනය කරමින්, කරුණාකර රැදී සිටින්න...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'අවලංගු විද්‍යුත් තැපැල් ලිපිනය: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
 $messages['messagedeleted'] = 'පණිවිඩ(ය) මකා දැමීම සාර්ථකයි.';
 $messages['messagemoved'] = 'පණිවිඩ(ය) ගෙනයෑම සාර්ථකයි.';
 $messages['messagecopied'] = 'පණිවිඩ(ය) පිටපත් කිරීම සාර්ථකයි.';
 $messages['messagemarked'] = 'පණිවිඩ(ය) සලකුණු කිරීම සාර්ථකයි.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'නම හිස්ව තැබිය නොහැක.';
 $messages['nametoolong'] = 'නම දිග වැඩිය.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 67dc921..36d9850 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -15,26 +15,24 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Vitajte v $product';
-$labels['username']  = 'Prihlasovacie meno';
+$labels['username']  = 'Meno používateľa';
 $labels['password']  = 'Heslo';
 $labels['server']    = 'Server';
 $labels['login']     = 'Prihlásiť';
 $labels['logout']   = 'Odhlásiť';
-$labels['mail']     = 'E-Mail';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Nastavenia';
-$labels['addressbook'] = 'Kontakty';
+$labels['addressbook'] = 'Adresár kontaktov';
 $labels['inbox']  = 'Doručená pošta';
-$labels['drafts'] = 'Rozpísané';
+$labels['drafts'] = 'Koncepty';
 $labels['sent']   = 'Odoslané';
 $labels['trash']  = 'Kôš';
 $labels['junk']   = 'Nevyžiadaná pošta';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
+$labels['show_real_foldernames'] = 'Pri osobitných priečinkoch zobrazovať reálne názvy';
 $labels['subject'] = 'Predmet';
 $labels['from']    = 'Odosielateľ';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Odosielateľ';
 $labels['to']      = 'Adresát';
 $labels['cc']      = 'Kópia';
 $labels['bcc']     = 'Tajná kópia';
@@ -55,9 +53,9 @@
 $labels['move']     = 'Presunúť';
 $labels['moveto']   = 'presunúť do...';
 $labels['download'] = 'stiahnuť';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
+$labels['open']     = 'Otvoriť';
+$labels['showattachment'] = 'Zobraziť';
+$labels['showanyway'] = 'Zobraziť aj napriek tomu';
 $labels['filename'] = 'Meno súboru';
 $labels['filesize'] = 'Veľkosť súboru';
 $labels['addtoaddressbook'] = 'Pridať do adresára';
@@ -139,7 +137,7 @@
 $labels['unread'] = 'Neprečítané';
 $labels['flagged'] = 'Označené';
 $labels['unanswered'] = 'Neoznačené';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = 'S prílohou';
 $labels['deleted'] = 'Zmazané';
 $labels['undeleted'] = 'Nevymazané';
 $labels['invert'] = 'Prevrátiť';
@@ -168,7 +166,7 @@
 $labels['folderactions'] = 'Akcie so zložkou...';
 $labels['compact'] = 'Zhustiť priečinok';
 $labels['empty'] = 'Vyprázdniť';
-$labels['importmessages'] = 'Import messages';
+$labels['importmessages'] = 'Importovať správy';
 $labels['quota'] = 'Zaplnenie schránky';
 $labels['unknown']  = 'neznáme';
 $labels['unlimited']  = 'neobmedzené';
@@ -176,12 +174,13 @@
 $labels['resetsearch']  = 'Vyčistiť vyhľadávanie';
 $labels['searchmod']  = 'Parametre hľadanie';
 $labels['msgtext']  = 'Celá správa';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
+$labels['body']  = 'Telo';
+$labels['type'] = 'Typ';
+$labels['namex'] = 'Meno';
 $labels['openinextwin'] = 'Otvoriť v novom okne';
 $labels['emlsave'] = 'Stiahnuť';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
+$labels['changeformattext'] = 'Zobraziť vo formáte čistého textu';
+$labels['changeformathtml'] = 'Zobraziť vo formáte HTML';
 $labels['editasnew']      = 'Upraviť ako novú';
 $labels['send']           = 'Odoslať';
 $labels['sendmessage']    = 'Odoslať správu';
@@ -297,8 +296,8 @@
 $labels['contactsfromto'] = 'Kontakty od $from do $to z $count';
 $labels['print']          = 'Tlač';
 $labels['export']         = 'Export';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Exportovať všetko';
+$labels['exportsel']      = 'Exportovať vybrané';
 $labels['exportvcards']   = 'Exportovať kontakty vo formáte vCard';
 $labels['newcontactgroup'] = 'Vytvoriť novú skupinu kontaktov';
 $labels['grouprename']    = 'Premenovať skupinu';
@@ -310,16 +309,19 @@
 $labels['lastpage']       = 'Posledná stránka';
 $labels['group'] = 'Skupina';
 $labels['groups'] = 'Skupiny';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Zoznam členov skupiny';
 $labels['personaladrbook'] = 'Osobné adresy';
 $labels['searchsave'] = 'Uložiť vyhľadávanie';
 $labels['searchdelete'] = 'Zmazať vyhľadávanie';
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Importovať kontakty';
 $labels['importfromfile'] = 'Importovať zo súboru:';
-$labels['importtarget'] = 'Pridať nové kontakty do adresára:';
+$labels['importtarget'] = 'Pridať kontakty do';
 $labels['importreplace'] = 'Nahradiť celý zoznam kontaktov';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importgroups'] = 'Importovať priradenia do skupín';
+$labels['importgroupsall'] = 'Všetky (vytvoriť skupiny, ak je to potrebné)';
+$labels['importgroupsexisting'] = 'Len pre existujúce skupiny';
+$labels['importdesc'] = 'Môžete vložiť kontakty zo svojho existujúceho adresára.<br/>Momentálne je možné importovanie adries z formátu <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> alebo CSV (údaje oddeľované čiarkou).';
 $labels['done'] = 'Hotovo';
 $labels['settingsfor'] = 'Nastavenia pre';
 $labels['about'] = 'O programe';
@@ -334,8 +336,8 @@
 $labels['preferhtml'] = 'Uprednostniť HTML zobrazenie';
 $labels['defaultcharset'] = 'Predvolené kódovanie';
 $labels['htmlmessage'] = 'HTML správa';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['messagepart'] = 'Časť';
+$labels['digitalsig'] = 'Digitálny podpis';
 $labels['dateformat'] = 'Formát dátumu';
 $labels['timeformat'] = 'Formát času';
 $labels['prettydate'] = 'Krajší dátum';
@@ -352,7 +354,7 @@
 $labels['htmlonreply'] = 'len v odpovedi na HTML správy';
 $labels['htmlonreplyandforward'] = 'pri preposielaní alebo odpovedi na HTML správu';
 $labels['htmlsignature'] = 'HTML podpis';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = 'Zobrazovať e-mailovú adresu so zobrazeným menom';
 $labels['previewpane'] = 'Ukázať náhľad';
 $labels['skin'] = 'Vzhľad';
 $labels['logoutclear'] = 'Vyprázdniť kôš pri odhlásení';
@@ -377,7 +379,7 @@
 $labels['showinlineimages'] = 'Zobraziť pripojené obrázky pod správou';
 $labels['autosavedraft']  = 'Automaticky uložiť koncept';
 $labels['everynminutes']  = 'každých $n minút';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = 'Obnoviť (skontrolovať nové správy a podobne)';
 $labels['never']  = 'nikdy';
 $labels['immediately']  = 'ihneď';
 $labels['messagesdisplaying'] = 'Zobrazovanie správ';
@@ -412,7 +414,7 @@
 $labels['reqmdn'] = 'Vždy požadovať doručenku';
 $labels['reqdsn'] = 'Vždy vyžadovať potvrdenie o doručení správy';
 $labels['replysamefolder'] = 'Umietniť odpoveď do adresára, kde je umiestnená správa, na ktorú sa odpovedalo';
-$labels['defaultabook'] = 'Default address book';
+$labels['defaultabook'] = 'Predvolený adresár';
 $labels['autocompletesingle'] = 'Vynechať alternatívnu emailovú adresu pri automatickom dopĺňaní';
 $labels['listnamedisplay'] = 'Zobraziť kontakt ako';
 $labels['spellcheckbeforesend'] = 'Skontrolovať pravopis pred odoslaním správy';
@@ -422,7 +424,7 @@
 $labels['spellcheckignorecaps'] = 'Ignorovať slová písané veľkými písmenami';
 $labels['addtodict'] = 'Pridať do slovníka';
 $labels['mailtoprotohandler'] = 'Zaregistrovať handler pre odkazy „mailto:“';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['standardwindows'] = 'S vyskakovacími oknami pracovať ako so štandardnými oknami';
 $labels['forwardmode'] = 'Preposielanie správ';
 $labels['inline'] = 'v tele spávy';
 $labels['asattachment'] = 'ako príloha';
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index a9dabb8..db830c2 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Vyskytla sa chyba!';
 $messages['loginfailed']  = 'Chybné prihlásenie';
 $messages['cookiesdisabled'] = 'Váš internetový prehliadač nepodporuje cookies, ktoré sú potrebné pre prihlásenie';
@@ -27,14 +26,14 @@
 $messages['requesttimedout'] = 'Čas požiadavky vypršal';
 $messages['errorreadonly'] = 'Nemožno vykonať operáciu. Adresár je len na čítanie';
 $messages['errornoperm'] = 'Nemožno vykonať operáciu. Prístup odmietnutý';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
+$messages['erroroverquota'] = 'Nemožno vykonať operáciu. Na disku nie je dostatok voľného miesta.';
+$messages['erroroverquotadelete'] = 'Na disku nie je dostatok voľného miesta. Vymažte nejakú správu pomocou klávesov SHIFT+DEL.';
 $messages['invalidrequest'] = 'Chybný požiadavek. Žiadne údaje neboli uložené.';
 $messages['invalidhost'] = 'Neplatný názov servera';
 $messages['nomessagesfound'] = 'Vo Vašej schránke nie je žiadna správa';
 $messages['loggedout'] = 'Odhlásenie prebehlo úspešne. Dovidenia.';
 $messages['mailboxempty'] = 'Schránka je prázdna';
-$messages['refreshing'] = 'Refreshing...';
+$messages['refreshing'] = 'Obnovuje sa...';
 $messages['loading'] = 'Načítava sa...';
 $messages['uploading'] = 'Nahrávám súbor...';
 $messages['uploadingmany'] = 'Nahrávam súbory...';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Zadaj nejaký vyhľadávací výraz pre hľadanie kontaktov.';
 $messages['sendingfailed'] = 'Odosielanie správy zlyhalo';
 $messages['senttooquickly'] = 'Počkajte $sec sekúnd pred odoslaním tejto správy';
-$messages['errorsavingsent'] = 'Pri ukladaní odoslanej správy nastala chyba';
-$messages['errorsaving'] = 'Vyskytla sa chyba pri ukladaní';
 $messages['errormoving'] = 'Správa sa nedá presunúť';
 $messages['errorcopying'] = 'Správa sa nedá skopírovať';
 $messages['errordeleting'] = 'Správa sa nedá zmazať';
@@ -100,16 +97,16 @@
 $messages['messageopenerror'] = 'Nedá sa načítať správa zo servera';
 $messages['fileuploaderror'] = 'Načítanie súboru nebolo úspešné';
 $messages['filesizeerror'] = 'Načítavaný súbor prekročil maximálnu veľkosť $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
+$messages['copysuccess'] = 'Počet úspešne skopírovaných kontaktov: $nr.';
+$messages['movesuccess'] = 'Počet úspešne presunutých kontaktov: $nr.';
+$messages['copyerror'] = 'Kontakty nie je možné kopírovať.';
+$messages['moveerror'] = 'Kontakty nemožno presúvať.';
 $messages['sourceisreadonly'] = 'Tento zdroj adries je len na čítanie';
 $messages['errorsavingcontact'] = 'Nedá sa uložiť adresa kontaktu';
 $messages['movingmessage'] = 'Správa sa presúva...';
 $messages['copyingmessage'] = 'Správa sa kopíruje...';
 $messages['copyingcontact'] = 'Kopírujem kontakt(y)';
-$messages['movingcontact'] = 'Moving contact(s)...';
+$messages['movingcontact'] = 'Presúvanie kontaktu (kontaktov)...';
 $messages['deletingmessage'] = 'Mažem správu(y)...';
 $messages['markingmessage'] = 'Označujem správu(y)...';
 $messages['addingmember'] = 'Pridávam kontakt(y) do skupiny...';
@@ -125,11 +122,11 @@
 $messages['contactremovedfromgroup'] = 'Kontakty boli úspešne odstráneny z tejto skupiny';
 $messages['nogroupassignmentschanged'] = 'Priradenia do skupín neboli zmenené.';
 $messages['importwait'] = 'Prebieha import, počkajte ...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importformaterror'] = 'Import nebol úspešný! Odoslaný súbor nie je platným súborom, z ktorého je možné vykonať import údajov.';
 $messages['importconfirm'] = '<b>Úspešne sa načítalo $inserted kontaktov, preskočilo sa $skipped existujúcich záznamov</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Preskočených $skipped existujúcich záznamov</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
+$messages['importmessagesuccess'] = 'Počet úspešne naimportovaných správ: $nr';
+$messages['importmessageerror'] = 'Importovanie bolo neúspešné! Odoslaný súbor nie je platným súborom pre správu alebo poštový priečinok';
 $messages['opnotpermitted'] = 'Operácia nie je povolená!';
 $messages['nofromaddress'] = 'Zvolená identita neobsahuje e-mailovú adresu';
 $messages['editorwarning'] = 'Prepnutie na editor obyčajného textu spôsobí stratu formátovania. Chcete napriek tomu pokračovať?';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email';
 $messages['toomanyrecipients'] = 'Príliš veľa príjemcov. Zmenšite počet príjemcov na $max.';
 $messages['maxgroupmembersreached'] = 'Počet členov skupiny dosiahol maxima z $max';
-$messages['internalerror'] = 'Došlo k internej chybe. Skúste to znova';
 $messages['contactdelerror'] = 'Nemôžem vymazať kontakt(y)';
 $messages['contactdeleted'] = 'Kontakt(y) bol vymazaný';
 $messages['contactrestoreerror'] = 'Nemôžem obnoviť zmazané kontakty';
@@ -169,6 +165,6 @@
 $messages['mispellingsfound'] = 'V správe boli nájdené pravopisné chyby';
 $messages['parentnotwritable'] = 'Nemôžem vytvoriť/presunúť adresár do zvoleného nadradeného adresára. Nemáte oprávnenia na zmenu.';
 $messages['messagetoobig'] = 'Časť správy je príliš veľká na spracovanie.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
+$messages['attachmentvalidationerror'] = 'UPOZORNENIE! Táto príloha je podozrivá, pretože jej typ sa nezhoduje s typom uvedeným v správe. Ak odosielateľovi prílohy nedôverujete, nemali by ste prílohu otvárať. Môže totiž obsahovať škodlivý obsah.<br/><br/><em>Očakávaná hodnota: $expected; nájdená hodnota: $detected</em>';
+$messages['noscriptwarning'] = 'Upozornenie: Táto webmailová služba vyžaduje Javascript! Ak ju chcete používať, prosím aktivujte Javascript v nastaveniach svojho prehliadača.';
 ?>
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index 1421913..f93684d 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Dobrodošli v $product';
 $labels['username']  = 'Uporabniško ime';
 $labels['password']  = 'Geslo';
@@ -178,6 +176,7 @@
 $labels['msgtext']  = 'Celotno sporočilo';
 $labels['body']  = 'Vsebina sporočila';
 $labels['type'] = 'Tip';
+$labels['namex'] = 'Ime';
 $labels['openinextwin'] = 'Odpri v novem oknu';
 $labels['emlsave'] = 'Prenos datoteke (.eml)';
 $labels['changeformattext'] = 'Prikaži kot golo besedilo';
@@ -317,7 +316,6 @@
 $labels['import'] = 'Uvozi';
 $labels['importcontacts'] = 'Uvozi stike';
 $labels['importfromfile'] = 'Uvozi iz datoteke:';
-$labels['importtarget'] = 'Dodaj nove stike v imenik:';
 $labels['importreplace'] = 'Zamenjaj celoten imenik';
 $labels['importdesc'] = 'Stike lahko naložite iz obstoječega imenika. <br/>Trenutno je podprt uvoz stikov v zapisu  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ali v CSV (z vejico ločene vrednosti) zapisu.';
 $labels['done'] = 'Dokončano';
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index 07b94ae..f1beffc 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Prišlo je do napake!';
 $messages['loginfailed']  = 'Prijava ni uspela';
 $messages['cookiesdisabled'] = 'Vaš spletni brskalnik ne sprejema piškotkov.';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Vpišite iskalni parameter za iskanje stika';
 $messages['sendingfailed'] = 'Sporočila ni bilo mogoče poslati.';
 $messages['senttooquickly'] = 'Počakajte $sec sekund in nato znova poskusite s pošiljanjem sporočila.';
-$messages['errorsavingsent'] = 'Pri shranjevanju poslanega sporočila je prišlo do napake.';
-$messages['errorsaving'] = 'Pri shranjevanju je prišlo do napake.';
 $messages['errormoving'] = 'Sporočila ni bilo mogoče premakniti.';
 $messages['errorcopying'] = 'Sporočila ni bilo mogoče kopirati.';
 $messages['errordeleting'] = 'Sporočila ni bilo mogoče izbrisati.';
@@ -100,13 +97,16 @@
 $messages['messageopenerror'] = 'Sporočila ni bilo mogoče prenesti iz strežnika';
 $messages['fileuploaderror'] = 'Prenos datoteke je spodletel';
 $messages['filesizeerror'] = 'Naložena datoteka presega največjo dovoljeno velikost $size';
-$messages['copysuccess'] = '$nr naslovov je bilo uspešno prenešenih';
-$messages['copyerror'] = 'Nobenih naslovov ni bilo mogoče kopirati';
+$messages['copysuccess'] = 'Uspešno ste kopirali $nr stikov.';
+$messages['movesuccess'] = 'Uspešno ste premaknili $nr stikov.';
+$messages['copyerror'] = 'Stikov ni bilo mogoče kopirati.';
+$messages['moveerror'] = 'Stikov ni bilo mogoče premakniti.';
 $messages['sourceisreadonly'] = 'Ta naslov je na voljo samo za branje';
 $messages['errorsavingcontact'] = 'Stika ni bilo mogoče shraniti';
 $messages['movingmessage'] = 'Premikanje sporočila...';
 $messages['copyingmessage'] = 'Kopiranje sporočila...';
 $messages['copyingcontact'] = 'Kopiranje stika/ov';
+$messages['movingcontact'] = 'Premikanje stika(ov)...';
 $messages['deletingmessage'] = 'Brisanje sporočil/a';
 $messages['markingmessage'] = 'Označevanje sporočil/a';
 $messages['addingmember'] = 'Dodajanje stika/ov v skupino...';
@@ -140,7 +140,6 @@
 $messages['emailformaterror'] = 'Nepravilen elektronski naslov: $email';
 $messages['toomanyrecipients'] = 'Navedli ste preveč prejemnikov. Zmanjšajte število prejemnikov na $max';
 $messages['maxgroupmembersreached'] = 'Število članov skupine presega največje dovoljeno število $max.';
-$messages['internalerror'] = 'Prišlo je do napake. Poskusite znova.';
 $messages['contactdelerror'] = 'Stika/ov ni bilo mogoče izbrisati';
 $messages['contactdeleted'] = 'Stik/i so bili uspešno izbrisani';
 $messages['contactrestoreerror'] = 'Ni bilo mogoče obnoviti izbrisanih stikov.';
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index d45272e..fa822a7 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Mirëseerdhe te $product';
 $labels['username']  = 'Përdoruesi';
 $labels['password']  = 'Fjalëkalimi';
@@ -31,33 +29,22 @@
 $labels['sent']   = 'Dërguar';
 $labels['trash']  = 'Fshirë';
 $labels['junk']   = 'Reklama';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Tema';
 $labels['from']    = 'Dërguesi';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'Marrësi';
 $labels['cc']      = 'Kopje';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Data';
 $labels['size']    = 'Madhësia';
 $labels['priority'] = 'Përparësia';
 $labels['organization'] = 'Organizata';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'Kutitë';
 $labels['messagesfromto'] = 'Mesazhet $from në $to nga $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Mesazhi $nr nga $count';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'Kopje';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'ço te...';
 $labels['download'] = 'shkarko';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'Emër skedari';
 $labels['filesize'] = 'Madhësi skedari';
 $labels['addtoaddressbook'] = 'Shto në librin e adresave';
@@ -75,43 +62,12 @@
 $labels['thursday']  = 'e enjte';
 $labels['friday']    = 'e premte';
 $labels['saturday']  = 'e shtunë';
-$labels['jan']	= 'Jan';
-$labels['feb']	= 'Feb';
-$labels['mar']	= 'Mar';
-$labels['apr']	= 'Apr';
-$labels['may']	= 'May';
-$labels['jun']	= 'Jun';
-$labels['jul'] 	= 'Jul';
-$labels['aug']	= 'Aug';
-$labels['sep']	= 'Sep';
-$labels['oct']	= 'Oct';
-$labels['nov']	= 'Nov';
-$labels['dec']	= 'Dec';
-$labels['longjan']	= 'January';
-$labels['longfeb']	= 'February';
-$labels['longmar']	= 'March';
-$labels['longapr']	= 'April';
-$labels['longmay']	= 'May';
-$labels['longjun']	= 'June';
-$labels['longjul']	= 'July';
-$labels['longaug']	= 'August';
-$labels['longsep']	= 'September';
-$labels['longoct']	= 'October';
-$labels['longnov']	= 'November';
-$labels['longdec']	= 'December';
 $labels['today'] = 'sot';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'Shiko për mesazhe të reja';
 $labels['compose']          = 'Shkruaj një mesazh';
 $labels['writenewmessage']  = 'Krijo një mesazh të ri';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'Ktheji përgjigje mesazhit';
 $labels['replytoallmessage'] = 'Ktheji përgjigje dërguesit dhe të gjithë marrësve';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'Pasoje mesazhin';
 $labels['deletemessage']    = 'Fshije mesazhin';
 $labels['movemessagetotrash'] = 'Hidhe mesazhin në kosh';
@@ -122,88 +78,33 @@
 $labels['lastmessage']      = 'Shfaq mesazhin e fundit';
 $labels['backtolist']       = 'Kthehu te lista e mesazheve';
 $labels['viewsource']       = 'Shfaq tekstin';
-$labels['mark']             = 'Mark';
 $labels['markmessages']     = 'Shëno mesazhet';
 $labels['markread']         = 'Si të lexuara';
 $labels['markunread']       = 'Si të palexuara';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'Zgjidh';
 $labels['all'] = 'Të gjitha';
 $labels['none'] = 'Asnjë';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Palexuar';
-$labels['flagged'] = 'Flagged';
-$labels['unanswered'] = 'Unanswered';
-$labels['withattachment'] = 'With attachment';
-$labels['deleted'] = 'Deleted';
-$labels['undeleted'] = 'Not deleted';
-$labels['invert'] = 'Invert';
-$labels['filter'] = 'Filter';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'Asnjë';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Zvogëlo';
 $labels['empty'] = 'Boshatis';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Përdorimi i diskut';
 $labels['unknown']  = 'i panjohur';
 $labels['unlimited']  = 'i pakufizuar';
 $labels['quicksearch']  = 'Kërkim i shpejtë';
 $labels['resetsearch']  = 'Pastro kërkimin';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Dërgoje mesazhin tani';
 $labels['savemessage']    = 'Ruaje si draft';
 $labels['addattachment']  = 'Bashkangjit një skedar';
 $labels['charset']        = 'Bashkësi shkronjash';
 $labels['editortype']     = 'Lloj editori';
 $labels['returnreceipt']  = 'Njoftim marrje';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Kontroll gabimesh';
 $labels['resumeediting'] = 'Vazhdo editimin';
 $labels['revertto']      = 'Ktheje te';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Bashkangjitjet';
 $labels['upload'] = 'Ngarko';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'Mbyll';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'I ulët';
 $labels['lowest']  = 'Më i ulëti';
 $labels['normal']  = 'Normal';
@@ -211,20 +112,11 @@
 $labels['highest'] = 'Më i larti';
 $labels['nosubject']  = '(pa subjekt)';
 $labels['showimages'] = 'Shfaq imazhet';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'TEXT';
-$labels['savesentmessagein'] = 'Save sent message in';
-$labels['dontsave'] = 'don\'t save';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
 $labels['addcc'] = 'Shto Cc';
 $labels['addbcc'] = 'Shto Bcc';
 $labels['addreplyto'] = 'Shto Reply-To';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'Dërguesi i këtij mesazhi ka kërkuar që të njoftohet kur ju të lexoni këtë mesazh. Dëshironi ta njoftoni dërguesin?';
 $labels['receiptread'] = 'Njoftim Leximi';
 $labels['yourmessage'] = 'Ky është një njoftim leximi për mesazhin tuaj';
@@ -232,97 +124,26 @@
 $labels['name']         = 'Emri që thirret';
 $labels['firstname']    = 'Emri';
 $labels['surname']      = 'Mbiemri';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'E-Mail';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Shto një kontakt të ri';
 $labels['editcontact'] = 'Ndrysho kontaktin';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'Ndrysho';
 $labels['cancel'] = 'Anullo';
 $labels['save']   = 'Ruaj';
 $labels['delete'] = 'Fshi';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'Krijo nje kartë të re kontakti';
 $labels['deletecontact']  = 'Fshi kontaktet e zgjedhura';
 $labels['composeto']      = 'Shkruaj email për';
 $labels['contactsfromto'] = 'Kontaktet $from në $to nga $count';
 $labels['print']          = 'Shtyp';
 $labels['export']         = 'Eksporto';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'Shfaq grupin e mëparshëm';
 $labels['firstpage']      = 'Shfaq grupin e parë';
 $labels['nextpage']       = 'Shfaq grupin tjetër';
 $labels['lastpage']       = 'Shfaq grupin e fundit';
-$labels['group'] = 'Group';
 $labels['groups'] = 'Grupet';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Adresat Personale';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
 $labels['settingsfor'] = 'Konfigurimet për';
-$labels['about'] = 'About';
 $labels['preferences'] = 'Preferencat';
 $labels['userpreferences'] = 'Preferencat e përdoruesit';
 $labels['editpreferences'] = 'Ndrysho preferencat e përdoruesit';
@@ -332,100 +153,19 @@
 $labels['newitem'] = 'Element i ri';
 $labels['edititem'] = 'Ndrysho element';
 $labels['preferhtml'] = 'Shfaq HTML';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Mesazh HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Data të këndshme';
 $labels['setdefault']  = 'Bëje identitet kryesor';
-$labels['autodetect']  = 'Auto';
 $labels['language']  = 'Gjuha';
 $labels['timezone']  = 'Brezi orar';
 $labels['pagesize']  = 'Rreshtat për faqe';
 $labels['signature'] = 'Nënshkrim';
 $labels['dstactive']  = 'Ndryshim ore';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Shkruaj mesazhe HTML';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Nënshkrimi HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Shiko si duket';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
-$labels['uisettings'] = 'User Interface';
-$labels['serversettings'] = 'Server Settings';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
-$labels['askuser'] = 'ask me';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
-$labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'Ruaje automatikisht si draft';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'kurrë';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
-$labels['advancedoptions'] = 'Advanced options';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
-$labels['newmessage'] = 'New Message';
-$labels['signatureoptions'] = 'Signature Options';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = 'Automatically add signature';
-$labels['newmessageonly'] = 'new message only';
-$labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['insertsignature'] = 'Insert signature';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Kutia';
 $labels['folders']  = 'Kutitë';
 $labels['foldername']  = 'Emër kutie';
@@ -434,48 +174,7 @@
 $labels['create']  = 'Krijo';
 $labels['createfolder']  = 'Krijo kuti të re';
 $labels['managefolders']  = 'Sistemo kutitë';
-$labels['specialfolders'] = 'Special Folders';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'Rradhit sipas';
 $labels['sortasc']  = 'Rradhitje rritëse';
 $labels['sortdesc'] = 'Rradhitje zbritëse';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
-$labels['B'] = 'B';
-$labels['KB'] = 'KB';
-$labels['MB'] = 'MB';
-$labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/sq_AL/messages.inc b/program/localization/sq_AL/messages.inc
index 8ef4021..d4b9813 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -15,29 +15,14 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'Hyrja dështoi';
 $messages['cookiesdisabled'] = 'Shfletuesi juaj nuk i pranon sheqerkat';
 $messages['sessionerror'] = 'Sesioni juaj është i pavlefshëm ose i ka kaluar afati';
 $messages['storageerror'] = 'Lidhja me serverin IMAP dështoi';
-$messages['servererror'] = 'Server Error!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nuk ka mesazhe në këtë kuti postare';
 $messages['loggedout'] = 'Sesionin e mbyllët me sukses. Mirupafshim!';
 $messages['mailboxempty'] = 'Kutia postare është bosh';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Po ngarkohet...';
-$messages['uploading'] = 'Uploading file...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Po ngarkohen të dhëna...';
 $messages['checkingmail'] = 'Po shoh për mesazhe të reja...';
 $messages['sendingmessage'] = 'Po dërgoj mesazhin...';
@@ -47,128 +32,42 @@
 $messages['successfullysaved'] = 'U ruajt me sukses';
 $messages['addedsuccessfully'] = 'Kontakti u shtua me sukses në librin e adresave';
 $messages['contactexists'] = 'Këtë adresë e-mail e ka një kontakt tjetër';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Për të mbrojtur fshehtësinë tuaj, imazhet e largëta të këtij mesazhi janë bllokuar.';
 $messages['encryptedmessage'] = 'Ky është një mesazh i koduar dhe nuk mund te shfaqet. Më vjen keq!';
 $messages['nocontactsfound'] = 'Nuk ka kontakte';
 $messages['contactnotfound'] = 'Kontakti që kërkoni nuk gjendet';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Dërgimi i mesazhit dështoi';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'Pati nje problem gjatë ruajtjes';
 $messages['errormoving'] = 'Nuk e lëviza dot mesazhin';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Nuk e fshiva dot mesazhin';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'Me të vërtetë doni ti fshini kontaktet e zgjedhura?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Me të vërtetë doni ti fshini mesazhet e zgjedhura?';
 $messages['deletefolderconfirm']  = 'Me të vërtetë doni ta fshini këtë kuti?';
 $messages['purgefolderconfirm']  = 'Me të vërtetë doni ti fshini të gjitha mesazhet në këtë kuti?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
-$messages['folderdeleting'] = 'Deleting folder...';
-$messages['foldermoving'] = 'Moving folder...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Formulari nuk ishte i gjithi i plotësuar';
 $messages['noemailwarning'] = 'Ju lutem jepni një adresë email të rregullt';
 $messages['nonamewarning']  = 'Ju lutem jepni një emër';
 $messages['nopagesizewarning'] = 'Ju lutem jepni nje madhësi për faqen';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Ju lutem shënoni të paktën një marrës';
 $messages['nosubjectwarning']  = 'Fusha e temës është bosh. Dëshironi të shënoni një temë tani?';
 $messages['nobodywarning'] = 'Ta dërgoj mesazhin pa tekst?';
 $messages['notsentwarning'] = 'Mesazhi nuk u dërgua. Doni ta hidhni poshtë mesazhin?';
 $messages['noldapserver'] = 'Ju lutem jepni një server ldap për të kërkuar';
 $messages['nosearchname'] = 'Ju lutem jepni një adresë email ose një emër kontakti';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'U gjetën $nr mesazhe';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Kërkimi nuk gjeti gjë';
 $messages['searching'] = 'Po kërkoj...';
 $messages['checking'] = 'Po kontrolloj...';
 $messages['nospellerrors'] = 'Nuk u gjetën gabime';
 $messages['folderdeleted'] = 'Kutia u fshi me sukses';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'U fshi me sukses';
 $messages['converting'] = 'Po i heq formatimin mesazhit...';
 $messages['messageopenerror'] = 'Nuk marr dot mesazhe nga serveri';
 $messages['fileuploaderror'] = 'Ngarkimi i skedarit dështoi';
 $messages['filesizeerror'] = 'Skedari i ngarkuar e kalon madhësinë kufi prej $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Ky burim adrese është vetëm i lexueshëm';
 $messages['errorsavingcontact'] = 'Nuk e ruajta dot adresën e kontaktit';
 $messages['movingmessage'] = 'Po lëviz mesazhin...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'U dërgua me sukses një njoftim leximi';
 $messages['errorsendingreceipt'] = 'Nuk mund të dërgohet njoftimi';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Ju nuk mund ta fshini këtë identitet sepse nuk ju ka mbetur tjetër.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
-$messages['importwait'] = 'Importing, please wait...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 2fe36ca..e2d40b1 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Добродошли на $product';
 $labels['username']  = 'Корисничко име';
 $labels['password']  = 'Лозинка';
@@ -31,15 +29,12 @@
 $labels['sent']   = 'Послате';
 $labels['trash']  = 'Канта';
 $labels['junk']   = 'Смеће';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Наслов';
 $labels['from']    = 'Од';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'За';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Одговори';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'Датум';
 $labels['size']    = 'Величина';
 $labels['priority'] = 'Приоритет';
@@ -55,9 +50,6 @@
 $labels['move']     = 'Пребаци';
 $labels['moveto']   = 'Пребаци у...';
 $labels['download'] = 'Преузми (скидање)';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'Име датотекеe';
 $labels['filesize'] = 'Величина датотеке';
 $labels['addtoaddressbook'] = 'Додај у именик';
@@ -110,7 +102,6 @@
 $labels['replyall']         = 'Одговори свима';
 $labels['replylist']        = 'Листа за одговоре';
 $labels['forward']          = 'Проследи';
-$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'Проследи као прилог';
 $labels['forwardmessage']   = 'Проследи поруку';
 $labels['deletemessage']    = 'Избриши поруку';
@@ -139,19 +130,13 @@
 $labels['unread'] = 'Непрочитане';
 $labels['flagged'] = 'Означено';
 $labels['unanswered'] = 'Неодговорено';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Обрисано';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Уведи';
 $labels['filter'] = 'Филтер';
 $labels['list'] = 'Листа';
 $labels['threads'] = 'Нити';
 $labels['expand-all'] = 'Прошири све';
-$labels['expand-unread'] = 'Expand Unread';
 $labels['collapse-all'] = 'Сажми све';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
 $labels['expand_only_unread'] = 'само са непрочитаним порукама';
 $labels['fromto'] = 'Од/За';
 $labels['flag'] = 'Застава';
@@ -163,27 +148,19 @@
 $labels['desc'] = 'опадајући';
 $labels['listcolumns'] = 'Лист колона';
 $labels['listsorting'] = 'Сортирање колонe';
-$labels['listorder'] = 'Sorting order';
 $labels['listmode'] = 'Лист режим приказивања';
 $labels['folderactions'] = 'Поставке фасцикле';
 $labels['compact'] = 'Компакција';
 $labels['empty'] = 'Испразни';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Квота';
 $labels['unknown']  = 'непозната';
 $labels['unlimited']  = 'бесконачна';
 $labels['quicksearch']  = 'Брза претрага';
 $labels['resetsearch']  = 'Прикажи све поруке';
-$labels['searchmod']  = 'Search modifiers';
 $labels['msgtext']  = 'Цела порука';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'Отвори у новом прозору';
 $labels['emlsave'] = 'Довнлоад (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'Модификуј као ново';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'Пошаљи поруку';
 $labels['savemessage']    = 'Сачувај у Снимљене';
 $labels['addattachment']  = 'Приложи датотеку';
@@ -212,10 +189,6 @@
 $labels['nosubject']  = '(без наслова)';
 $labels['showimages'] = 'Прикажи слике';
 $labels['alwaysshow'] = 'Увек покажи слике од $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Обичан текст';
 $labels['savesentmessagein'] = 'Послате поруке сачувај у';
@@ -224,7 +197,6 @@
 $labels['addcc'] = 'Додај Cc';
 $labels['addbcc'] = 'Додај Bcc';
 $labels['addreplyto'] = 'Додај Одговор-за';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'Пошиљалац ове поруке је замолио да буде обавештен када прочитате ову поруку. Да ли желите да обавестите пошиљаоца?';
 $labels['receiptread'] = 'Обавештење о приспећу (прочитана порука)';
 $labels['yourmessage'] = 'Ово је обавештење о приспећу за вашу поруку';
@@ -297,8 +269,6 @@
 $labels['contactsfromto'] = 'Контакти $from до $to од укупно $count';
 $labels['print']          = 'Штампај';
 $labels['export']         = 'Извези';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Извези конакте у vCard формату';
 $labels['newcontactgroup'] = 'Креирај нову контакт групу';
 $labels['grouprename']    = 'Преименуј групу';
@@ -310,16 +280,13 @@
 $labels['lastpage']       = 'Прикажи последњи скуп';
 $labels['group'] = 'Група';
 $labels['groups'] = 'Групе';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Личне адресе';
 $labels['searchsave'] = 'Сачувај претрагу';
 $labels['searchdelete'] = 'Избриши претрагу';
 $labels['import'] = 'Увези';
 $labels['importcontacts'] = 'Увези контакте';
 $labels['importfromfile'] = 'Увези из датотеке:';
-$labels['importtarget'] = 'Додај нове контакте у адресар';
 $labels['importreplace'] = 'Измени цели адресар';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Готово';
 $labels['settingsfor'] = 'Подешавања за';
 $labels['about'] = 'Инфо';
@@ -332,10 +299,7 @@
 $labels['newitem'] = 'Нова ставка';
 $labels['edititem'] = 'Измена ставке';
 $labels['preferhtml'] = 'Предност дај ХТМЛ формату';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ХТМЛ формат поруке';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Формат датума';
 $labels['timeformat'] = 'Формат времена';
 $labels['prettydate'] = 'Форматирани датум';
@@ -346,13 +310,9 @@
 $labels['pagesize']  = 'Редова по страни';
 $labels['signature'] = 'Потпис';
 $labels['dstactive']  = 'Летње померање времена';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Састави HTML поруке';
 $labels['htmlonreply'] = 'само при одговору на HTML поруку';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML потпис';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Прикажи панел за преглед';
 $labels['skin'] = 'Интерфејс';
 $labels['logoutclear'] = 'Избриши смеће при логовању';
@@ -360,24 +320,13 @@
 $labels['uisettings'] = 'Кориснички интерфејс';
 $labels['serversettings'] = 'Поставке сервера';
 $labels['mailboxview'] = 'Преглед сандучета';
-$labels['mdnrequests'] = 'On request for return receipt';
 $labels['askuser'] = 'питај ме';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'игнорисати';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'Не приказуј избрисане поруке';
 $labels['deletealways'] = 'Ако слање поруке у отпад не успе, обришите их';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'увек';
 $labels['showinlineimages'] = 'Покажи приложене слике испод поруке';
 $labels['autosavedraft']  = 'Аутоматски чувај у Снимљене';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'никад';
 $labels['immediately']  = 'одмах';
 $labels['messagesdisplaying'] = 'прикажи поруке';
@@ -386,7 +335,6 @@
 $labels['2231folding'] = 'Full RFC 2231 (тхундербирд )';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (други)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Напредне опције';
 $labels['focusonnewmessage'] = 'Фокусирати прозор претраживача на новој поруци';
 $labels['checkallfolders'] = 'Проверите све фасцикле за нове поруке';
@@ -399,7 +347,6 @@
 $labels['newmessage'] = 'Нова порука';
 $labels['signatureoptions'] = 'Опције потписа';
 $labels['whenreplying'] = 'При одговору';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'Почни нову поруку преко оригинала';
 $labels['replybottomposting'] = 'Почни нову поруку испод оригинала';
 $labels['replyremovesignature'] = 'При одговору одстрани оригинални потпис из поруке';
@@ -412,20 +359,12 @@
 $labels['reqmdn'] = 'Увек затражи повратну скрипту';
 $labels['reqdsn'] = 'Увек затражи обавештење о статусу слања поруке';
 $labels['replysamefolder'] = 'Сачувај одговоре у фасциклу поруке на коју се одговара';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
 $labels['listnamedisplay'] = 'Листи контакате као';
 $labels['spellcheckbeforesend'] = 'Проверите правопис пре слања поруке';
 $labels['spellcheckoptions'] = 'Опције  Провере  правописа';
 $labels['spellcheckignoresyms'] = 'игнориши  речи са симболима';
 $labels['spellcheckignorenums'] = 'игнориши  речи са бројевима';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'Додај у речник';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'Фасцикла';
 $labels['folders']  = 'Фасцикле';
 $labels['foldername']  = 'Име фасцикле';
@@ -450,7 +389,6 @@
 $labels['sortasc']  = 'Сортирај растуће';
 $labels['sortdesc'] = 'Сортирај опадајуће';
 $labels['undo'] = 'Унатраг';
-$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Додаци';
 $labels['version'] = 'Верзија';
 $labels['source'] = 'Извор';
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 1f86fa8..7a4c893 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Дошло је до грешке!';
 $messages['loginfailed']  = 'Неуспешно пријављивање';
 $messages['cookiesdisabled'] = 'Ваш интернет прегледач не подржава колачиће';
@@ -27,8 +26,6 @@
 $messages['requesttimedout'] = 'Захтев је истекао';
 $messages['errorreadonly'] = 'Не може да изврши операцију. Фасцикла се може само читати.';
 $messages['errornoperm'] = 'Извршење операције није могуће. Одбијен захтев за дозволу.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Погрешан захтев! Подаци нису сачувани.';
 $messages['invalidhost'] = 'Погрешно име сервера.';
 $messages['nomessagesfound'] = 'Немате порука у сандучету.';
@@ -55,8 +52,6 @@
 $messages['contactsearchonly'] = 'Унесите шта тражите да пронађете контакте';
 $messages['sendingfailed'] = 'Грешка при слању поруке';
 $messages['senttooquickly'] = 'Молимо Вас да сачекате $sec секунд(и) пре него пошаљете ову поруку';
-$messages['errorsavingsent'] = 'Приликом похрањивања послате поруке десила се грешка';
-$messages['errorsaving'] = 'Грешка при снимању поруке';
 $messages['errormoving'] = 'Грешка при премештању поруке';
 $messages['errorcopying'] = 'Копирање поруке није било успешно';
 $messages['errordeleting'] = 'Грешка при брисању поруке';
@@ -100,16 +95,11 @@
 $messages['messageopenerror'] = 'Порука се не може учитати са сервера';
 $messages['fileuploaderror'] = 'Слање датотеке неуспешно';
 $messages['filesizeerror'] = 'Послата датотека не може да прекорачи величину од $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Овај извор адресе је само за читање';
 $messages['errorsavingcontact'] = 'Неуспело снимање адресе контакта';
 $messages['movingmessage'] = 'Премештам поруку...';
 $messages['copyingmessage'] = 'Копирам поруке...';
 $messages['copyingcontact'] = 'Умножава контакте...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'бришем поруке...';
 $messages['markingmessage'] = 'Означавам поруке...';
 $messages['addingmember'] = 'Додаје контакте у групу...';
@@ -128,8 +118,6 @@
 $messages['importformaterror'] = 'Увоз је неуспешан! Послата датотека није допуштена за увоз.';
 $messages['importconfirm'] = '<b>Успешно увезжени $inserted контакти </b>';
 $messages['importconfirmskipped'] = '<b>Прескочени $skipped постојећи уноси </b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Операција није дозвољена!';
 $messages['nofromaddress'] = 'Недостаје имејл адреса у изабраном налогу';
 $messages['editorwarning'] = 'Пребацивање на обичан текст едитор ће изазвати губитак целог форматирања. Да ли желите да наставите?';
@@ -143,7 +131,6 @@
 $messages['emailformaterror'] = 'Имејл адреса није валидна: $email';
 $messages['toomanyrecipients'] = 'Превише прималаца. Смањите број прималаца на $max.';
 $messages['maxgroupmembersreached'] = 'Број чланова гупе прелази максимум од $max';
-$messages['internalerror'] = 'Десила се интерна грешка. Молимо покушајте поново';
 $messages['contactdelerror'] = 'Брисање контакта неуспешно';
 $messages['contactdeleted'] = 'Брисање контакта успешно';
 $messages['contactrestoreerror'] = 'Не може да врати обрисане контакте.';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 1a1048c..48f71ab 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Välkommen till $product';
 $labels['username']  = 'Användarnamn';
 $labels['password']  = 'Lösenord';
@@ -178,6 +176,7 @@
 $labels['msgtext']  = 'Hela meddelandet';
 $labels['body']  = 'Innehåll';
 $labels['type'] = 'Typ';
+$labels['namex'] = 'Namn';
 $labels['openinextwin'] = 'Öppna i nytt fönster';
 $labels['emlsave'] = 'Spara (.eml)';
 $labels['changeformattext'] = 'Visa i text-format';
@@ -317,8 +316,11 @@
 $labels['import'] = 'Importera';
 $labels['importcontacts'] = 'Importera kontakter';
 $labels['importfromfile'] = 'Importera från fil:';
-$labels['importtarget'] = 'Lägg till nya kontakter till adressbok:';
+$labels['importtarget'] = 'Lägg till kontakter i';
 $labels['importreplace'] = 'Ersätt samtliga kontakter i adressboken';
+$labels['importgroups'] = 'Importera grupptillhörigheter';
+$labels['importgroupsall'] = 'Alla (skapa grupper om nödvändigt)';
+$labels['importgroupsexisting'] = 'Endast till befintliga grupper';
 $labels['importdesc'] = 'Kontakter kan importeras från en befintlig adressbok.<br/>Programmet stödjer inläsning av kontakter i formatet <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> eller formatet CSV (kommaseparerad data).';
 $labels['done'] = 'Klart';
 $labels['settingsfor'] = 'Inställningar för';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 3aeb6e2..2773ae4 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Ett fel uppstod!';
 $messages['loginfailed']  = 'Inloggningen misslyckades';
 $messages['cookiesdisabled'] = 'Din webbläsare accepterar inte cookies';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Ange sökord för att hitta kontakter';
 $messages['sendingfailed'] = 'Meddelandet kunde inte skickas';
 $messages['senttooquickly'] = 'Vänta ytterligare $sec sekunder med att skicka meddelandet';
-$messages['errorsavingsent'] = 'Ett fel inträffade när det skickade meddelandet skulle sparas';
-$messages['errorsaving'] = 'Meddelandet kunde inte sparas';
 $messages['errormoving'] = 'Meddelandet kunde inte flyttas';
 $messages['errorcopying'] = 'Meddelandet kunde inte kopieras';
 $messages['errordeleting'] = 'Meddelandet kunde inte tas bort';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = 'Felaktig adress: $email';
 $messages['toomanyrecipients'] = 'Förmånga mottagare. Minska antalet till högst $max';
 $messages['maxgroupmembersreached'] = 'Antalet gruppmedlemmar får inte överstiga $max';
-$messages['internalerror'] = 'Ett internt fel uppstod. Försök igen.';
 $messages['contactdelerror'] = 'Kontakt kunde inte tas bort';
 $messages['contactdeleted'] = 'Kontakt borttagen.';
 $messages['contactrestoreerror'] = 'Borttagna kontakter kunde inte återskapas';
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index 8b22335..dd8c134 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'நல்வரவு';
 $labels['username']  = 'பயனர்';
 $labels['password']  = 'கடவுச்சொல்';
@@ -31,33 +29,22 @@
 $labels['sent']   = 'அனுப்பிய அஞ்சல்';
 $labels['trash']  = 'குப்பை';
 $labels['junk']   = 'எரிதம்';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'தலைப்பு';
 $labels['from']    = 'அனுப்புனர்';
-$labels['sender']  = 'Sender';
 $labels['to']      = 'பெறுனர்';
 $labels['cc']      = 'நகல்';
 $labels['bcc']     = 'மறை நகல்';
 $labels['replyto'] = 'பதிலளி';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'தேதி';
 $labels['size']    = 'அளவு';
 $labels['priority'] = 'முக்கியத்துவம்';
 $labels['organization'] = 'நிறுவனம்';
-$labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
 $labels['mailboxlist'] = 'அடைவுகள்';
 $labels['messagesfromto'] = 'செய்திகள் $countல் $from லிருந்து $to வரை';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$countல் $nr வது செய்தி';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'நகல்';
-$labels['move']     = 'Move';
 $labels['moveto']   = 'இதற்கு அனுப்பு...';
 $labels['download'] = 'பதிவிறக்கு';
-$labels['open']     = 'Open';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'கோப்பு பெயர்';
 $labels['filesize'] = 'கோப்பு அளவு';
 $labels['addtoaddressbook'] = 'தொடர்புகளுக்கு சேர்க்கவும்';
@@ -100,18 +87,11 @@
 $labels['longnov']	= 'நவம்பர்';
 $labels['longdec']	= 'டிசம்பர்';
 $labels['today'] = 'இன்று';
-$labels['refresh']          = 'Refresh';
 $labels['checkmail']        = 'புது அஞ்சல்களை பார்க்கவும்';
 $labels['compose']          = 'அஞ்சல் எழுது';
 $labels['writenewmessage']  = 'புது அஞ்சல் எழுதவும்';
-$labels['reply']            = 'Reply';
 $labels['replytomessage']   = 'அனுப்புனருக்கு பதிலளி';
 $labels['replytoallmessage'] = 'அனுப்புனர் மற்றும் எல்லா பெறுனர்களுக்கும் பதிலளி';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
 $labels['forwardmessage']   = 'செய்தியை முன்அனுப்பு';
 $labels['deletemessage']    = 'செய்தியை நீக்கு';
 $labels['movemessagetotrash'] = 'செய்தியை குப்பைக்கு நகர்த்து';
@@ -122,53 +102,23 @@
 $labels['lastmessage']      = 'கடைசி செய்தியை காட்டு';
 $labels['backtolist']       = 'செய்தி பட்டியலுக்கு செல்லவும்';
 $labels['viewsource']       = 'மூலத்தை காட்டு';
-$labels['mark']             = 'Mark';
 $labels['markmessages']     = 'செய்திகளை குறியிடு';
 $labels['markread']         = 'படித்ததாக குறியிடு';
 $labels['markunread']       = 'படிக்காததாக குறியிடு';
 $labels['markflagged']      = 'நட்சத்திரமிட்டதாக குறியிடு';
 $labels['markunflagged']    = 'நட்சத்திரமிடாததாக குறியிடு';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
 $labels['select'] = 'தேர்ந்தெடு';
 $labels['all'] = 'எல்லாம்';
 $labels['none'] = 'எதுவுமில்லை';
-$labels['currpage'] = 'Current page';
 $labels['unread'] = 'படிக்காதது';
 $labels['flagged'] = 'நட்சத்திரமிட்டது';
 $labels['unanswered'] = 'பதிலளிக்காதது';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'நீக்கியது';
-$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'தலைகீழ்';
 $labels['filter'] = 'வடிப்பான்';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
-$labels['expand-all'] = 'Expand All';
-$labels['expand-unread'] = 'Expand Unread';
-$labels['collapse-all'] = 'Collapse All';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
-$labels['attachment'] = 'Attachment';
 $labels['nonesort'] = 'எதுவுமில்லை';
-$labels['sentdate'] = 'Sent date';
-$labels['arrival'] = 'Arrival date';
-$labels['asc'] = 'ascending';
-$labels['desc'] = 'descending';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'குறுகிய';
 $labels['empty'] = 'காலி';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'பயன்பாட்டு அளவு';
 $labels['unknown']  = 'தெரியாத';
 $labels['unlimited']  = 'அளவில்லா';
@@ -176,34 +126,21 @@
 $labels['resetsearch']  = 'தேடலை மறுஅமை';
 $labels['searchmod']  = 'மாற்றிகளை தேடு';
 $labels['msgtext']  = 'முழு செய்தி';
-$labels['body']  = 'Body';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = 'புது சாளரத்தில் திற';
 $labels['emlsave'] = 'பதிவிறக்கு (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
 $labels['editasnew']      = 'புதியதாக திருத்து';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'இப்போது அனுப்பு';
 $labels['savemessage']    = 'இந்த வரைவை சேமி';
 $labels['addattachment']  = 'ஒரு கோப்பை இணைக்கவும்';
 $labels['charset']        = 'எழுத்து குறிமுறை';
 $labels['editortype']     = 'திருத்தும் வகை';
 $labels['returnreceipt']  = 'திரும்பு சீட்டு';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'எழுத்துப்பிழை சரிபார்';
 $labels['resumeediting'] = 'திருத்துவதை தொடரவும்';
 $labels['revertto']      = 'முந்திய நிலைக்கு திரும்பவும்';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'கோப்பு இணைப்புகள்';
 $labels['upload'] = 'பதிவேற்று';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'மூடு';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'குறைந்த';
 $labels['lowest']  = 'மிக குறைந்த';
 $labels['normal']  = 'சாதாரண';
@@ -212,10 +149,6 @@
 $labels['nosubject']  = '(தலைப்பில்லா)';
 $labels['showimages'] = 'படங்களை காட்டு';
 $labels['alwaysshow'] = '$-னிடமிருந்து வரும் படங்களை காட்டு';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'எளிய உரை';
 $labels['savesentmessagein'] = 'அனுப்பிய அஞ்சலை இங்கு சேமிக்கவும்';
@@ -224,7 +157,6 @@
 $labels['addcc'] = 'நகல் சேர்';
 $labels['addbcc'] = 'மறை நகல் சேர்';
 $labels['addreplyto'] = 'பதிலளிக்க வேண்டியவர்களை சேர்';
-$labels['addfollowupto'] = 'Add Followup-To';
 $labels['mdnrequest'] = 'இந்த செய்தியின் அனுப்புனர் இதை படித்தவுடன் அறிவிக்கும்படி கேட்டார். அறிவிக்க விரும்புகிறீர்களா ?';
 $labels['receiptread'] = 'திரும்பு சீட்டு (படி)';
 $labels['yourmessage'] = 'இது உங்கள் செய்தியின் திரும்பு சீட்டு';
@@ -232,97 +164,32 @@
 $labels['name']         = 'காட்சி பெயர்';
 $labels['firstname']    = 'முதற் பெயர்';
 $labels['surname']      = 'கடைசி பெயர்';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'மின்னஞ்சல்';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
-$labels['typepager']  = 'Pager';
-$labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
-$labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
-$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'புது தொடர்பை சேர்';
 $labels['editcontact'] = 'தொடர்பை திருத்து';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'திருத்து';
 $labels['cancel'] = 'ரத்து';
 $labels['save']   = 'சேமி';
 $labels['delete'] = 'நீக்கு';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'புது தொடர்பு அட்டையை உருவாக்கு';
 $labels['deletecontact']  = 'தேர்ந்தெடுத்த தொடர்புகளை நீக்கு';
 $labels['composeto']      = 'இவர்-கு அஞ்சல் எழுது';
 $labels['contactsfromto'] = 'தொடர்புகள் $countல் $from லிருந்து $to வரை';
 $labels['print']          = 'அச்சிடு';
 $labels['export']         = 'ஏற்றுமதி';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'தொடர்புகளை vCard வடிவத்தில் ஏற்றுமதி செய்யவும்';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'முந்திய குழுவை காட்டு';
 $labels['firstpage']      = 'முதல் குழுவை காட்டு';
 $labels['nextpage']       = 'அடுத்த குழுவை காட்டு';
 $labels['lastpage']       = 'கடைசி குழுவை காட்டு';
-$labels['group'] = 'Group';
 $labels['groups'] = 'குழுக்கள்';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'சுய முகவரி';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
 $labels['import'] = 'இறக்குமதி';
 $labels['importcontacts'] = 'தொடர்புகளை இறக்குமதி செய்யவும்';
 $labels['importfromfile'] = 'இந்த கோப்பிலிருந்து இறக்குமதி செய்யவும்:';
-$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'எல்லா தொடர்புகளையும் மாற்றி அமை';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'முடிந்தது';
 $labels['settingsfor'] = 'இதற்கான அமைப்புகள்';
-$labels['about'] = 'About';
 $labels['preferences'] = 'விருப்பங்கள்';
 $labels['userpreferences'] = 'பயனர் விருப்பங்கள்';
 $labels['editpreferences'] = 'பயனர் விருப்பங்களை திருத்து';
@@ -332,12 +199,7 @@
 $labels['newitem'] = 'புது உருப்படி';
 $labels['edititem'] = 'உருப்படியை திருத்து';
 $labels['preferhtml'] = 'HTML காட்டு';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML செய்தி';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'நல்ல தேதி';
 $labels['setdefault']  = 'இயல்பை அமை';
 $labels['autodetect']  = 'தானியங்கி';
@@ -346,13 +208,8 @@
 $labels['pagesize']  = 'ஒரு பக்கத்திற்கான வரிகள்';
 $labels['signature'] = 'கையொப்பம்';
 $labels['dstactive']  = 'பகல் ஒளி சேமிப்பு நேரம்';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'HTML செய்திகளை எழுது';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML கையொப்பம்';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'முந்திய பாத்தியை காட்டு';
 $labels['skin'] = 'முகப்பு தோற்றம்';
 $labels['logoutclear'] = 'வெளியேறும் போது குப்பையை காலி செய்';
@@ -363,43 +220,33 @@
 $labels['mdnrequests'] = 'அனுப்புனர் அறிவிப்புகள்';
 $labels['askuser'] = 'பயனரை கேள்';
 $labels['autosend'] = 'தானாக அனுப்பு';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'தவிர்';
 $labels['readwhendeleted'] = 'செய்தியை நீக்கும் போது படித்ததாக குறி';
 $labels['flagfordeletion'] = 'நீக்குவதற்கு பதிலாக நீக்குவதாக நட்சத்திரமிடு';
 $labels['skipdeleted'] = 'நீக்கிய செய்திகளை காட்டாதே';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'தொலை தூர துணை படங்களை காட்டு';
 $labels['fromknownsenders'] = 'தெரிந்த அனுப்புனரிடமிருந்து';
 $labels['always'] = 'எப்போதும்';
 $labels['showinlineimages'] = 'இணைத்த படங்களை செய்திகளுக்கு கீழே காட்டவும்';
 $labels['autosavedraft']  = 'தானாக வரைவுகளை சேமி';
 $labels['everynminutes']  = 'ஒவ்வொரு $n நிமிடங்களுக்கும்';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'எப்போதுமில்லை';
-$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'செய்திகளை காட்டுகிறது';
 $labels['messagescomposition'] = 'செய்திகளை எழுதுகிறது';
 $labels['mimeparamfolding'] = 'இணைப்பு பெயர்கள்';
 $labels['2231folding'] = 'முழு RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'முழு RFC 2047 (மற்ற)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'மேம்பட்ட விருப்பங்கள்';
 $labels['focusonnewmessage'] = 'உலாவி சாளரத்தை புது செய்திக்காக கவனி';
 $labels['checkallfolders'] = 'புது செய்திகளுக்காக எல்லா அடைவுகளையும் சரிபார்';
 $labels['displaynext'] = 'செய்தியை நீக்கு/நகர் பிறகு அடுத்த செய்தியை காட்டு';
-$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'முக்கிய விருப்பங்கள்';
-$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'பிரிவு';
 $labels['maintenance'] = 'பராமரிப்பு';
 $labels['newmessage'] = 'புது செய்தி';
 $labels['signatureoptions'] = 'கையொப்ப விருப்பங்கள்';
 $labels['whenreplying'] = 'பதிலளிக்கும் போது';
-$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'புது செய்தியை அசலின் மேல் துவக்கு';
 $labels['replybottomposting'] = 'புது செய்தியை அசலின் கீழ் துவக்கு';
 $labels['replyremovesignature'] = 'பதிலளிக்கும் போது அசல் கையெழுத்தை செய்தியிலிருந்து நீக்கவும்';
@@ -407,25 +254,6 @@
 $labels['newmessageonly'] = 'புது செய்தி மட்டும்';
 $labels['replyandforwardonly'] = 'பதிலளிப்பு முன்அனுப்பு மட்டும்';
 $labels['insertsignature'] = 'கையோப்பமிடு';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
 $labels['folder']  = 'அடைவு';
 $labels['folders']  = 'அடைவுகள்';
 $labels['foldername']  = 'அடைவு பெயர்';
@@ -435,47 +263,11 @@
 $labels['createfolder']  = 'புது அடைவு உருவாக்கு';
 $labels['managefolders']  = 'அடைவுகளை நிற்வகி';
 $labels['specialfolders'] = 'சிறப்பு அடைவுகள்';
-$labels['properties'] = 'Properties';
-$labels['folderproperties'] = 'Folder properties';
-$labels['parentfolder'] = 'Parent folder';
-$labels['location'] = 'Location';
-$labels['info'] = 'Information';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
-$labels['foldertype'] = 'Folder Type';
-$labels['personalfolder']  = 'Private Folder';
-$labels['otherfolder']  = 'Other User\'s Folder';
-$labels['sharedfolder']  = 'Public Folder';
 $labels['sortby'] = 'வாரியாக அடுக்கு';
 $labels['sortasc']  = 'ஏறு வரிசையாக அடுக்கு';
 $labels['sortdesc'] = 'இறங்கு வரிசையாக அடுக்கு';
-$labels['undo'] = 'Undo';
-$labels['installedplugins'] = 'Installed plugins';
-$labels['plugin'] = 'Plugin';
-$labels['version'] = 'Version';
-$labels['source'] = 'Source';
-$labels['license'] = 'License';
-$labels['support'] = 'Get support';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
-$labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index 98ccd52..d496b38 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -15,29 +15,17 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'நுழைவு தோல்வியடைந்தது';
 $messages['cookiesdisabled'] = 'உங்கள் உலாவி நினைவிகளை அனுமதிப்பதில்லை';
 $messages['sessionerror'] = 'உங்கள் அமர்வு செல்லாது அல்லது முடிவுற்றது';
 $messages['storageerror'] = 'IMAP சேவையகத்திற்கான இணைப்பு தோல்வியடைந்தது';
 $messages['servererror'] = 'சேவையக பிழை!';
-$messages['servererrormsg'] = 'Server Error: $msg';
-$messages['dberror'] = 'Database Error!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'செல்லாத வேண்டுகோள்! எந்த தரவும் சேமிக்கப்படவில்லை.';
-$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'இந்த தபால் பெட்டியில் எந்த தரவும் சேமிக்கப்படவில்லை';
 $messages['loggedout'] = 'நீங்கள் அமர்வை வெற்றிகரமாக முடித்தீர்கள். வணக்கம்';
 $messages['mailboxempty'] = 'தபால் பெட்டி காலியாக உள்ளது';
-$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'ஏற்றுகிறது...';
 $messages['uploading'] = 'கோப்பை ஏற்றுகிறது...';
-$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'தரவை ஏற்றுகிறது...';
 $messages['checkingmail'] = 'புது செய்திகளை சரிபார்க்கிறது...';
 $messages['sendingmessage'] = 'செய்தியை அனுப்புகிறது...';
@@ -47,31 +35,21 @@
 $messages['successfullysaved'] = 'வெற்றிகரமாக சேமிக்கப்பட்டது';
 $messages['addedsuccessfully'] = 'தொடர்பு சேமிக்கப்பட்டது';
 $messages['contactexists'] = 'இந்த மின்னஞ்சல் முகவரியுடன் ஒரு தொடர்பு ஏற்கனவே உள்ளது';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'உங்கள் தனிப்பட்ட தகவலை பாதுகாக்க, தொலை தூரப் படங்கள் இந்த செய்தியில் தடுக்கப்பட்டது';
 $messages['encryptedmessage'] = 'மன்னிக்கவும்! இந்த செய்தி குறிமுறையாக்கப்பட்டது அதனால் காட்ட முடியாது.';
 $messages['nocontactsfound'] = 'எந்த தொடர்புகளும் காணப்படவில்லை';
 $messages['contactnotfound'] = 'நீங்கள் வேண்டிய தொடர்பு காணப்படவில்லை';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'செய்தி அனுப்புவது தோல்வியுற்றது';
 $messages['senttooquickly'] = 'இந்த செய்தி அனுப்புவதற்கு முன்பு தயவு செய்து $sec வினாடி(கள்) காத்திருக்கவும்.';
-$messages['errorsavingsent'] = 'அனுப்பிய அஞ்சலை சேமிக்கும் போது பிழை ஏற்பட்டது';
-$messages['errorsaving'] = 'சேமிக்கும் போது பிழை ஏற்பட்டது';
 $messages['errormoving'] = 'செய்தியை நகர்த்த முடியவில்லை';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'செய்தியை நீக்க முடியவில்லை';
 $messages['errormarking'] = 'செய்தியை நட்சத்திரமிட முடியவில்லை';
 $messages['deletecontactconfirm']  = 'நீங்கள் தேர்ந்தெடுத்த தொடர்புகளை நீக்க விரும்புகிறீர்களா ?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'நீங்கள் தேர்ந்தெடுத்த செய்திகளை நீக்க விரும்புகிறீர்களா ?';
 $messages['deletefolderconfirm']  = 'நீங்கள் இந்த அடைவை நீக்க விரும்புகிறீர்களா ?';
 $messages['purgefolderconfirm']  = 'நீங்கள் இந்த அடைவிலிருக்கும் எல்லா செய்திகளையும் நீக்க விரும்புகிறீர்களா ?';
-$messages['contactdeleting'] = 'Deleting contact(s)...';
-$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'அடைவை நீக்குகிறது...';
 $messages['foldermoving'] = 'அடைவை நகர்த்துகிறது...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'விண்ணப்பத்தை முழுமையாக நிறைவு செய்யவில்லை';
 $messages['noemailwarning'] = 'தயவு செய்து உண்மையான மின்னஞ்சலை எழுதுங்கள்';
 $messages['nonamewarning']  = 'தயவு செய்து பெயரை எழுதுங்கள்';
@@ -85,51 +63,27 @@
 $messages['nosearchname'] = 'தயவு செய்து தொடர்பின் பெயரோ மின்னஞ்சல் முகவரியோ எழுதுங்கள்';
 $messages['notuploadedwarning'] = 'எல்லா இணைப்புகளும் ஏற்றப்படவில்லை. தயவு செய்து காத்திருங்கள் அல்லது ஏற்றத்தை ரத்து செய்யுங்கள்.';
 $messages['searchsuccessful'] = '$nr செய்திகள் கண்டுபிடிக்கப்பட்டது';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'தேடுதல் எந்த பொருத்தத்தையும் அனுப்பவில்லை';
 $messages['searching'] = 'தேடுகிறது...';
 $messages['checking'] = 'சரி பார்க்கிறது...';
 $messages['nospellerrors'] = 'எழுத்து பிழைகள் இல்லை';
 $messages['folderdeleted'] = 'அடைவு வெற்றிகரமாக நீக்கப்பட்டது';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'வெற்றிகரமாக நீக்கப்பட்டது';
 $messages['converting'] = 'வடிவத்தை நீக்குகிறது...';
 $messages['messageopenerror'] = 'சேவையகத்திலிருந்து செய்தியை ஏற்ற முடியவில்லை';
 $messages['fileuploaderror'] = 'கோப்பு ஏற்றம் தோல்வியடாந்தது';
 $messages['filesizeerror'] = 'ஏற்றிய கோப்பு அதிகபட்ச அளவான $size-ஐ மீறியது';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'இந்த முகவரியின் மூலத்தை படிக்க மட்டும்தான் முடியும்';
 $messages['errorsavingcontact'] = 'தொடர்பு முகவரியை சேமிக்க முடியவில்லை';
 $messages['movingmessage'] = 'செய்தியை நகர்த்துகிறது...';
-$messages['copyingmessage'] = 'Copying message(s)...';
-$messages['copyingcontact'] = 'Copying contact(s)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
-$messages['deletingmessage'] = 'Deleting message(s)...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'படித்த சீட்டு வெற்றிகரமாக அனுப்பப்பட்டது';
 $messages['errorsendingreceipt'] = 'சீட்டை அனுப்ப முடியவில்லை';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'நீங்கள் இந்த அடையாளத்தை நீக்க முடியாது இது தான் கடைசி';
 $messages['forbiddencharacter'] = 'அடைவு பெயரில் தடை செய்யப்பட்ட எழுத்துக்கள் உள்ளது';
 $messages['selectimportfile'] = 'தயவு செய்து ஏற்றுவதற்கு ஒரு கோப்பை தேர்ந்தெடுங்கள்';
 $messages['addresswriterror'] = 'நீங்கள் தேர்ந்தெடுத்த தொடர்புகளில் எழுத முடியாது';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'ஏற்றுகிறது, தயவு செய்து காத்திருங்கள்...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>வெற்றிகரமாக $inserted தொடர்புகள் ஏற்றப்பட்டது, ஏற்கனவே உள்ள $skipped தொடர்புகள் தவிர்க்கப்பட்டது</b>: <p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'பணி அனுமதிக்கப்படவில்லை!';
 $messages['nofromaddress'] = 'நீங்கள் தேர்ந்தெடுத்த அடையாளத்தில் மின்னஞ்சல் இல்லை';
 $messages['editorwarning'] = 'எளிய உரை திருத்திக்கு மாறுவதன் மூலம் எல்லா உரை வடிவங்களும் தொலைந்து போகக் கூடும். தொடர விரும்புகிறீர்களா ?';
@@ -141,34 +95,4 @@
 $messages['smtprecipientserror'] = 'SMTP பிழை : பெறுனர் பட்டியலை பிரிக்க முடியவில்லை';
 $messages['smtperror'] = 'SMTP பிழை: $msg';
 $messages['emailformaterror'] = 'தவறான மின்னஞ்சல் முகவரி: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index 06e3996..9ee0858 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'ยินดีต้อนรับสู่ $product';
 $labels['username']  = 'บัญชีผู้ใช้';
 $labels['password']  = 'รหัสผ่าน';
@@ -31,7 +29,6 @@
 $labels['sent']   = 'กล่องขาออก';
 $labels['trash']  = 'ถังขยะ';
 $labels['junk']   = 'กล่องจดหมายขยะ';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'หัวจดหมาย';
 $labels['from']    = 'ผู้ส่ง';
 $labels['sender']  = 'ผู้ส่ง';
@@ -39,7 +36,6 @@
 $labels['cc']      = 'คัดลอก';
 $labels['bcc']     = 'แอบสำเนาถึง';
 $labels['replyto'] = 'ตอบกลับ';
-$labels['followupto'] = 'Followup-To';
 $labels['date']    = 'วันที่';
 $labels['size']    = 'ขนาด';
 $labels['priority'] = 'ระดับความสำคัญ';
@@ -48,16 +44,12 @@
 $labels['listoptions'] = 'ตัวเลือกการแสดงรายการ';
 $labels['mailboxlist'] = 'กล่องจดหมาย';
 $labels['messagesfromto'] = 'จดหมายจาก $from ถึง $to จำนวน $count ฉบับ';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'จดหมายฉบับที่ $nr จาก $count ฉบับ';
-$labels['fromtoshort'] = '$from – $to of $count';
 $labels['copy']     = 'คัดลอก';
 $labels['move']     = 'เลื่อน';
 $labels['moveto']   = 'ย้ายไป...';
 $labels['download'] = 'ดาวน์โหลด';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'แสดง';
-$labels['showanyway'] = 'Show it anyway';
 $labels['filename'] = 'ชื่อไฟล์';
 $labels['filesize'] = 'ขนาดไฟล์';
 $labels['addtoaddressbook'] = 'บันทึกในสมุดรายชื่อ';
@@ -110,7 +102,6 @@
 $labels['replyall']         = 'ตอบกลับทั้งหมด';
 $labels['replylist']        = 'รายชื่อตอบกลับ';
 $labels['forward']          = 'ส่งต่อ';
-$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'ส่งต่อเป็นไฟล์แนบ';
 $labels['forwardmessage']   = 'ส่งต่อจดหมาย';
 $labels['deletemessage']    = 'ลบจดหมาย';
@@ -126,8 +117,6 @@
 $labels['markmessages']     = 'ทำเครื่องหมายข้อความ';
 $labels['markread']         = 'ว่าอ่านแล้ว';
 $labels['markunread']       = 'ว่ายังไม่ได้อ่าน';
-$labels['markflagged']      = 'As flagged';
-$labels['markunflagged']    = 'As unflagged';
 $labels['moreactions']      = 'การกระทำเพิ่มเติม...';
 $labels['more']             = 'เพิ่มเติม';
 $labels['back']             = 'ย้อนกลับ';
@@ -137,73 +126,41 @@
 $labels['none'] = 'ไม่เลือก';
 $labels['currpage'] = 'หน้าปัจจุบัน';
 $labels['unread'] = 'จดหมายที่ไม่ได้อ่าน';
-$labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'ยังไม่ได้ตอบ';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ลบแล้ว';
 $labels['undeleted'] = 'ยังไม่ได้ลบ';
-$labels['invert'] = 'Invert';
 $labels['filter'] = 'ตัวกรองข้อมูล';
 $labels['list'] = 'รายการ';
-$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'แสดงทั้งหมด';
 $labels['expand-unread'] = 'แสดงเฉพาะที่ยังไม่ได้อ่าน';
 $labels['collapse-all'] = 'ปิดทั้งหมด';
-$labels['threaded'] = 'Threaded';
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'จาก/ถึง';
-$labels['flag'] = 'Flag';
 $labels['attachment'] = 'ไฟล์แนบ';
 $labels['nonesort'] = 'ไม่เลือก';
 $labels['sentdate'] = 'วันที่ส่ง';
 $labels['arrival'] = 'วันที่มาถึง';
 $labels['asc'] = 'เรียงจากน้อยมามาก';
 $labels['desc'] = 'เรีียงจากมากไปน้อย';
-$labels['listcolumns'] = 'List columns';
 $labels['listsorting'] = 'จัดเรียงคอลัมน์';
-$labels['listorder'] = 'Sorting order';
-$labels['listmode'] = 'List view mode';
-$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'แบบย่อ';
 $labels['empty'] = 'ว่างเปล่า';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'พื้นที่ใช้งาน';
 $labels['unknown']  = 'ไม่ทราบ';
 $labels['unlimited']  = 'ไม่จำกัด';
 $labels['quicksearch']  = 'ค้นหาแบบด่วน';
 $labels['resetsearch']  = 'ล้างการค้นหา';
-$labels['searchmod']  = 'Search modifiers';
-$labels['msgtext']  = 'Entire message';
 $labels['body']  = 'เนื้อหา';
-$labels['type'] = 'Type';
-$labels['openinextwin'] = 'Open in new window';
-$labels['emlsave'] = 'Download (.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
 $labels['sendmessage']    = 'ส่งจดหมาย';
 $labels['savemessage']    = 'บันทึกฉบับร่าง';
 $labels['addattachment']  = 'แนบไฟล์';
 $labels['charset']        = 'Charset';
-$labels['editortype']     = 'Editor type';
 $labels['returnreceipt']  = 'ตอบกลับผู้รับ';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ตรวจสอบคำผิด';
 $labels['resumeediting'] = 'แก้ไขต่อ';
 $labels['revertto']      = 'ย้นกลับไปยัง';
-$labels['attach'] = 'Attach';
 $labels['attachments'] = 'ไฟล์แนบ';
 $labels['upload'] = 'อัพโหลด';
-$labels['uploadprogress'] = '$percent ($current from $total)';
 $labels['close']  = 'ปิด';
-$labels['messageoptions']  = 'Message options...';
 $labels['low']     = 'ต่ำ';
 $labels['lowest']  = 'ต่ำสุด';
 $labels['normal']  = 'ปกติ';
@@ -211,24 +168,8 @@
 $labels['highest'] = 'สูงสุด';
 $labels['nosubject']  = '(ไม่มีหัวข้อ)';
 $labels['showimages'] = 'แสดงรูป';
-$labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plain text';
-$labels['savesentmessagein'] = 'Save sent message in';
-$labels['dontsave'] = 'don\'t save';
-$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
-$labels['addcc'] = 'Add Cc';
-$labels['addbcc'] = 'Add Bcc';
-$labels['addreplyto'] = 'Add Reply-To';
-$labels['addfollowupto'] = 'Add Followup-To';
-$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
-$labels['receiptread'] = 'Return Receipt (read)';
-$labels['yourmessage'] = 'This is a Return Receipt for your message';
-$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
 $labels['name']         = 'ชื่อแสดง';
 $labels['firstname']    = 'ชื่อ';
 $labels['surname']      = 'สกุล';
@@ -239,7 +180,6 @@
 $labels['jobtitle']     = 'ตำแหน่งงาน';
 $labels['department']   = 'แผนก';
 $labels['gender']       = 'เพศ';
-$labels['maidenname']   = 'Maiden Name';
 $labels['email']        = 'อีเมล์';
 $labels['phone']        = 'โทรศัพท์';
 $labels['address']      = 'ที่อยู่';
@@ -249,15 +189,12 @@
 $labels['region']       = 'รัฐ/จังหวัด';
 $labels['country']      = 'ประเทศ';
 $labels['birthday']     = 'วันเกิด';
-$labels['anniversary']  = 'Anniversary';
 $labels['website']      = 'เว็บไซต์';
 $labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
 $labels['male']   = 'ชาย';
 $labels['female'] = 'หญิง';
 $labels['manager'] = 'ผู้จัดการ';
 $labels['assistant'] = 'ผู้ช่วย';
-$labels['spouse'] = 'Spouse';
 $labels['allfields'] = 'ช่องข้อมูลทั้่งหมด';
 $labels['search'] = 'ค้นหา';
 $labels['advsearch'] = 'ค้นหาขั้นสูง';
@@ -267,30 +204,23 @@
 $labels['typework']   = 'สถานที่ทำงาน';
 $labels['typeother']  = 'อื่นๆ';
 $labels['typemobile']  = 'มือถือ';
-$labels['typemain']  = 'Main';
 $labels['typehomefax']  = 'โทรสารที่บ้าน';
 $labels['typeworkfax']  = 'โทรสารที่ทำงาน';
 $labels['typecar']  = 'รถ';
 $labels['typepager']  = 'เพจเจอร์';
 $labels['typevideo']  = 'วีดีโอ';
-$labels['typeassistant']  = 'Assistant';
 $labels['typehomepage']  = 'โฮมเพจ';
 $labels['typeblog'] = 'บล็อก';
 $labels['typeprofile'] = 'โปรไฟล์';
 $labels['addfield'] = 'เพิ่มช่องข้อมูล...';
 $labels['addcontact'] = 'เพิ่มรายชื่อ';
 $labels['editcontact'] = 'แก้ไขรายชื่อ';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
 $labels['edit']   = 'แก้ไข';
 $labels['cancel'] = 'ยกเลิก';
 $labels['save']   = 'บันทึก';
 $labels['delete'] = 'ลบ';
 $labels['rename'] = 'เปลี่ยนชื่อ';
 $labels['addphoto'] = 'เพิ่ม';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
 $labels['newcontact']     = 'สร้างรายชื่อใหม่';
 $labels['deletecontact']  = 'ลบรายชื่อที่เลือก';
 $labels['composeto']      = 'เขียนจดหมายถึง';
@@ -299,30 +229,9 @@
 $labels['export']         = 'ส่งออก';
 $labels['exportall']      = 'ส่งออกทั้งหมด';
 $labels['exportsel']      = 'ส่งออกเฉพาะที่เลือก';
-$labels['exportvcards']   = 'Export contacts in vCard format';
-$labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
 $labels['previouspage']   = 'หน้าที่แล้ว';
-$labels['firstpage']      = 'Show first page';
 $labels['nextpage']       = 'หน้าถัดไป';
-$labels['lastpage']       = 'Show last page';
-$labels['group'] = 'Group';
-$labels['groups'] = 'Groups';
-$labels['listgroup'] = 'List group members';
-$labels['personaladrbook'] = 'Personal Addresses';
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
-$labels['import'] = 'Import';
-$labels['importcontacts'] = 'Import contacts';
-$labels['importfromfile'] = 'Import from file:';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = 'Replace the entire address book';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
-$labels['done'] = 'Done';
 $labels['settingsfor'] = 'ตั้งค่าสำหรับ';
-$labels['about'] = 'About';
 $labels['preferences'] = 'ปรับแต่ง';
 $labels['userpreferences'] = 'ข้อมูลส่วนตัว';
 $labels['editpreferences'] = 'แก้ไขข้อมูลส่วนตัว';
@@ -332,99 +241,27 @@
 $labels['newitem'] = 'New item';
 $labels['edititem'] = 'Edit item';
 $labels['preferhtml'] = 'อ่านแบบ HTML';
-$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'จดหมาย HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'แสดงวันที่แบบย่อ';
 $labels['setdefault']  = 'ตั้งเป็นค่าใช้งาน';
-$labels['autodetect']  = 'Auto';
 $labels['language']  = 'ภาษา';
 $labels['timezone']  = 'เขตเวลา';
 $labels['pagesize']  = 'จำนวนจดหมายต่อหน้า';
 $labels['signature'] = 'ลายมือชื่อ';
 $labels['dstactive']  = 'Daylight savings';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'เขียนจดหมายแบบ HTML';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ลายมือชื่อแบบ HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'แสดงหน้าต่างตัวอย่างแสดงผล';
-$labels['skin'] = 'Interface skin';
-$labels['logoutclear'] = 'Clear Trash on logout';
-$labels['logoutcompact'] = 'Compact Inbox on logout';
-$labels['uisettings'] = 'User Interface';
-$labels['serversettings'] = 'Server Settings';
-$labels['mailboxview'] = 'Mailbox View';
-$labels['mdnrequests'] = 'On request for return receipt';
-$labels['askuser'] = 'ask me';
-$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = 'ignore';
-$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-$labels['skipdeleted'] = 'Do not show deleted messages';
-$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
-$labels['showremoteimages'] = 'Display remote inline images';
-$labels['fromknownsenders'] = 'from known senders';
-$labels['always'] = 'always';
-$labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'บันทึกเป็นจดหมายร่างอัตโนมัติ';
-$labels['everynminutes']  = 'every $n minute(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'ไม่ใช้';
-$labels['immediately']  = 'immediately';
-$labels['messagesdisplaying'] = 'Displaying Messages';
-$labels['messagescomposition'] = 'Composing Messages';
-$labels['mimeparamfolding'] = 'Attachment names';
-$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
-$labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'ตัวเลือกขั้นสูง';
-$labels['focusonnewmessage'] = 'Focus browser window on new message';
-$labels['checkallfolders'] = 'Check all folders for new messages';
-$labels['displaynext'] = 'After message delete/move display the next message';
-$labels['defaultfont'] = 'Default font of HTML message';
-$labels['mainoptions'] = 'Main Options';
-$labels['browseroptions'] = 'Browser Options';
-$labels['section'] = 'Section';
-$labels['maintenance'] = 'Maintenance';
 $labels['newmessage'] = 'ข้อความใหม่';
 $labels['signatureoptions'] = 'ตัวเลือกสำหรับลายเซ็็นต์';
 $labels['whenreplying'] = 'เมื่อตอบกลับ';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
 $labels['autoaddsignature'] = 'เพิ่มลายเซ็นต์เข้าไปอัตโนมัติ';
 $labels['newmessageonly'] = 'เฉพาะข้อความใหม่เท่านั้น';
 $labels['replyandforwardonly'] = 'ตอบกลับและส่งต่อเท่านั้น';
 $labels['insertsignature'] = 'แทรกลายเซ็นต์';
-$labels['previewpanemarkread']  = 'Mark previewed messages as read';
-$labels['afternseconds']  = 'after $n seconds';
-$labels['reqmdn'] = 'Always request a return receipt';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
-$labels['spellcheckoptions'] = 'Spellcheck Options';
-$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
-$labels['spellcheckignorenums'] = 'Ignore words with numbers';
-$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
-$labels['addtodict'] = 'Add to dictionary';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
 $labels['asattachment'] = 'เป็นไฟล์แนบ';
 $labels['folder']  = 'กล่องจดหมาย';
 $labels['folders']  = 'กล่องจดหมาย';
@@ -438,13 +275,9 @@
 $labels['properties'] = 'คุณสมบัติ';
 $labels['folderproperties'] = 'คุณสมบัติเกี่ยวกับโฟลเดอร์';
 $labels['parentfolder'] = 'โฟลเดอร์แม่';
-$labels['location'] = 'Location';
 $labels['info'] = 'ข้อมูล';
-$labels['getfoldersize'] = 'Click to get folder size';
-$labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'ประเภทโฟลเดอร์';
 $labels['personalfolder']  = 'โฟลเดอร์ส่วนตัว';
-$labels['otherfolder']  = 'Other User\'s Folder';
 $labels['sharedfolder']  = 'โฟลเดอร์สาธารณะ';
 $labels['sortby'] = 'เรียงตาม';
 $labels['sortasc']  = 'เรียงจากหน้าไปหลัง';
@@ -453,29 +286,10 @@
 $labels['installedplugins'] = 'ปลั๊กอินที่ติดตั้ง';
 $labels['plugin'] = 'ปลั๊กอิน';
 $labels['version'] = 'รุ่น';
-$labels['source'] = 'Source';
 $labels['license'] = 'สัญญาอนุญาต';
-$labels['support'] = 'Get support';
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 $labels['unicode'] = 'Unicode';
-$labels['english'] = 'English';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
-$labels['turkish'] = 'Turkish';
-$labels['nordic'] = 'Nordic';
-$labels['thai'] = 'Thai';
-$labels['celtic'] = 'Celtic';
-$labels['vietnamese'] = 'Vietnamese';
-$labels['japanese'] = 'Japanese';
-$labels['korean'] = 'Korean';
-$labels['chinese'] = 'Chinese';
 ?>
diff --git a/program/localization/th_TH/messages.inc b/program/localization/th_TH/messages.inc
index f39da77..46d960a 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -15,21 +15,13 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'เกิดข้อผิดพลาดบางประการ!';
 $messages['loginfailed']  = 'ไม่สามารถเข้าสู่ระบบได้';
 $messages['cookiesdisabled'] = 'Browser ของคุณไม่ได้เปิดการใช้งาน Cookie ไว้';
 $messages['sessionerror'] = 'Your session is invalid or expired';
 $messages['storageerror'] = 'ไม่สามารถติดต่อ IMAP Server ได้';
 $messages['servererror'] = 'เกิดข้อผิดพลาดเกี่ยวกับเซิร์ฟเวอร์';
-$messages['servererrormsg'] = 'Server Error: $msg';
 $messages['dberror'] = 'เกิดข้อผิดพลาดเกี่ยวกับฐานข้อมูล';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
-$messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
-$messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'ชื่อเซิร์ฟเวอร์ไม่ถูกต้อง';
 $messages['nomessagesfound'] = 'ไม่มีจดหมายในกล่องจดหมายนี้';
 $messages['loggedout'] = 'ทำการออกจากระบบเรียบร้อย';
@@ -47,22 +39,14 @@
 $messages['successfullysaved'] = 'บันทึกเรียบร้อยแล้ว';
 $messages['addedsuccessfully'] = 'รายชื่อถูกบันทึกเรียบร้อยแล้ว';
 $messages['contactexists'] = 'อีเมล์นี้มีอยู่แล้ว';
-$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'เพื่อปกป้องความส่วนตัว รูปจากภายนอกในจดหมายนี้จะถูกปิดบังไว้';
 $messages['encryptedmessage'] = 'จดหมายถูกเข้ารหัสไม่สามารถแสดงผลได้';
 $messages['nocontactsfound'] = 'ไม่พบรายชื่อที่ค้นหา';
 $messages['contactnotfound'] = 'ไม่พบรายชื่อที่ค้นหา';
-$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'การส่งจดหมายล้มเหลว';
-$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
-$messages['errorsavingsent'] = 'An error occured while saving sent message.';
-$messages['errorsaving'] = 'เกิดข้อผิดพลาดระหว่างการบันทึก';
 $messages['errormoving'] = 'ไม่สามารถย้ายจดหมายได้';
-$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'ไม่สามารถลบจดหมายได้';
-$messages['errormarking'] = 'Could not mark the message(s).';
 $messages['deletecontactconfirm']  = 'คุณมั่นใจที่ต้องการลบรายชื่อที่เลือกใช่หรือไม่?';
-$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'คุณมั่นใจที่ต้องการลบจดหมายที่เลือกใช่หรือไม่?';
 $messages['deletefolderconfirm']  = 'คุณมั่นใจที่ต้องการลบแฟ้มนี้หรือไม่?';
 $messages['purgefolderconfirm']  = 'คุณมั่นใจที่ต้องการลบจดหมายทั้งหมดในแฟ้มนี้ใช่หรือไม่?';
@@ -70,105 +54,32 @@
 $messages['groupdeleting'] = 'กำลังลบกลุ่ม...';
 $messages['folderdeleting'] = 'กำลังลบโฟลเดอร์...';
 $messages['foldermoving'] = 'กำลังย้ายโฟลเดอร์...';
-$messages['foldersubscribing'] = 'Subscribing folder...';
-$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'ฟอร์มยังไม่ครบถ้วนสมบูรณ์';
 $messages['noemailwarning'] = 'โปรดใส่อีเมล์ให้ถูกต้อง';
 $messages['nonamewarning']  = 'โปรดใส่ชื่อ';
 $messages['nopagesizewarning'] = 'โปรดใส่จำนวนหน้า';
-$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'โปรดใส่ผู้รับอย่างน้อย 1 ชื่อ';
 $messages['nosubjectwarning']  = 'หัวจดหมายว่างเปล่า คุณต้องการใส่หัวจดหมายเดี๋ยวนี้หรือไม่?';
 $messages['nobodywarning'] = 'คุณต้องการส่งจดหมายโดยไม่มีข้อความใช่หรือไม่?';
 $messages['notsentwarning'] = 'จดหมายยังไม่ถูกส่ง คุณต้องการยกเลิกหรือไม่?';
 $messages['noldapserver'] = 'โปรดเลือก LDAP Server เพื่อค้นหา';
 $messages['nosearchname'] = 'โปรดใสชื่อหรืออีเมล์';
-$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'พบจดหมายจำนวน $nr ฉบับ';
-$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'การค้นหาไม่พบ';
 $messages['searching'] = 'กำลังค้นหา...';
 $messages['checking'] = 'กำลังตรวจสอบ...';
 $messages['nospellerrors'] = 'ไม่พบคำที่สะกดผิด';
 $messages['folderdeleted'] = 'ลบแฟ้มเสร็จสมบูรณ์';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
-$messages['folderpurged'] = 'Folder has successfully been emptied.';
-$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'ลบเสร็จสมบูรณ์';
 $messages['converting'] = 'นำเอาหารจัดรูปแบบในจดหมายออก...';
 $messages['messageopenerror'] = 'ไม่สามารถอ่านจดหมายจาก Server ได้';
 $messages['fileuploaderror'] = 'การอัพโหลดล้มเหลว';
 $messages['filesizeerror'] = 'ไฟล์มีขนาดใหญ่เกิน $size';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'จดหมายนี้เป็นแบบอ่านอย่างเดียว';
 $messages['errorsavingcontact'] = 'ไม่สามารถบันทึกรายชื่อได้';
 $messages['movingmessage'] = 'กำลังย้ายข้อความ...';
 $messages['copyingmessage'] = 'กำลังคัดลอกข้อความ...';
 $messages['copyingcontact'] = 'กำลังคัดลอกรายชื่อผู้ติดต่อ...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'กำลังลบข้อความ...';
-$messages['markingmessage'] = 'Marking message(s)...';
-$messages['addingmember'] = 'Adding contact(s) to the group...';
-$messages['removingmember'] = 'Removing contact(s) from the group...';
-$messages['receiptsent'] = 'Successfully sent a read receipt.';
-$messages['errorsendingreceipt'] = 'Could not send the receipt.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
-$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
-$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
-$messages['selectimportfile'] = 'Please select a file to upload.';
-$messages['addresswriterror'] = 'The selected address book is not writeable.';
-$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
-$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'กำลังนำเข้าข้อมูล, โปรดรอสักครู่';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
-$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
-$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
-$messages['opnotpermitted'] = 'Operation not permitted!';
-$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
-$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
-$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
-$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
-$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
-$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
-$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
-$messages['smtperror'] = 'SMTP Error: $msg';
-$messages['emailformaterror'] = 'Invalid e-mail address: $email';
-$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
-$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
-$messages['internalerror'] = 'An internal error occured. Please try again.';
-$messages['contactdelerror'] = 'Could not delete contact(s).';
-$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 ?>
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 3ab173b..bcecd51 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -15,9 +15,7 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
-$labels['welcome']   = '$product, Hoş Geldiniz';
+$labels['welcome']   = '$product E-Posta Sistemine Hoş Geldiniz';
 $labels['username']  = 'Kullanıcı Adı';
 $labels['password']  = 'Parola';
 $labels['server']    = 'Sunucu';
@@ -178,6 +176,7 @@
 $labels['msgtext']  = 'Tüm posta gövdesi';
 $labels['body']  = 'Gövde';
 $labels['type'] = 'Tip';
+$labels['namex'] = 'Ad';
 $labels['openinextwin'] = 'Yeni pencerede aç';
 $labels['emlsave'] = 'İndir (.eml)';
 $labels['changeformattext'] = 'Düz yazı formatında göster';
@@ -317,8 +316,11 @@
 $labels['import'] = 'İçe aktar';
 $labels['importcontacts'] = 'Kişileri içe aktar';
 $labels['importfromfile'] = 'Dosyadan içe aktar:';
-$labels['importtarget'] = 'Yeni kişiler eklenecek adres defteri:';
+$labels['importtarget'] = 'Kişileri ekle';
 $labels['importreplace'] = 'Tüm adres defterinin yerine geçsin';
+$labels['importgroups'] = 'Grup atamalarını içe aktar';
+$labels['importgroupsall'] = 'Tümü (Gerekirse grupları oluştur)';
+$labels['importgroupsexisting'] = 'Sadece mevcut gruplar için';
 $labels['importdesc'] = 'Mevcut bir adres defterinden kişileri yükleyebilirsiniz.<br/> Şu anda <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> veya CSV (virgülle ayrılmış) veri formatları desteklenmektedir.';
 $labels['done'] = 'Tamam';
 $labels['settingsfor'] = 'Ayarlar';
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index 1831340..0b2ac1e 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Bir hata oluştu!';
 $messages['loginfailed']  = 'Giriş Başarısız';
 $messages['cookiesdisabled'] = 'Tarayıcınız çerezleri kabul etmiyor';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = 'Kişi aramak için arama terimleri giriniz';
 $messages['sendingfailed'] = 'Posta gönderilemedi';
 $messages['senttooquickly'] = 'Lütfen bu postayı göndermeden önce $sec saniye bekleyin';
-$messages['errorsavingsent'] = 'Gönderilen postayı kaydederken hata oluştu';
-$messages['errorsaving'] = 'Kaydederken bir hata oluştu';
 $messages['errormoving'] = 'Posta taşınamadı';
 $messages['errorcopying'] = 'Posta kopyalanamadı';
 $messages['errordeleting'] = 'Posta silinemedi';
@@ -100,13 +97,16 @@
 $messages['messageopenerror'] = 'Sunucudan posta yüklenemedi';
 $messages['fileuploaderror'] = 'Dosya yükleme başarısız';
 $messages['filesizeerror'] = 'Yüklenen dosya en büyük dosya boyunu ($size) aşıyor';
-$messages['copysuccess'] = '$nr adres kopyalandı';
-$messages['copyerror'] = 'Hiçbir adres kopyalanamadı';
+$messages['copysuccess'] = '$nr adet kişi başarıyla kopyalandı.';
+$messages['movesuccess'] = '$nr adet kişi başarıyla taşındı.';
+$messages['copyerror'] = 'Kişiler kopyalanamadı.';
+$messages['moveerror'] = 'Kişiler taşınamadı.';
 $messages['sourceisreadonly'] = 'Adres kaynağı salt okunur durumda';
 $messages['errorsavingcontact'] = 'Kişinin adresi kaydedilemedi';
 $messages['movingmessage'] = 'Posta(lar) taşınıyor...';
 $messages['copyingmessage'] = 'Posta(lar) kopyalanıyor...';
 $messages['copyingcontact'] = 'Kişile(ler) kopyalanıyor...';
+$messages['movingcontact'] = 'Kişi(ler) taşınıyor...';
 $messages['deletingmessage'] = 'Posta(lar) siliniyor...';
 $messages['markingmessage'] = 'Posta(lar) işaretleniyor...';
 $messages['addingmember'] = 'Gruba kişi(ler) ekleniyor...';
@@ -140,7 +140,6 @@
 $messages['emailformaterror'] = 'Hatalı e-posta adresi: $email';
 $messages['toomanyrecipients'] = 'Çok fazla alıcı. En fazla $max alıcı girebilirsiniz.';
 $messages['maxgroupmembersreached'] = 'Grup üyelerinin sayısı $max sınırını aşıyor.';
-$messages['internalerror'] = 'Bir hata oluştu. Lütfen tekrar deneyin.';
 $messages['contactdelerror'] = 'Kişi(ler) silinemedi';
 $messages['contactdeleted'] = 'Kişi(ler) silindi';
 $messages['contactrestoreerror'] = 'Silinen kişi(ler) geri getirilemiyor.';
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index ae90bd0..f530c21 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Ласкаво просимо до $product';
 $labels['username']  = 'Ім\'я користувача';
 $labels['password']  = 'Пароль';
@@ -31,7 +29,6 @@
 $labels['sent']   = 'Надіслані';
 $labels['trash']  = 'Кошик';
 $labels['junk']   = 'Спам';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Тема';
 $labels['from']    = 'Відправник';
 $labels['sender']  = 'Відправник';
@@ -139,7 +136,6 @@
 $labels['unread'] = 'Непрочитані';
 $labels['flagged'] = 'Із зірочкою';
 $labels['unanswered'] = 'Без відповіді';
-$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Видалені';
 $labels['undeleted'] = 'Не видалено';
 $labels['invert'] = 'Інвертувати виділення';
@@ -177,7 +173,6 @@
 $labels['searchmod']  = 'Де шукати';
 $labels['msgtext']  = 'В усьому листі';
 $labels['body']  = 'Тіло повідомлення';
-$labels['type'] = 'Type';
 $labels['namex'] = 'Ім\'я';
 $labels['openinextwin'] = 'Відкрити в новому вікні';
 $labels['emlsave'] = 'Зберегти (.eml)';
@@ -311,17 +306,13 @@
 $labels['lastpage']       = 'Остання сторінка';
 $labels['group'] = 'Група';
 $labels['groups'] = 'Групи';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = 'Персональні адреси';
 $labels['searchsave'] = 'Зберегти пошук';
 $labels['searchdelete'] = 'Видалити пошук';
 $labels['import'] = 'Імпорт';
 $labels['importcontacts'] = 'Імпортувати контакти';
 $labels['importfromfile'] = 'Імпортувати з файлу:';
-$labels['importtarget'] = 'Add contacts to';
 $labels['importreplace'] = 'Замінити всю адресну книгу';
-$labels['importgroups'] = 'Import group assignments';
-$labels['importgroupsall'] = 'All (create groups if necessary)';
 $labels['importgroupsexisting'] = 'Лише для існуючих груп';
 $labels['importdesc'] = 'Ви можете завантажити контакти з існуючої адресної книги.<br/>В даний час ми підтримуємо імпорт адрес в форматі візитної картки <a href="http://en.wikipedia.org/wiki/VCard"> vCard</ a> або CSV (дані розділені комами).';
 $labels['done'] = 'Готово';
@@ -356,7 +347,6 @@
 $labels['htmlonreply'] = 'тільки у відповідь на HTML повідомлення';
 $labels['htmlonreplyandforward'] = 'під час пересилання або відповіді на повідомлення HTML';
 $labels['htmlsignature'] = 'Підпис в HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Показати панель перегляду';
 $labels['skin'] = 'Тема';
 $labels['logoutclear'] = 'Очищати кошик при виході';
@@ -426,7 +416,6 @@
 $labels['spellcheckignorecaps'] = 'Ігнорувати слова із великими буквами';
 $labels['addtodict'] = 'Додати до словника';
 $labels['mailtoprotohandler'] = 'Зареєструвати обробник для посилань mailto';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Пересилання повідомлень';
 $labels['inline'] = 'у тексті';
 $labels['asattachment'] = 'як вкладення';
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index c555f93..669190c 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Виникла помилка!';
 $messages['loginfailed']  = 'Невдала спроба входу';
 $messages['cookiesdisabled'] = 'Ваш переглядач не приймає cookie';
@@ -27,8 +26,7 @@
 $messages['requesttimedout'] = 'Тайм-аут запиту';
 $messages['errorreadonly'] = 'Неможливо виконати операцію. Папка доступна тільки для читання.';
 $messages['errornoperm'] = 'Неможливо виконати операцію. Доступ заборонено';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
+$messages['erroroverquota'] = 'Неможливо виконати операцію. Немає вільного місця на диску.';
 $messages['invalidrequest'] = 'Невірний запит! Дані не збережено.';
 $messages['invalidhost'] = 'Невірне ім\'я серверу.';
 $messages['nomessagesfound'] = 'Листів не знайдено';
@@ -55,8 +53,6 @@
 $messages['contactsearchonly'] = 'Введіть деякі критерії пошуку, щоб знайти контакти';
 $messages['sendingfailed'] = 'Не вдалося відправити листа';
 $messages['senttooquickly'] = 'Будь ласка, зачекайте $sec секунд для відправки листа';
-$messages['errorsavingsent'] = 'Помилка при збереженні відправленого листа';
-$messages['errorsaving'] = 'Помилка при збереженні';
 $messages['errormoving'] = 'Не вдалося перемістити листи';
 $messages['errorcopying'] = 'Не вдалося зкопіювати листи';
 $messages['errordeleting'] = 'Не вдалося видалити листи';
@@ -100,16 +96,11 @@
 $messages['messageopenerror'] = 'Не вдалося завантажити повідомлення з сервера';
 $messages['fileuploaderror'] = 'Не вдалося вкласти файл';
 $messages['filesizeerror'] = 'Розмір вибраного файлу перевищує максимально дозволений ($size)';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Дане джерело адрес доступне лише для читання';
 $messages['errorsavingcontact'] = 'Неможливо зберегти адресу контакту';
 $messages['movingmessage'] = 'Переміщення листа...';
 $messages['copyingmessage'] = 'Копіювання листа...';
 $messages['copyingcontact'] = 'Копіювання контакту(ів)...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Видалення листа (ів)';
 $messages['markingmessage'] = 'Позначення листа (ів)';
 $messages['addingmember'] = 'Додання контакту(ів) до групи...';
@@ -128,8 +119,7 @@
 $messages['importformaterror'] = 'Помилка імпорту! Завантажений файл має невідомий формат даних.';
 $messages['importconfirm'] = '<b>Успішно імпортовано $inserted контактів, пропущено $skipped існуючих</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Пропущені $skipped наявні записи</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
+$messages['importmessageerror'] = 'Імпорт не вдався! Завантажений файл не є припустимим повідомлення або файлом поштової скриньки';
 $messages['opnotpermitted'] = 'Дія заборонена!';
 $messages['nofromaddress'] = 'В обраному профілі не вистачає адреси електронної пошти';
 $messages['editorwarning'] = 'Перемикання в режим звичайного тексту спричинить втрату всього форматування. Продовжити?';
@@ -143,7 +133,6 @@
 $messages['emailformaterror'] = 'Невірна електронна адреса: $email';
 $messages['toomanyrecipients'] = 'Занадто багато отримувачів. Зменшіть їх число до $max.';
 $messages['maxgroupmembersreached'] = 'Число адрес у групі перевищило максимум у $max.';
-$messages['internalerror'] = 'Виникла внутрішня помилка. Будь ласка, спробуйте ще раз';
 $messages['contactdelerror'] = 'Неможливо видалити контакт(и)';
 $messages['contactdeleted'] = 'Контакт(и) видалено успішно';
 $messages['contactrestoreerror'] = 'Неможливо відновити видалений(і) контакт(и).';
diff --git a/program/localization/ur_PK/labels.inc b/program/localization/ur_PK/labels.inc
index f05f851..797c98f 100644
--- a/program/localization/ur_PK/labels.inc
+++ b/program/localization/ur_PK/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = ' $product میں خوش آمدید';
 $labels['server']    = 'سَروَر';
 $labels['mail']     = 'میل';
diff --git a/program/localization/ur_PK/messages.inc b/program/localization/ur_PK/messages.inc
index 9a3c2ba..da4e396 100644
--- a/program/localization/ur_PK/messages.inc
+++ b/program/localization/ur_PK/messages.inc
@@ -15,6 +15,4 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
-
 ?>
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index 34a6625..6bd6d44 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = 'Chào bạn đã đến với $product';
 $labels['username']  = 'Tên đăng nhập';
 $labels['password']  = 'Mật khẩu';
@@ -31,7 +29,6 @@
 $labels['sent']   = 'Đã gửi';
 $labels['trash']  = 'Sọt rác';
 $labels['junk']   = 'Thư rác';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = 'Tiêu đề';
 $labels['from']    = 'Người gửi';
 $labels['sender']  = 'Người gửi';
@@ -55,7 +52,6 @@
 $labels['move']     = 'Di Chuyển';
 $labels['moveto']   = 'Di chuyển tới...';
 $labels['download'] = 'Tải về';
-$labels['open']     = 'Open';
 $labels['showattachment'] = 'Hiển thị';
 $labels['showanyway'] = 'Tiếp tục hiển thị';
 $labels['filename'] = 'Tên tập tin';
@@ -139,7 +135,7 @@
 $labels['unread'] = 'Chưa đọc';
 $labels['flagged'] = 'Đã đánh dấu';
 $labels['unanswered'] = 'Chưa trả lời';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = 'Có tệp tin đính kèm';
 $labels['deleted'] = 'Đã xóa';
 $labels['undeleted'] = 'Chưa xóa được';
 $labels['invert'] = 'Đảo ngược';
@@ -168,7 +164,6 @@
 $labels['folderactions'] = 'Thao tác với thư mục';
 $labels['compact'] = 'Nén';
 $labels['empty'] = 'Trống';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = 'Lượng đĩa sử dụng';
 $labels['unknown']  = 'Không rõ';
 $labels['unlimited']  = 'không giới hạn';
@@ -177,11 +172,12 @@
 $labels['searchmod']  = 'Tìm kiếm với từ khóa và ký tự đặc biệt [() : " - ]';
 $labels['msgtext']  = 'Toàn bộ thư';
 $labels['body']  = 'Nội dung thư';
-$labels['type'] = 'Type';
+$labels['type'] = 'Định dạng';
+$labels['namex'] = 'Họ tên';
 $labels['openinextwin'] = 'Mở trong khung cửa mới';
 $labels['emlsave'] = 'Tải về theo định dạng .eml';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
+$labels['changeformattext'] = 'Hiển thị ở chế độ text';
+$labels['changeformathtml'] = 'Hiển thị ở chế độ HTML';
 $labels['editasnew']      = 'Sửa như một email mới';
 $labels['send']           = 'Gửi';
 $labels['sendmessage']    = 'Gửi thư';
@@ -310,14 +306,13 @@
 $labels['lastpage']       = 'Hiển thị trang cuối';
 $labels['group'] = 'Nhóm';
 $labels['groups'] = 'Các nhóm';
-$labels['listgroup'] = 'List group members';
+$labels['listgroup'] = 'Danh sách các thành viên nhóm';
 $labels['personaladrbook'] = 'Các địa chỉ cá nhân';
 $labels['searchsave'] = 'Lưu tìm kiếm';
 $labels['searchdelete'] = 'Xóa tìm kiếm';
 $labels['import'] = 'Nhập';
 $labels['importcontacts'] = 'Nhập liên lạc';
 $labels['importfromfile'] = 'Nhập từ tập tin:';
-$labels['importtarget'] = 'Thêm liên lạc mới vào sổ địa chỉ';
 $labels['importreplace'] = 'Thay thế toàn bộ sổ địa chỉ';
 $labels['importdesc'] = 'Bạn có thể cập nhật các liên hệ từ một sổ địa chỉ có sẵn.<br />Hiện tại, chúng tôi hỗ trợ nhập địa chỉ từ dạng dữ liệu <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> hoặc CSV (dạng thức dữ liệu ngăn cách bằng dấu phẩy)';
 $labels['done'] = 'Hoàn tất';
@@ -352,7 +347,6 @@
 $labels['htmlonreply'] = 'Chỉ trả lời lại bằng thư HTML';
 $labels['htmlonreplyandforward'] = 'Khi chuyển tiếp hoặc trả lời thư theo định dạng HTML';
 $labels['htmlsignature'] = 'Chữ ký HTML';
-$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Hiển thị ô Xem thử';
 $labels['skin'] = 'Bề mặt giao diện';
 $labels['logoutclear'] = 'Xóa sạch rác khi thoát';
@@ -422,7 +416,6 @@
 $labels['spellcheckignorecaps'] = 'Bỏ qua các từ được viết hoa';
 $labels['addtodict'] = 'Thêm vào từ điển';
 $labels['mailtoprotohandler'] = 'Xác định cách xử lý giao thức mailto: liên kết';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Chuyển tiếp thư';
 $labels['inline'] = 'nội tuyến';
 $labels['asattachment'] = 'dạng gửi kèm';
diff --git a/program/localization/vi_VN/messages.inc b/program/localization/vi_VN/messages.inc
index f1d3b01..b2d7c71 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = 'Xuất hiện 1 lỗi';
 $messages['loginfailed']  = 'Không đăng nhập được';
 $messages['cookiesdisabled'] = 'Trình duyệt không hỗ trợ cookies';
@@ -27,8 +26,6 @@
 $messages['requesttimedout'] = 'Yêu cầu hết  hạn';
 $messages['errorreadonly'] = 'Không thể thực hiện thao tác. Thư mục chỉ cho phép đọc.';
 $messages['errornoperm'] = 'Bạn không đủ quyền hạn để thực hiện thao tác này.';
-$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
-$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Yêu cầu không hợp lệ! Không có dữ liệu nào được lưu.';
 $messages['invalidhost'] = 'Sai thông tin máy chủ';
 $messages['nomessagesfound'] = 'Không thấy có thư nào trong hộp thư này.';
@@ -55,8 +52,6 @@
 $messages['contactsearchonly'] = 'Gõ một vài từ tìm kiếm để tìm liên hệ';
 $messages['sendingfailed'] = 'Không gửi được thư';
 $messages['senttooquickly'] = 'Xin đợi vài giây trước khi gửi thư này';
-$messages['errorsavingsent'] = 'Xuất hiện một lỗi trong khi lưu thư đã gửi';
-$messages['errorsaving'] = 'Lỗi trong quá trình lưu.';
 $messages['errormoving'] = 'Không thể chuyển được thư';
 $messages['errorcopying'] = 'Không thể sao chép thư';
 $messages['errordeleting'] = 'Không thể xóa được thư';
@@ -100,16 +95,11 @@
 $messages['messageopenerror'] = 'Không thể tải thư từ máy chủ';
 $messages['fileuploaderror'] = 'Tải tập tin lên thất bại';
 $messages['filesizeerror'] = 'Tập tin được tải lên vượt quá dung lượng tối đa....';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
 $messages['sourceisreadonly'] = 'Nguồn địa chỉ này chỉ cho đọc';
 $messages['errorsavingcontact'] = 'Không thể lưu địa chỉ liên lạc';
 $messages['movingmessage'] = 'Đang chuyển thư...';
 $messages['copyingmessage'] = 'Đang sao chép thư...';
 $messages['copyingcontact'] = 'Đang sao chép liên lạc...';
-$messages['movingcontact'] = 'Moving contact(s)...';
 $messages['deletingmessage'] = 'Đang xóa thư...';
 $messages['markingmessage'] = 'Đánh dấu thư...';
 $messages['addingmember'] = 'Đang thêm liên lạc vào nhóm...';
@@ -128,8 +118,6 @@
 $messages['importformaterror'] = 'Nhập dữ liệu lỗi. Tệp tin vừa tải lên không phải tệp dữ liệu chính xác.';
 $messages['importconfirm'] = 'Đã nhập $inserted liên hệ đã chèn vào thành công.';
 $messages['importconfirmskipped'] = 'Đã bỏ qua được $skipped mục tồn tại.';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Thao tác không được cho phép!';
 $messages['nofromaddress'] = 'Địa chỉ email mất ở trong nhận dạng đã chọn';
 $messages['editorwarning'] = 'Việc chuyển soạn thảo text gốc sẽ gây ra toàn bộ định dạng text đã có bị mất. Bạn có muốn tiếp tục không?';
@@ -143,7 +131,6 @@
 $messages['emailformaterror'] = 'Địa chỉ email không hợp lệ';
 $messages['toomanyrecipients'] = 'Quá nhiều người nhận. Hãy giảm số lượng người nhận xuống tối đa là $max.';
 $messages['maxgroupmembersreached'] = 'Số lượng thành viên trong nhóm vượt quá mức tối đa là $max.';
-$messages['internalerror'] = 'Xuất hiện một lỗi nội bộ. Xin hãy thử lại';
 $messages['contactdelerror'] = 'Không thể xóa liên lạc';
 $messages['contactdeleted'] = 'Liên lạc được xóa thành công';
 $messages['contactrestoreerror'] = 'Không thể khôi phục liên lạc đã xóa';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index a22f1bf..1d9c047 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '欢迎使用 $product';
 $labels['username']  = '用户名';
 $labels['password']  = '密码';
@@ -31,7 +29,6 @@
 $labels['sent']   = '已发送邮件';
 $labels['trash']  = '已删除邮件';
 $labels['junk']   = '垃圾邮件';
-$labels['show_real_foldernames'] = 'Show real names for special folders';
 $labels['subject'] = '主题';
 $labels['from']    = '发件人';
 $labels['sender']  = '发件人';
@@ -47,10 +44,10 @@
 $labels['readstatus'] = '阅读状态';
 $labels['listoptions'] = '列表选项';
 $labels['mailboxlist'] = '邮件夹';
-$labels['messagesfromto'] = '第 $from 到 $to,共计 $count 封邮件';
-$labels['threadsfromto'] = '第 $from 到 $to,共计 $count 个主题';
+$labels['messagesfromto'] = '从 $from 到 $to,共计 $count 封邮件';
+$labels['threadsfromto'] = '从 $from 到 $to,共计 $count 个主题';
 $labels['messagenrof'] = '第 $nr 封邮件,共计 $count 封';
-$labels['fromtoshort'] = '自 $from – $to 统计 $count';
+$labels['fromtoshort'] = '$from – $to 共计 $count 个';
 $labels['copy']     = '复制';
 $labels['move']     = '移动';
 $labels['moveto']   = '移至...';
@@ -121,17 +118,17 @@
 $labels['nextmessage']      = '下一封';
 $labels['lastmessage']      = '最后一封';
 $labels['backtolist']       = '返回邮件列表';
-$labels['viewsource']       = '显示原始邮件文件';
-$labels['mark']             = '标记';
+$labels['viewsource']       = '显示来源';
+$labels['mark']             = '标记为';
 $labels['markmessages']     = '标记选中的邮件为';
 $labels['markread']         = '已读';
 $labels['markunread']       = '未读';
-$labels['markflagged']      = '已标记';
-$labels['markunflagged']    = '未标记';
+$labels['markflagged']      = '重要';
+$labels['markunflagged']    = ' 不重要';
 $labels['moreactions']      = '更多操作...';
 $labels['more']             = '更多';
 $labels['back']             = '返回';
-$labels['options']          = '选项';
+$labels['options']          = '个人选项';
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
@@ -139,7 +136,7 @@
 $labels['unread'] = '未读邮件';
 $labels['flagged'] = '已标记邮件';
 $labels['unanswered'] = '未回复邮件';
-$labels['withattachment'] = 'With attachment';
+$labels['withattachment'] = '包含附件';
 $labels['deleted'] = '已删除邮件';
 $labels['undeleted'] = '未删除邮件';
 $labels['invert'] = '反选';
@@ -168,7 +165,6 @@
 $labels['folderactions'] = '文件夹操作...';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
-$labels['importmessages'] = 'Import messages';
 $labels['quota'] = '邮箱容量';
 $labels['unknown']  = '未知';
 $labels['unlimited']  = '无限制';
@@ -177,11 +173,10 @@
 $labels['searchmod']  = '修改搜索';
 $labels['msgtext']  = '整封邮件';
 $labels['body']  = '正文';
-$labels['type'] = 'Type';
 $labels['openinextwin'] = '在新窗口中打开';
 $labels['emlsave'] = '下载(.eml)';
-$labels['changeformattext'] = 'Display in plain text format';
-$labels['changeformathtml'] = 'Display in HTML format';
+$labels['changeformattext'] = '以文本格式显示';
+$labels['changeformathtml'] = '以 HTML 格式显示';
 $labels['editasnew']      = '以新邮件编辑';
 $labels['send']           = '发送';
 $labels['sendmessage']    = '立即发送';
@@ -211,9 +206,9 @@
 $labels['highest'] = '最高';
 $labels['nosubject']  = '(无主题)';
 $labels['showimages'] = '显示图片';
-$labels['alwaysshow'] = '总是在来自 $sender 的邮件中显示图片';
+$labels['alwaysshow'] = '总是显示来自 $sender 的图片';
 $labels['isdraft']    = '这是一封草稿';
-$labels['andnmore']   = '第$nr封或更多...';
+$labels['andnmore']   = '第 $nr 封或更多...';
 $labels['togglemoreheaders'] = '显示更多消息头';
 $labels['togglefullheaders'] = '切换至原始消息头';
 $labels['htmltoggle'] = 'HTML';
@@ -302,22 +297,20 @@
 $labels['exportvcards']   = '导出联系人为 vCard 格式';
 $labels['newcontactgroup'] = '创建新的联系人群组';
 $labels['grouprename']    = '重命名群组';
-$labels['groupdelete']    = '删除群组组';
+$labels['groupdelete']    = '删除群组';
 $labels['groupremoveselected'] = '删除选中';
 $labels['previouspage']   = '上一页';
-$labels['firstpage']      = '第一页';
+$labels['firstpage']      = '首页';
 $labels['nextpage']       = '下一页';
-$labels['lastpage']       = '最后一页';
+$labels['lastpage']       = '末页';
 $labels['group'] = '分组';
 $labels['groups'] = '分组';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = '个人通讯录';
 $labels['searchsave'] = '保存搜索';
 $labels['searchdelete'] = '删除搜索';
 $labels['import'] = '导入';
 $labels['importcontacts'] = '导入通讯录';
 $labels['importfromfile'] = '从文件导入';
-$labels['importtarget'] = '添加新联系人至通讯录:';
 $labels['importreplace'] = '替换全部通讯录';
 $labels['importdesc'] = '您可以从通讯录文件上传联系人,目前已支持 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 和 CSV(逗号分隔)格式';
 $labels['done'] = '完成';
@@ -326,7 +319,7 @@
 $labels['preferences'] = '选项';
 $labels['userpreferences'] = '个人选项';
 $labels['editpreferences'] = '修改个人选项';
-$labels['identities'] = '发件身份';
+$labels['identities'] = '发件人身份';
 $labels['manageidentities'] = '管理此账号的身份';
 $labels['newidentity'] = '添加身份';
 $labels['newitem'] = '添加条目';
@@ -349,16 +342,16 @@
 $labels['showinextwin'] = '在新窗口中打开';
 $labels['composeextwin'] = '在新窗口中撰写';
 $labels['htmleditor'] = '使用 HTML 编辑器';
-$labels['htmlonreply'] = '仅当回复 HTML 邮件';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreply'] = '仅当回复 HTML 邮件时';
+$labels['htmlonreplyandforward'] = '仅当回复或转发 HTML 邮件时';
 $labels['htmlsignature'] = '使用 HTML 签名';
-$labels['showemail'] = 'Show email address with display name';
+$labels['showemail'] = '显示邮件地址时显示名字';
 $labels['previewpane'] = '显示预览窗口';
 $labels['skin'] = '界面皮肤';
 $labels['logoutclear'] = '退出时清空回收站';
 $labels['logoutcompact'] = '退出时压缩收件箱';
 $labels['uisettings'] = '用户界面';
-$labels['serversettings'] = '服务器设置';
+$labels['serversettings'] = '服务端设置';
 $labels['mailboxview'] = '显示邮件';
 $labels['mdnrequests'] = '发件人请求回执';
 $labels['askuser'] = '询问用户';
@@ -370,7 +363,7 @@
 $labels['flagfordeletion'] = '标记邮件为已删除而不是实际删除';
 $labels['skipdeleted'] = '不显示标记为已删除的邮件';
 $labels['deletealways'] = '如果移动邮件到回收站失败,则删除';
-$labels['deletejunk'] = '在、';
+$labels['deletejunk'] = '直接删除垃圾邮箱中的邮件';
 $labels['showremoteimages'] = '显示内嵌的图片';
 $labels['fromknownsenders'] = '来自已知发件人';
 $labels['always'] = '总是';
@@ -386,7 +379,7 @@
 $labels['2231folding'] = '完整的 RFC 2231(Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2232(MS Outlook)';
 $labels['2047folding'] = '完整的 RFC 2047(其它)';
-$labels['force7bit'] = '对8位字符使用 MIME 编码';
+$labels['force7bit'] = '对 8 位字符使用 MIME 编码';
 $labels['advancedoptions'] = '高级选项';
 $labels['focusonnewmessage'] = '新邮件到达时将窗口提升为焦点窗口';
 $labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
@@ -411,7 +404,7 @@
 $labels['afternseconds']  = '$n 秒之后';
 $labels['reqmdn'] = '总是要求回执';
 $labels['reqdsn'] = '总是要求投递状态通知';
-$labels['replysamefolder'] = '保存回复邮件到邮件相同的目录';
+$labels['replysamefolder'] = '保存回复邮件到邮件相同的文件夹';
 $labels['defaultabook'] = '默认地址薄';
 $labels['autocompletesingle'] = '跳过自动完成的电子邮件地址';
 $labels['listnamedisplay'] = '列出联系人为';
@@ -421,20 +414,19 @@
 $labels['spellcheckignorenums'] = '忽略带数字的单词';
 $labels['spellcheckignorecaps'] = '忽略所有大写字母的单词';
 $labels['addtodict'] = '添加到字典中';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['standardwindows'] = 'Handle popups as standard windows';
+$labels['mailtoprotohandler'] = '注册为处理 mailto 链接的程序';
 $labels['forwardmode'] = '邮件转发方式';
 $labels['inline'] = '内嵌';
 $labels['asattachment'] = '作为附件';
-$labels['folder']  = '目录管理';
-$labels['folders']  = '目录管理';
+$labels['folder']  = '文件夹管理';
+$labels['folders']  = '文件夹管理';
 $labels['foldername']  = '邮件夹名称';
 $labels['subscribed']  = '已订阅';
 $labels['messagecount'] = '邮件数量';
 $labels['create']  = '建立';
 $labels['createfolder']  = '建立新邮件夹';
 $labels['managefolders']  = '管理邮件夹';
-$labels['specialfolders'] = '定义邮件夹';
+$labels['specialfolders'] = '自定义邮件夹';
 $labels['properties'] = '属性';
 $labels['folderproperties'] = '文件夹属性';
 $labels['parentfolder'] = '父文件夹';
@@ -442,10 +434,10 @@
 $labels['info'] = '信息';
 $labels['getfoldersize'] = '获得文件夹容量';
 $labels['changesubscription'] = '更改订阅';
-$labels['foldertype'] = '目录类型';
-$labels['personalfolder']  = '私有目录';
-$labels['otherfolder']  = '他人目录';
-$labels['sharedfolder']  = '共享目录';
+$labels['foldertype'] = '文件夹类型';
+$labels['personalfolder']  = '私有文件夹';
+$labels['otherfolder']  = '他人文件夹';
+$labels['sharedfolder']  = '共享文件夹';
 $labels['sortby'] = '排序';
 $labels['sortasc']  = '递增排序';
 $labels['sortdesc'] = '递减排序';
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index ef40ed5..bf6e8cf 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -15,118 +15,122 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = '发生错误!';
 $messages['loginfailed']  = '登录失败。';
-$messages['cookiesdisabled'] = '您的浏览器不接受 cookies。';
-$messages['sessionerror'] = '会话已过期。';
-$messages['storageerror'] = '连接到邮件服务器失败。';
+$messages['cookiesdisabled'] = '您的浏览器不支持 Cookies。';
+$messages['sessionerror'] = '会话无效或已过期。';
+$messages['storageerror'] = '连接至 IMAP 服务器失败。';
 $messages['servererror'] = '服务器错误!';
-$messages['servererrormsg'] = '服务器错误: $msg';
+$messages['servererrormsg'] = '服务器错误:$msg';
 $messages['dberror'] = '数据库错误!';
 $messages['requesttimedout'] = '请求超时';
-$messages['errorreadonly'] = '不可对只读文件夹进行操作。';
-$messages['errornoperm'] = '无权限操作';
-$messages['invalidrequest'] = '无效的请求!数据保存失败。';
-$messages['invalidhost'] = '非法主机名。';
+$messages['errorreadonly'] = '无法完成操作。文件夹为只读。';
+$messages['errornoperm'] = '无法完成操作。没有权限。';
+$messages['erroroverquota'] = '无法完成操作。没有足够的磁盘空间。';
+$messages['erroroverquotadelete'] = '没有足够的磁盘空间。请使用 SHIFT+DEL 删除一部分邮件。';
+$messages['invalidrequest'] = '请求无效!未保存数据。';
+$messages['invalidhost'] = '无效的主机名。';
 $messages['nomessagesfound'] = '此邮件夹内无邮件。';
 $messages['loggedout'] = '您已成功注销,再见!';
-$messages['mailboxempty'] = '邮件夹为空';
-$messages['refreshing'] = '刷新中...';
+$messages['mailboxempty'] = '邮件夹为空。';
+$messages['refreshing'] = '正在刷新...';
 $messages['loading'] = '正在载入...';
 $messages['uploading'] = '正在上传文件...';
 $messages['uploadingmany'] = '正在上传文件...';
 $messages['loadingdata'] = '正在载入数据...';
 $messages['checkingmail'] = '正在检查新邮件...';
-$messages['sendingmessage'] = '正在发送邮件...';
-$messages['messagesent'] = '邮件发送成功。';
+$messages['sendingmessage'] = '正在发送...';
+$messages['messagesent'] = '邮件已发送。';
 $messages['savingmessage'] = '正在保存邮件...';
-$messages['messagesaved'] = '邮件已暂存到草稿箱。';
+$messages['messagesaved'] = '邮件已暂存至草稿箱。';
 $messages['successfullysaved'] = '保存成功。';
-$messages['addedsuccessfully'] = '成功添加联系人。';
+$messages['addedsuccessfully'] = '联系人已添加。';
 $messages['contactexists'] = '当前联系人的电子邮件地址已存在。';
-$messages['contactnameexists'] = '已存在同名的联系人。';
-$messages['blockedimages'] = '为保护隐私,此邮件中的远程图片未显示。';
+$messages['contactnameexists'] = '已存在同名联系人。';
+$messages['blockedimages'] = '由于保护隐私,此邮件中的远程图片未予显示。';
 $messages['encryptedmessage'] = '抱歉!该邮件已被加密,无法显示。';
 $messages['nocontactsfound'] = '未找到联系人。';
 $messages['contactnotfound'] = '未找到指定的联系人。';
 $messages['contactsearchonly'] = '请输入联系人的搜索条件';
 $messages['sendingfailed'] = '发送失败。';
-$messages['senttooquickly'] = '您需要等待 $sec 秒才能发送邮件。';
-$messages['errorsavingsent'] = '保存已发送邮件时发生错误。';
-$messages['errorsaving'] = '保存时发生错误。';
+$messages['senttooquickly'] = '您需要等待$sec秒才能发送邮件。';
 $messages['errormoving'] = '无法移动邮件。';
 $messages['errorcopying'] = '无法复制邮件。';
 $messages['errordeleting'] = '无法删除邮件。';
 $messages['errormarking'] = '无法标记邮件。';
-$messages['deletecontactconfirm']  = '确定要删除已选中的联系人?';
-$messages['deletegroupconfirm']  = '确定要删除以选中的组?';
-$messages['deletemessagesconfirm'] = '确定要删除已选中的邮件?';
-$messages['deletefolderconfirm']  = '确定要删除已选中的邮件夹?';
-$messages['purgefolderconfirm']  = '是否确认要删除当前邮件夹中的所有邮件?';
+$messages['deletecontactconfirm']  = '是否删除选中的联系人?';
+$messages['deletegroupconfirm']  = '是否删除选中的群组?';
+$messages['deletemessagesconfirm'] = '是否删除选中的邮件?';
+$messages['deletefolderconfirm']  = '是否删除选中的邮件夹?';
+$messages['purgefolderconfirm']  = '是否删除当前邮件夹中的全部邮件?';
 $messages['contactdeleting'] = '正在删除联系人...';
-$messages['groupdeleting'] = '正在删除组...';
+$messages['groupdeleting'] = '正在删除群组...';
 $messages['folderdeleting'] = '正在删除文件夹...';
 $messages['foldermoving'] = '正在移动文件夹...';
 $messages['foldersubscribing'] = '订阅文件夹中...';
 $messages['folderunsubscribing'] = '退订中...';
-$messages['formincomplete'] = '当前表单未填写完整,请完整填写。';
+$messages['formincomplete'] = '表单未填写完整。';
 $messages['noemailwarning'] = '请输入一个有效的邮件地址。';
-$messages['nonamewarning']  = '请输入名字。';
-$messages['nopagesizewarning'] = '请输入每页显示的邮件数量';
+$messages['nonamewarning']  = '请输入名称。';
+$messages['nopagesizewarning'] = '请输入每页显示的邮件数量。';
 $messages['nosenderwarning'] = '请输入发件人地址。';
-$messages['norecipientwarning'] = '至少需要一个收件人。';
+$messages['norecipientwarning'] = '至少输入一个收件人。';
 $messages['nosubjectwarning']  = '主题为空。您要输入一个主题吗?';
-$messages['nobodywarning'] = '要发送无正文的邮件吗?';
+$messages['nobodywarning'] = '要发送没有正文的邮件吗?';
 $messages['notsentwarning'] = '邮件未发送。您确定要离开并舍弃当前邮件吗?';
-$messages['noldapserver'] = '请选择一个LDAP服务器进行查找。';
-$messages['nosearchname'] = '请输入一个联系人姓名或电子邮件地址。';
-$messages['notuploadedwarning'] = '附件还没有全部上传,请等待或者取消上传。';
+$messages['noldapserver'] = '请选择一个用来查找的 LDAP 服务器。';
+$messages['nosearchname'] = '请输入联系人姓名或电子邮件地址。';
+$messages['notuploadedwarning'] = '附件尚未全部上传,请耐心等待或者取消上传。';
 $messages['searchsuccessful'] = '共找到 $nr 封邮件。';
 $messages['contactsearchsuccessful'] = '共找到 $nr 位联系人。';
-$messages['searchnomatch'] = '未找到任何符合条件的邮件';
+$messages['searchnomatch'] = '未找到任何符合条件的邮件。';
 $messages['searching'] = '正在搜索...';
 $messages['checking'] = '正在检查...';
-$messages['nospellerrors'] = '未发现拼写错误';
-$messages['folderdeleted'] = '文件夹已被成功删除。';
-$messages['foldersubscribed'] = '成功订阅文件夹。';
-$messages['folderunsubscribed'] = '成功退订的文件夹。';
-$messages['folderpurged'] = '成功清空文件夹。';
+$messages['nospellerrors'] = '未发现拼写错误。';
+$messages['folderdeleted'] = '删除文件夹成功。';
+$messages['foldersubscribed'] = '订阅文件夹成功。';
+$messages['folderunsubscribed'] = '退订文件夹成功。';
+$messages['folderpurged'] = '清空文件夹成功。';
 $messages['folderexpunged'] = '文件夹已清空。';
 $messages['deletedsuccessfully'] = '删除成功。';
 $messages['converting'] = '格式转换中...';
-$messages['messageopenerror'] = '无法从服务器上加载邮件内容。';
+$messages['messageopenerror'] = '无法从服务器加载邮件内容。';
 $messages['fileuploaderror'] = '文件上传失败。';
 $messages['filesizeerror'] = '上传的文件超过了 $size 的大小限制。';
-$messages['copysuccess'] = '成功复制 $nr 个地址。';
-$messages['copyerror'] = '无法复制地址。';
+$messages['copysuccess'] = '成功复制 $nr 个联系人。';
+$messages['movesuccess'] = '成功移动 $nr 个联系人。';
+$messages['copyerror'] = '无法复制联系人。';
+$messages['moveerror'] = '无法移动联系人。';
 $messages['sourceisreadonly'] = '源地址为只读。';
-$messages['errorsavingcontact'] = '无法保存联系人的地址。';
-$messages['movingmessage'] = '移动邮件到...';
-$messages['copyingmessage'] = '复制邮件到...';
-$messages['copyingcontact'] = '复制联系人...';
+$messages['errorsavingcontact'] = '无法保存联系人地址。';
+$messages['movingmessage'] = '正在移动邮件...';
+$messages['copyingmessage'] = '正在复制邮件...';
+$messages['copyingcontact'] = '正在复制联系人...';
+$messages['movingcontact'] = '移动联系人...';
 $messages['deletingmessage'] = '正在删除邮件...';
 $messages['markingmessage'] = '正在标记邮件...';
-$messages['addingmember'] = '正在添加联系人到组...';
-$messages['removingmember'] = '正在从组中删除联系人...';
-$messages['receiptsent'] = '成功发送了一个已读回执。';
-$messages['errorsendingreceipt'] = '无法发送回执。';
-$messages['deleteidentityconfirm'] = '您真的想删除这个验证信息吗?';
-$messages['nodeletelastidentity'] = '无法删除这个身份,这是最后一个。';
-$messages['forbiddencharacter'] = '目录名包含隐藏字符。';
+$messages['addingmember'] = '正在添加联系人至群组...';
+$messages['removingmember'] = '正在从群组中删除联系人...';
+$messages['receiptsent'] = '成功发送一个已读回执。';
+$messages['errorsendingreceipt'] = '无法发送已读回执。';
+$messages['deleteidentityconfirm'] = '是否删除该身份?';
+$messages['nodeletelastidentity'] = '无法删除该身份,这是最后一个。';
+$messages['forbiddencharacter'] = '文件夹名包含禁止字符。';
 $messages['selectimportfile'] = '请选择要上传的文件。';
-$messages['addresswriterror'] = '已选择的地址簿不可写。';
-$messages['contactaddedtogroup'] = '成功添加联系人至该分组。';
-$messages['contactremovedfromgroup'] = '成功从该分组移除联系人。';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['addresswriterror'] = '选中的通讯录不可写。';
+$messages['contactaddedtogroup'] = '添加联系人至该群组成功。';
+$messages['contactremovedfromgroup'] = '从该群组移除联系人成功。';
+$messages['nogroupassignmentschanged'] = '群组资料没有变更。';
 $messages['importwait'] = '正在导入,请稍后...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importformaterror'] = '导入失败!文件无效。';
 $messages['importconfirm'] = '<b>成功导入 $inserted 联系人</b>';
 $messages['importconfirmskipped'] = '<b>跳过已存在的 $skipped 项目</b>';
+$messages['importmessagesuccess'] = '成功导入 $nr 条信息';
+$messages['importmessageerror'] = '导入失败!文件无效';
 $messages['opnotpermitted'] = '不允许的操作!';
-$messages['nofromaddress'] = '选中的身份中没有邮件地址。';
-$messages['editorwarning'] = '切换到纯文本编辑器将导致邮件正文中的所有文本格式失效,您确定要这样做吗?';
-$messages['httpreceivedencrypterror'] = '发生了一个致命的配置错误,请立即联系管理员。<b>您的邮件无法发送。</b>';
+$messages['nofromaddress'] = '选中的身份没有邮件地址。';
+$messages['editorwarning'] = '切换至纯文本编辑器将导致邮件正文中的所有文本格式失效,您确定要这样做吗?';
+$messages['httpreceivedencrypterror'] = '<b>您的邮件无法发送</b>,因为发生了一个严重的配置错误,请立即联系管理员。';
 $messages['smtpconnerror'] = 'SMTP 错误 ($code):连接服务器失败。';
 $messages['smtpautherror'] = 'SMTP 错误 ($code): 认证失败。';
 $messages['smtpfromerror'] = 'SMTP 错误 ($code):添加发件人失败 "$from" ($msg)。';
@@ -136,17 +140,16 @@
 $messages['emailformaterror'] = '无效的邮件地址:$email';
 $messages['toomanyrecipients'] = '收件人太多,请减少人数至 $max。';
 $messages['maxgroupmembersreached'] = '组员数量超过最大值 $max。';
-$messages['internalerror'] = '遇到一个内部错误,请重试。';
 $messages['contactdelerror'] = '无法删除联系人。';
 $messages['contactdeleted'] = '删除联系人成功。';
 $messages['contactrestoreerror'] = '无法恢复已删除的联系人。';
 $messages['contactrestored'] = '联系人恢复成功。';
-$messages['groupdeleted'] = '成功删除组。';
-$messages['grouprenamed'] = '组改名成功。';
-$messages['groupcreated'] = '成功创建组';
+$messages['groupdeleted'] = '删除群组成功。';
+$messages['grouprenamed'] = '群组改名成功。';
+$messages['groupcreated'] = '成功创建群组';
 $messages['savedsearchdeleted'] = '成功删除保存的搜索';
 $messages['savedsearchdeleteerror'] = '无法删除保存的搜索';
-$messages['savedsearchcreated'] = '成功建立保存的搜索';
+$messages['savedsearchcreated'] = '成功创建保存的搜索';
 $messages['savedsearchcreateerror'] = '无法创建保存的搜索。';
 $messages['messagedeleted'] = '删除邮件成功。';
 $messages['messagemoved'] = '移动邮件成功。';
@@ -160,8 +163,8 @@
 $messages['foldercreated'] = '成功创建文件夹';
 $messages['invalidimageformat'] = '非法的图像类型。';
 $messages['mispellingsfound'] = '检查到拼写错误。';
-$messages['parentnotwritable'] = '无法创建和转移到所选的目录,权限不足。';
-$messages['messagetoobig'] = '由于邮件部分过大无法处理。';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
+$messages['parentnotwritable'] = '无法创建/转移文件夹至指定的上级文件夹,没有权限。';
+$messages['messagetoobig'] = '邮件过大无法处理。';
+$messages['attachmentvalidationerror'] = '警告!该附件很可疑,因为其自身的格式与邮件中声明的格式不符。如果您不信任发送人,则不应该在浏览器中打开该附件。<br/><br/><em>声明格式:$expected;实际格式:$detected</em>';
+$messages['noscriptwarning'] = '警告:本程序需要 Javascript 支持!请在浏览器设置中启用 Javascript。';
 ?>
diff --git a/program/localization/zh_TW/csv2vcard.inc b/program/localization/zh_TW/csv2vcard.inc
index 9dacdde..36c5495 100644
--- a/program/localization/zh_TW/csv2vcard.inc
+++ b/program/localization/zh_TW/csv2vcard.inc
@@ -15,7 +15,6 @@
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
-
 $map = array();
 $map['anniversary'] = "紀念日";
 $map['assistants_name'] = "助理";
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index ab23c7a..4250e51 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -15,8 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
-
-
 $labels['welcome']   = '歡迎使用 $product';
 $labels['username']  = '使用者名稱';
 $labels['password']  = '使用者密碼';
@@ -177,7 +175,6 @@
 $labels['searchmod']  = '修改搜尋';
 $labels['msgtext']  = '整封郵件';
 $labels['body']  = '內文';
-$labels['type'] = 'Type';
 $labels['namex'] = '名稱';
 $labels['openinextwin'] = '在新視窗開啟';
 $labels['emlsave'] = '下載(.eml)';
@@ -311,16 +308,13 @@
 $labels['lastpage']       = '顯示最後一頁';
 $labels['group'] = '群組';
 $labels['groups'] = '群組';
-$labels['listgroup'] = 'List group members';
 $labels['personaladrbook'] = '個人通訊錄';
 $labels['searchsave'] = '儲存搜尋結果';
 $labels['searchdelete'] = '刪除搜尋結果';
 $labels['import'] = '匯入通訊錄';
 $labels['importcontacts'] = '由檔案匯入通訊錄';
 $labels['importfromfile'] = '選擇你要匯入的檔案:';
-$labels['importtarget'] = 'Add contacts to';
 $labels['importreplace'] = '以匯入的資料取代已存在的重複資料';
-$labels['importgroups'] = 'Import group assignments';
 $labels['importgroupsall'] = '全部(如有必要,新增群組)';
 $labels['importgroupsexisting'] = '僅限於既有群組';
 $labels['importdesc'] = '您可以將已存在的資料匯入通訊錄,目前支援匯入 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 與 CSV (逗點分隔)格式資料';
@@ -426,7 +420,6 @@
 $labels['spellcheckignorecaps'] = '忽略大寫字母';
 $labels['addtodict'] = '加入詞典';
 $labels['mailtoprotohandler'] = '註冊mailto:協定處理程式';
-$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = '郵件轉寄方式';
 $labels['inline'] = '放入內文';
 $labels['asattachment'] = '當成附件';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 04e8c23..c52116a 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
-
 $messages['errortitle']  = '發生錯誤!';
 $messages['loginfailed']  = '登入失敗';
 $messages['cookiesdisabled'] = '你的瀏覽器不接受 cookies';
@@ -43,7 +42,7 @@
 $messages['sendingmessage'] = '寄出郵件中...';
 $messages['messagesent'] = '郵件寄出成功';
 $messages['savingmessage'] = '儲存郵件中...';
-$messages['messagesaved'] = '訊息已經存至';
+$messages['messagesaved'] = '郵件已經儲存至草稿匣';
 $messages['successfullysaved'] = '儲存成功';
 $messages['addedsuccessfully'] = '聯絡人已經成功地新增至通訊錄';
 $messages['contactexists'] = '此聯絡人的電子郵件位址已存在';
@@ -55,8 +54,6 @@
 $messages['contactsearchonly'] = '輸入關鍵字找尋連絡人';
 $messages['sendingfailed'] = '郵件寄出失敗';
 $messages['senttooquickly'] = '你寄出的郵件太過於頻繁,請稍候 $sec 秒後再試一次。';
-$messages['errorsavingsent'] = '儲存寄件備份時發生錯誤';
-$messages['errorsaving'] = '儲存時發生錯誤';
 $messages['errormoving'] = '無法移動此郵件';
 $messages['errorcopying'] = '無法訊息';
 $messages['errordeleting'] = '無法刪除此郵件';
@@ -100,16 +97,16 @@
 $messages['messageopenerror'] = '無法從伺服器載入郵件';
 $messages['fileuploaderror'] = '檔案上傳失敗';
 $messages['filesizeerror'] = '上傳的檔案超過了 $size 的大小限制';
-$messages['copysuccess'] = 'Successfully copied $nr contacts.';
-$messages['movesuccess'] = 'Successfully moved $nr contacts.';
-$messages['copyerror'] = 'Could not copy any contacts.';
-$messages['moveerror'] = 'Could not move any contacts.';
+$messages['copysuccess'] = '成功複製 $nr 個聯絡人。';
+$messages['movesuccess'] = '成功移動 $nr 個聯絡人。';
+$messages['copyerror'] = '無法複製任何聯絡人。';
+$messages['moveerror'] = '無法移動任何聯絡人。';
 $messages['sourceisreadonly'] = '此來源位址是唯讀的';
 $messages['errorsavingcontact'] = '無法儲存連絡人的位址';
 $messages['movingmessage'] = '移動郵件中...';
 $messages['copyingmessage'] = '複製訊息...';
 $messages['copyingcontact'] = '複製群組...';
-$messages['movingcontact'] = 'Moving contact(s)...';
+$messages['movingcontact'] = '正在移動連絡人...';
 $messages['deletingmessage'] = '刪除訊息...';
 $messages['markingmessage'] = '標示訊息...';
 $messages['addingmember'] = '新增連絡人至群組';
@@ -128,8 +125,8 @@
 $messages['importformaterror'] = '匯入失敗!上載的檔案格式不支援';
 $messages['importconfirm'] = '<b>成功匯入 $inserted 筆資料,略過 $skipped 筆已存在的資料</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>略過 $skipped 個已存在的項目</b>';
-$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
-$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
+$messages['importmessagesuccess'] = '成功匯入 $nr 封郵件';
+$messages['importmessageerror'] = '匯入失敗!上載的檔案不是有效的郵件或資料夾檔案';
 $messages['opnotpermitted'] = '不允許的操作';
 $messages['nofromaddress'] = '在選擇的身分中遺失了電子郵件位址';
 $messages['editorwarning'] = '切換到純文字編輯模式將會遺失所有設定的樣式。您確定要繼續嗎?';
@@ -143,7 +140,6 @@
 $messages['emailformaterror'] = '錯誤電子郵件:$email';
 $messages['toomanyrecipients'] = '太多收件人。請減少至 $max 人';
 $messages['maxgroupmembersreached'] = '太多群組成員,超過最大人數 $max 人';
-$messages['internalerror'] = '內部發生錯誤。請再次嘗試';
 $messages['contactdelerror'] = '無法刪除聯絡人';
 $messages['contactdeleted'] = '聯絡人成功刪除';
 $messages['contactrestoreerror'] = '無法復原刪除的連絡人';

--
Gitblit v1.9.1